spree 1.1.6 → 1.2.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).
@@ -10,7 +14,6 @@ in a single set of [online documentation](http://spreecommerce.com/documentation
 automatically require all of the necessary gem dependencies which are:
 
 * spree_api
-* spree_auth
 * spree_cmd
 * spree_core
 * spree_dash
@@ -19,9 +22,9 @@ automatically require all of the necessary gem dependencies which are:
 
 All of the gems are designed to work together to provide a fully functional e-commerce platform.  It is also possible,
 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 authorization scheme instead of using spree_auth.
+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?branch=1-1-stable)](https://travis-ci.org/spree/spree)
+[![Build Status](https://secure.travis-ci.org/spree/spree.png)](http://travis-ci.org/spree/spree)
 
 Installation
 ------------
@@ -29,9 +32,9 @@ 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.12
+    $ gem install rails -v 3.2.7
     $ gem install spree
-    $ rails _3.2.12_ new my_store
+    $ rails _3.2.7_ new my_store
     $ spree install my_store
 
 This will add the Spree gem to your Gemfile, create initializers, copy migrations and
@@ -52,7 +55,7 @@ You can manually add Spree to your Rails 3.2.x application. Add Spree to
 your Gemfile.
 
 ```ruby
-gem 'spree', '1.1.6.beta'
+gem 'spree', :git => 'git://github.com/spree/spree.git'
 ```
 
 Update your bundle
@@ -97,21 +100,21 @@ The source code is essentially a collection of gems.  Spree is meant to be run w
 
 1. Clone the Git repo
 
-        $ git clone git://github.com/spree/spree.git
-        $ cd spree
+        git clone git://github.com/spree/spree.git
+        cd spree
 
 2. Install the gem dependencies
 
-        $ bundle install
+        bundle install
 
 3. Create a sandbox Rails application for testing purposes (and automatically perform all necessary database setup)
 
-        $ bundle exec rake sandbox
+        bundle exec rake sandbox
 
 4. Start the server
 
-        $ cd sandbox
-        $ rails server
+        cd sandbox
+        rails server
 
 Performance
 -----------
@@ -126,13 +129,23 @@ If you want to remove precompiled assets (recommended before you commit to Git a
 
     $ bundle exec rake assets:clean
 
-Running Tests
--------------
+Use Dedicated Spree Devise Authentication
+-----------------------------------------
+Add the following to your Gemfile
 
-If you want to run all the tests across all the gems then
+    $ gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise'
+    
+Then run `bundle install`. Authentication will then work exactly as it did in previous versions of Spree.
 
-    $ cd spree
-    $ bundle exec rake
+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
+    $ bundle exec rake db:migrate
+
+and then run `bundle exec rake spree_auth:admin:create` in order to set up the admin user for the application.
+
+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
@@ -161,6 +174,15 @@ 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.
+
+    $ alias set_gemfile='export BUNDLE_GEMFILE="`pwd`/Gemfile"'
+    $ bundle exec rake test_app
+    $ cd api; set_gemfile; bundle install; bundle exec rspec spec
+    $ cd ../core; set_gemfile; bundle install; bundle exec rspec spec
+    $ cd ../dash; set_gemfile; bundle install; bundle exec rspec spec
+    $ cd ../promo; set_gemfile; bundle install; bundle exec rspec spec
+
 
 Contributing
 ------------

data/lib/sandbox.sh

@@ -0,0 +1,10 @@
+# Used in the sandbox rake task in Rakefile
+#!/bin/bash
+rm -rf sandbox
+rails new sandbox --skip-bundle
+cd sandbox
+echo "gem 'spree', :path => '..'" >> Gemfile
+echo "gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise'" >> Gemfile
+bundle install --gemfile Gemfile
+rails g spree:install --auto-accept
+rake assets:precompile

data/lib/spree.rb

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

metadata

@@ -1,128 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: spree
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.6
+  version: 1.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
   name: spree_core
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-  name: spree_auth
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+- !ruby/object:Gem::Dependency
   name: spree_api
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+- !ruby/object:Gem::Dependency
   name: spree_dash
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+- !ruby/object:Gem::Dependency
   name: spree_sample
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+- !ruby/object:Gem::Dependency
   name: spree_promo
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
+        version: 1.2.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+- !ruby/object:Gem::Dependency
   name: spree_cmd
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.2.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.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
@@ -131,11 +115,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/generators/spree/site/site_generator.rb
+- lib/sandbox.sh
 - lib/spree.rb
 homepage: http://spreecommerce.com
-licenses:
-- BSD-3
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/generators/spree/site/site_generator.rb

@@ -1,18 +0,0 @@
-require 'rails/generators'
-require 'generators/spree/install/install_generator'
-
-module Spree
-  class SiteGenerator < Rails::Generators::Base
-    class_option :auto_accept, :type => :boolean, :default => false, :aliases => '-A', :desc => "Answer yes to all prompts"
-
-    def run_install_generator
-      if options[:auto_accept]
-        Spree::InstallGenerator.start ["--auto-accept"]
-      else
-        Spree::InstallGenerator.start
-      end
-
-      puts ActiveSupport::Deprecation.warn "rails g spree:site has been deprecated and will be removed in the future, use rails g spree:install instead."
-    end
-  end
-end