genesis 1.4.0 → 1.5.0

data/.rvmrc

@@ -1,2 +1,2 @@
-rvm use ruby-1.8.7-p302@genesis --create
+rvm use ruby-1.9.3-p392@genesis --create
 rvm info

data/README.rdoc

@@ -30,7 +30,7 @@ seeding tools currently available.
 
 * Ruby 1.8
 * Rails 3
-* Rails 2
+* Rails 2 (no generators)
 
 == TODO
 
@@ -50,25 +50,21 @@ seeding tools currently available.
 
 Run the prepare seeding generator to create a lib/tasks/genesis.rake file:
 
-  rails generate prepare_genesis    # Rails 3
-  script/generate prepare_seeding   # Rails 2
+  rails generate genesis:install    # Rails 3
 
 Or to specify which environments to create:
 
-  rails generate prepare_genesis [development,staging,production]       # Rails 3
-  script/generate prepare_seeding env:[development,staging,production]  # Rails 2
+  rails generate genesis:install [development,staging,production]       # Rails 3
 
 Generate a seed file:
 
-  rails generate genesis create_users    # Rails 3
-  script/generate genesis create_users   # Rails 2
+  rails generate genesis:seed create_users    # Rails 3
 
 This will generate a seed file for you in the db/seeds directory.
 
 Generate a seed file in a specific environment folder:
 
-  rails generate genesis create_users production     # Rails 3
-  script/generate genesis create_users production    # Rails 2
+  rails generate genesis:seed create_users production     # Rails 3
 
 This will generate a seed file for you in the db/seeds/production directory.
 

data/genesis.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   %w(
     gem-dandy
     rspec
-    ruby-debug
+    ruby-debug19
     guard
     rb-fsevent
     growl

data/lib/generators/genesis/install/install_generator.rb

@@ -15,7 +15,6 @@ module Genesis
 
     def install_seeding
       envs.each { |env| empty_directory "db/seeds/#{env}" }
-      copy_file 'genesis.rake', 'lib/tasks/genesis.rake'
       copy_file 'genesis_callbacks.rb', 'db/seeds/genesis_callbacks.rb'
     end
 

data/lib/genesis.rb

@@ -1,12 +1,11 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'genesis/active_record_extensions'
-require 'genesis/seeder'
-require 'genesis/schema_seed'
+require 'genesis/railtie' if defined?( Rails )
 
 module Genesis
+
   SEEDS_ROOT = 'db/seeds'
-end
 
-ActiveRecord::Base.send :include, Genesis::ActiveRecordExtensions if defined? ActiveRecord::Base
+  autoload :ActiveRecordExtensions, 'genesis/active_record_extensions'
+  autoload :SchemaSeed,             'genesis/schema_seed'
+  autoload :Seeder,                 'genesis/seeder'
+
+end

data/lib/genesis/railtie.rb

@@ -0,0 +1,16 @@
+require 'genesis'
+require 'rails'
+
+class Railtie < Rails::Railtie
+
+  initializer 'genesis.insert_into_active_record' do |app|
+    ActiveSupport.on_load :active_record do
+      ActiveRecord::Base.send :include, Genesis::ActiveRecordExtensions
+    end
+  end
+
+  rake_tasks do
+    Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f }
+  end
+
+end

data/lib/genesis/seeder.rb

@@ -136,8 +136,7 @@ module Genesis
       log_entry_start( class_name )
       klass.send( @method )
       if @method == :up
-        # SchemaSeed.create!( :version => version )
-        ActiveRecord::Base.connection.execute( "INSERT INTO schema_seeds(`version`) VALUES('#{version}');" )
+        ActiveRecord::Base.connection.execute( "INSERT INTO schema_seeds(#{ActiveRecord::Base.connection.quote_column_name 'version'}) VALUES('#{version}');" )
       else
         schema_seed = SchemaSeed.find( :first, :conditions => { :version => version } )
         schema_seed.destroy unless schema_seed.nil?

data/lib/{generators/genesis/install/templates → genesis/tasks}/genesis.rake

@@ -1,4 +1,5 @@
 namespace :db do
+
   desc "Loads seed data for the current environment."
   task :genesis => :environment do
     Genesis::Seeder.verify_or_create_version_table
@@ -22,12 +23,31 @@ namespace :db do
     puts message( contexts, :using_contexts => using_contexts ), "", ""
   end
 
-  desc "Drops and recreates all tables along with seeding the database"
+  desc "Recreates the databse by migrating down to VERSION=0 and then db:migrate and db:seed"
   task :mulligan => :environment do
-    Rake::Task['db:migrate:reset'].invoke
+    raise 'Cannot seed production' if ENV['RAILS_ENV'] == 'production' || Rails.env.production?
+
+    ENV['VERSION']= '0'
+    Rake::Task['db:migrate'].invoke
+    Rake::Task['db:migrate'].reenable
+    ENV.delete 'VERSION'
+    Rake::Task["db:migrate"].invoke
+    Genesis::SchemaSeed.delete_all
     Rake::Task['db:genesis'].invoke
   end
 
+  namespace :mulligan do
+
+    desc 'Recreates database using db:migrate:reset and db:seed (helpful when an irreversible migration is blocking db:mulligan)'
+    task :reset => :environment do
+      raise 'Cannot seed production' if ENV['RAILS_ENV'] == 'production' || Rails.env.production?
+
+      Rake::Task['db:migrate:reset'].invoke
+      Rake::Task['db:genesis'].invoke
+    end
+
+  end
+
   desc "An alias for the db:genesis task"
   task :seed => :environment do
     Rake::Task['db:genesis'].invoke
@@ -38,8 +58,10 @@ namespace :db do
     Rake::Task['db:regenesis'].invoke
   end
 
-  desc "Removes all data, runs migrations and then seeds the database"
+  desc "Removes all data and then seeds the database"
   task :regenesis => :environment do
+    raise 'Cannot seed production' if ENV['RAILS_ENV'] == 'production' || Rails.env.production?
+
     ActiveRecord::Base.connection.tables.select { |t| !['schema_migrations', 'schema_seeds', 'versions', 'sessions'].include?( t ) }.each do |table|
       puts "Emptying the #{table} table"
       klass = table.classify.to_s.constantize
@@ -49,11 +71,7 @@ namespace :db do
     puts ''
 
     Genesis::SchemaSeed.delete_all
-    ActiveRecord::Base.connection.execute( 'DELETE FROM `versions`' )
-    ActiveRecord::Base.connection.execute( 'DELETE FROM `sessions`' )
 
-    Rake::Task['db:migrate'].invoke
-    Rake::Task['db:test:prepare'].invoke
     Rake::Task['db:genesis'].invoke
   end
 

data/lib/genesis/version.rb

@@ -1,3 +1,3 @@
 module Genesis
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,159 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: genesis
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - C. Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-19 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-09-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gem-dandy
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: genspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: genspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: A data seeding solution for Ruby on Rails providing seeding facilities far more advanced than the current built in Ruby on Rails solution.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A data seeding solution for Ruby on Rails providing seeding facilities
+  far more advanced than the current built in Ruby on Rails solution.
+email:
 - jason@lookforwardenterprises.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -166,57 +175,53 @@ files:
 - genesis.gemspec
 - lib/generators/genesis/contexts/contexts_generator.rb
 - lib/generators/genesis/install/install_generator.rb
-- lib/generators/genesis/install/templates/genesis.rake
 - lib/generators/genesis/install/templates/genesis_callbacks.rb
 - lib/generators/genesis/seed/seed_generator.rb
 - lib/generators/genesis/seed/templates/migration.erb
 - lib/genesis.rb
 - lib/genesis/active_record_extensions.rb
 - lib/genesis/create_schema_seeds.rb
+- lib/genesis/railtie.rb
 - lib/genesis/schema_seed.rb
 - lib/genesis/seeder.rb
+- lib/genesis/tasks/genesis.rake
 - lib/genesis/version.rb
-- lib/tasks/genesis.rake
 - spec/generators/genesis/contexts/contexts_generator_spec.rb
 - spec/generators/genesis/install/install_generator_spec.rb
 - spec/generators/genesis/seed/seed_generator_spec.rb
 - spec/genesis_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/midas/genesis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2473917623763783060
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2473917623763783060
 requirements: []
-
 rubyforge_project: genesis
-rubygems_version: 1.6.0
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A data seeding solution for Ruby on Rails.
-test_files: 
+test_files:
 - spec/generators/genesis/contexts/contexts_generator_spec.rb
 - spec/generators/genesis/install/install_generator_spec.rb
 - spec/generators/genesis/seed/seed_generator_spec.rb

data/lib/tasks/genesis.rake

@@ -1,88 +0,0 @@
-namespace :db do
-  desc "Loads seed data for the current environment."
-  task :genesis => :environment do
-    Genesis::Seeder.verify_or_create_version_table
-    ignores = %w(genesis_common.rb)
-    seeds = Dir[File.join( Rails.root, 'db', 'seeds', '*.rb' )] +
-            Dir[File.join( Rails.root, 'db', 'seeds', Rails.env, '*.rb') ]
-
-    contexts = ENV['CONTEXTS']
-    unless contexts.nil? || contexts.empty?
-      using_contexts = true
-      contexts = expand_contexts if contexts == 'all'
-      contexts.split( ',' ).each do |context|
-        seeds += Dir[File.join( Rails.root, 'db', 'seeds', 'contexts', context, '*.rb' )]
-      end
-    end
-
-
-
-    puts "", message( contexts, :using_contexts => using_contexts, :start => true ), ""
-    Genesis::Seeder.run( seeds, ENV['VERSION'] || nil, ignores )
-    puts message( contexts, :using_contexts => using_contexts ), "", ""
-  end
-
-  desc "Drops and recreates all tables along with seeding the database"
-  task :mulligan => :environment do
-    Rake::Task['db:migrate:reset'].invoke
-    Rake::Task['db:genesis'].invoke
-  end
-
-  desc "An alias for the db:genesis task"
-  task :seed => :environment do
-    Rake::Task['db:genesis'].invoke
-  end
-
-  desc "An alias for the db:regenesis task"
-  task :reseed => :environment do
-    Rake::Task['db:regenesis'].invoke
-  end
-
-  desc "Removes all data, runs migrations and then seeds the database"
-  task :regenesis => :environment do
-    ActiveRecord::Base.connection.tables.select { |t| !['schema_migrations', 'schema_seeds', 'versions', 'sessions'].include?( t ) }.each do |table|
-      puts "Emptying the #{table} table"
-      klass = table.classify.to_s.constantize
-      klass.delete_all
-    end
-
-    puts ''
-
-    Genesis::SchemaSeed.delete_all
-    ActiveRecord::Base.connection.execute( 'DELETE FROM `versions`' )
-    ActiveRecord::Base.connection.execute( 'DELETE FROM `sessions`' )
-
-    Rake::Task['db:migrate'].invoke
-    Rake::Task['db:test:prepare'].invoke
-    Rake::Task['db:genesis'].invoke
-  end
-
-  namespace :genesis do
-    desc "Returns the current seed version from teh schema_seeds table"
-    task :version => :environment do
-      puts "[Genesis Seed Version] #{Genesis::Seeder.get_current_version}"
-    end
-  end
-end
-
-def seeds_root
-  File.join( Rails.root, 'db', 'seeds' )
-end
-
-def contexts_root
-  File.join( seeds_root, 'contexts' )
-end
-
-def expand_contexts
-  Dir[File.join( contexts_root, '*'  )].map { |d| d.split( '/' ).last }.join ','
-end
-
-def message( contexts, options={} )
-  msg = options[:using_contexts] ?
-    "*** #{start_or_end_word( options )} seeding (contexts: #{contexts.split(',').join(', ')})" :
-    "*** #{start_or_end_word( options )} seeding"
-end
-
-def start_or_end_word( options )
-  return options[:start] ? 'Start' : 'End'
-end