train-core 1.4.29 → 1.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 873addbef7c16e3ff149dbad280ae61c1913b689adcd50535bd0471ad091f020
-  data.tar.gz: 0dce14e56c157bb0ab9291a04768b3786cefdbf2e0952401d61bc76e7e5f693f
+  metadata.gz: '096ddd9b85e884861709f1bcfffc3b1be99f202f40e506a3e9d07bba59f6b178'
+  data.tar.gz: 2a1e7c6376bf4f0a44543b8a1a50d89270ea60ae71bc89cd32d447bb24fdd827
 SHA512:
-  metadata.gz: c27449cfdf20762084d4e7c759b08a9da4ff7a78221320c3218059509ac409fc524aa5cfd8f542a85a8518c181613f93eb17c04b003201ace6047c88708413e2
-  data.tar.gz: ab7334d0c6db00ba245bf8a74bad71ac0bf95d7542b3a904748bd965eaec602e282508d15eb825bb67279af605b26537d3b4a1ff6371e5a8cf7385466eb6c47f
+  metadata.gz: db0c6f74250762ef38e5941acc67fe18447cf300443dc7198161108900ea9df78130b842d66640bfcb8fecf8dc5299f2c2b950630b0a6e16551ed5ad690a380a
+  data.tar.gz: 47cc525c48959f6f09268ec8637ef9284b5039afcb4c5f2d1bd51d37d3e3705a8dd521a90d37e392cecd13e939909530aeb0948c49b69068248434cc52e34d52

data/CHANGELOG.md

@@ -1,28 +1,34 @@
-<!-- latest_release 1.4.29 -->
-## [v1.4.29](https://github.com/inspec/train/tree/v1.4.29) (2018-08-15)
+<!-- latest_release 1.4.31 -->
+## [v1.4.31](https://github.com/inspec/train/tree/v1.4.31) (2018-08-16)
 
 #### Merged Pull Requests
-- Add non_interactive support for SSH [#336](https://github.com/inspec/train/pull/336) ([marcparadise](https://github.com/marcparadise))
+- Enable using rubygems as plugins [#335](https://github.com/inspec/train/pull/335) ([clintoncwolfe](https://github.com/clintoncwolfe))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.4.25 -->
-### Changes since 1.4.25 release
-
-#### Features & Enhancements
-- Pulls file credentials parsing out of Azure class [#324](https://github.com/inspec/train/pull/324) ([dmccown](https://github.com/dmccown)) <!-- 1.4.27 -->
+<!-- release_rollup since=1.4.29 -->
+### Changes since 1.4.29 release
 
 #### Merged Pull Requests
-- Add non_interactive support for SSH [#336](https://github.com/inspec/train/pull/336) ([marcparadise](https://github.com/marcparadise)) <!-- 1.4.29 -->
-- Require Ruby 2.0 and allow net-ssh 5.0 [#334](https://github.com/inspec/train/pull/334) ([tas50](https://github.com/tas50)) <!-- 1.4.28 -->
-- Modify checksum logic to use system binaries [#251](https://github.com/inspec/train/pull/251) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.4.26 -->
+- Enable using rubygems as plugins [#335](https://github.com/inspec/train/pull/335) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 1.4.31 -->
+- Fixes an issue where the credential file was nil [#337](https://github.com/inspec/train/pull/337) ([dmccown](https://github.com/dmccown)) <!-- 1.4.30 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.4.29](https://github.com/inspec/train/tree/v1.4.29) (2018-08-15)
+
+#### Features & Enhancements
+- Pulls file credentials parsing out of Azure class [#324](https://github.com/inspec/train/pull/324) ([dmccown](https://github.com/dmccown))
+
+#### Merged Pull Requests
+- Modify checksum logic to use system binaries [#251](https://github.com/inspec/train/pull/251) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Require Ruby 2.0 and allow net-ssh 5.0 [#334](https://github.com/inspec/train/pull/334) ([tas50](https://github.com/tas50))
+- Add non_interactive support for SSH [#336](https://github.com/inspec/train/pull/336) ([marcparadise](https://github.com/marcparadise))
+<!-- latest_stable_release -->
+
 ## [v1.4.25](https://github.com/inspec/train/tree/v1.4.25) (2018-08-01)
 
 #### Merged Pull Requests
 - Remove not needed google-cloud dependency (see #328) and correct GCP … [#329](https://github.com/inspec/train/pull/329) ([skpaterson](https://github.com/skpaterson))
-<!-- latest_stable_release -->
 
 ## [v1.4.24](https://github.com/inspec/train/tree/v1.4.24) (2018-07-26)
 

data/Gemfile

@@ -19,6 +19,13 @@ group :test do
   gem 'rubocop', '~> 0.36.0'
   gem 'simplecov', '~> 0.10'
   gem 'concurrent-ruby', '~> 1.0'
+  gem 'pry-byebug'
+  gem 'm'
+  # This is not a true gem installation
+  # (Gem::Specification.find_by_path('train-gem-fixture') will return nil)
+  # but it's close enough to show the gempath handler can find a plugin
+  # See test/unit/
+  gem 'train-gem-fixture', path: 'test/fixtures/gempath/gems'
 end
 
 group :integration do

data/lib/train.rb

@@ -36,16 +36,29 @@ module Train
   #
   # @param [String] name of the plugin
   # @return [Train::Transport] the transport plugin
-  def self.load_transport(name)
-    res = Train::Plugins.registry[name.to_s]
-    return res unless res.nil?
-
-    # if the plugin wasnt loaded yet:
-    require 'train/transports/' + name.to_s
-    Train::Plugins.registry[name.to_s]
+  def self.load_transport(transport_name)
+    transport_name = transport_name.to_s
+    transport_class = Train::Plugins.registry[transport_name]
+    return transport_class unless transport_class.nil?
+
+    # Try to load the transport name from the core transports...
+    require 'train/transports/' + transport_name
+    return Train::Plugins.registry[transport_name]
   rescue LoadError => _
-    raise Train::UserError,
-          "Can't find train plugin #{name.inspect}. Please install it first."
+    begin
+      # If it's not in the core transports, try loading from a train plugin gem.
+      gem_name = 'train-' + transport_name
+      require gem_name
+      return Train::Plugins.registry[transport_name]
+      # rubocop: disable Lint/HandleExceptions
+    rescue LoadError => _
+      # rubocop: enable Lint/HandleExceptions
+      # Intentionally empty rescue - we're handling it below anyway
+    end
+
+    ex = Train::PluginLoadError.new("Can't find train plugin #{transport_name}. Please install it first.")
+    ex.transport_name = transport_name
+    raise ex
   end
 
   # Resolve target configuration in URI-scheme into

data/lib/train/errors.rb

@@ -23,6 +23,11 @@ module Train
   # errors.
   class UserError < Error; end
 
+  # We could not load a plugin, because of a user error
+  class PluginLoadError < UserError
+    attr_accessor :transport_name
+  end
+
   # Base exception class for all exceptions that are caused by incorrect use
   # of an API.
   class ClientError < Error; end

data/lib/train/platforms/detect/helpers/os_common.rb

@@ -5,7 +5,7 @@ require 'train/platforms/detect/helpers/os_windows'
 require 'rbconfig'
 
 module Train::Platforms::Detect::Helpers
-  module OSCommon # rubocop:disable Metrics/ModuleLength
+  module OSCommon
     include Train::Platforms::Detect::Helpers::Linux
     include Train::Platforms::Detect::Helpers::Windows
 

data/lib/train/plugins/base_connection.rb

@@ -77,7 +77,7 @@ class Train::Plugins::Transport
       false
     end
 
-    def direct_platform(name, platform_details = nil)
+    def force_platform!(name, platform_details = nil)
       plat = Train::Platforms.name(name)
       plat.backend = self
       plat.platform = platform_details unless platform_details.nil?
@@ -86,6 +86,8 @@ class Train::Plugins::Transport
       plat
     end
 
+    alias direct_platform force_platform!
+
     def family_hierarchy(plat)
       plat.families.each_with_object([]) do |(k, _v), memo|
         memo << k.name

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '1.4.29'.freeze
+  VERSION = '1.4.31'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 1.4.29
+  version: 1.4.31
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout