train 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea754f958e2bab35ca522e56f923380b7a9f5935
-  data.tar.gz: 6491c524a67fd53b3002c248c5fe147a7dc2ff2c
+  metadata.gz: 1bef12aa9d490abb7a8b9e33416f0073bbc4fe3f
+  data.tar.gz: b66c3e02c956534b72cc9b7b4b3026203abf2f77
 SHA512:
-  metadata.gz: c0a535c4afb9e2369f91c25637e713dd2b8e5b20ca45ac77d97ea4e759e20224a45eadc09e013f6c376f5149f455bf12799a650f554f19745c581e9745a553f2
-  data.tar.gz: 629cf69e0aabb71976651f513fd42fd1e42cb844f3d9313d3662faa7b0b7c8fc8b1bef5df3b6e80f2fa7ec7fba3ef8fbea79fde814376a1048885daff8a6d64b
+  metadata.gz: 803a0fdf661f82aefb707e3fe8f6aeba968cf04571ed58b851198a79d2a169ea58a70cc806e06fa7d025eab6e48e56b57192f16865fa83e6cd839933ac9280e6
+  data.tar.gz: d37fa6a60ce6dc33a12d3d5972a8341b2ee52667c9a4cbd1d733ed7e00504572842d722ac7ae70e344e5e81888489d789731660faafd45944db753137effa3e8

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.17.0](https://github.com/chef/train/tree/0.17.0) (2016-08-19)
-[Full Changelog](https://github.com/chef/train/compare/v0.16.0...0.17.0)
+## [0.18.0](https://github.com/chef/train/tree/0.18.0) (2016-08-26)
+[Full Changelog](https://github.com/chef/train/compare/v0.17.0...0.18.0)
+
+**Merged pull requests:**
+
+- Allow JSON 2.0 on Ruby 2.2 and above [\#144](https://github.com/chef/train/pull/144) ([jkeiser](https://github.com/jkeiser))
+- Enable Ruby 2.3 in Travis, make it default suite [\#143](https://github.com/chef/train/pull/143) ([jkeiser](https://github.com/jkeiser))
+- Add the darwin platform family [\#141](https://github.com/chef/train/pull/141) ([tas50](https://github.com/tas50))
+- update integration test dependencies [\#139](https://github.com/chef/train/pull/139) ([tas50](https://github.com/tas50))
+- Add badges to the readme [\#138](https://github.com/chef/train/pull/138) ([tas50](https://github.com/tas50))
+- use --decode on base64 command to maintain compatibility with Darwin. [\#137](https://github.com/chef/train/pull/137) ([thomascate](https://github.com/thomascate))
+
+## [v0.17.0](https://github.com/chef/train/tree/v0.17.0) (2016-08-19)
+[Full Changelog](https://github.com/chef/train/compare/v0.16.0...v0.17.0)
 
 **Implemented enhancements:**
 

data/Gemfile

@@ -8,6 +8,11 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
   gem 'net-ssh', '~> 2.9'
 end
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2')
+  gem 'json', '< 2.0'
+  gem 'rack', '< 2.0'
+end
+
 group :test do
   gem 'bundler', '~> 1.11'
   gem 'minitest', '~> 5.8'
@@ -18,8 +23,8 @@ group :test do
 end
 
 group :integration do
-  gem 'berkshelf', '~> 4.0'
-  gem 'test-kitchen', '~> 1.4'
+  gem 'berkshelf', '~> 4.3'
+  gem 'test-kitchen', '~> 1.11'
   gem 'kitchen-vagrant'
 end
 

data/README.md

@@ -1,5 +1,9 @@
 # Train - Transport Interface
 
+[![Build Status](https://travis-ci.org/chef/train.svg?branch=master)](https://travis-ci.org/chef/train)
+[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/train?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/train/branch/master)
+[![Gem Version](https://badge.fury.io/rb/train.svg)](https://badge.fury.io/rb/train)
+
 Train lets you talk to your local or remote operating systems with a unified interface.
 
 It allows you to:

data/lib/train/extras/command_wrapper.rb

@@ -89,7 +89,7 @@ module Train::Extras
 
       unless @sudo_password.nil?
         b64pw = Base64.strict_encode64(@sudo_password + "\n")
-        res = "echo #{b64pw} | base64 -d | #{res}-S "
+        res = "echo #{b64pw} | base64 --decode | #{res}-S "
       end
 
       res << @sudo_options.to_s + ' ' unless @sudo_options.nil?

data/lib/train/extras/os_common.rb

@@ -60,6 +60,9 @@ module Train::Extras
       'esx' => %w{
         esx
       },
+      'darwin' => %w{
+        darwin
+      },
     }
 
     OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware fedora amazon} + OS['redhat'] + OS['debian'] + OS['suse']

data/lib/train/version.rb

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

data/test/integration/cookbooks/test/recipes/prep_files.rb

@@ -5,9 +5,7 @@
 # Helper recipe to create create a few files in the operating
 # systems, which the runner will test against.
 
-gid = 'root'
-gid = 'wheel' if node['platform_family'] == 'freebsd'
-gid = 'system' if node['platform_family'] == 'aix'
+gid = node['platform_family'] == 'aix' ? 'system' : node['root_group']
 
 file '/tmp/file' do
   mode '0765'

data/test/unit/extras/command_wrapper_test.rb

@@ -36,7 +36,7 @@ describe 'linux command' do
     pw = rand.to_s
     lc = cls.new(backend, { sudo: true, sudo_password: pw })
     bpw = Base64.strict_encode64(pw + "\n")
-    lc.run(cmd).must_equal "echo #{bpw} | base64 -d | sudo -S #{cmd}"
+    lc.run(cmd).must_equal "echo #{bpw} | base64 --decode | sudo -S #{cmd}"
   end
 
   it 'wraps commands in sudo_command instead of sudo' do
@@ -57,7 +57,7 @@ describe 'linux command' do
     sudo_command = rand.to_s
     lc = cls.new(backend, { sudo: true, sudo_command: sudo_command, sudo_password: pw })
     bpw = Base64.strict_encode64(pw + "\n")
-    lc.run(cmd).must_equal "echo #{bpw} | base64 -d | #{sudo_command} -S #{cmd}"
+    lc.run(cmd).must_equal "echo #{bpw} | base64 --decode | #{sudo_command} -S #{cmd}"
   end
 end
 

data/test/unit/extras/os_common_test.rb

@@ -286,4 +286,14 @@ describe 'os common plugin' do
     it { os.esx?.must_equal(true) }
   end
 
+  describe 'with platform set to darwin' do
+    let(:os) { mock_platform('darwin') }
+    it { os.solaris?.must_equal(false) }
+    it { os.linux?.must_equal(false) }
+    it {os[:family].must_equal('darwin')}
+    it { os.unix?.must_equal(true) }
+    it { os.bsd?.must_equal(true) }
+    it { os.esx?.must_equal(false) }
+  end
+
 end

data/train.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency 'json', '>= 1.8', '< 3.0'
   # chef-client < 12.4.1 require mixlib-shellout-2.0.1
   spec.add_dependency 'mixlib-shellout', '~> 2.0'
   # net-ssh 3.x drops Ruby 1.9 support, so this constraint could be raised when

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to different backends.