wagons 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ad6e032983bebf58125a39ac88e3979933ce023f4d764de8f4c5e0481a7408
-  data.tar.gz: 9d43e8b0c92ea4eecb432a5ffba1c4b975e59af87e8b0a9147337c33747a2ec8
+  metadata.gz: b26448bff509cc5ad70160bbeac2873f5cf3a0a3485cf0436ae195d64798a8bb
+  data.tar.gz: 26dab68871588dd95d7df6a5948ace57cab89996ae8fe7db64d5d26b547ab366
 SHA512:
-  metadata.gz: 1d5fd33f45e525195cd60b3ad0cadc279801400f2c9ea7698cf57a2652015d74aabd8519e9c800374483127c9e4978258964229472676241a83c51447e5832e6
-  data.tar.gz: 874710b14255e36237d347c279317c29e0245d82247b1cc3c5fff080781d97e544d8e32bf5ec5cd40d87d3423c0870592117eb99aa4310c0533b2070647e1a1a
+  metadata.gz: dd6596f5826acf95cadd059c0ab7603bf0bb4e52495b000dd50dfd54cdb9722510cbf7dd62b3e8f6761b957a2468027cd4fcc21784f06060f16100648c4fc6b8
+  data.tar.gz: 27a9363ab8212a7a3d779ad35c767e56283900bda2466ffe628eb494dfee6e4a5ef69e6c90776b4e805d302059cb1f5d799fe418f89866291a4b4757d9563d0c

data/README.rdoc

@@ -143,4 +143,4 @@ with wagons. If you install your gems from <tt>vendor/cache</tt> into <tt>vendor
 you still get most of the benefits of using Bundler, including the guarantee for the very same gem
 versions as used in development.
 
-Contributions to this or any other issues are very welcome.
+Contributions to this or any other issues are very welcome.

data/Rakefile

@@ -47,6 +47,7 @@ task :test => :set_rails_version do
       in_dummy 'mkdir -p vendor/wagons/superliner/.bundle'
       in_dummy 'echo -e "---\nBUNDLE_PATH: \"$ROOT_BUNDLE_PATH\"\n" > vendor/wagons/superliner/.bundle/config'
     end
+    in_dummy 'bundle'
     in_dummy 'bundle exec rails g wagon test_wagon'
     in_dummy 'bundle exec rake wagon:bundle:update'
     in_dummy "bundle exec rake db:migrate test  #{'-t' if Rake.application.options.trace}"

data/lib/tasks/wagons.rake

@@ -180,17 +180,14 @@ namespace :db do
     Rake::Task[:'db:_dump'].clear_actions
 
     task :_dump do
-      wagon_migrations =
-        if defined?(ActiveRecord::MigrationContext)
-          context = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths)
-          migrated = Set.new(context.get_all_versions)
-          migrated.size > context.migrations.size
+      context =
+        if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('6.0.0')
+          ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths)
         else
-          migrations = ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)
-          migrated = Set.new(ActiveRecord::Migrator.get_all_versions)
-          migrated.size > migrations.size
+          ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration)
         end
-      if wagon_migrations
+      migrated = Set.new(context.get_all_versions)
+      if migrated.size > context.migrations.size
         puts "The database schema will not be dumped when there are loaded wagon migrations."
         puts "To dump the application schema, please 'rake wagon:remove WAGON=ALL' wagons beforehand or reset the database."
       else

data/lib/wagons.rb

@@ -9,9 +9,7 @@ require 'wagons/version'
 require 'wagons/extensions/application'
 require 'wagons/extensions/require_optional'
 require 'wagons/extensions/test_case'
-if ::Rails::VERSION::STRING >= '4.1'
-  require 'wagons/extensions/migration'
-end
+require 'wagons/extensions/migration'
 
 # Utility class to find single wagons and provide additional information
 # about the main application.

data/lib/wagons/extensions/application.rb

@@ -5,13 +5,8 @@ module Rails
     # Append wagons at the end of all railties, even after the application.
     def ordered_railties_with_wagons
       @ordered_railties ||= ordered_railties_without_wagons.tap do |ordered|
-        flat = Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('4.1.6')
         Wagons.all.each do |w|
-          if flat
-            ordered.push(ordered.delete(w))
-          else
-            ordered.unshift(array_deep_delete(ordered, w))
-          end
+          ordered.unshift(array_deep_delete(ordered, w))
         end
       end
     end

data/lib/wagons/extensions/migration.rb

@@ -33,11 +33,7 @@ module ActiveRecord
       end
 
       def load_app_schema(config)
-        if Tasks::DatabaseTasks.respond_to?(:load_schema_for)
-          Tasks::DatabaseTasks.load_schema_for(config)
-        else
-          Tasks::DatabaseTasks.load_schema(config)
-        end
+        Tasks::DatabaseTasks.load_schema(config)
         check_pending!
       end
 
@@ -47,29 +43,25 @@ module ActiveRecord
       end
 
       def defined_app_migration_versions
-        if defined?(MigrationContext)
-          migration_context.migrations.collect(&:version).to_set
-        else
-          Migrator.migrations(Migrator.migrations_paths).collect(&:version).to_set
-        end
+        migration_context.migrations.collect(&:version).to_set
       end
 
       def migration_versions_in_db
         if Base.connection.table_exists?(SchemaMigration.table_name)
-          if defined?(MigrationContext)
-            migration_context.get_all_versions.to_set
-          else
-            Migrator.get_all_versions.to_set
-          end
+          migration_context.get_all_versions.to_set
         else
           [].to_set
         end
       end
 
       def migration_context
-        MigrationContext.new(Migrator.migrations_paths)
+        if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('6.0.0')
+          MigrationContext.new(Migrator.migrations_paths)
+        else
+          MigrationContext.new(Migrator.migrations_paths, SchemaMigration)
+        end
       end
 
     end
   end
-end
+end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/wagons/wagon.rb

@@ -109,10 +109,6 @@ module Wagons
     # Loads tasks into the main Rails application.
     # Overwritten to only load own rake tasks, without install:migrations task from Rails::Engine
     def load_tasks(app = self)
-      if Rails::VERSION::MAJOR < 4
-        railties.all { |r| r.load_tasks(app) }
-      end
-
       extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each { |block| instance_exec(app, &block) }
       paths['lib/tasks'].existent.sort.each { |ext| load(ext) }
@@ -127,15 +123,15 @@ module Wagons
     end
 
     def migrate_to(version)
-      if defined?(ActiveRecord::MigrationContext)
-        migration_context.migrate(version)
-      else
-        ActiveRecord::Migrator.migrate(migrations_paths, version)
-      end
+      migration_context.migrate(version)
     end
 
     def migration_context
-      ActiveRecord::MigrationContext.new(migrations_paths)
+      if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('6.0.0')
+        ActiveRecord::MigrationContext.new(migrations_paths)
+      else
+        ActiveRecord::MigrationContext.new(migrations_paths, ActiveRecord::SchemaMigration)
+      end
     end
 
     module ClassMethods

data/lib/wagons/wagon_tasks.rake

@@ -100,38 +100,6 @@ end
 
 Rake.application.invoke_task(:load_app)
 
-if ::Rails::VERSION::STRING < '4.1'
-  task :test => [:'app:db:test:prepare']
-
-  namespace :app do
-    namespace :db do
-      task :load_config do
-        # set migrations paths to core only to have db:test:prepare work as desired
-        ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
-      end
-
-      namespace :test do
-        # for sqlite, make sure to delete the test.sqlite3 from the main application
-        task :purge do
-          abcs = ActiveRecord::Base.configurations
-          case abcs['test']['adapter']
-          when /sqlite/
-            dbfile = Rails.application.root.join(abcs['test']['database'])
-            File.delete(dbfile) if File.exist?(dbfile)
-          end
-        end
-
-        # run wagon migrations and load seed data.
-        # append this to the regular app:db:test:prepare task.
-        task :prepare do
-          Rails.env = 'test'
-          Wagons.current_wagon.prepare_test_db
-        end
-      end
-    end
-  end
-end
-
 task :notes => 'app:notes'
 
 task :stats => ['wagon:statsetup', 'app:stats']

data/test/ci/{rails42.gemfile → rails52.gemfile}

@@ -2,9 +2,7 @@ source 'https://rubygems.org'
 
 gemspec :path => '../..'
 
-gem 'rails', '~> 4.2.0'
-
-gem 'seed-fu-ndo', '>= 0.0.2'
+gem 'rails', '~> 5.2.0'
 
 group :test do
   gem 'mocha', :require => false

data/test/ci/rails52.gemfile.lock

@@ -0,0 +1,146 @@
+PATH
+  remote: ../..
+  specs:
+    wagons (0.5.0)
+      bundler (>= 1.1)
+      rails (>= 4.2)
+      seed-fu-ndo (>= 0.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.3.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    mocha (1.9.0)
+      metaclass (~> 0.0.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    open4 (1.3.4)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (13.0.0)
+    seed-fu (2.3.9)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
+    seed-fu-ndo (0.0.3)
+      seed-fu (>= 2.2.0)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  open4
+  rails (~> 5.2.0)
+  rails-controller-testing
+  sqlite3
+  wagons!
+
+BUNDLED WITH
+   2.0.2

data/test/dummy/Gemfile

@@ -10,9 +10,7 @@ end
 
 group :test do
   gem 'mocha', :require => false
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'][/(\d+\.\d+\.\d+)/, 1] >= '5.0'
-    gem 'rails-controller-testing'
-  end
+  gem 'rails-controller-testing'
 end
 
 # Include the wagons you want attached in Wagonfile.

data/test/dummy/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     dummy_test_wagon (0.0.1)
 
 PATH
-  remote: /Users/pascal/Code/ruby/wagons
+  remote: /home/pzumkehr/src/ruby/libraries/wagons
   specs:
     wagons (0.5.0)
       bundler (>= 1.1)
@@ -19,126 +19,142 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.1, >= 2.1.8)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    erubi (1.9.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.0.1)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.5.0)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
+    mocha (1.9.0)
       metaclass (~> 0.0.1)
-    nio4r (2.3.1)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.5)
-    rack-test (1.0.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       bundler (>= 1.3.0)
-      railties (= 5.2.0)
+      railties (= 6.0.0)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.1)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.0)
     seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
     seed-fu-ndo (0.0.3)
       seed-fu (>= 2.2.0)
-    sprockets (3.7.1)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.0)
 
 PLATFORMS
   ruby
@@ -153,4 +169,4 @@ DEPENDENCIES
   wagons!
 
 BUNDLED WITH
-   1.16.2
+   2.0.2