train 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e42871db47191abec6fe3d94b56a60863abd48
-  data.tar.gz: 9004baaebe7b8021f840647bdc5032b88fb130fc
+  metadata.gz: 04b361d035e2f468512b7a2daf50ee16be2b69e7
+  data.tar.gz: 53d547202564642c4adbfa6bd4995c1ada9831e8
 SHA512:
-  metadata.gz: 32c7d11c6aeaee6a856dfa3ce914e8d6a64d23108d8239473a7364b82929cace43c495f21765486d5b4fec02911c67747075376bde4ed8239fb88c54d30cac6d
-  data.tar.gz: 1335190030d7f53d31b7c5ee4f7c882fc101e80b9ae808da030c4090ecac2cc95a1b609049dbccd78ab9e7235a1c649dc9a206700de9c4689c2c1b890425f77f
+  metadata.gz: 12d486c2d8cb2d7e7b80d2220dd9f53f92571e7a5c97333b80670aa8e4e920c5e01b6531416fdecfd62d972ff2a6534eb5a1bca0eae2df6cb2732d7cc919b66d
+  data.tar.gz: f45f67cbe240440d9fb832f23dc626154a839a9949de25aeba19f7a70dbd7a2d178f13ea7fe1ebe209ca67ada5021b5732b6b04786f0783136bf5f5389445c7f

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [0.20.0](https://github.com/chef/train/tree/0.20.0) (2016-09-21)
-[Full Changelog](https://github.com/chef/train/compare/v0.19.1...0.20.0)
+## [0.20.1](https://github.com/chef/train/tree/0.20.1) (2016-10-15)
+[Full Changelog](https://github.com/chef/train/compare/v0.20.0...0.20.1)
+
+**Fixed bugs:**
+
+- support empty URIs [\#154](https://github.com/chef/train/pull/154) ([arlimus](https://github.com/arlimus))
+
+## [v0.20.0](https://github.com/chef/train/tree/v0.20.0) (2016-09-21)
+[Full Changelog](https://github.com/chef/train/compare/v0.19.1...v0.20.0)
 
 **Fixed bugs:**
 

data/lib/train.rb

@@ -51,19 +51,14 @@ module Train
   # e.g. ssh://bob@remote  =>  backend: ssh, user: bob, host: remote
   def self.target_config(config = nil) # rubocop:disable Metrics/AbcSize
     conf = config.nil? ? {} : config.dup
-
-    # symbolize keys
-    conf = conf.each_with_object({}) do |(k, v), acc|
-      acc[k.to_sym] = v
-      acc
-    end
+    conf = symbolize_keys(conf)
 
     group_keys_and_keyfiles(conf)
 
     return conf if conf[:target].to_s.empty?
 
     # split up the target's host/scheme configuration
-    uri = URI.parse(conf[:target].to_s)
+    uri = parse_uri(conf[:target].to_s)
     unless uri.host.nil? and uri.scheme.nil?
       conf[:backend]  ||= uri.scheme
       conf[:host]     ||= uri.host
@@ -80,6 +75,44 @@ module Train
     conf
   end
 
+  # Takes a map of key-value pairs and turns all keys into symbols. For this
+  # to work, only keys are supported that can be turned into symbols.
+  # Example: { 'a' => 123 }  ==>  { a: 123 }
+  #
+  # @param map [Hash]
+  # @return [Hash] new map with all keys being symbols
+  def self.symbolize_keys(map)
+    map.each_with_object({}) do |(k, v), acc|
+      acc[k.to_sym] = v
+      acc
+    end
+  end
+  private_class_method :symbolize_keys
+
+  # Parse a URI. Supports empty URI's with paths, e.g. `mock://`
+  #
+  # @param string [string] URI string, e.g. `schema://domain.com`
+  # @return [URI::Generic] parsed URI object
+  def self.parse_uri(string)
+    URI.parse(string)
+  rescue URI::InvalidURIError => e
+    # A use-case we want to catch is parsing empty URIs with a schema
+    # e.g. mock://. To do this, we match it manually and fake the hostname
+    case string
+    when %r{^([a-z]+)://$}
+      string += 'dummy'
+    when /^([a-z]+):$/
+      string += '//dummy'
+    else
+      raise Train::UserError, e
+    end
+
+    u = URI.parse(string)
+    u.host = nil
+    u
+  end
+  private_class_method :parse_uri
+
   def self.validate_backend(conf, default = :local)
     return default if conf.nil?
     res = conf[:backend]

data/lib/train/version.rb

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

data/test/integration/test-one.yaml

@@ -0,0 +1,4 @@
+images:
+- alpine:edge
+provision:
+- script: bootstrap.sh

data/test/integration/test-two.yaml

@@ -0,0 +1,4 @@
+images:
+- ubuntu:16.04
+provision:
+- script: bootstrap.sh

data/test/unit/train_test.rb

@@ -128,6 +128,35 @@ describe Train do
       res = Train.target_config(org)
       res.must_equal nu
     end
+
+    it 'supports empty URIs with schema://' do
+      org = { target: 'mock://' }
+      res = Train.target_config(org)
+      res[:backend].must_equal 'mock'
+      res[:host].must_be_nil
+      res[:user].must_be_nil
+      res[:password].must_be_nil
+      res[:port].must_be_nil
+      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)
+      res[:backend].must_equal 'mock'
+      res[:host].must_be_nil
+      res[:user].must_be_nil
+      res[:password].must_be_nil
+      res[:port].must_be_nil
+      res[:path].must_be_nil
+      res[:target].must_equal org[:target]
+    end
+
+    it 'it raises UserError on invalid URIs' do
+      org = { target: 'mock world' }
+      proc { Train.target_config(org) }.must_raise Train::UserError
+    end
   end
 
   describe '#validate_backend' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -195,11 +195,13 @@ files:
 - test/integration/sudo/passwd.rb
 - test/integration/sudo/reqtty.rb
 - test/integration/sudo/run_as.rb
+- test/integration/test-one.yaml
 - test/integration/test-travis-centos.yml
 - test/integration/test-travis-debian.yml
 - test/integration/test-travis-fedora.yml
 - test/integration/test-travis-oel.yml
 - test/integration/test-travis-ubuntu.yml
+- test/integration/test-two.yaml
 - test/integration/test_local.rb
 - test/integration/test_ssh.rb
 - test/integration/tests/path_block_device_test.rb
@@ -251,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to different backends.
@@ -272,11 +274,13 @@ test_files:
 - test/integration/sudo/passwd.rb
 - test/integration/sudo/reqtty.rb
 - test/integration/sudo/run_as.rb
+- test/integration/test-one.yaml
 - test/integration/test-travis-centos.yml
 - test/integration/test-travis-debian.yml
 - test/integration/test-travis-fedora.yml
 - test/integration/test-travis-oel.yml
 - test/integration/test-travis-ubuntu.yml
+- test/integration/test-two.yaml
 - test/integration/test_local.rb
 - test/integration/test_ssh.rb
 - test/integration/tests/path_block_device_test.rb