mini_portile 0.7.0.rc3 → 0.7.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b543ca78884927062b44e38c56d01e69b89bcb79
-  data.tar.gz: 366e7c9a6610c2ad0d7df9d506cf039596ce4c4d
+  metadata.gz: 13e154f5ec48faf357e723128554adbf010dbb83
+  data.tar.gz: 2df757250068da8befe741764764c2c0d59bef16
 SHA512:
-  metadata.gz: c5572f248c68e6139cbed61da20f3c680465eb1ce1e1f5936316f6d56a538e7d26aad85770d1dc37ad72fbe6fe5795349925bbb069e8b676e212710ed0276b95
-  data.tar.gz: e99707c84d0149e132b27d5b17e1fee04cd281aa78c6a0ccc0bc643998fa4cba75ef750a7f95506e2e829b15751165d98d1fd4a12f2a5fab6d958eebed0fe87e
+  metadata.gz: 7a3abf6d4f20ed7202f9e821c46ccfc3a06bbbf2d2071108c04fee2a4240c8f277fc8f8f5a78f0be5cf8baad5bcca5622dde6db09813d636017c383709a701de
+  data.tar.gz: 1a6e61c274a691e8a7ec4d4f07c6d50db6c6d9e8992c8c0f657954fe5cc3f4156861387ec7bd1ec2855d7b3464ea2c8a188d133df9b7efb1a7610a49849e5ce8

data/.travis.yml

@@ -8,8 +8,4 @@ rvm:
   - 2.2
   - ruby-head
   - jruby-1.7.22
-  - jruby-9.0.0.0
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.0.0.0
+  - jruby-9.0.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.7.0.rc4 / 2015-08-24
+
+* Updated tests for Windows. No functional change. Final release candidate?
+
+
 ### 0.7.0.rc3 / 2015-08-24
 
 * Restore backwards-compatible behavior with respect to escaped strings.

data/lib/mini_portile/mini_portile.rb

@@ -8,6 +8,7 @@ require 'digest/md5'
 require 'open-uri'
 require 'cgi'
 require 'rbconfig'
+require 'shellwords'
 
 # Monkey patch for Net::HTTP by ruby open-uri fix:
 # https://github.com/ruby/ruby/commit/58835a9
@@ -342,12 +343,12 @@ private
         pid = spawn(*args)
         Process.wait(pid)
       else
-        if command.kind_of?(Array)
-          system(*command)
-        else
-          redirected = %Q{#{command} > "#{log_out}" 2>&1}
-          system(redirected)
-        end
+        redirected = if command.kind_of?(Array)
+                       %Q{#{command.map(&:shellescape).join(" ")} > #{log_out.shellescape} 2>&1}
+                     else
+                       %Q{#{command} > #{log_out.shellescape} 2>&1}
+                     end
+        system redirected
       end
 
       if $?.success?
@@ -497,8 +498,8 @@ private
   end
 
   def unescape_options_from command
-    return command unless unescape_commands
-    [command].flatten.map do |opt|
+    return command unless unescape_commands && command.kind_of?(Array)
+    command.map do |opt|
       if opt =~ /\\/
         warn "NOTICE: MiniPortile: escaping shell characters is not necessary in MiniPortile 0.7.0+ (\"#{opt}\"). Set the `:unescape_commands` option to false if you actually want to preserve escapes."
         opt.gsub!(/\\/, "")

data/lib/mini_portile/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "0.7.0.rc3"
+  VERSION = "0.7.0.rc4"
 end

data/test/test_unescaping_commands.rb

@@ -8,10 +8,19 @@ class TestUnescapingCommands < TestCase
     end
   end
 
+  def is_windows
+    !! (RbConfig::CONFIG['target_os'] =~ /mingw32|mswin/)
+  end
+
   def echo_helper recipe, string
     FileUtils.mkdir_p File.join(recipe.send(:tmp_path), "workdir")
-    recipe.send :execute, "echo", ["echo", "-en", string]
-    File.read Dir.glob("tmp/**/echo.log").first
+    command = if is_windows
+                ["cmd", "/C", "echo", string]
+              else
+                ["/usr/bin/env", "echo", string]
+              end
+    recipe.send :execute, "echo", command
+    File.read(Dir.glob("tmp/**/echo.log").first).chop
   end
 
   def test_setting_unescape_to_true_unescapes_escaped_strings
@@ -21,7 +30,7 @@ class TestUnescapingCommands < TestCase
 
   def test_setting_unescape_to_false_does_not_touch_unescaped_strings
     recipe = MiniPortile.new("foo", "1.0", :unescape_commands => false)
-    assert_equal "this\tthat", echo_helper(recipe, 'this\tthat')
+    assert_equal 'this\tthat', echo_helper(recipe, 'this\tthat')
   end
 
   def test_default_unescape_setting_is_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile
 version: !ruby/object:Gem::Version
-  version: 0.7.0.rc3
+  version: 0.7.0.rc4
 platform: ruby
 authors:
 - Luis Lavena
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler