train 1.4.35 → 1.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893a9b5ce2710681b1d4bd795661244d5a7148bbd4ec265b607fc4241394e999
-  data.tar.gz: 0500f6af3195b846c025afb818ad939cbf9592e28002a6093c0ced0e75851604
+  metadata.gz: 2ce75bd50237ced9c7c0c00176b234c15d8f19f1a2e8be7e540552c0ce215ad4
+  data.tar.gz: 1ededc00e30dbbc3aeb955d317b864d798e45aa73dbbc96e65ad0fd6075ff453
 SHA512:
-  metadata.gz: f5bfe0c9737ad2db256d5e7b9434afa0eb8013e47417bfe2d9feaf858c8518f06592f3eab7081d47beb64847c0f876727fd83935cac5eeb2f804a142112d8ed0
-  data.tar.gz: 2da5c3b0c40fb01b7f999cc56a2f5f0c0c15afc5db513f6574421197dbe5ec26d2ab7f69f13d2107f785421a89d80fefb35aeee3d26747d3f7bc0e8bbc93f521
+  metadata.gz: 242b6ec10cce928d6c4f99da4a1f362e13050fc92a9bcf7571d768da760dd78f348329167efb14e77b74bb03b1ba5fddbd13f5ab6a09d81b6c972dd038cce33a
+  data.tar.gz: 6e21cd50aa5fb11e25398878a1ed6386e7e9068cd008c6f9fb1919616cc623d641bf51d1c0340b2d73f70425869771448b2e865b459e7537d836586f6d0d5a32

data/CHANGELOG.md

@@ -1,27 +1,33 @@
-<!-- latest_release 1.4.35 -->
-## [v1.4.35](https://github.com/inspec/train/tree/v1.4.35) (2018-08-23)
+<!-- latest_release 1.4.37 -->
+## [v1.4.37](https://github.com/inspec/train/tree/v1.4.37) (2018-09-13)
 
 #### Merged Pull Requests
-- Adds connection to Graph RBAC API  [#327](https://github.com/inspec/train/pull/327) ([r-fennell](https://github.com/r-fennell))
+- Add a export method for platforms [#347](https://github.com/inspec/train/pull/347) ([jquick](https://github.com/jquick))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.4.31 -->
-### Changes since 1.4.31 release
+<!-- release_rollup since=1.4.35 -->
+### Changes since 1.4.35 release
 
 #### Merged Pull Requests
-- Adds connection to Graph RBAC API  [#327](https://github.com/inspec/train/pull/327) ([r-fennell](https://github.com/r-fennell)) <!-- 1.4.35 -->
-- Fixes failing test when you have a cred file [#343](https://github.com/inspec/train/pull/343) ([dmccown](https://github.com/dmccown)) <!-- 1.4.34 -->
-- Modify Cisco UUID detection to use processor ID [#342](https://github.com/inspec/train/pull/342) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.4.33 -->
-- Ensure unique_identifier returns something meaningful for service acc… [#338](https://github.com/inspec/train/pull/338) ([skpaterson](https://github.com/skpaterson)) <!-- 1.4.32 -->
+- Add a export method for platforms [#347](https://github.com/inspec/train/pull/347) ([jquick](https://github.com/jquick)) <!-- 1.4.37 -->
+- Rescues SystemCallError instead of Errno [#346](https://github.com/inspec/train/pull/346) ([dmccown](https://github.com/dmccown)) <!-- 1.4.36 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.4.35](https://github.com/inspec/train/tree/v1.4.35) (2018-08-23)
+
+#### Merged Pull Requests
+- Ensure unique_identifier returns something meaningful for service acc… [#338](https://github.com/inspec/train/pull/338) ([skpaterson](https://github.com/skpaterson))
+- Modify Cisco UUID detection to use processor ID [#342](https://github.com/inspec/train/pull/342) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Fixes failing test when you have a cred file [#343](https://github.com/inspec/train/pull/343) ([dmccown](https://github.com/dmccown))
+- Adds connection to Graph RBAC API  [#327](https://github.com/inspec/train/pull/327) ([r-fennell](https://github.com/r-fennell))
+<!-- latest_stable_release -->
+
 ## [v1.4.31](https://github.com/inspec/train/tree/v1.4.31) (2018-08-17)
 
 #### Merged Pull Requests
 - Fixes an issue where the credential file was nil [#337](https://github.com/inspec/train/pull/337) ([dmccown](https://github.com/dmccown))
 - Enable using rubygems as plugins [#335](https://github.com/inspec/train/pull/335) ([clintoncwolfe](https://github.com/clintoncwolfe))
-<!-- latest_stable_release -->
 
 ## [v1.4.29](https://github.com/inspec/train/tree/v1.4.29) (2018-08-15)
 

data/lib/train/platforms.rb

@@ -24,6 +24,12 @@ module Train::Platforms
     def families
       @families ||= {}
     end
+
+    # Clear all platform settings. Only used for testing.
+    def __reset
+      @list = {}
+      @families = {}
+    end
   end
 
   # Create or update a platform
@@ -81,4 +87,16 @@ module Train::Platforms
       print_children(obj, pad + 2) if defined?(obj.children) && !obj.children.nil?
     end
   end
+
+  def self.export
+    export = []
+    list.each do |name, platform|
+      platform.find_family_hierarchy
+      export << {
+        name: name,
+        families: platform.family_hierarchy,
+      }
+    end
+    export.sort_by { |platform| platform[:name] }
+  end
 end

data/lib/train/platforms/platform.rb

@@ -22,6 +22,14 @@ module Train::Platforms
       @families.collect { |k, _v| k.name }
     end
 
+    def find_family_hierarchy(platform = self)
+      families = platform.families.each_with_object([]) do |(k, _v), memo|
+        memo << k.name
+        memo << find_family_hierarchy(k) unless k.families.empty?
+      end
+      @family_hierarchy = families.flatten
+    end
+
     def family
       @platform[:family] || @family_hierarchy[0]
     end

data/lib/train/plugins/base_connection.rb

@@ -81,20 +81,13 @@ class Train::Plugins::Transport
       plat = Train::Platforms.name(name)
       plat.backend = self
       plat.platform = platform_details unless platform_details.nil?
-      plat.family_hierarchy = family_hierarchy(plat).flatten
+      plat.find_family_hierarchy
       plat.add_platform_methods
       plat
     end
 
     alias direct_platform force_platform!
 
-    def family_hierarchy(plat)
-      plat.families.each_with_object([]) do |(k, _v), memo|
-        memo << k.name
-        memo << family_hierarchy(k) unless k.families.empty?
-      end
-    end
-
     # Get information on the operating system which this transport connects to.
     #
     # @return [Platform] system information

data/lib/train/transports/azure.rb

@@ -164,7 +164,7 @@ module Train::Transports
           begin
             TCPSocket.new('localhost', port).close
             true
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          rescue SystemCallError
             false
           end
         end

data/lib/train/transports/mock.rb

@@ -77,7 +77,7 @@ class Train::Transports::Mock
       value = { name: 'mock', family: 'mock', release: 'unknown', arch: 'unknown' }.merge(value)
 
       platform = Train::Platforms.name(value[:name])
-      platform.family_hierarchy = family_hierarchy(platform).flatten
+      platform.find_family_hierarchy
       platform.platform = value
       platform.add_platform_methods
       @platform = platform

data/lib/train/version.rb

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

data/test/unit/platforms/platform_test.rb

@@ -61,6 +61,12 @@ describe 'platform' do
     plat.families.values[0].must_equal({ arch: '= x86_64' })
   end
 
+  it 'finds family hierarchy' do
+    plat = Train::Platforms.name('linux')
+    plat.find_family_hierarchy
+    plat.family_hierarchy.must_equal ['linux', 'unix', 'os']
+  end
+
   it 'return direct families' do
     plat = mock_platform_family('mock')
     plat.in_family('mock2')

data/test/unit/platforms/platforms_test.rb

@@ -39,4 +39,14 @@ describe 'platforms' do
     top = Train::Platforms.top_platforms
     top.count.must_equal(1)
   end
+
+  it 'return platforms export with data' do
+    Train::Platforms.__reset
+    Train::Platforms::Detect::Specifications::OS.load
+    export = Train::Platforms.export
+    export.size.must_be :>, 10
+    export[0][:name].must_equal 'aix'
+    expected_families = ['aix', 'unix', 'os']
+    export[0][:families].must_equal expected_families
+  end
 end

data/test/unit/plugins/connection_test.rb

@@ -72,12 +72,6 @@ describe 'v1 Connection Plugin' do
       plat[:release].must_equal aws_version
     end
 
-    it 'provides family hierarchy' do
-      plat = Train::Platforms.name('linux')
-      family = connection.family_hierarchy(plat)
-      family.flatten.must_equal ['linux', 'unix', 'os']
-    end
-
     it 'must use the user-provided logger' do
       l = rand
       cls.new({logger: l})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 1.4.35
+  version: 1.4.37
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json