mini_portile 0.7.0.rc2 → 0.7.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a24bcc1e3b18b3338a9595b520062973a78dafb
-  data.tar.gz: 265a02102a47fecdf0b5fd96536bfe67878e9ba8
+  metadata.gz: b543ca78884927062b44e38c56d01e69b89bcb79
+  data.tar.gz: 366e7c9a6610c2ad0d7df9d506cf039596ce4c4d
 SHA512:
-  metadata.gz: b8ece67b3e3e972ffea18f98b2ceebc1f4a2b3b1158fd30fb7d22aac3cd41578f1c00ecd877f325359e8e5062c5c6cf262203c91c5374f43ba455235e2310826
-  data.tar.gz: f59593838f8fb5d24c526a8e911aee3b854ecbfcc483bc61481ae72de3c2ba03b01bb77e186f47b7ef81c7af807e179a14529c3bb85ccee6b7ca86a0fa7a53b1
+  metadata.gz: c5572f248c68e6139cbed61da20f3c680465eb1ce1e1f5936316f6d56a538e7d26aad85770d1dc37ad72fbe6fe5795349925bbb069e8b676e212710ed0276b95
+  data.tar.gz: e99707c84d0149e132b27d5b17e1fee04cd281aa78c6a0ccc0bc643998fa4cba75ef750a7f95506e2e829b15751165d98d1fd4a12f2a5fab6d958eebed0fe87e

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.7.0.rc3 / 2015-08-24
+
+* Restore backwards-compatible behavior with respect to escaped strings.
+
+
+### 0.7.0.rc2 / 2015-08-24
+
+* Restore support for Ruby 1.9.2
+* Add Ruby 2.0.0 and Ruby 2.1.x to Appveyor suite
+
+
 ### 0.7.0.rc1 / 2015-08-24
 
 Many thanks to @larskanis, @knu, and @kirikak2, who all contributed

data/README.md

@@ -1,7 +1,7 @@
 # MiniPortile
 
 [![travis status](https://travis-ci.org/flavorjones/mini_portile.svg?branch=master)](https://travis-ci.org/flavorjones/mini_portile?branch=master)
-[![appveyor status](https://ci.appveyor.com/api/projects/status/rjji6y9uteaw4oua/branch/master?svg=true)](https://ci.appveyor.com/project/flavorjones/mini-portile/branch/master)
+[![appveyor status](https://ci.appveyor.com/api/projects/status/509669xx1qlhqqab/branch/master?svg=true)](https://ci.appveyor.com/project/flavorjones/mini-portile/branch/master)
 
 * Documentation: http://www.rubydoc.info/github/flavorjones/mini_portile
 * Source Code: https://github.com/flavorjones/mini_portile

data/appveyor.yml

@@ -15,10 +15,10 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: "193"
-    - ruby_version: "200"
-    - ruby_version: "200-x64"
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
-    - ruby_version: "22"
     - ruby_version: "22-x64"
+    - ruby_version: "22"
+    - ruby_version: "21-x64"
+    - ruby_version: "21"
+    - ruby_version: "200-x64"
+    - ruby_version: "200"
+    - ruby_version: "193"

data/lib/mini_portile/mini_portile.rb

@@ -28,11 +28,11 @@ class Net::HTTP
 end
 
 class MiniPortile
-  attr_reader :name, :version, :original_host
+  attr_reader :name, :version, :original_host, :unescape_commands
   attr_writer :configure_options
   attr_accessor :host, :files, :patch_files, :target, :logger
 
-  def initialize(name, version)
+  def initialize(name, version, options={})
     @name = name
     @version = version
     @target = 'ports'
@@ -42,6 +42,8 @@ class MiniPortile
     @logger = STDOUT
 
     @original_host = @host = detect_host
+
+    @unescape_commands = options.fetch(:unescape_commands) { true }
   end
 
   def download
@@ -333,6 +335,8 @@ private
         message "Running '#{action}' for #{@name} #{@version}... "
       end
 
+      command = unescape_options_from command
+
       if Process.respond_to?(:spawn) && ! RbConfig.respond_to?(:java)
         args = [command].flatten + [{[:out, :err]=>[log_out, "a"]}]
         pid = spawn(*args)
@@ -491,4 +495,16 @@ private
     m = ENV['MAKE'] || ENV['make'] || 'make'
     return m.dup
   end
+
+  def unescape_options_from command
+    return command unless unescape_commands
+    [command].flatten.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!(/\\/, "")
+      else
+        opt
+      end
+    end
+  end
 end

data/lib/mini_portile/version.rb

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

data/test/test_unescaping_commands.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../helper', __FILE__)
+require 'mini_portile'
+
+class TestUnescapingCommands < TestCase
+  class << self
+    def startup
+      FileUtils.rm_rf "tmp" # remove any previous test files
+    end
+  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
+  end
+
+  def test_setting_unescape_to_true_unescapes_escaped_strings
+    recipe = MiniPortile.new("foo", "1.0", :unescape_commands => true)
+    assert_equal "thistthat", echo_helper(recipe, 'this\tthat')
+  end
+
+  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')
+  end
+
+  def test_default_unescape_setting_is_true
+    recipe = MiniPortile.new("foo", "1.0")
+    assert_true recipe.unescape_commands
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile
 version: !ruby/object:Gem::Version
-  version: 0.7.0.rc2
+  version: 0.7.0.rc3
 platform: ruby
 authors:
 - Luis Lavena
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_proxy.rb
+- test/test_unescaping_commands.rb
 homepage: http://github.com/flavorjones/mini_portile
 licenses:
 - MIT
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers
@@ -130,3 +131,4 @@ test_files:
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_proxy.rb
+- test/test_unescaping_commands.rb