spree 0.40.4 → 0.50.0

data/README.md

@@ -73,7 +73,7 @@ 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/railsdog/spree.git spree
+        git clone git://github.com/spree/spree.git spree
         cd spree
 
 2. Install the gem dependencies
@@ -92,29 +92,39 @@ The source code is essentially a collection of gems.  Spree is meant to be run w
 Running Tests
 -------------
 
+If you want to run all the tests across all the gems then
+
+    $ cd spree
+    $ rake spec     #=> 'this will run spec tests for all the gems'
+    $ rake cucumber #=> 'this will run cucumber tests for all the gems'
+    $ rake          #=> 'this will run both spec and cucumber tests for all the gems'
+
 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
 tests for the core project.
 
-    rails new testapp -m spec/test_template.rb -T -J
-    cd testapp
-    rails g spree_core:install
-    rake db:migrate db:seed db:test:prepare
+    $ cd core
+    $ rake test_app
+    $ rake spec
+    $ rake cucumber
+    $ rake          #=> 'this will run both spec and cucumber tests for the gem'
 
-Then run the tests
+    # If you want to run specs for only a single spec file
+    $ bundle exec rspec spec/models/state_spec.rb
 
-    rspec spec
+    # If you want to run a particular line of spec
+    $ bundle exec rspec spec/models/state_spec.rb:7
 
-Note that each project has its own generator for "installing."  This basically sets up the test
-app with what it needs to run (primarily migrations.)  So for the spree_auth gem, for example,
-you would use the following
+    # If you want to run a single cucumber feature
+    # bundle exec cucumber features/admin/orders.feature --require features
 
-    rails g spree_auth:install
+    # If you want to run a particular scenario then include the line number
+    # bundle exec cucumber features/admin/orders.feature:3 --require features
 
 
 Contributing
 ------------
 
-Spree is an open source project.  We encourage contributions.  Please see the [contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html) before contributing. 
+Spree is an open source project.  We encourage contributions.  Please see the [contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html) before contributing.
 
 The Github team has also been kind enough to write up some great [documentation](http://help.github.com/pull-requests/) on working with pull requests. Contributions should be performed on [topic branches](http://progit.org/book/ch3-4.html) in your personal forks - just issue your pull requests from there. We're also asking that you continue to log important issues for non-trivial patches in our [lighthouse repository](http://railsdog.lighthouseapp.com/projects/31096-spree). You can just link the pull request in the ticket (and link the ticket in the pull request.)

data/lib/generators/spree/test_app_generator.rb

@@ -4,6 +4,10 @@ module Spree
   module Generators
     class TestAppGenerator < Rails::Generators::Base
 
+      class << self
+        attr_accessor :verbose
+      end
+
       class_option :app_name, :type => :string,
                               :desc => "The name of the test rails app to generate. Defaults to test_app.",
                               :default => "test_app"
@@ -13,10 +17,20 @@ module Spree
       end
 
       def generate_app
-        remove_directory_if_exists("spec/#{test_app}")
-        inside "spec" do
-          run "rails new #{test_app} -GJT --skip-gemfile"
-        end
+        silence_stream(STDOUT) {
+          remove_directory_if_exists("spec/#{test_app}")
+          inside "spec" do
+            run "rails new #{test_app} -GJTq --skip-gemfile"
+          end
+        }
+      end
+
+      def create_rspec_gemfile
+        # newer versions of rspec require a Gemfile in the local gem dirs so create one there as well as in spec/test_app
+        silence_stream(STDOUT) {
+          template "Gemfile", :force => true
+          remove_file "Gemfile.lock"
+        }
       end
 
       def create_root
@@ -24,64 +38,61 @@ module Spree
       end
 
       def remove_unneeded_files
-        remove_file "doc"
-        remove_file "lib/tasks"
-        remove_file "public/images/rails.png"
-        remove_file "public/index.html"
-        remove_file "README"
-        remove_file "vendor"
+        silence_stream(STDOUT) {
+          remove_file "doc"
+          remove_file "lib/tasks"
+          remove_file "public/images/rails.png"
+          remove_file "public/index.html"
+          remove_file "README"
+          remove_file "vendor"
+        }
       end
 
       def replace_gemfile
-        template "Gemfile"
+        silence_stream(STDOUT) {
+          template "Gemfile"
+        }
       end
 
       def setup_environments
-        template "config/environments/cucumber.rb"
-        append_file "config/environments/test.rb" do
-<<-constantz
-CART = "cart"
-ADDRESS = "address"
-DELIVERY = "delivery"
-PAYMENT = "payment"
-CONFIRM = "confirm"
-COMPLETE = "complete"
-CANCELED = "canceled"
-RETURNED = "returned"
-RETURN_AUTHORIZED = "awaiting_return"
-
-ORDER_STATES = [CART, ADDRESS, DELIVERY, PAYMENT, CONFIRM, COMPLETE, CANCELED, RETURNED, RETURN_AUTHORIZED]
-
-READY = "ready"
-SHIPPED = "shipped"
-PARTIAL = "partial"
-PENDING = "pending"
-BACKORDER = "backorder"
-
-SHIPMENT_STATES = [READY, SHIPPED, PARTIAL, PENDING, BACKORDER]
-
-PROCESSING = 'processing'
-FAILED = 'failed'
-COMPLETED = 'completed'
-VOID = 'void'
-CHECKOUT = 'checkout'
-
-PAYMENT_STATES = [CHECKOUT, PROCESSING, FAILED, COMPLETED, VOID, PENDING]
-constantz
-        end
+        silence_stream(STDOUT) {
+          template "config/environments/cucumber.rb"
+        }
       end
 
       def create_databases_yml
-        remove_file "config/database.yml"
-        template "config/database.yml"
+        silence_stream(STDOUT) {
+          remove_file "config/database.yml"
+          template "config/database.yml"
+        }
+      end
+
+      def tweak_gemfile
+        silence_stream(STDOUT) {
+          append_file '../../Gemfile' do
+            full_path_for_local_gems
+          end
+
+          append_file 'Gemfile' do
+            full_path_for_local_gems
+          end
+        }
+      end
+
+      protected
+      def full_path_for_local_gems
+        # Gemfile needs to be full local path to the source (ex. /Users/schof/repos/spree/auth)
+        # By default we do nothing but each gem should override this method with the appropriate content
       end
 
       private
 
       def run_migrations
         inside "" do
-          run "rake db:migrate db:seed RAILS_ENV=test"
-          run "rake db:migrate db:seed RAILS_ENV=cucumber"
+          silence_stream(STDOUT) {
+            run "rake db:migrate db:seed RAILS_ENV=test"
+            run "rake db:migrate db:seed RAILS_ENV=cucumber"
+          }
         end
       end
 
@@ -90,7 +101,24 @@ constantz
       end
 
       def remove_directory_if_exists(path)
-        run "rm -r #{path}" if File.directory?(path)
+        silence_stream(STDOUT) {
+          run "rm -r #{path}" if File.directory?(path)
+        }
+      end
+
+      def silence_stream(stream)
+        if self.class.verbose
+          yield
+        else
+          begin
+            old_stream = stream.dup
+            stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+            stream.sync = true
+            yield
+          ensure
+            stream.reopen(old_stream)
+          end
+        end
       end
     end
   end

data/lib/generators/templates/Gemfile

@@ -1,16 +1,34 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.0.1'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
 
 group :test do
-  gem 'rspec-rails', '~> 2.1.0'
-  gem 'factory_girl_rails'
+  gem 'rspec-rails', '= 2.5.0'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'rcov'
+  gem 'shoulda'
+  gem 'faker'
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
 end
 
 group :cucumber do
   gem 'cucumber-rails'
   gem 'database_cleaner', '~> 0.5.2'
   gem 'nokogiri'
-  gem 'capybara'
+  gem 'capybara', '= 0.4.1.2'
+  gem 'factory_girl', '= 1.3.3'
+  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'faker'
+  gem 'launchy'
+
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug"
+  else
+    gem "ruby-debug19"
+  end
 end

data/lib/generators/templates/Rakefile.tt

@@ -1,12 +1,29 @@
-require File.expand_path('../../config/application', __FILE__)
-
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
-spec = eval(File.read('<%=file_name %>.gemspec'))
+gemfile = File.expand_path('../spec/test_app/Gemfile', __FILE__)
+if File.exists?(gemfile) && (%w(spec cucumber).include?(ARGV.first.to_s) || ARGV.size == 0)
+  require 'bundler'
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  Bundler.setup
+
+  require 'rspec'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
+
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new do |t|
+    t.cucumber_opts = %w{--format progress}
+  end
+end
+
+desc "Default Task"
+task :default => [:spec, :cucumber ]
+
+spec = eval(File.read('<%= file_name %>.gemspec'))
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
@@ -22,10 +39,37 @@ end
 desc "Default Task"
 task :default => [ :spec ]
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+desc "Regenerates a rails 3 app for testing"
+task :test_app do
+  require '../spree/lib/generators/spree/test_app_generator'
+  class <%= file_name.classify %>TestAppGenerator < Spree::Generators::TestAppGenerator
 
-# require 'cucumber/rake/task'
-# Cucumber::Rake::Task.new do |t|
-#   t.cucumber_opts = %w{--format pretty}
-# end
+    def install_gems
+      inside "test_app" do
+        run 'rake spree_core:install'
+        run 'rake <%= file_name %>:install'
+      end
+    end
+
+    def migrate_db
+      run_migrations
+    end
+
+    protected
+    def full_path_for_local_gems
+      <<-gems
+gem 'spree_core', :path => \'#{File.join(File.dirname(__FILE__), "../spree/", "core")}\'
+gem '<%= file_name %>', :path => \'#{File.dirname(__FILE__)}\'
+      gems
+    end
+
+  end
+  <%= file_name.classify %>TestAppGenerator.start
+end
+
+namespace :test_app do
+  desc 'Rebuild test and cucumber databases'
+  task :rebuild_dbs do
+    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test && rake db:drop db:migrate RAILS_ENV=cucumber")
+  end
+end

data/lib/generators/templates/config/environments/cucumber.rb

@@ -32,7 +32,7 @@ TestApp::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-  
+
   config.action_mailer.default_url_options = { :host => 'testapp.com' }
-  
+
 end

data/lib/generators/templates/extension.gemspec.tt

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = '<%= file_name %>'
-  s.version     = '1.0.0'
+  s.version     = '<%= Spree.version %>'
   s.summary     = 'Add gem summary here'
-  #s.description = 'Add (optional) gem description here'
+  s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'
 
   # s.author            = 'David Heinemeier Hansson'
@@ -11,11 +11,12 @@ Gem::Specification.new do |s|
   # s.homepage          = 'http://www.rubyonrails.org'
   # s.rubyforge_project = 'actionmailer'
 
-  s.files        = Dir['CHANGELOG', 'README.md', 'LICENSE', 'lib/**/*', 'app/**/*']
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
   s.has_rdoc = true
 
   s.add_dependency('spree_core', '>= <%= Spree.version %>')
-end
+end

data/lib/generators/templates/spec_helper.rb

@@ -1,7 +1,7 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../../config/environment", __FILE__)
+require File.expand_path("../test_app/config/environment", __FILE__)
 require 'rspec/rails'
 
 # Requires supporting files with custom matchers and macros, etc,

data/lib/generators/templates/spree_site.rb

@@ -3,6 +3,10 @@ module SpreeSite
     def self.activate
       # Add your custom site logic here
     end
+    
+    def load_tasks
+    end
+    
     config.to_prepare &method(:activate).to_proc
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  hash: 183
-  prerelease: 
+  hash: 215
+  prerelease: false
   segments: 
   - 0
-  - 40
-  - 4
-  version: 0.40.4
+  - 50
+  - 0
+  version: 0.50.0
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,104 +15,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-03-23 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: spree_core
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id001
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_core
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: spree_auth
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id002
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_auth
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: spree_api
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id003
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_api
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: spree_dash
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id004
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_dash
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: spree_sample
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id005
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_sample
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: spree_promo
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 183
+        hash: 215
         segments: 
         - 0
-        - 40
-        - 4
-        version: 0.40.4
-  requirement: *id006
+        - 50
+        - 0
+        version: 0.50.0
   type: :runtime
-  prerelease: false
-  name: spree_promo
+  version_requirements: *id006
 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@railsdog.com
 executables: []
@@ -143,6 +144,7 @@ files:
 - lib/generators/templates/spree_site.rb
 - lib/spree.rb
 - lib/tasks/install.rake
+has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Full-stack e-commerce framework for Ruby on Rails.