seedbank 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTE3NWRlOGJlYzUzNDIyYjcyZTU0ZGZhZDllZDE5MmZmODM3NzE5Mw==
+  data.tar.gz: !binary |-
+    ODFhMmMxNTNhYTViNDY2NjA1ZGZiYWVmYTU2M2QxMTk0YWQ5ZmU4Mg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWZkODAzNDBhYTg0MzQ0NDc1MzZkMWI5OTczYzhiZWJjYzAzMjE4MDQxNjU1
+    NmFhZGIyYTM0MDY0OWQ5NDI5NDMxNTJkM2ZiNDczM2IyYTkxN2I1NmEyZTI4
+    MDYyYTlkNmNmODU2MWJiMzRmMGZiOTQ1ZDQzNmZmZTU3OGVkMGQ=
+  data.tar.gz: !binary |-
+    MmJjZjc4ZjBhNmU0MGFkZGExYjdhYzcxNGE5ZTQ4ZGEzNzMwOGI1NWUwYzE3
+    OGJiMGI5MDY5NWM1Nzc1ZmRiZDhhYTBmNTdmNWQ1OWNhNGQxYTAyZGVkYTJh
+    NTk0N2FiZjUwMTU5NTIyNDQ4MjUxZDQ5YzVmZGJkNDkxZGRhNmU=

data/.gitignore

@@ -23,4 +23,6 @@ pkg
 test/dummy/tmp
 test/dummy/log
 .rvmrc
+.ruby-version
+.ruby-gemset
 Gemfile.lock

data/.travis.yml

@@ -1,9 +1,15 @@
 language: ruby
+
 rvm:
   - ree
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode
+
+gemfile:
+  - gemfiles/rake0.9.gemfile
+  - gemfiles/rake10.gemfile

data/Gemfile

@@ -3,14 +3,10 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in seedbank.gemspec
 gemspec
 
-group :test do
-  gem 'rake'
-end
+gem 'rake', :group => :test
 
 # for CRuby, Rubinius, including Windows and RubyInstaller
 gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 
 # for JRuby
-platform :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby

data/README.md

@@ -79,7 +79,7 @@ If you vendor the gem you'll need to change the require to the specific path.
 Usage
 =====
 
-Seeds files are just plain old Ruby executed in your rails application environment so anything you could type into the rails console will work in your seeds.
+Seeds files are just plain old Ruby executed in your rails application environment so anything you could type into the rails console will work in your seeds. Seeds files have to be named with the '.seeds.rb' extension.
 
 db/seeds/companies.seeds.rb
 ```ruby
@@ -124,6 +124,8 @@ after "development:companies" do
 end
 ```
 
+*Note* - If you experience any errors like `Don't know how to build task 'db:seed:users'`. Ensure your specifying `after 'development:companies'` like the above example. This is the usual culprit (YMMV).
+
 Contributors
 ============
 ```shell
@@ -135,6 +137,13 @@ git log | grep Author | sort | uniq
 * Philip Arndt
 * Peter Suschlik
 * Joost Baaij
+* Justin Smestad
+* Peter Suschlik
+* Philip Arndt
+* Tim Galeckas
+* lulalala
+* pivotal-cloudplanner
+* vkill
 
 Note on Patches/Pull Request
 ============================

data/gemfiles/rake0.9.gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in seedbank.gemspec
+gemspec :path => "../"
+
+gem 'rake', '~>0.9.0', :group => :test
+
+# for CRuby, Rubinius, including Windows and RubyInstaller
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+
+# for JRuby
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+gem 'seedbank', :path => '../'

data/gemfiles/rake10.gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in seedbank.gemspec
+gemspec :path=>"../"
+
+gem 'rake', '~>10.0', :group => :test
+
+# for CRuby, Rubinius, including Windows and RubyInstaller
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+
+# for JRuby
+gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+
+gem 'seedbank', :path => '../'
+

data/lib/seedbank/dsl.rb

@@ -1,21 +1,18 @@
 module Seedbank
   module DSL
 
-    def self.included(base)
-      Rake::Task.send(:include, Seedbank::RenameTask)
-      Rake::Application.send(:include, Seedbank::TaskManager)
-    end
-
-    def override_seed_task(*args, &block)
-      Rake.application.override_task(*args, &block)
+    def override_seed_task(*args)
+      task_name, arg_names, deps = Rake.application.resolve_args(args)
+      seed_task = Rake::Task.task_defined?(task_name) ? Rake::Task[task_name].clear : Rake::Task.define_task(task_name)
+      add_comment_to(seed_task, Rake.application.last_description)
+      seed_task.enhance deps
     end
 
     def seed_task_from_file(seed_file)
       scopes  = scope_from_seed_file(seed_file)
       fq_name = scopes.push(File.basename(seed_file, '.seeds.rb')).join(':')
-      args    = Rake::Task.task_defined?('db:abort_if_pending_migrations') ? { fq_name => 'db:abort_if_pending_migrations' } : { fq_name => :environment }
 
-      define_seed_task(seed_file, args)
+      define_seed_task(seed_file, fq_name)
     end
 
     def glob_seed_files_matching(*args, &block)
@@ -26,7 +23,15 @@ module Seedbank
       task = Rake::Task.define_task(*args) do |seed_task|
         Seedbank::Runner.new(seed_task).module_eval(File.read(seed_file), seed_file) if File.exist?(seed_file)
       end
+
       task.add_description "Load the seed data from #{seed_file}"
+
+      if Rake::Task.task_defined?('db:abort_if_pending_migrations')
+        task.enhance(['db:abort_if_pending_migrations'])
+      elsif Rake::Task.task_defined?(':environment')
+        task.enhance([':environment'])
+      end
+
       task.name
     end
 
@@ -41,5 +46,15 @@ module Seedbank
       Pathname.new Seedbank.seeds_root
     end
 
+    private
+
+    def add_comment_to(seed_task, comment)
+      if seed_task.respond_to?(:clear_comments)
+        seed_task.comment = comment
+      else
+        seed_task.send :instance_variable_set, '@full_comment', comment
+      end
+    end
+
   end
 end

data/lib/seedbank/version.rb

@@ -1,3 +1,3 @@
 module Seedbank
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/seedbank.rb

@@ -1,6 +1,4 @@
 require 'seedbank/dsl'
-require 'seedbank/rename_task'
-require 'seedbank/task_manager'
 require 'seedbank/runner'
 
 module Seedbank

data/lib/tasks/seed.rake

@@ -25,10 +25,18 @@ namespace :db do
 
       override_dependency << "db:seed:#{environment}" if defined?(Rails) && Rails.env == environment
     end
+
+    if Rails.version > '4'
+      original_seeds_file = Rails.application.paths["db/seeds.rb"].existent.first
+    elsif Rails.version > '3'
+      original_seeds_file = Rails.application.paths["db/seeds"].existent.first
+    else
+      original_seeds_file = Rails.root.join("db","seeds").children.first.to_s
+    end
+    define_seed_task original_seeds_file, :original if original_seeds_file
   end
 
   # Override db:seed to run all the common and environments seeds plus the original db:seed.
-  desc "Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/ENVIRONMENT/*.seeds.rb. ENVIRONMENT is the current environment in Rails.env."
+  desc 'Load the seed data from db/seeds.rb, db/seeds/*.seeds.rb and db/seeds/ENVIRONMENT/*.seeds.rb. ENVIRONMENT is the current environment in Rails.env.'
   override_seed_task :seed => override_dependency
-
 end

data/test/dummy/db/seeds.rb

@@ -0,0 +1 @@
+FakeModel.seed('db/seeds.rb')

data/test/lib/seedbank/dsl_test.rb

@@ -54,7 +54,7 @@ describe Seedbank::DSL do
 
     let(:seeds_root) { '/my/seeds/directory' }
 
-    subject { Seedbank::DSL.seeds_root }
+    subject { Seedbank::DSL.send(:seeds_root) }
 
     it "returns a Pathname" do
       flexmock(Seedbank).should_receive(:seeds_root).and_return(seeds_root).by_default
@@ -111,12 +111,6 @@ describe Seedbank::DSL do
       Rake::Task[name].wont_be_nil
     end
 
-    it "sets Rake Task dependencies" do
-      Seedbank::DSL.define_seed_task(seed_file, name => dependencies)
-
-      Rake::Task[name].prerequisite_tasks.must_equal dependencies.map { |dependency| Rake::Task[dependency] }
-    end
-
     it "sets Rake Task description" do
       Seedbank::DSL.define_seed_task(seed_file, name => dependencies)
 
@@ -130,17 +124,57 @@ describe Seedbank::DSL do
 
       Rake::Task[name].invoke
     end
+
+    describe "when db:abort_if_pending_migrations exists" do
+      it "sets Rake Task dependencies" do
+        Seedbank::DSL.define_seed_task(seed_file, name => dependencies)
+        expected_dependencies = dependencies.map { |dependency| Rake::Task[dependency] }
+        expected_dependencies << Rake::Task['db:abort_if_pending_migrations']
+
+        Rake::Task[name].prerequisite_tasks.must_equal expected_dependencies
+      end
+    end
+
+    describe "when db:abort_if_pending_migrations does not exist" do
+      it "sets Rake Task dependencies" do
+        flexmock(Rake::Task).should_receive(:task_defined?).and_return(false).by_default
+
+        Seedbank::DSL.define_seed_task(seed_file, name => dependencies)
+
+        Rake::Task[name].prerequisite_tasks.must_equal dependencies.map { |dependency| Rake::Task[dependency] }
+      end
+    end
   end
 
   describe "override_seed_task" do
 
-    let(:arguments) { 'my_task' }
+    describe "when no task exists to override" do
+
+      let(:name) { 'my_task' }
+      let(:dependencies) { ['seedy:users'] }
+
+      it "creates a new task" do
+        Seedbank::DSL.override_seed_task(name => dependencies)
 
-    it "calls Rake::TaskManager#override_task" do
-      block = proc {}
-      flexmock(Rake.application).should_receive(:override_task).with(arguments, block).once
+        Rake::Task[name].wont_be_nil
+      end
+
+      it "applies the dependencies" do
+        expected_dependencies = dependencies.map { |dependency| Rake::Task[dependency] }
+        Seedbank::DSL.override_seed_task(name => dependencies)
 
-      Seedbank::DSL.override_seed_task(arguments, &block)
+        Rake::Task[name].prerequisite_tasks.must_equal expected_dependencies
+      end
+
+      it "applies the description" do
+        description = 'Expected Description'
+        Rake.application.last_description = description
+
+        Seedbank::DSL.override_seed_task(name => dependencies)
+
+        Rake::Task[name].full_comment.must_equal description
+      end
     end
+
   end
 end

data/test/lib/seedbank/runner_test.rb

@@ -47,7 +47,7 @@ describe Seedbank::Runner do
   end
 
   describe "after with no block given" do
-    
+
     subject { Rake::Task['db:seed:no_block'] }
 
     it "runs the dependencies" do
@@ -56,4 +56,11 @@ describe Seedbank::Runner do
       subject.invoke
     end
   end
+
+  describe "let" do
+
+    it "does something" do
+
+    end
+  end
 end

data/test/lib/tasks/seed_rake_test.rb

@@ -4,7 +4,7 @@ describe 'Seedbank rake.task' do
 
   describe "seeds with dependency" do
 
-    subject { Rake.application.tasks_in_scope %w[db seed] }
+    subject { Rake.application.tasks_in_scope(defined?(Rake::Scope) ? Rake::Scope.new('db:seed') : %w[db seed]) }
 
     it "creates all the seed tasks" do
       seeds = %w(db:seed:circular1 db:seed:circular2 db:seed:common db:seed:dependency db:seed:dependency2
@@ -22,7 +22,7 @@ describe 'Seedbank rake.task' do
 
       describe seed do
 
-        subject { Rake.application.lookup(seed, %w[db seed]) }
+        subject { Rake.application.lookup(['db', 'seed', seed].join(':')) }
 
         it "is dependent on db:abort_if_pending_migrations" do
           subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
@@ -49,7 +49,7 @@ describe 'Seedbank rake.task' do
     subject { Rake::Task['db:seed:original'] }
 
     it "has no dependencies" do
-      subject.prerequisites.must_be_empty
+      subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
     end
 
     describe "when seeds are reloaded" do
@@ -59,7 +59,7 @@ describe 'Seedbank rake.task' do
       end
 
       it "still has no dependencies" do
-        subject.prerequisites.must_be_empty
+        subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
       end
     end
   end
@@ -76,7 +76,7 @@ describe 'Seedbank rake.task' do
 
           describe seed do
 
-            subject { Rake.application.lookup(seed, ['db', 'seed', environment]) }
+            subject { Rake.application.lookup(['db', 'seed', environment, seed].join(':')) }
 
             it "is dependent on db:abort_if_pending_migrations" do
               subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
@@ -87,7 +87,7 @@ describe 'Seedbank rake.task' do
 
       describe "db:seed:#{environment}" do
 
-        subject { Rake.application.lookup(environment, %w[db seed]) }
+        subject { Rake.application.lookup(['db', 'seed', environment].join(':')) }
 
         it "is dependent on the seeds in the environment directory" do
           prerequisite_seeds = Dir[File.expand_path("../../../dummy/db/seeds/#{environment}/*.seeds.rb", __FILE__)].sort.map do |seed_file|

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: seedbank
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - James McCarthy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,12 +68,12 @@ files:
 - README.md
 - Rakefile
 - TODO.txt
+- gemfiles/rake0.9.gemfile
+- gemfiles/rake10.gemfile
 - lib/seedbank.rb
 - lib/seedbank/dsl.rb
 - lib/seedbank/railtie.rb
-- lib/seedbank/rename_task.rb
 - lib/seedbank/runner.rb
-- lib/seedbank/task_manager.rb
 - lib/seedbank/version.rb
 - lib/tasks/seed.rake
 - seedbank.gemspec
@@ -113,14 +106,13 @@ files:
 - test/dummy/lib/tasks/dsl.rake
 - test/dummy/script/rails
 - test/lib/seedbank/dsl_test.rb
-- test/lib/seedbank/rename_task_test.rb
 - test/lib/seedbank/runner_test.rb
-- test/lib/seedbank/task_manager_test.rb
 - test/lib/tasks/seed_rake_test.rb
 - test/test_helper.rb
 homepage: http://github.com/james2m/seedbank
 licenses:
 - MIT
+metadata: {}
 post_install_message: ! "\n  ================================================================================\n\n
   \ Rails 2.x\n  ---------\n  If you are using Seedbank with Rails 2.x you will need
   to place the following at \n  the end of your Rakefile so Rubygems can load the
@@ -132,22 +124,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.2.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extends Rails seeds to split out complex seeds into their own file and have
   different seeds for each environment.
 test_files:
@@ -180,8 +170,6 @@ test_files:
 - test/dummy/lib/tasks/dsl.rake
 - test/dummy/script/rails
 - test/lib/seedbank/dsl_test.rb
-- test/lib/seedbank/rename_task_test.rb
 - test/lib/seedbank/runner_test.rb
-- test/lib/seedbank/task_manager_test.rb
 - test/lib/tasks/seed_rake_test.rb
 - test/test_helper.rb

data/lib/seedbank/rename_task.rb

@@ -1,9 +0,0 @@
-module Seedbank
-  module RenameTask
-
-    def rename(new_name)
-      @name = new_name
-    end
-
-  end
-end

data/lib/seedbank/task_manager.rb

@@ -1,21 +0,0 @@
-module Seedbank
-  module TaskManager
-
-    def override_task(*args, &block)
-      name, params, deps = resolve_args(args.dup)
-      fq_name = current_scope.push(name).join(':')
-      new_name = "#{fq_name}:original"
-      unless Rake::Task.task_defined?(new_name)
-        rename_task(fq_name, new_name)
-        define_task(Rake::Task, *args, &block)
-      end
-    end
-
-    def rename_task(fq_name, new_name)
-      task = @tasks.delete(fq_name)
-      task.rename(new_name)
-      @tasks[new_name] = task
-    end
-
-  end
-end

data/test/lib/seedbank/rename_task_test.rb

@@ -1,19 +0,0 @@
-require 'test_helper'
-
-describe Seedbank::RenameTask do
-
-  describe "rename" do
-
-    let(:original_name) { 'original_name' }
-    let(:new_name) { 'new_name' }
-
-    subject { Rake::Task.define_task(original_name) }
-
-    before { subject.rename(new_name) }
-
-    it "changes the tasks name" do
-      subject.name.must_equal new_name
-    end
-
-  end
-end

data/test/lib/seedbank/task_manager_test.rb

@@ -1,104 +0,0 @@
-require 'test_helper'
-
-describe Seedbank::TaskManager do
-
-  describe "override_task" do
-
-    let(:task_name) { 'my_task' }
-
-    describe "with no original version of the task exists" do
-
-      it "appends :original to the task name" do
-        task = Rake::Task.define_task(task_name)
-
-        Rake.application.override_task(task_name)
-
-        task.must_equal Rake.application.lookup('original', [task_name])
-      end
-
-      it "creates a new task in place of the original" do
-        Rake::Task.define_task(task_name)
-        task = Rake.application.override_task(task_name => [:dependency])
-
-        task.must_be_instance_of Rake::Task
-      end
-
-      it "adds the supplied dependencies to the new task" do
-        dependency = ['db:seed:dependency']
-
-        Rake::Task.define_task(task_name)
-        task = Rake.application.override_task(task_name => dependency)
-
-        task.prerequisites.must_equal dependency
-      end
-
-      it "adds the supplied action to the new task" do
-        action = proc {}
-        Rake::Task.define_task(task_name)
-        task = Rake.application.override_task(task_name, &action)
-
-        task.actions.must_equal [action]
-      end
-    end
-
-    describe "when the original version of the task exists" do
-
-      let(:original_name) { [task_name, 'original'].join(':') }
-
-      it "leaves the original task in place" do
-        task     = Rake::Task.define_task(task_name)
-        original = Rake::Task.define_task(original_name)
-        new_task = Rake.application.override_task(task_name)
-
-        Rake::Task[task_name].must_equal task
-      end
-
-      it "leaves the task:original task in place" do
-        task     = Rake::Task.define_task(task_name)
-        original = Rake::Task.define_task(original_name)
-        new_task = Rake.application.override_task(task_name)
-
-        Rake::Task[original].must_equal original
-      end
-
-      it "does not create a new task" do
-        task     = Rake::Task.define_task(task_name)
-        original = Rake::Task.define_task(original_name)
-        new_task = Rake.application.override_task(task_name)
-
-        new_task.must_be_nil
-      end
-    end
-  end
-
-  describe "rename_task" do
-
-    let(:original_name) { 'original_name' }
-    let(:new_name) { 'new_name' }
-
-    before do
-      Rake::Task.define_task(original_name)
-    end
-
-    it "changes the tasks name" do
-      task = Rake::Task[original_name]
-      flexmock(task).should_receive(:rename).with(new_name).once
-
-      Rake.application.rename_task(original_name, new_name)
-    end
-
-    it "removes the original task name" do
-      Rake.application.rename_task(original_name, new_name)
-
-      Rake.application.lookup(original_name).must_be_nil
-    end
-
-    it "give the original task the new name" do
-      original_task = Rake::Task[original_name]
-
-      Rake.application.rename_task(original_name, new_name)
-
-      Rake.application.lookup(new_name).must_equal original_task
-    end
-  end
-end