train 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cc6cfd826d49507368b99a990fed0eeba925af
-  data.tar.gz: b1dd4839b1a46ac0c246cdd0d7a00e8adda03150
+  metadata.gz: 6fc74b66a02b98fd67a644a04eb0e5f2186a1826
+  data.tar.gz: 131969604ad1bc09e8189c341fbbcca6d27c2315
 SHA512:
-  metadata.gz: ab1770e2b5e06c10cc21dfb327c934acc4b9a2a38f8a016584e426a0d1da27b4cfcf794da4777bda6c51d251092848b538de98236b03d55d30dce0cfdd9b53e9
-  data.tar.gz: 3c98eba3d01ab9f934e613a4d9ce6bd566f7a97fefa38b4e7986f1894e1e8428ac52807e3c9ace7dfe1cf2cacb0364eb3fda9735676ac1aa8d6a8a0040d92cb5
+  metadata.gz: 291bcb6b64d9d02da399f3f99e6d7dbde34cf5049601712559e79b7d4118bf55d78201c9d70564f5f90c7e88ef516f7f59b19ac0046a21c2c1202eb144201a8c
+  data.tar.gz: e8f7a849c58abfc84bdd01e282b43bef1d6fc2766d26293c9eee414a136ad8b8875b6b0f464cd682a29df81692bfbdc7c13014622442159b51cbac94a13a2611

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Change Log
 
-## [0.31.1](https://github.com/chef/train/tree/0.31.1) (2017-12-06)
-[Full Changelog](https://github.com/chef/train/compare/v0.31.0...0.31.1)
+## [0.32.0](https://github.com/chef/train/tree/0.32.0) (2018-01-04)
+[Full Changelog](https://github.com/chef/train/compare/v0.31.1...0.32.0)
+
+**Fixed bugs:**
+
+- platform names should be lower case [\#191](https://github.com/chef/train/issues/191)
+- Return platform name that is lower case and underscored [\#228](https://github.com/chef/train/pull/228) ([jquick](https://github.com/jquick))
+
+**Merged pull requests:**
+
+- Set mock transport to use the platform instance variable [\#230](https://github.com/chef/train/pull/230) ([jquick](https://github.com/jquick))
+
+## [v0.31.1](https://github.com/chef/train/tree/v0.31.1) (2017-12-06)
+[Full Changelog](https://github.com/chef/train/compare/v0.31.0...v0.31.1)
 
 **Merged pull requests:**
 
+- Release 0.31.1 [\#226](https://github.com/chef/train/pull/226) ([adamleff](https://github.com/adamleff))
 - Allow runner specifications for local connections [\#225](https://github.com/chef/train/pull/225) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 
 ## [v0.31.0](https://github.com/chef/train/tree/v0.31.0) (2017-12-05)

data/lib/train/platforms/platform.rb

@@ -25,7 +25,16 @@ module Train::Platforms
     def name
       # Override here incase a updated name was set
       # during the detect logic
-      @platform[:name] || @name
+      clean_name
+    end
+
+    def clean_name(force: false)
+      @cleaned_name = nil if force
+      @cleaned_name ||= begin
+                          name = (@platform[:name] || @name)
+                          name.downcase!.tr!(' ', '_') if name =~ /[A-Z ]/
+                          name
+                        end
     end
 
     # This is for backwords compatability with
@@ -53,6 +62,10 @@ module Train::Platforms
     # This is done later to add any custom
     # families/properties that were created
     def add_platform_methods
+      # Redo clean name if there is a detect override
+      clean_name(force: true) unless @platform[:name].nil?
+
+      # Add in family methods
       family_list = Train::Platforms.families
       family_list.each_value do |k|
         next if respond_to?(k.name + '?')
@@ -70,9 +83,9 @@ module Train::Platforms
       end
 
       # Create method for name if its not already true
-      plat_name = name.downcase.tr(' ', '_') + '?'
-      return if respond_to?(plat_name)
-      define_singleton_method(plat_name) do
+      m = name + '?'
+      return if respond_to?(m)
+      define_singleton_method(m) do
         true
       end
     end

data/lib/train/transports/mock.rb

@@ -57,8 +57,6 @@ end
 
 class Train::Transports::Mock
   class Connection < BaseConnection
-    attr_reader :os
-
     def initialize(conf = nil)
       super(conf)
       mock_os
@@ -80,7 +78,7 @@ class Train::Transports::Mock
       platform.family_hierarchy = mock_os_hierarchy(platform).flatten
       platform.platform = value
       platform.add_platform_methods
-      @os = platform
+      @platform = platform
     end
 
     def mock_os_hierarchy(plat)

data/lib/train/version.rb

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

data/test/unit/platforms/platform_test.rb

@@ -34,13 +34,19 @@ describe 'platform' do
     plat.title.must_equal('The Best Mock')
   end
 
+  it 'clean init name' do
+    plat = mock_platform_family('Mo ck')
+    plat.name.must_equal('mo_ck')
+  end
+
   it 'set name and name override' do
     plat = mock_platform_family('mock')
     plat.name.must_equal('mock')
     plat[:name].must_equal('mock')
-    plat.platform[:name] = 'mock2020'
-    plat.name.must_equal('mock2020')
-    plat[:name].must_equal('mock2020')
+    plat.platform[:name] = 'Mock 2020'
+    plat.add_platform_methods
+    plat.name.must_equal('mock_2020')
+    plat[:name].must_equal('mock_2020')
   end
 
   it 'check families' do

data/test/unit/transports/mock_test.rb

@@ -83,6 +83,7 @@ describe 'mock transport' do
   describe 'when accessing a mocked os' do
     it 'has the default mock os faily set to mock' do
       connection.os[:name].must_equal 'mock'
+      connection.platform[:name].must_equal 'mock'
     end
 
     it 'sets the OS to the mocked value' do

data/test/windows/local_test.rb

@@ -25,7 +25,7 @@ describe 'windows local command' do
 
   it 'verify os' do
     os = conn.os
-    os[:name].must_equal 'Windows Server 2012 R2 Datacenter'
+    os[:name].must_equal 'windows_server_2012_r2_datacenter'
     os[:family].must_equal "windows"
     os[:release].must_equal '6.3.9600'
     os[:arch].must_equal 'x86_64'

data/test/windows/winrm_test.rb

@@ -27,7 +27,7 @@ describe 'windows winrm command' do
 
   it 'verify os' do
     os = conn.os
-    os[:name].must_equal 'Windows Server 2012 R2 Datacenter'
+    os[:name].must_equal 'windows_server_2012_r2_datacenter'
     os[:family].must_equal 'windows'
     os[:release].must_equal '6.3.9600'
     os[:arch].must_equal 'x86_64'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json