albacore 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d652382ec8cc7fceda047d9d6fc256bb0b1320f4
-  data.tar.gz: a8d0f033e45efb7955f75a87f33cbb2145fd4ed3
+  metadata.gz: 560c9fa28236e37df5b2efdf8085cfe7bcd068fd
+  data.tar.gz: 8fd54f812d717c6a0037d5793f2206619f94bb08
 SHA512:
-  metadata.gz: e989a37a6b7689464fa9b7b8de221d3077a628dd471bcb4912b2d2533f0b274796ad0a7327e00d5a72341ba4bb9ceede9ce88f098f62f7b7f39f8f1a23178088
-  data.tar.gz: 884c905b0327ebfc8ab6db60a2ab5eb16cfd7eb6e4c6b41c16b4f816f93c62d2b354c8c368843cba48044e56f7fbfbe6dc13d53ad6d2254b658008b122c61288
+  metadata.gz: ba75ed679a1dbb9312b2a47f868495c477886bf454589cf93ec678f2f11028f8edb67a6d2191aa6839f61f2592fdb34b55a4b6a552099b98553928d360d4ad91
+  data.tar.gz: 62c2660a8ee8cfb735bc8a078f528a476c7bd937d8b4f4217ced87631637ccf2b19c579d4f05346e4b0f5257673f8f35ff0d29b8f6b9887f4dbbad90bbdccd9e

data/lib/albacore/cross_platform_cmd.rb

@@ -107,7 +107,8 @@ module Albacore
         debug 'waiting for process completion'
         _, status = Process.wait2 @pid
 
-        return block.call(status.success? && inmem.string, status, inmem.string)
+        ret_str = inmem.string.encode 'utf-8', invalid: :replace, undef: :replace, replace: ''
+        return block.call(status.success? && ret_str, status, ret_str)
       end
     end  
 

data/lib/albacore/task_types/nugets_pack.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 require 'rake'
 require 'nokogiri'
-require 'fileutils'        
+require 'fileutils'
 require 'albacore'
 require 'albacore/paths'
 require 'albacore/cmd_config'
@@ -70,11 +72,11 @@ module Albacore
       # regexpes the package path from the output
       def get_nuget_path_of
         out = yield
-        out.match /Successfully created package '([:\s\w\\\/\d\.\-]+\.symbols\.nupkg)'./i if out.respond_to? :match
+        out.match /Successfully created package '([:\s\p{Word}\\\/\d\.\-]+\.symbols\.nupkg)'./iu if out.respond_to? :match
         trace "Got symbols return value: '#{out}', matched: '#{$1}'" if $1
         return $1 if $1
 
-        out.match /Successfully created package '([:\s\w\\\/\d\.\-]+\.nupkg)'./i if out.respond_to? :match
+        out.match /Successfully created package '([:\s\p{Word}\\\/\d\.\-]+\.nupkg)'./iu if out.respond_to? :match
         trace "Got NOT-symbols return value: '#{out}', matched: '#{$1}'"
 
         unless $1

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.15"
+  VERSION = "2.0.16"
 end

data/spec/nugets_pack_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'shared_contexts'
 require 'support/sh_interceptor'
@@ -153,6 +155,13 @@ Successfully created package '/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-a
 EXAMPLE_OUTPUT
   end
 
+  let :sample5 do
+<<EXAMPLE_OUTPUT
+Attempting to build package from 'Fröken.nuspec'.
+Successfully created package '/home/xyz/Shared/build/pkg/Fröken.1.0.0-alpha.nupkg'.
+EXAMPLE_OUTPUT
+  end
+
   it "should match sample1 with last nupkg mentioned" do
     match = subject.send(:get_nuget_path_of) { sample1 }
     match.should eq('Y:\\Shared\\build\\pkg\\MyNuget.Package.1.0.0.symbols.nupkg')
@@ -172,6 +181,11 @@ EXAMPLE_OUTPUT
     match = subject.send(:get_nuget_path_of) { sample4 }
     match.should eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-alpha.nupkg')
   end
+
+  it 'should match sample5 despite non-ASCII' do
+    match = subject.send(:get_nuget_path_of) { sample5 }
+    match.should eq('/home/xyz/Shared/build/pkg/Fröken.1.0.0-alpha.nupkg')
+  end
 end
 
 # testing nuspec task
@@ -282,3 +296,21 @@ describe ProjectTask, "creating nuget from proj file" do
     end
   end
 end
+
+describe 'encoding functions' do
+  it 'should throw InvalidByteSequenceError by default' do
+    # http://www.ruby-doc.org/core-2.1.3/String.html#method-i-encode
+    begin
+      # it's "valid US-ASCII" from the POV of #encode unless
+      # #force_encoding is used
+      [0xef].pack('C*').force_encoding('US-ASCII').encode 'utf-8'
+      fail 'should throw invalid byte sequence error, because it\'s NOT US-ASCII'
+    rescue Encoding::InvalidByteSequenceError
+      # yep
+    end
+  end
+  it 'should be replaceable' do
+    subj =  [0xef].pack('C*').encode 'utf-8', undef: :replace, invalid: :replace, replace: ''
+    expect(subj).to eq ''
+  end
+end

data/spec/support/sh_interceptor.rb

@@ -51,7 +51,8 @@ module ShInterceptor
     @executable = args[0] || ''
     @parameters = args[1..-1].flatten || []
     @system_calls = system_calls + 1
-    add_invocation(OpenStruct.new({ :executable => @executable, :parameters => @parameters, :options => @options}))
+    add_invocation(OpenStruct.new({ :executable => @executable, :parameters => @parameters, :options => @options }))
+    "".force_encoding 'utf-8' # expecting string output in utf-8 (hopefully)
   end
 
   # gets the invocations given to #system, with readers:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Henrik Feldt
@@ -381,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks