spree 0.50.4 → 0.60.0.RC1

data/lib/generators/spree/extension_generator.rb

@@ -18,6 +18,7 @@ module Spree
         template "README.md", "#{file_name}/README.md"
         template "gitignore.tt", "#{file_name}/.gitignore"
         template "extension.gemspec.tt", "#{file_name}/#{file_name}.gemspec"
+        template "Versionfile.tt", "#{file_name}/Versionfile"
       end
 
       def config_routes
@@ -67,4 +68,4 @@ module Spree
 
     end
   end
-end
+end

data/lib/generators/spree/test_app_generator.rb

@@ -17,12 +17,10 @@ module Spree
       end
 
       def generate_app
-        silence_stream(STDOUT) {
           remove_directory_if_exists("spec/#{test_app}")
           inside "spec" do
-            run "rails new #{test_app} -GJTq --skip-gemfile"
+            run "rails new #{test_app} --database=#{database_name} -GJTq --skip-gemfile"
           end
-        }
       end
 
       def create_rspec_gemfile
@@ -63,7 +61,8 @@ module Spree
       def create_databases_yml
         silence_stream(STDOUT) {
           remove_file "config/database.yml"
-          template "config/database.yml"
+          template "config/database.yml.#{database_name}"
+          mv "spec/test_app/config/database.yml.#{database_name}", "spec/test_app/config/database.yml", :verbose => false
         }
       end
 
@@ -79,6 +78,23 @@ module Spree
         }
       end
 
+      def append_db_adapter_gem
+        silence_stream(STDOUT) {
+          case database_name
+          when "mysql"
+            gem "mysql2"
+            append_file '../../Gemfile' do
+              "gem 'mysql2'"
+            end
+          else
+            gem "sqlite3-ruby"
+            append_file '../../Gemfile' do
+              "gem 'sqlite3-ruby'"
+            end
+          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)
@@ -88,18 +104,22 @@ module Spree
       private
 
       def run_migrations
-        inside "" do
-          silence_stream(STDOUT) {
-            run "rake db:migrate db:seed RAILS_ENV=test"
-            run "rake db:migrate db:seed RAILS_ENV=cucumber"
-          }
-        end
+        silence_stream(STDOUT) {
+          inside "" do
+              run "rake db:drop db:create db:migrate db:seed RAILS_ENV=test"
+              run "rake db:drop db:create db:migrate db:seed RAILS_ENV=cucumber"
+          end
+        }
       end
 
       def test_app
         options[:app_name]
       end
 
+      def database_name
+        ENV['DB_NAME'] || "sqlite3"
+      end
+
       def remove_directory_if_exists(path)
         silence_stream(STDOUT) {
           run "rm -r #{path}" if File.directory?(path)
@@ -122,4 +142,4 @@ module Spree
       end
     end
   end
-end
+end

data/lib/generators/templates/Gemfile

@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'sqlite3'
-
 group :test do
   gem 'rspec-rails', '= 2.5.0'
   gem 'factory_girl', '= 1.3.3'
@@ -18,7 +16,7 @@ end
 
 group :cucumber do
   gem 'cucumber-rails'
-  gem 'database_cleaner', '~> 0.5.2'
+  gem 'database_cleaner', '= 0.6.7.RC'
   gem 'nokogiri'
   gem 'capybara', '= 0.4.1.2'
   gem 'factory_girl', '= 1.3.3'

data/lib/generators/templates/Versionfile.tt

@@ -0,0 +1,9 @@
+# This file is used to designate compatibilty with different versions of Spree
+# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details
+
+# Examples
+#
+# "0.50.x" => { :branch => "master" }
+# "0.40.x" => { :tag => "v1.0.0", :version => "1.0.0" }
+
+

data/lib/generators/templates/config/database.yml.mysql

@@ -0,0 +1,29 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: test_app_development
+  pool: 5
+  username: root
+  password: welcome
+  socket: /tmp/mysql.sock
+
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: test_app_test
+  pool: 5
+  username: root
+  password: welcome
+  socket: /tmp/mysql.sock
+
+cucumber:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: test_app_cucumber
+  pool: 5
+  username: root
+  password: welcome
+  socket: /tmp/mysql.sock

data/lib/generators/templates/config/database.yml.sqlite3

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/cucumber.sqlite3
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+cucumber:
+  adapter: sqlite3
+  database: db/cucumber.sqlite3
+  pool: 5
+  timeout: 5000

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

@@ -16,7 +16,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.has_rdoc = true
-
   s.add_dependency('spree_core', '>= <%= Spree.version %>')
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  hash: 223
-  prerelease: 
+  hash: 11094359
+  prerelease: 7
   segments: 
   - 0
-  - 50
-  - 4
-  version: 0.50.4
+  - 60
+  - 0
+  - RC
+  - 1
+  version: 0.60.0.RC1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,104 +17,117 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-05-03 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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id001
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id002
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id003
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id004
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id005
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: 223
+        hash: 11094359
         segments: 
         - 0
-        - 50
-        - 4
-        version: 0.50.4
-  requirement: *id006
+        - 60
+        - 0
+        - RC
+        - 1
+        version: 0.60.0.RC1
   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: []
@@ -127,6 +142,8 @@ files:
 - lib/generators/spree/site_generator.rb
 - lib/generators/spree/test_app_generator.rb
 - lib/generators/templates/config/database.yml
+- lib/generators/templates/config/database.yml.mysql
+- lib/generators/templates/config/database.yml.sqlite3
 - lib/generators/templates/config/environments/cucumber.rb
 - lib/generators/templates/extension/extension.rb.tt
 - lib/generators/templates/extension.gemspec.tt
@@ -141,8 +158,10 @@ files:
 - lib/generators/templates/routes.rb
 - lib/generators/templates/spec_helper.rb
 - lib/generators/templates/spree_site.rb
+- lib/generators/templates/Versionfile.tt
 - lib/spree.rb
 - lib/tasks/install.rake
+has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -176,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree
-rubygems_version: 1.8.10
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Full-stack e-commerce framework for Ruby on Rails.