r-train 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6916554d58ef01bd5484721a401f17bad17cfb4d
-  data.tar.gz: 954215659b584ce9e2c7bdcf9be79afd73f83916
+  metadata.gz: 2d69879f6efb3b134ed37106668927425fa61faf
+  data.tar.gz: 0d6b28c005b416325c844cb5c6fe0951ef295a45
 SHA512:
-  metadata.gz: df35a74c3535cdb75ecb1d8e525e5ba56e0430d46b67021fdca3b55e7b3263ce06251f6eebd5d7c3c2924637452c74373de645382aa1bebaa35e5461235b3f68
-  data.tar.gz: 784104525a498146eb28cfa23a2e04e67028255f9391970335698cd3501775b32c5179ec4826fc2edc7c4892aef9fa1934f0e73e3db245f9da4c631aed692817
+  metadata.gz: 7835e5f36f0bc6775b72fee8de73342868d4e6dc6a6a17d52456c6b3f310a3c296e87c0a5d57e74be2c18522ed7a70a3d7e82356bc878b85b7b61c12e5555b6d
+  data.tar.gz: 09f2f66a0ce30ddc229640e8ae2a1c0c293317d8e6756a5486c2607eb2677355bc6105e9b5c887b7ce5b7827996e1994504fc76d3936e5058d0eeb3a28fe324b

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [0.10.3](https://github.com/chef/train/tree/0.10.3) (2016-03-07)
-[Full Changelog](https://github.com/chef/train/compare/v0.10.1...0.10.3)
+## [0.10.4](https://github.com/chef/train/tree/0.10.4) (2016-03-31)
+[Full Changelog](https://github.com/chef/train/compare/v0.10.3...0.10.4)
+
+**Fixed bugs:**
+
+- bugfix: do not use unix path escape for windows [\#79](https://github.com/chef/train/pull/79) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.10.3](https://github.com/chef/train/tree/v0.10.3) (2016-03-07)
+[Full Changelog](https://github.com/chef/train/compare/v0.10.1...v0.10.3)
 
 **Fixed bugs:**
 
@@ -10,6 +17,7 @@
 
 **Merged pull requests:**
 
+- 0.10.3 [\#78](https://github.com/chef/train/pull/78) ([chris-rock](https://github.com/chris-rock))
 - 0.10.2 [\#76](https://github.com/chef/train/pull/76) ([arlimus](https://github.com/arlimus))
 
 ## [v0.10.1](https://github.com/chef/train/tree/v0.10.1) (2016-02-29)

data/lib/train/extras/file_windows.rb

@@ -14,13 +14,21 @@ module Train::Extras
     def initialize(backend, path)
       @backend = backend
       @path = path
-      @spath = Shellwords.escape(@path)
+      @spath = sanitize_filename(@path)
     end
 
     def basename(suffix = nil, sep = '\\')
       super(suffix, sep)
     end
 
+    # Ensures we do not use invalid characters for file names
+    # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#naming_conventions
+    def sanitize_filename(filename)
+      return if filename.nil?
+      # we do not filter :, backslash and forward slash, since they are part of the path
+      filename.gsub(/[<>"|?*]/, '')
+    end
+
     def content
       return @content if defined?(@content)
       @content = @backend.run_command(

data/lib/train/version.rb

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

data/test/unit/extras/windows_file_test.rb

@@ -19,11 +19,26 @@ describe 'file common' do
     cls.new(backend, 'C:\dir\file').basename.must_equal 'file'
   end
 
+  it 'provides the full path with whitespace' do
+    wf = cls.new(backend, 'C:\Program Files\file name')
+    wf.path.must_equal 'C:\Program Files\file name'
+    wf.basename.must_equal 'file name'
+  end
+
   it 'reads file contents' do
     out = rand.to_s
     backend.mock_command('Get-Content("path") | Out-String', out)
     cls.new(backend, 'path').content.must_equal out
   end
 
+  it 'check escaping of invalid chars in path' do
+    wf = cls.new(nil, nil)
+    wf.sanitize_filename('c:/test') .must_equal 'c:/test'
+    wf.sanitize_filename('c:/test directory') .must_equal 'c:/test directory'
+    %w{ < > " * ?}.each do |char|
+      wf.sanitize_filename("c:/test#{char}directory") .must_equal 'c:/testdirectory'
+    end
+  end
+
   # TODO: add all missing file tests!!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -238,7 +238,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.