spree 0.8.4 → 0.8.5

data/db/seeds.rb

@@ -0,0 +1,10 @@
+def yaml_to_database(fixture, path)
+  require 'active_record/fixtures'
+  ActiveRecord::Base.establish_connection(RAILS_ENV)
+  tables = Dir.new(path).entries.select{|e| e =~ /(.+)?\.yml/}.collect{|c| c.split('.').first} 
+  Fixtures.create_fixtures(path, tables)
+end
+
+# load setup data from seeds
+fixture = "default"
+yaml_to_database(fixture, "#{SPREE_ROOT}/db/#{fixture}")

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '8'
-      Tiny  = '4'
+      Tiny  = '5'
 
       class << self
         def to_s

data/lib/spree/setup.rb

@@ -15,8 +15,10 @@ module Spree
         setup
       end  
       def create_admin_user
-        raise "Cannot create a second admin user." unless User.count == 0
         new.create_admin_user
+      end 
+      def load_sample_data
+        new.load_sample_data
       end
     end
     
@@ -26,10 +28,16 @@ module Spree
       # make sure the product images directory exists
       FileUtils.mkdir_p "#{RAILS_ROOT}/public/images/products/"
       
-      @config = config
-      @admin = create_admin_user(config[:admin_password], config[:admin_email])
-      load_sample_data if sample_data?
-      announce "Finished.\n\n"
+      @config = config      
+      load_default_data unless Country.count > 0
+      create_admin_user(config[:admin_password], config[:admin_email]) unless User.first(:include => :roles, :conditions => ["roles.name = 'admin'"])     
+      
+      if RAILS_ENV == 'production' and Product.count > 0
+        announce "WARNING: Running bootstrap in production mode and there is already existing product data.  Sample data will not be loaded."
+      else
+        load_sample_data if sample_data?
+      end
+      announce "Bootstrap Complete.\n\n"
     end
 
     def create_admin_user(password=nil, email=nil)
@@ -45,13 +53,22 @@ module Spree
         :email => email,
         :login => email
       }
-      admin = User.create(attributes)
       
-      # create an admin role and and assign the admin user to that role
-      role = Role.create(:name => 'admin')
-      admin.roles << role
-      admin.save      
-      admin      
+      if User.find_by_login(email)
+        say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake db:admin:create again with a different email.\n\n"
+      else
+        admin = User.create(attributes)
+
+        # create an admin role and and assign the admin user to that role
+        role = Role.find_or_create_by_name "admin"
+        admin.roles << role
+        admin.save          
+      end      
+    end
+
+    # Loads default data necessary for basic spree functionality
+    def load_default_data
+      Rake::Task["db:seed"].invoke
     end
     
     # Uses a special set of fixtures to load sample data
@@ -83,7 +100,7 @@ module Spree
         end
       end
 
-      announce "Sample products have been loaded into to the store"
+      announce "Sample data has been loaded"
     end
          
     private
@@ -112,7 +129,7 @@ module Spree
       def sample_data?
         return true if ENV['AUTO_ACCEPT']
         sample = ask('Load Sample Data? [y]: ', String) do |q|
-          q.echo = false
+          q.echo = true
           q.whitespace = :strip
         end
         sample == "" or sample == "y" or sample == "yes" or sample == "true"

data/lib/tasks/database.rake

@@ -27,35 +27,52 @@ namespace :db do
       require 'authlogic'     
       Spree::Setup.create_admin_user      
     end
-  end     
+  end
   
+  desc 'Create the database, load the schema, and initialize with the seed data'  
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]  
+       
+  desc 'Load the seed data from db/seeds.rb'  
+  task :seed => :environment do  
+    seed_file = File.join(SPREE_ROOT, 'db', 'seeds.rb')  
+    load(seed_file) if File.exist?(seed_file)  
+  end
+
+  desc 'Load the sample fixture data from db/sample'  
+  task :sample => :environment do  
+    require 'spree/setup'
+    Spree::Setup.load_sample_data
+  end
+    
   desc "Bootstrap your database for Spree."
   task :bootstrap  => :environment do
     require 'highline/import'       
     require 'authlogic'     
 
-    raise "Cannot bootstrap in production mode (for saftey reasons.)" unless %w[demo development test].include? RAILS_ENV    
-    if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
-
-      ENV['SKIP_NAG'] = 'yes'
-
-      # Remigrate
-      Rake::Task["db:remigrate"].invoke
-    
-      require 'spree/setup'
-      
-      attributes = {}
-      if ENV['AUTO_ACCEPT']
-        attributes = {
-          :admin_password => "spree",
-          :admin_email => "spree@example.com"          
-        }
+    # remigrate unless production mode (as saftey check)
+    if %w[demo development test].include? RAILS_ENV 
+      if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+        ENV['SKIP_NAG'] = 'yes'
+        Rake::Task["db:remigrate"].invoke
+      else
+        say "Task cancelled."
+        exit
       end
-      
-      Spree::Setup.bootstrap attributes
-    else
-      say "Task cancelled."
-      exit
+    else 
+      say "NOTE: Bootstrap in production mode will not drop database before migration"
+      Rake::Task["db:migrate"].invoke
     end
+    
+    require 'spree/setup'
+    
+    attributes = {}
+    if ENV['AUTO_ACCEPT']
+      attributes = {
+        :admin_password => "spree",
+        :admin_email => "spree@example.com"          
+      }
+    end
+    
+    Spree::Setup.bootstrap attributes
   end
 end

data/lib/tasks/release.rake

@@ -56,10 +56,9 @@ namespace 'spree' do
     files.exclude 'config/locomotive.yml'
     files.exclude 'config/lighttpd.conf'
     files.exclude 'config/mongrel_mimes.yml'
-    files.exclude 'db/*.db'
+    files.exclude 'db/schema.db'
     files.exclude 'db/*.sqlite3'
     files.exclude 'db/*.sql'
-    files.exclude 'db/*.rb'
     files.exclude /^doc/
     files.exclude 'log/*.log'
     files.exclude 'log/*.pid'

data/vendor/plugins/attribute_fu/test/db/schema.rb

@@ -0,0 +1,16 @@
+ActiveRecord::Schema.define(:version => 2) do
+
+  create_table :comments, :force => true do |t|
+    t.integer :photo_id
+    t.string :author
+    t.text :body
+    t.timestamps
+  end
+
+  create_table :photos, :force => true do |t|
+    t.string :title
+    t.text   :description
+    t.timestamps
+  end
+
+end

data/vendor/plugins/resource_controller/test/db/schema.rb

@@ -0,0 +1,78 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 14) do
+
+  create_table "accounts", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "comments", :force => true do |t|
+    t.integer "post_id"
+    t.string  "author"
+    t.text    "body"
+  end
+
+  create_table "images", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "options", :force => true do |t|
+    t.integer "product_id"
+    t.integer "account_id"
+    t.string  "title"
+  end
+
+  create_table "personnel", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "photos", :force => true do |t|
+    t.string  "title"
+    t.integer "account_id"
+    t.integer "personnel_id"
+  end
+
+  create_table "photos_tags", :force => true do |t|
+    t.integer "photo_id"
+    t.integer "tag_id"
+  end
+
+  create_table "posts", :force => true do |t|
+    t.string "title", :default => ""
+    t.text   "body",  :default => ""
+  end
+
+  create_table "products", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "projects", :force => true do |t|
+    t.string "title"
+  end
+
+  create_table "somethings", :force => true do |t|
+    t.string "title"
+  end
+
+  create_table "tags", :force => true do |t|
+    t.string "name"
+  end
+
+  create_table "users", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Sean Schofield
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-02 00:00:00 -04:00
+date: 2009-07-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -490,6 +490,12 @@ files:
 - config/spree_permissions.yml
 - CONTRIBUTORS
 - db
+- db/default
+- db/default/countries.yml
+- db/default/roles.yml
+- db/default/states.yml
+- db/default/zone_members.yml
+- db/default/zones.yml
 - db/migrate
 - db/migrate/001_create_addresses.rb
 - db/migrate/002_create_cart_items.rb
@@ -607,11 +613,9 @@ files:
 - db/sample/products.yml
 - db/sample/properties.yml
 - db/sample/prototypes.yml
-- db/sample/roles.yml
 - db/sample/shipments.yml
 - db/sample/shipping_categories.yml
 - db/sample/shipping_methods.yml
-- db/sample/states.yml
 - db/sample/tax_categories.yml
 - db/sample/taxonomies.yml
 - db/sample/taxons.yml
@@ -619,6 +623,8 @@ files:
 - db/sample/variants.yml
 - db/sample/zone_members.yml
 - db/sample/zones.yml
+- db/schema.rb
+- db/seeds.rb
 - INSTALL
 - lib
 - lib/annotatable.rb
@@ -2114,6 +2120,7 @@ files:
 - vendor/plugins/attribute_fu/test/comment_test.rb
 - vendor/plugins/attribute_fu/test/db
 - vendor/plugins/attribute_fu/test/db/database.yml
+- vendor/plugins/attribute_fu/test/db/schema.rb
 - vendor/plugins/attribute_fu/test/models
 - vendor/plugins/attribute_fu/test/models/comment.rb
 - vendor/plugins/attribute_fu/test/models/photo.rb
@@ -2429,6 +2436,7 @@ files:
 - vendor/plugins/resource_controller/test/db/migrate/012_create_users.rb
 - vendor/plugins/resource_controller/test/db/migrate/013_create_personnel.rb
 - vendor/plugins/resource_controller/test/db/migrate/014_add_personnel_id_to_photos.rb
+- vendor/plugins/resource_controller/test/db/schema.rb
 - vendor/plugins/resource_controller/test/log
 - vendor/plugins/resource_controller/test/Rakefile
 - vendor/plugins/resource_controller/test/script

data/db/sample/roles.yml

@@ -1,3 +0,0 @@
-user_role:
-  id: 2
-  name: user

data/db/sample/states.yml

@@ -1,204 +0,0 @@
-alabama:
-  name: Alabama
-  abbr: AL
-  country_id: 214
-alaska:
-  name: Alaska
-  abbr: AK
-  country_id: 214
-arizona:
-  name: Arizona
-  abbr: AZ
-  country_id: 214
-arkansas:
-  name: Arkansas
-  abbr: AR
-  country_id: 214
-california:
-  name: California
-  abbr: CA
-  country_id: 214
-colorado:
-  name: Colorado
-  abbr: CO
-  country_id: 214
-connecticut:
-  name: Connecticut
-  abbr: CT
-  country_id: 214
-deleware:
-  name: Delaware
-  abbr: DE
-  country_id: 214
-dc:
-  name: District of Columbia
-  abbr: DC
-  country_id: 214
-florida:
-  name: Florida
-  abbr: FL
-  country_id: 214
-georgia:
-  name: Georgia
-  abbr: GA
-  country_id: 214
-hawaii:
-  name: Hawaii
-  abbr: HI
-  country_id: 214
-idaho:
-  name: Idaho
-  abbr: ID
-  country_id: 214
-illinois:
-  name: Illinois
-  abbr: IL
-  country_id: 214
-indiana:
-  name: Indiana
-  abbr: IN
-  country_id: 214
-iowa:
-  name: Iowa
-  abbr: IA
-  country_id: 214
-kansas:
-  name: Kansas
-  abbr: KS
-  country_id: 214
-kentucky:
-  name: Kentucky
-  abbr: KY
-  country_id: 214
-louisiana:
-  name: Louisiana
-  abbr: LA
-  country_id: 214
-maine: 
-  name: Maine
-  abbr: ME
-  country_id: 214
-maryland:
-  name: Maryland
-  abbr: MD
-  country_id: 214
-massachusetts:
-  name: Massachusetts
-  abbr: MA
-  country_id: 214
-michigan:
-  name: Michigan
-  abbr: MI
-  country_id: 214
-minnesota:
-  name: Minnesota
-  abbr: MN
-  country_id: 214
-mississippi:
-  name: Mississippi
-  abbr: MS
-  country_id: 214
-missouri:
-  name: Missouri
-  abbr: MO
-  country_id: 214
-montana:
-  name: Montana
-  abbr: MT
-  country_id: 214
-nebraska:
-  name: Nebraska
-  abbr: NE
-  country_id: 214
-nevada:
-  name: Nevada
-  abbr: NV
-  country_id: 214
-new_hampshire:
-  name: New Hampshire
-  abbr: NH
-  country_id: 214
-new_jersey:
-  name: New Jersey
-  abbr: NJ
-  country_id: 214
-new_mexico:
-  name: New Mexico
-  abbr: NM
-  country_id: 214
-new_york:
-  name: New York
-  abbr: NY
-  country_id: 214
-north_carolina:
-  name: North Carolina
-  abbr: NC
-  country_id: 214
-north_dakota:
-  name: North Dakota
-  abbr: ND
-  country_id: 214
-ohio: 
-  name: Ohio
-  abbr: OH
-  country_id: 214
-oklahoma: 
-  name: Oklahoma
-  abbr: OK
-  country_id: 214
-oregon:
-  name: Oregon
-  abbr: OR
-  country_id: 214
-pennsylvania:
-  name: Pennsylvania
-  abbr: PA
-  country_id: 214
-rhode_island:
-  name: Rhode Island
-  abbr: RI
-  country_id: 214
-south_carolina:
-  name: South Carolina
-  abbr: SC
-  country_id: 214
-south_dakota:
-  name: South Dakota
-  abbr: SD
-  country_id: 214
-tennesse:
-  name: Tennessee
-  abbr: TN
-  country_id: 214
-texas:
-  name: Texas
-  abbr: TX
-  country_id: 214
-utah: 
-  name: Utah
-  abbr: UT
-  country_id: 214
-vermont:
-  name: Vermont
-  abbr: VT
-  country_id: 214
-virginia:
-  name: Virginia
-  abbr: VA
-  country_id: 214
-washington:
-  name: Washington
-  abbr: WA
-  country_id: 214
-west_virginia:
-  name: West Virginia
-  abbr: WV
-  country_id: 214
-wisconsin:
-  name: Wisconsin
-  abbr: WI
-  country_id: 214
-wyoming:
-  name: Wyoming
-  abbr: WY
-  country_id: 214