seedbank 0.4.0 → 0.5.0

data/test/lib/seedbank/runner_test.rb

@@ -1,12 +1,11 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 describe Seedbank::Runner do
-
-  describe "seeds with dependency" do
-
+  describe 'seeds with dependency' do
     subject { Rake::Task['db:seed:dependent'] }
 
-    it "runs the dependencies in order" do
+    it 'runs the dependencies in order' do
       FakeModel.expect :seed, true, ['dependency']
       FakeModel.expect :seed, true, ['dependent']
 
@@ -15,7 +14,7 @@ describe Seedbank::Runner do
       FakeModel.verify
     end
 
-    it "executes the body of the dependencies exactly once per invocation" do
+    it 'executes the body of the dependencies exactly once per invocation' do
       FakeModel.expect :seed, true, ['dependency']
       FakeModel.expect :seed, true, ['dependent']
       FakeModel.expect :seed, true, ['dependency']
@@ -24,7 +23,7 @@ describe Seedbank::Runner do
       subject.invoke
 
       # Allow all tasks to be re-executed, including dependencies
-      Rake.application.tasks.each { |t| t.reenable }
+      Rake.application.tasks.each(&:reenable)
 
       subject.invoke
 
@@ -32,11 +31,10 @@ describe Seedbank::Runner do
     end
   end
 
-  describe "seeds with multiple dependencies" do
-
+  describe 'seeds with multiple dependencies' do
     subject { Rake::Task['db:seed:dependent_on_several'] }
 
-    it "runs the dependencies in order" do
+    it 'runs the dependencies in order' do
       FakeModel.expect :seed, true, ['dependency']
       FakeModel.expect :seed, true, ['dependency2']
       FakeModel.expect :seed, true, ['dependent on several']
@@ -47,11 +45,10 @@ describe Seedbank::Runner do
     end
   end
 
-  describe "seeds with nested dependencies" do
-
+  describe 'seeds with nested dependencies' do
     subject { Rake::Task['db:seed:dependent_on_nested'] }
 
-    it "runs all dependencies in order" do
+    it 'runs all dependencies in order' do
       FakeModel.expect :seed, true, ['dependency']
       FakeModel.expect :seed, true, ['dependent']
       FakeModel.expect :seed, true, ['dependency2']
@@ -61,14 +58,12 @@ describe Seedbank::Runner do
 
       FakeModel.verify
     end
-
   end
 
-  describe "after with no block given" do
-
+  describe 'after with no block given' do
     subject { Rake::Task['db:seed:no_block'] }
 
-    it "runs the dependencies" do
+    it 'runs the dependencies' do
       FakeModel.expect :seed, true, ['dependency']
 
       subject.invoke
@@ -77,20 +72,19 @@ describe Seedbank::Runner do
     end
   end
 
-  describe "let" do
-
-    describe "evaluates dependencies in order" do
-
+  describe 'let' do
+    describe 'evaluates dependencies in order' do
       subject { Rake::Task['db:seed:reference_memos'] }
 
-      it "runs the dependencies in order" do
+      it 'runs the dependencies in order' do
         FakeModel.expect :seed, true, ['with_inline_memo']
         FakeModel.expect :seed, true, ['with_block_memo']
         FakeModel.expect :calling_let, true, ['BLOCK_LET']
         FakeModel.expect :calling_let, true, ['INLINE_LET']
 
-        def FakeModel.calling_let!(*args); end
-        def FakeModel.calling_method(*args); end
+        def FakeModel.calling_let!(*_args); end
+
+        def FakeModel.calling_method(*_args); end
 
         subject.invoke
 
@@ -98,13 +92,12 @@ describe Seedbank::Runner do
       end
     end
 
-    describe "a previously defined method" do
-
+    describe 'a previously defined method' do
       let(:runner) { Seedbank::Runner.new }
 
       before { runner.let(:existing) {} }
 
-      %w(__eigenclass existing let let evaluate after).each do |name|
+      %w[existing let! let evaluate after extend].each do |name|
         it 'raises ArgumentError' do
           assert_raises(ArgumentError, Regexp.new(name)) do
             runner.let(name)
@@ -112,43 +105,44 @@ describe Seedbank::Runner do
         end
       end
     end
-
   end
 
-  describe "let!" do
-
-    describe "evaluates dependencies in order" do
-
+  # TODO: These don't really test in order. Maybe swap in rspec_mocks
+  describe 'let!' do
+    describe 'evaluates dependencies in order' do
       subject { Rake::Task['db:seed:reference_memos'] }
 
-      it "runs the dependencies in order" do
+      it 'runs the dependencies in order' do
+        FakeModel.expect :seed, true, ['with_inline_memo']
         FakeModel.expect :calling_let!, true, ['INLINE_LET!']
+        FakeModel.expect :seed, true, ['with_block_memo']
         FakeModel.expect :calling_let!, true, ['BLOCK_LET!']
-
-        def FakeModel.seed(*args); end
-        def FakeModel.calling_let(*args); end
-        def FakeModel.calling_method(*args); end
+        FakeModel.expect :calling_let, true, ['BLOCK_LET']
+        FakeModel.expect :calling_let, true, ['INLINE_LET']
+        FakeModel.expect :calling_method, true, ['inline_method']
 
         subject.invoke
 
         FakeModel.verify
       end
     end
-
   end
 
-  describe "defining an inline method" do
-
-    describe "evaluates dependencies in order" do
-
+  # TODO: This doesn't do anything more than the above except for
+  # isolating the inline method call. Would be better served by it's
+  # own seeds in isolation.
+  describe 'defining an inline method' do
+    describe 'evaluates dependencies in order' do
       subject { Rake::Task['db:seed:reference_memos'] }
 
-      it "runs the dependencies in order" do
+      it 'runs the dependencies in order' do
         FakeModel.expect :calling_method, true, ['inline_method']
 
-        def FakeModel.seed(*args); end
-        def FakeModel.calling_let(*args); end
-        def FakeModel.calling_let!(*args); end
+        def FakeModel.seed(*_args); end
+
+        def FakeModel.calling_let(*_args); end
+
+        def FakeModel.calling_let!(*_args); end
 
         subject.invoke
 
@@ -156,5 +150,4 @@ describe Seedbank::Runner do
       end
     end
   end
-
 end

data/test/lib/tasks/seed_rake_test.rb

@@ -1,96 +1,138 @@
+# frozen_string_literal: true
 require 'test_helper'
+using Seedbank::DSL
 
 describe 'Seedbank rake.task' do
+  def self.dummy_seeds_root
+    Pathname.new('../../../dummy/db/seeds').expand_path(__FILE__)
+  end
+
+  def self.glob_dummy_seeds
+    Pathname.glob(dummy_seeds_root.join(Seedbank.matcher), Seedbank.nesting)
+  end
 
-  describe "seeds with dependency" do
+  it 'does not pollute the global namespace' do
+    Object.new.wont_respond_to :seeds_root
+  end
 
+  describe 'seeds with dependency' do
     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
-        db:seed:dependent db:seed:dependent_on_nested db:seed:dependent_on_several db:seed:development
-        db:seed:development:users db:seed:no_block db:seed:original db:seed:reference_memos db:seed:with_block_memo db:seed:with_inline_memo)
+    it 'creates all the seed tasks' do
+      seeds = %w[db:seed:circular1 db:seed:circular2 db:seed:common db:seed:dependency db:seed:dependency2
+                 db:seed:dependent db:seed:dependent_on_nested db:seed:dependent_on_several db:seed:development
+                 db:seed:development:users db:seed:no_block db:seed:original db:seed:reference_memos db:seed:with_block_memo db:seed:with_inline_memo]
 
       subject.map(&:to_s).must_equal seeds
     end
   end
 
-  describe "common seeds in the root directory" do
-
-    Dir[File.expand_path('../../../dummy/db/seeds/*.seeds.rb', __FILE__)].each do |seed_file|
+  describe 'common seeds in the root directory' do
+    glob_dummy_seeds.each do |seed_file|
       seed = File.basename(seed_file, '.seeds.rb')
 
       describe seed do
-
         subject { Rake.application.lookup(['db', 'seed', seed].join(':')) }
 
-        it "is dependent on db:abort_if_pending_migrations" do
+        it 'is dependent on db:abort_if_pending_migrations' do
           subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
         end
       end
     end
   end
 
-  describe "db:seed:common" do
-
+  describe 'db:seed:common' do
     subject { Rake::Task['db:seed:common'] }
 
-    it "is dependent on the common seeds and db:seed:original" do
-      prerequisite_seeds = Dir[File.expand_path('../../../dummy/db/seeds/*.seeds.rb', __FILE__)].sort.map do |seed_file|
-        ['db', 'seed', File.basename(seed_file, '.seeds.rb')].join(':')
-      end.unshift('db:seed:original')
+    describe 'when db/seeds.rb exists' do
+      it 'is dependent on the common seeds and db:seed:original' do
+        prerequisite_seeds = self.class.glob_dummy_seeds.sort.map do |seed_file|
+          ['db', 'seed', File.basename(seed_file, '.seeds.rb')].join(':')
+        end.unshift('db:seed:original')
+
+        subject.prerequisites.must_equal prerequisite_seeds
+      end
+    end
+
+    describe 'when db/seeds.rb does not exist' do
+      def setup
+        main = TOPLEVEL_BINDING.eval('class << self; self; end')
+        orig = original_seeds_file
+        main.send(:undef_method, :original_seeds_file) if main.respond_to?(:original_seeds_file, true)
+        main.send(:define_method, :original_seeds_file) { nil }
+        super
+        main.send(:undef_method, :original_seeds_file)
+        main.send(:define_method, :original_seeds_file) { orig }
+      end
 
-      subject.prerequisites.must_equal prerequisite_seeds
+      it 'is dependent on only the common seeds' do
+        prerequisite_seeds = self.class.glob_dummy_seeds.sort.map do |seed_file|
+          ['db', 'seed', File.basename(seed_file, '.seeds.rb')].join(':')
+        end
+
+        subject.prerequisites.must_equal prerequisite_seeds
+      end
     end
   end
 
-  describe "db:seed:original" do
-
+  describe 'db:seed:original' do
     subject { Rake::Task['db:seed:original'] }
 
-    it "has no dependencies" do
+    it 'is only dependent on db:abort_if_pending_migrations' do
       subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
     end
 
-    describe "when seeds are reloaded" do
+    it 'runs within Seedbank::Runner' do
+      FakeModel.expect :seed, true, ['db/seeds.rb']
 
+      subject.invoke
+
+      FakeModel.verify
+    end
+
+    describe 'when seeds are reloaded' do
       before do
-        Dummy::Application.load_tasks
+        silence_warnings { Dummy::Application.load_tasks }
       end
 
-      it "still has no dependencies" do
+      it 'is still only dependent on db:abort_if_pending_migrations' do
         subject.prerequisites.must_equal %w[db:abort_if_pending_migrations]
       end
+
+      it 'still runs within Seedbank::Runner' do
+        skip 'TODO: Appears that it gets invoked twice after reloading.'
+        FakeModel.expect :seed, true, ['db/seeds.rb']
+
+        subject.invoke
+
+        FakeModel.verify
+      end
     end
   end
 
-  describe "environment seeds" do
-
-    Dir[File.expand_path('../../../dummy/db/seeds', __FILE__) + '/*/'].each do |environment_directory|
+  describe 'environment seeds ' do
+    dummy_seeds_root.each_child.select(&:directory?).each do |environment_directory|
       environment = File.basename(environment_directory)
 
-      describe "seeds in the #{environment} environment" do
-
-        Dir[File.expand_path("../../../dummy/db/seeds/#{environment}/*.seeds.rb", __FILE__)].each do |seed_file|
+      describe "in the #{environment} environment " do
+        Pathname.glob(environment_directory.join(Seedbank.matcher), Seedbank.nesting).each do |seed_file|
           seed = File.basename(seed_file, '.seeds.rb')
 
           describe seed do
-
             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]
+            it 'is dependent on db:abort_if_pending_migrations' do
+              subject.prerequisites.must_equal %w[db:abort_if_pending_migrations] if subject
             end
           end
         end
       end
 
       describe "db:seed:#{environment}" do
-
         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|
+        it 'is dependent on the seeds in the environment directory' do
+          prerequisite_seeds = Pathname.glob(environment_directory.join(Seedbank.matcher), Seedbank.nesting).sort.map do |seed_file|
             ['db', 'seed', environment, File.basename(seed_file, '.seeds.rb')].join(':')
           end.unshift('db:seed:common')
 
@@ -100,27 +142,22 @@ describe 'Seedbank rake.task' do
     end
   end
 
-  describe "db:seed task" do
-
+  describe 'db:seed task' do
     subject { Rake::Task['db:seed'] }
 
-    describe "when no environment seeds are defined" do
-
-      it "is dependent on db:seed:common" do
-        subject.prerequisites.must_equal %w[db:seed:common]
+    describe 'when no environment seeds are defined' do
+      it 'is dependent on db:seed:common' do
+        subject.prerequisites.must_equal %w[db:abort_if_pending_migrations db:seed:common]
       end
     end
 
-    describe "when environment seeds are defined" do
-
-      it "is dependent on db:seed:common" do
+    describe 'when environment seeds are defined' do
+      it 'is dependent on db:seed:common' do
         Rails.stub(:env, 'development') do
-
           Rake.application.clear
-          Dummy::Application.load_tasks
-
-          subject.prerequisites.must_equal %w[db:seed:common db:seed:development]
+          silence_warnings { Dummy::Application.load_tasks }
 
+          subject.prerequisites.must_equal %w[db:abort_if_pending_migrations db:seed:common db:seed:development]
         end
       end
     end

data/test/test_helper.rb

@@ -1,26 +1,28 @@
-require 'rubygems'
+# frozen_string_literal: true
+require 'rake'
 require 'minitest/autorun'
+require 'active_record/railtie'
 
 # Configure Rails Environment
-environment  = ENV["RAILS_ENV"] = 'test'
-rails_root   = File.expand_path('../dummy', __FILE__)
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('config/environment.rb', rails_root)
+require 'dummy/config/application'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-Seedbank.seeds_root = File.expand_path('dummy/db/seeds', __FILE__)
+Seedbank.application_root = Pathname.new(File.expand_path('../dummy', __FILE__))
 
 class Seedbank::Spec < MiniTest::Spec
-
   def setup
-    Rake.application = Rake::Application.new
-    Dummy::Application.load_tasks
-    Object.const_set :FakeModel, MiniTest::Mock.new
-    TOPLEVEL_BINDING.eval('self').send(:instance_variable_set, :@_seedbank_runner, Seedbank::Runner.new)
+    silence_warnings do
+      Rake.application = Rake::Application.new
+      Dummy::Application.load_tasks
+      Object.const_set :FakeModel, MiniTest::Mock.new
+      TOPLEVEL_BINDING.eval('self').send(:instance_variable_set, :@_seedbank_runner, Seedbank::Runner.new)
+    end
+
     super
   end
-
 end
 
 MiniTest::Spec.register_spec_type(/^Seedbank/i, Seedbank::Spec)

metadata

@@ -1,46 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: seedbank
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James McCarthy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-description: "\n    Extends Rails seeds to split out complex seeds into multiple\n
-  \   files and lets each environment have it's own seeds.\n  "
-email: james2mccarthy@gmail.com
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+description: "\n    Adds simple rake commands for seeding your database. Simple dependencies
+  let you organise your seeds.\n    If you are using Rails, Seedbank extends Rails
+  seeds and lets you add seeds for each environment.\n  "
+email:
+- "[james2mccarthy@gmail.com"
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -48,14 +78,18 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - TODO.txt
-- gemfiles/rake0.9.gemfile
 - gemfiles/rake10.gemfile
+- gemfiles/rake11.gemfile
+- gemfiles/rake12.gemfile
 - lib/seedbank.rb
 - lib/seedbank/dsl.rb
 - lib/seedbank/railtie.rb
@@ -91,7 +125,6 @@ files:
 - test/dummy/db/seeds/reference_memos.seeds.rb
 - test/dummy/db/seeds/with_block_memo.seeds.rb
 - test/dummy/db/seeds/with_inline_memo.seeds.rb
-- test/dummy/lib/tasks/dsl.rake
 - test/dummy/script/rails
 - test/lib/seedbank/dsl_test.rb
 - test/lib/seedbank/runner_test.rb
@@ -101,12 +134,7 @@ 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 seedbank
-  tasks;\n\n    require 'seedbank'\n    Seedbank.load_tasks if defined?(Seedbank)\n\n
-  \ Rails 3.x and 4.x\n  ---------\n  Your work here is done!\n\n  ================================================================================\n
-  \ "
+post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -115,19 +143,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.2.0
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Extends Rails seeds to split out complex seeds into their own file and have
-  different seeds for each environment.
+summary: Generate seeds data for your Ruby application.
 test_files:
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
@@ -157,7 +184,6 @@ test_files:
 - test/dummy/db/seeds/reference_memos.seeds.rb
 - test/dummy/db/seeds/with_block_memo.seeds.rb
 - test/dummy/db/seeds/with_inline_memo.seeds.rb
-- test/dummy/lib/tasks/dsl.rake
 - test/dummy/script/rails
 - test/lib/seedbank/dsl_test.rb
 - test/lib/seedbank/runner_test.rb

data/test/dummy/lib/tasks/dsl.rake

@@ -1,4 +0,0 @@
-namespace :seedy do
-  include Seedbank::DSL
-  task :users
-end