wagons 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb5c3068da7f326c778f484c01ab545176e1a836bdd1b97e74a5ab8e8c33c8e4
-  data.tar.gz: d5e835973232338332bedd472dad3cbb20b08c37c56a64d5d7bfe2137dd2a8f0
+  metadata.gz: 3d06295f19bd1963830bd47006676c4b25eb2b1e7b30af0f8c2302996b129493
+  data.tar.gz: d3c66601cc2869001432ae9877cbd03dfd6a68f9685aa47ab929a3b36023dcef
 SHA512:
-  metadata.gz: 7333b065d4dab93c3ff9ef06f7d6ad42af0fa206a0cc49d46bbcdbc373232f22672efb0c00b2355d458a633508c4aad3f661cf9962342fd4fe9f11203821ca0e
-  data.tar.gz: b20c4fa29ccbed32c5fc629dabd0ccb4156daf50a2a352c3ed120c8ad52235ce8bbd8ca11cb6460c445190b240d755d8918625e454768f93dc9a6be847dbf212
+  metadata.gz: bb293faaa5f7639c22dea5b78a98b202936ad6dd5fe6016c7215b81866861c9eb23a81a733e2dffc27ce09d1ebd7459f000a33dd73913e94633a4d0b96ad245a
+  data.tar.gz: ac080f11d0a70f91755e510f365a9c36bfec28e2918fd167edf58524f40834c52b0fae01bcb8dd44b1e1bce8ca7abc50bd96e877220ffbd454b80a9e4aaac076

data/README.rdoc

@@ -1,6 +1,7 @@
 = Here Be Wagons
 
-{<img src="https://secure.travis-ci.org/codez/wagons.png" />}[http://travis-ci.org/codez/wagons]
+{<img src="https://github.com/codez/wagons/actions/workflows/build.yml/badge.svg" />}[https://github.com/codez/wagons/actions/workflows/build.yml]
+{<img src="https://api.codeclimate.com/v1/badges/32a0d860544681cf718c/maintainability" />}[https://codeclimate.com/github/codez/wagons/maintainability]
 
 Wagons are extensions to your application train running on Rails. You can see them as plugins that
 extend the behavior of your specific Rails application. This framework makes it easy to create and

data/Rakefile

@@ -30,24 +30,8 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :test => :set_rails_version do
-  def in_dummy(command)
-    version = "RAILS_VERSION=\"#{ENV['RAILS_VERSION']}\" " if ENV['RAILS_VERSION']
-    Bundler.with_clean_env { sh "cd test/dummy && #{version}#{command}" }
-  end
-
+task :test => :bundle do
   begin
-    in_dummy 'rm -rf Gemfile.lock'
-    if ENV['ROOT_BUNDLE_PATH'] # used by travis-ci
-      in_dummy 'mkdir -p .bundle'
-      in_dummy 'echo "---\nBUNDLE_PATH: \"$ROOT_BUNDLE_PATH\"\n" > .bundle/config'
-      in_dummy 'cat .bundle/config'
-      in_dummy 'mkdir -p vendor/wagons/test_wagon/.bundle'
-      in_dummy 'echo -e "---\nBUNDLE_PATH: \"$ROOT_BUNDLE_PATH\"\n" > vendor/wagons/test_wagon/.bundle/config'
-      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}"
@@ -57,6 +41,20 @@ task :test => :set_rails_version do
   end
 end
 
+task :bundle => :set_rails_version do
+  in_dummy 'rm -rf Gemfile.lock'
+  if ENV['ROOT_BUNDLE_PATH'] # used by ci
+    in_dummy 'mkdir -p .bundle'
+    in_dummy 'echo "---\nBUNDLE_PATH: \"$ROOT_BUNDLE_PATH\"\n" > .bundle/config'
+    in_dummy 'cat .bundle/config'
+    in_dummy 'mkdir -p vendor/wagons/test_wagon/.bundle'
+    in_dummy 'echo -e "---\nBUNDLE_PATH: \"$ROOT_BUNDLE_PATH\"\n" > vendor/wagons/test_wagon/.bundle/config'
+    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'
+end
+
 task :set_rails_version do
   if ENV['BUNDLE_GEMFILE']
     version = File.read(ENV['BUNDLE_GEMFILE'])[/gem\s*'rails',\s*'(.*)'/, 1]
@@ -65,3 +63,8 @@ task :set_rails_version do
 end
 
 task :default => :test
+
+def in_dummy(command)
+  version = "RAILS_VERSION=\"#{ENV['RAILS_VERSION']}\" " if ENV['RAILS_VERSION']
+  Bundler.with_unbundled_env { sh "cd test/dummy && #{version}#{command}" }
+end

data/lib/tasks/wagons.rake

@@ -123,7 +123,7 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
       puts "\n*** #{w.wagon_name.upcase} ***" if wagons.size > 1
       rel_dir = w.root.to_s.sub(Rails.root.to_s + File::SEPARATOR, '')
       cmd = "cd #{rel_dir} && #{ENV['CMD']}"
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         verbose(Rake.application.options.trace) { sh cmd }
       end
     end

data/lib/wagons/extensions/migration.rb

@@ -5,12 +5,12 @@ module ActiveRecord
       # Extend maintain_test_schema! to include migrations of the current wagon to test
       # or to make sure no wagon migrations are loaded when testing the main application.
       def maintain_test_schema_with_wagons!
-        if Base.maintain_test_schema
-          # set migrations paths to core only, wagon migrations are loaded separately
-          Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
-          if app_needs_migration?
-            suppress_messages { load_wagon_schema! }
-          end
+        return unless maintain_test_schema?
+
+        # set migrations paths to core only, wagon migrations are loaded separately
+        Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
+        if app_needs_migration?
+          suppress_messages { load_wagon_schema! }
         end
       end
       alias maintain_test_schema_without_wagons! maintain_test_schema!
@@ -23,7 +23,12 @@ module ActiveRecord
 
         # Contrary to the original rails approach (#load_schema_if_pending!),
         # purge the database first to get rid of all wagon tables.
-        config = Base.configurations['test']
+        config =
+          if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('6.1.0')
+            Base.configurations['test']
+          else
+            Base.configurations.configs_for(env_name: 'test').first
+          end
         Tasks::DatabaseTasks.purge(config)
 
         Base.establish_connection(config)
@@ -62,6 +67,14 @@ module ActiveRecord
         end
       end
 
+      def maintain_test_schema?
+        if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('7.0.0')
+          ActiveRecord::Base.maintain_test_schema
+        else
+          ActiveRecord.maintain_test_schema
+        end
+      end
+
     end
   end
 end

data/lib/wagons/installer.rb

@@ -256,7 +256,7 @@ module Wagons
       cmd = setup_command(specs)
       Rails.logger.info(cmd)
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         ENV['RAILS_ENV'] = env
         execute_setup(cmd)
       end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/test/ci/rails52.gemfile.lock

@@ -1,138 +1,134 @@
 PATH
   remote: ../..
   specs:
-    wagons (0.5.0)
+    wagons (0.6.1)
       bundler (>= 1.1)
-      rails (>= 4.2)
+      rails (>= 5.2)
       seed-fu-ndo (>= 0.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.8.1)
+      actionpack (= 5.2.8.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
       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)
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
+      rack (~> 2.0, >= 2.0.8)
       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)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
       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)
+    activejob (5.2.8.1)
+      activesupport (= 5.2.8.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activerecord (5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activestorage (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      marcel (~> 1.0.0)
+    activesupport (5.2.8.1)
       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)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.3.1)
+    loofah (2.19.0)
       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)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    mocha (1.15.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
     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)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (5.2.8.1)
+      actioncable (= 5.2.8.1)
+      actionmailer (= 5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      activestorage (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.8.1)
       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-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.0)
+    rake (13.0.6)
     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)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
+    sqlite3 (1.5.3-x86_64-linux)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   mocha
@@ -143,4 +139,4 @@ DEPENDENCIES
   wagons!
 
 BUNDLED WITH
-   2.0.2
+   2.3.19

data/test/ci/rails60.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'rails', '~> 6.0.0'
+
+group :test do
+  gem 'mocha', :require => false
+  gem 'net-smtp'
+  gem 'rails-controller-testing'
+end

data/test/ci/rails60.gemfile.lock

@@ -0,0 +1,164 @@
+PATH
+  remote: ../..
+  specs:
+    wagons (0.6.1)
+      bundler (>= 1.1)
+      rails (>= 5.2)
+      seed-fu-ndo (>= 0.0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.6)
+      actionpack (= 6.0.6)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.6)
+      actionpack (= 6.0.6)
+      activejob (= 6.0.6)
+      activerecord (= 6.0.6)
+      activestorage (= 6.0.6)
+      activesupport (= 6.0.6)
+      mail (>= 2.7.1)
+    actionmailer (6.0.6)
+      actionpack (= 6.0.6)
+      actionview (= 6.0.6)
+      activejob (= 6.0.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.6)
+      actionview (= 6.0.6)
+      activesupport (= 6.0.6)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.6)
+      actionpack (= 6.0.6)
+      activerecord (= 6.0.6)
+      activestorage (= 6.0.6)
+      activesupport (= 6.0.6)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.6)
+      activesupport (= 6.0.6)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.6)
+      activesupport (= 6.0.6)
+      globalid (>= 0.3.6)
+    activemodel (6.0.6)
+      activesupport (= 6.0.6)
+    activerecord (6.0.6)
+      activemodel (= 6.0.6)
+      activesupport (= 6.0.6)
+    activestorage (6.0.6)
+      actionpack (= 6.0.6)
+      activejob (= 6.0.6)
+      activerecord (= 6.0.6)
+      marcel (~> 1.0)
+    activesupport (6.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.19.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    mocha (1.15.0)
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.2)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
+    open4 (1.3.4)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.0.6)
+      actioncable (= 6.0.6)
+      actionmailbox (= 6.0.6)
+      actionmailer (= 6.0.6)
+      actionpack (= 6.0.6)
+      actiontext (= 6.0.6)
+      actionview (= 6.0.6)
+      activejob (= 6.0.6)
+      activemodel (= 6.0.6)
+      activerecord (= 6.0.6)
+      activestorage (= 6.0.6)
+      activesupport (= 6.0.6)
+      bundler (>= 1.3.0)
+      railties (= 6.0.6)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.3)
+      loofah (~> 2.3)
+    railties (6.0.6)
+      actionpack (= 6.0.6)
+      activesupport (= 6.0.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.6)
+    seed-fu (2.3.9)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
+    seed-fu-ndo (0.0.3)
+      seed-fu (>= 2.2.0)
+    sprockets (4.1.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.5.3-x86_64-linux)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    timeout (0.3.0)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  mocha
+  net-smtp
+  open4
+  rails (~> 6.0.0)
+  rails-controller-testing
+  sqlite3
+  wagons!
+
+BUNDLED WITH
+   2.3.19

data/test/ci/rails61.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'rails', '~> 6.1.0'
+
+group :test do
+  gem 'mocha', :require => false
+  gem 'net-smtp'
+  gem 'rails-controller-testing'
+end