train 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b82f61f801217ce81fc40bb5ad6a6e73a19da3de
-  data.tar.gz: 25fb11d1d6930ecda79bb5d2e70030ddddcf976b
+  metadata.gz: 8f08c1d5dc97551bd522b203489d60896b2d12a3
+  data.tar.gz: dc98c76bf9a16796e8ff4873ca6976fbfdb8a2fe
 SHA512:
-  metadata.gz: 1c752a556c55eadeaec19702a6db9ba3110b17b55418f3301a04d919ae899a3e806ed716ce5239515f33efb203e98d6678a8d0bed0f515a8cf0e4cbf22e1dc9f
-  data.tar.gz: 51098591df48b28d34798dbf729c701f903889e55d63f48a38115aeea0a94d2eca48bcc32bba33b398700574f66db6d7f980aa2e50b1b9fda528edba9b96cba6
+  metadata.gz: d5c09fc411b4359394bb34e875f8db1e9255b8e86e61db758254f1d748d060a2b2adefb9b40968ed0b5ed348fbf9eb738b830eafbdd83f8619402c6003be80bc
+  data.tar.gz: b5fbd002908a670d9352782d5455feffb3595816cce1fb86d0e41e118f7fcd3702a1379c93534dba7608b1d68e99b132d71f67dc85efffeaabda28045a7019b8

data/CHANGELOG.md

@@ -1,10 +1,19 @@
 # Change Log
 
-## [0.29.0](https://github.com/chef/train/tree/0.29.0) (2017-11-13)
-[Full Changelog](https://github.com/chef/train/compare/v0.28.0...0.29.0)
+## [0.29.1](https://github.com/chef/train/tree/0.29.1) (2017-11-13)
+[Full Changelog](https://github.com/chef/train/compare/v0.29.0...0.29.1)
 
 **Merged pull requests:**
 
+- Allow for a nil value when mocking OS [\#212](https://github.com/chef/train/pull/212) ([adamleff](https://github.com/adamleff))
+- Ensure a `mounted?` method exists for all File classes, including Mock [\#211](https://github.com/chef/train/pull/211) ([adamleff](https://github.com/adamleff))
+
+## [v0.29.0](https://github.com/chef/train/tree/v0.29.0) (2017-11-13)
+[Full Changelog](https://github.com/chef/train/compare/v0.28.0...v0.29.0)
+
+**Merged pull requests:**
+
+- Release 0.29.0 [\#210](https://github.com/chef/train/pull/210) ([adamleff](https://github.com/adamleff))
 - Reverting accidental push to master re: \#204 [\#208](https://github.com/chef/train/pull/208) ([adamleff](https://github.com/adamleff))
 - clearer error if no auth methods are available [\#207](https://github.com/chef/train/pull/207) ([thommay](https://github.com/thommay))
 - Build a complete mock OS object [\#206](https://github.com/chef/train/pull/206) ([adamleff](https://github.com/adamleff))

data/lib/train/file.rb

@@ -140,5 +140,18 @@ module Train
         @path
       end
     end
+
+    # if the OS-specific file class supports inquirying as to whether the
+    # file/device is mounted, the #mounted method should return a command
+    # object whose stdout will not be nil if indeed the device is mounted.
+    #
+    # if the OS-specific file class does not support checking for mount
+    # status, the method should not be implemented and this method will
+    # return false.
+    def mounted?
+      return false unless respond_to?(:mounted)
+
+      !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
+    end
   end
 end

data/lib/train/file/local/unix.rb

@@ -50,10 +50,6 @@ module Train
             @backend.run_command("mount | grep -- ' on #{@spath} '")
         end
 
-        def mounted?
-          !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
-        end
-
         def grouped_into?(sth)
           group == sth
         end

data/lib/train/file/remote/unix.rb

@@ -31,10 +31,6 @@ module Train
           )
         end
 
-        def mounted?
-          !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
-        end
-
         def mounted
           @mounted ||=
             @backend.run_command("mount | grep -- ' on #{@spath} '")

data/lib/train/transports/mock.rb

@@ -74,6 +74,9 @@ class Train::Transports::Mock
     end
 
     def mock_os(value = {})
+      # if a user passes a nil value, set to an empty hash so the merge still succeeds
+      value ||= {}
+
       os_params = { name: 'unknown', family: 'unknown', release: 'unknown', arch: 'unknown' }.merge(value)
       @os = OS.new(self, os_params)
     end

data/lib/train/version.rb

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

data/test/unit/transports/mock_test.rb

@@ -81,6 +81,40 @@ describe 'mock transport' do
       connection.os.redhat?.must_equal true
       connection.os[:family].must_equal 'centos'
     end
+
+    it 'allows the setting of the name' do
+      connection.mock_os({ name: 'foo' })
+      connection.os[:name].must_equal 'foo'
+    end
+
+    it 'allows setting of the family' do
+      connection.mock_os({ family: 'foo' })
+      connection.os[:family].must_equal 'foo'
+    end
+
+    it 'allows setting of the release' do
+      connection.mock_os({ release: '1.2.3' })
+      connection.os[:release].must_equal '1.2.3'
+    end
+
+    it 'allows setting of the arch' do
+      connection.mock_os({ arch: 'amd123' })
+      connection.os[:arch].must_equal 'amd123'
+    end
+
+    it 'allow setting of multiple values' do
+      connection.mock_os({ name: 'foo', family: 'bar' })
+      connection.os[:name].must_equal 'foo'
+      connection.os[:family].must_equal 'bar'
+      connection.os[:arch].must_equal 'unknown'
+      connection.os[:release].must_equal 'unknown'
+    end
+
+    it 'properly handles a nil value' do
+      connection.mock_os(nil)
+      connection.os[:name].must_equal 'unknown'
+      connection.os[:family].must_equal 'unknown'
+    end
   end
 
   describe 'when accessing a mocked file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Dominik Richter