spree 1.2.5 → 1.3.0.rc1

data/README.md

@@ -1,6 +1,10 @@
+**THIS README IS FOR THE MASTER BRANCH OF SPREE AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF
+SPREE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
+
 SUMMARY
 -------
 
+
 Spree is a complete open source e-commerce solution built with Ruby on Rails.  It was originally developed by Sean Schofield
 and is now maintained by a dedicated [core team](http://spreecommerce.com/core-team).  You can find out more
 by visiting the [Spree e-commerce project page](http://spreecommerce.com).
@@ -20,17 +24,17 @@ All of the gems are designed to work together to provide a fully functional e-co
 however, to use only the pieces you are interested in.  So for example, you could use just the barebones spree\_core gem
 and perhaps combine it with your own custom promotion scheme instead of using spree_promo.
 
+[![Build Status](https://secure.travis-ci.org/spree/spree.png)](http://travis-ci.org/spree/spree)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/spree/spree)
-
 Installation
 ------------
 
 The fastest way to get started is by using the spree command line tool
 available in the spree gem which will add Spree to an existing Rails application.
 
-    $ gem install rails -v 3.2.13
+    $ gem install rails -v 3.2.9
     $ gem install spree
-    $ rails _3.2.13_ new my_store
+    $ rails _3.2.9_ new my_store
     $ spree install my_store
 
 This will add the Spree gem to your Gemfile, create initializers, copy migrations and
@@ -133,6 +137,8 @@ Add the following to your Gemfile
 
 Then run `bundle install`. Authentication will then work exactly as it did in previous versions of Spree.
 
+This line is automatically added by the `spree install` command.
+
 If you're installing this in a new Spree 1.2+ application, you'll need to install and run the migrations with
 
     $ bundle exec rake spree_auth:install:migrations
@@ -146,18 +152,14 @@ to
 ```ruby
 Spree.user_class = "Spree::User"
 ```
-and then run `bundle exec rake spree_auth:admin:create` in order to set up the admin user for the application.
-
-Running Tests
--------------
 
-[![Team City](http://www.jetbrains.com/img/logos/logo_teamcity_small.gif)](http://www.jetbrains.com/teamcity)
+In order to set up the admin user for the application you should then run:
 
-We use [TeamCity](http://www.jetbrains.com/teamcity/) to run the tests for Spree.
+    $ bundle exec rake spree_auth:admin:create
 
-You can see the build statuses at [http://ci.spreecommerce.com](http://ci.spreecommerce.com/guestLogin.html?guest=1).
 
----
+Running Tests
+-------------
 
 Each gem contains its own series of tests, and for each directory, you need to do a quick one-time
 creation of a test application and then you can use it to run the tests.  For example, to run the
@@ -186,6 +188,8 @@ If you want to run a particular line of spec
 
     $ bundle exec rspec spec/models/state_spec.rb:7
 
+Travis, the continuous integration service, runs the test suite for each gem one at a time, using the same commands as contained within [`build.sh`](https://github.com/spree/spree/tree/master/build.sh).
+
 Contributing
 ------------
 

data/lib/sandbox.sh

@@ -4,6 +4,6 @@ rm -rf sandbox
 rails new sandbox --skip-bundle
 cd sandbox
 echo "gem 'spree', :path => '..'" >> Gemfile
-echo "gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-2-stable'" >> Gemfile
+echo "gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => 'edge'" >> Gemfile
 bundle install --gemfile Gemfile
 rails g spree:install --auto-accept --user_class=Spree::User

data/lib/spree.rb

@@ -1,4 +1,5 @@
 require 'spree_core'
 require 'spree_api'
+require 'spree_dash'
 require 'spree_promo'
 require 'spree_sample'

metadata

@@ -1,86 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: spree
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
+- !ruby/object:Gem::Dependency
+  name: spree_dash
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_sample
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_promo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_cmd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.5
-description: 'Spree is an open source e-commerce framework for Ruby on Rails.  Join
+        version: 1.3.0.rc1
+description: ! 'Spree is an open source e-commerce framework for Ruby on Rails.  Join
   us on the spree-user google group or in #spree on IRC'
 email: sean@spreecommerce.com
 executables: []
@@ -91,28 +118,28 @@ files:
 - lib/sandbox.sh
 - lib/spree.rb
 homepage: http://spreecommerce.com
-licenses:
-- BSD-3
-metadata: {}
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Full-stack e-commerce framework for Ruby on Rails.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6e57c6a006b76810c1a8d090193a0efa93c0a16c
-  data.tar.gz: dd0230cf7cbe0ddab3f8f0c2a20841610b6f5d79
-SHA512:
-  metadata.gz: 92c71e2357c354cf95b1e3503fdb1c5c82673800c1a5879804d028962c481b43a33a851a4721f15e76c58494b50127e1229d200d61d4c635e040f2e369b3b8dd
-  data.tar.gz: 1765f9dc944027b0d39e19a5f298380654edb17304fb01559671af5a40e5ebf6dd71879c0a95a4487da619a69a8c15deedb1f4fb6f06903c91a0c9e210a0db45