rebase to spree 2.4.11.beta

.editorconfig

@@ -0,0 +1,22 @@
+# http://EditorConfig.org
+# https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 2
+
+[**.rb]
+max_line_length = 80
+
+[**.js, **.coffee]
+max_line_length = 120
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -9,6 +9,7 @@
 .idea
 .loadpath
 .project
+.ruby-version
 bin/*
 public/dispatch.cgi
 public/dispatch.fcgi
@@ -37,19 +38,18 @@ spree_test
 testapp
 **/spec/dummy
 tmp
-vendor/rails
-vendor/extensions/google_base
 public/google_base.xml
 public/template_google_base.xml
 coverage/*
 var
 TAGS
 nbproject
-vendor/extensions/theme_default/app/stylesheets/*.css
+./vendor
 tags
 *.swp
 rerun.txt
 test_app
 .rvmrc
 **/coverage
 */.sass-cache
+.localeapp

.teatro.yml

@@ -0,0 +1,19 @@
+stage:
+  before:
+    - export SECRET_KEY_BASE=abc
+    - bundle exec rake sandbox
+    - echo 'Rails.logger = Logger.new(STDOUT)' > sandbox/config/initializers/logger_stdout.rb
+    - cd sandbox
+    - ln -sf $PWD/public $PWD/../public
+
+  run:
+    # workdir is sandbox
+    - bundle exec rails server
+
+  database:
+    - echo "skip database stage. rake sandbox already did everything"
+
+config:
+  database: postgresql
+  services:
+    - postgresql

.travis.yml

@@ -1,29 +1,22 @@
 before_script:
-  - 'sh -e /etc/init.d/xvfb start'
-  - 'export DISPLAY=:99.0'
+  - sh -e /etc/init.d/xvfb start
+  - export DISPLAY=:99.0
 bundler_args: --without development production --quiet
 env:
-  - GEM='api:sqlite'
-  - GEM='api:mysql'
-  - GEM='api:postgres'
-  - GEM='core:sqlite'
-  - GEM='core:mysql'
-  - GEM='core:postgres'
-  - GEM='dash:sqlite'
-  - GEM='dash:mysql'
-  - GEM='dash:postgres'
-  - GEM='promo:sqlite'
-  - GEM='promo:mysql'
-  - GEM='promo:postgres'
+  - GEM=api DB=mysql
+  - GEM=api DB=postgres
+  - GEM=backend DB=mysql
+  - GEM=backend DB=postgres
+  - GEM=core DB=mysql
+  - GEM=core DB=postgres
+  - GEM=frontend DB=mysql
+  - GEM=frontend DB=postgres
+  - GEM=sample DB=mysql
+  - GEM=sample DB=postgres
+before_install:
+  - cd $GEM; export BUNDLE_GEMFILE="`pwd`/Gemfile"
 script:
-  - 'ci/travis.sh'
-notifications:
-  email:
-    - ryan@spreecommerce.com
-  irc:
-    use_notice: true
-    skip_join: true
-    channels:
-      - "irc.freenode.org#spree"
+  - bundle exec rake test_app
+  - RSPEC_RETRY_COUNT=2 bundle exec rake spec
 rvm:
-  - 1.9.3
+  - 2.1.5

CONTRIBUTING.md

@@ -1,21 +1,30 @@
-Spree is an open source project and we encourage contributions.  Please see the [contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html) before contributing.
+Spree is an open source project and we encourage contributions.  Please see the
+[contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html)
+before contributing.
 
 ## Filing an issue
 
 When filing an issue on the Spree project, please provide these details:
 
 * A comprehensive list of steps to reproduce the issue.
-* The version of Spree *and* the version of Rails.
-* A list of all extensions.
+* What you're *expecting* to happen compared with what's *actually* happening.
+* Your application's complete `Gemfile.lock`, and `Gemfile.lock` as text in a [Gist](https://gist.github.com) (*not as an image*)
 * Any relevant stack traces ("Full trace" preferred)
 
-In 99% of cases, this information is enough to determine the cause and solution to the problem that is being described.
+In 99% of cases, this information is enough to determine the cause and solution
+to the problem that is being described.
 
-Any issue that is open for 14 days without actionable information or activity will be marked as "stalled" and then closed. Stalled issues can be re-opened if the information requested is provided.
+Please remember to format code using triple backticks (\`) so that it is neatly
+formatted when the issue is posted.
+
+Any issue that is open for 14 days without actionable information or activity
+will be marked as "stalled" and then closed. Stalled issues can be re-opened if
+the information requested is provided.
 
 ## Pull requests
 
-We gladly accept pull requests to fix bugs and, in some circumstances, add new features to Spree.
+We gladly accept pull requests to add documentation, fix bugs and, in some circumstances,
+add new features to Spree.
 
 Here's a quick guide:
 
@@ -24,17 +33,18 @@ Here's a quick guide:
 2. Run the tests. We only take pull requests with passing tests, and it's great
 to know that you have a clean slate:
 
-        $ bundle install
-        $ bundle exec rake test_app
-        $ bundle exec rake
+        $ bash build.sh
 
-3. Add a test for your change. Only refactoring and documentation changes
-require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+3. Create new branch then make changes and add tests for your changes. Only
+refactoring and documentation changes require no new tests. If you are adding
+functionality or fixing a bug, we need tests!
 
-4. Make the test pass.
+4. Push to your fork and submit a pull request. If the changes will apply cleanly
+to the latest stable branches and master branch, you will only need to submit one
+pull request.
 
-5. Push to your fork and submit a pull request. If the changes will apply cleanly to the latest stable branches and master branch, you will only need to submit one pull request.
+5. If a PR does not apply cleanly to one of its targeted branches, then a separate
+PR should be created that does. For instance, if a PR applied to master & 2-1-stable but not 2-0-stable, then there should be one PR for master & 2-1-stable and another, separate PR for 2-0-stable.
 
 At this point you're waiting on us. We like to at least comment on, if not
 accept, pull requests within three business days (and, typically, one business
@@ -53,9 +63,12 @@ Syntax:
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.
 * Prefer &&/|| over and/or.
-* `MyClass.my_method(my_arg)` not `my_method( my_arg )` or my_method my_arg.
+* `MyClass.my_method(my_arg)` not `my_method( my_arg )` or `my_method my_arg`.
 * `a = b` and not `a=b`.
 * `a_method { |block| ... }` and not `a_method { | block | ... }`
 * Follow the conventions you see used in the source already.
+* -> symbol over lambda
+* Ruby 1.9 hash syntax `{ key: value }` over Ruby 1.8 hash syntax `{ :key => value }`
+* Alphabetize the class methods to keep them organized
 
 And in case we didn't emphasize it enough: we love tests!