train 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 380cb81ba3b1d72ce15736240e1f24ee21b2c44f
-  data.tar.gz: 1905fe211a29868e810a9bd07c736817b262cee7
+  metadata.gz: 3d5ba0a8f8379e5671fbe8175b6a30f738b37325
+  data.tar.gz: 7de578f40b6116ce01c5d0a2bcf163d627f05d98
 SHA512:
-  metadata.gz: d2b4b3d6d9373376766c691629201f922e39699dc1e3c2fa5962235b851110c55901040b491c18fbf472d3acf6616159be2aa2c8f310ca3935f7f92f916b7109
-  data.tar.gz: aece6b8119d0d5aa9a4c8a8ae6846009b0105a5724b03f70b3e6fc6ba09d9a21461826405bc54e6e72d8f2a02db9d449e72056e59ea319df32279ca01a689a89
+  metadata.gz: 9d0dc0adf8e12a97c53852ac99ca904ca188e5457ba51bc82cc7e8c14506c8905a706bf2a66a509fe227835d8be053bcd8af9272a8b8f7d1ee4e31bddbe1faca
+  data.tar.gz: 744b6133eba631cc0e89926b46484865fe21868064d9ded6b4f7176748525c02464b3c228f95e59c6940794835d4fc2200b7b5523877f4af41868b9c046b1cd5

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [0.24.0](https://github.com/chef/train/tree/0.24.0) (2017-05-30)
-[Full Changelog](https://github.com/chef/train/compare/v0.23.0...0.24.0)
+## [0.25.0](https://github.com/chef/train/tree/0.25.0) (2017-06-15)
+[Full Changelog](https://github.com/chef/train/compare/v0.24.0...0.25.0)
+
+**Merged pull requests:**
+
+- Fix CoreOS platform detection [\#180](https://github.com/chef/train/pull/180) ([rarenerd](https://github.com/rarenerd))
+- Remove autoloads in favor of eager loading [\#178](https://github.com/chef/train/pull/178) ([Sharpie](https://github.com/Sharpie))
+- Fixed IPv6 URI parsing [\#176](https://github.com/chef/train/pull/176) ([zfjagann](https://github.com/zfjagann))
+
+## [v0.24.0](https://github.com/chef/train/tree/v0.24.0) (2017-05-30)
+[Full Changelog](https://github.com/chef/train/compare/v0.23.0...v0.24.0)
 
 **Merged pull requests:**
 

data/lib/train.rb

@@ -3,6 +3,7 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 require 'train/version'
+require 'train/options'
 require 'train/plugins'
 require 'train/errors'
 require 'uri'
@@ -61,7 +62,7 @@ module Train
     uri = parse_uri(conf[:target].to_s)
     unless uri.host.nil? and uri.scheme.nil?
       conf[:backend]  ||= uri.scheme
-      conf[:host]     ||= uri.host
+      conf[:host]     ||= uri.hostname
       conf[:port]     ||= uri.port
       conf[:user]     ||= uri.user
       conf[:password] ||= uri.password

data/lib/train/extras.rb

@@ -3,14 +3,14 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train::Extras
-  autoload :CommandWrapper, 'train/extras/command_wrapper'
-  autoload :FileCommon,     'train/extras/file_common'
-  autoload :AixFile,        'train/extras/file_aix'
-  autoload :UnixFile,       'train/extras/file_unix'
-  autoload :LinuxFile,      'train/extras/file_linux'
-  autoload :WindowsFile,    'train/extras/file_windows'
-  autoload :OSCommon,       'train/extras/os_common'
-  autoload :Stat,           'train/extras/stat'
+  require 'train/extras/command_wrapper'
+  require 'train/extras/file_common'
+  require 'train/extras/file_unix'
+  require 'train/extras/file_aix'
+  require 'train/extras/file_linux'
+  require 'train/extras/file_windows'
+  require 'train/extras/os_common'
+  require 'train/extras/stat'
 
   CommandResult = Struct.new(:stdout, :stderr, :exit_status)
   LoginCommand = Struct.new(:command, :arguments)

data/lib/train/extras/os_detect_linux.rb

@@ -85,10 +85,9 @@ module Train::Extras
       elsif !(raw = get_config('/etc/alpine-release')).nil?
         @platform[:name] = 'alpine'
         @platform[:release] = raw.strip
-      elsif !(raw = get_config('/etc/coreos/update.conf')).nil?
+      elsif !get_config('/etc/coreos/update.conf').nil?
         @platform[:name] = 'coreos'
-        meta = lsb_config(raw)
-        @platform[:release] = meta[:release]
+        @platform[:release] = lsb[:release]
       elsif !(os_info = fetch_os_release).nil?
         if os_info['ID_LIKE'] =~ /wrlinux/
           @platform[:name] = 'wrlinux'

data/lib/train/plugins.rb

@@ -7,7 +7,7 @@ require 'train/errors'
 
 module Train
   class Plugins
-    autoload :Transport, 'train/plugins/transport'
+    require 'train/plugins/transport'
 
     class << self
       # Retrieve the current plugin registry, containing all plugin names

data/lib/train/plugins/transport.rb

@@ -13,7 +13,7 @@ class Train::Plugins
     include Train::Extras
     Train::Options.attach(self)
 
-    autoload :BaseConnection, 'train/plugins/base_connection'
+    require 'train/plugins/base_connection'
 
     # Initialize a new Transport object
     #

data/lib/train/transports/local.rb

@@ -12,14 +12,14 @@ module Train::Transports
 
     include_options Train::Extras::CommandWrapper
 
-    autoload :File, 'train/transports/local_file'
-    autoload :OS,   'train/transports/local_os'
-
     def connection(_ = nil)
       @connection ||= Connection.new(@options)
     end
 
     class Connection < BaseConnection
+      require 'train/transports/local_file'
+      require 'train/transports/local_os'
+
       def initialize(options)
         super(options)
         @cmd_wrapper = nil

data/lib/train/transports/local_file.rb

@@ -6,7 +6,7 @@
 require 'train/extras'
 
 class Train::Transports::Local::Connection
-  class File < LinuxFile
+  class File < Train::Extras::LinuxFile
     def content
       @content ||= ::File.read(@path, encoding: 'UTF-8')
     rescue StandardError => _

data/lib/train/transports/ssh.rb

@@ -36,7 +36,7 @@ module Train::Transports
   class SSH < Train.plugin(1)
     name 'ssh'
 
-    autoload :Connection, 'train/transports/ssh_connection'
+    require 'train/transports/ssh_connection'
 
     # add options for submodules
     include_options Train::Extras::CommandWrapper

data/lib/train/transports/winrm.rb

@@ -38,7 +38,7 @@ module Train::Transports
   class WinRM < Train.plugin(1)
     name 'winrm'
 
-    autoload :Connection, 'train/transports/winrm_connection'
+    require 'train/transports/winrm_connection'
 
     # common target configuration
     option :host, required: true

data/lib/train/version.rb

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

data/test/unit/extras/os_detect_linux_test.rb

@@ -107,6 +107,18 @@ describe 'os_detect_linux' do
       end
     end
 
+    describe '/etc/coreos/update.conf' do
+      it 'sets the correct family/release for coreos' do
+        detector.stubs(:get_config).with('/etc/coreos/update.conf').returns('data')
+        detector.stubs(:lsb).returns({ id: 'Container Linux by CoreOS', release: 'coreos-version' })
+
+        detector.detect_linux_via_config.must_equal(true)
+        detector.platform[:name].must_equal('coreos')
+        detector.platform[:family].must_equal('coreos')
+        detector.platform[:release].must_equal('coreos-version')
+      end
+    end
+
     describe '/etc/os-release' do
       describe 'when not on a wrlinux build' do
         it 'does not set a platform family/release' do

data/test/unit/train_test.rb

@@ -129,6 +129,30 @@ describe Train do
       res.must_equal nu
     end
 
+    it 'supports IPv4 URIs' do
+      org = { target: 'mock://1.2.3.4:123' }
+      res = Train.target_config(org)
+      res[:backend].must_equal 'mock'
+      res[:host].must_equal '1.2.3.4'
+      res[:user].must_be_nil
+      res[:password].must_be_nil
+      res[:port].must_equal 123
+      res[:path].must_be_nil
+      res[:target].must_equal org[:target]
+    end
+
+    it 'supports IPv6 URIs' do
+      org = { target: 'mock://[abc::def]:123' }
+      res = Train.target_config(org)
+      res[:backend].must_equal 'mock'
+      res[:host].must_equal 'abc::def'
+      res[:user].must_be_nil
+      res[:password].must_be_nil
+      res[:port].must_equal 123
+      res[:path].must_be_nil
+      res[:target].must_equal org[:target]
+    end
+
     it 'supports empty URIs with schema://' do
       org = { target: 'mock://' }
       res = Train.target_config(org)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json