albacore 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85542d66384696f189f24a0f21558d9bc09132be
-  data.tar.gz: 2123d8810cff6bff2c7593a12613f6b6978209e6
+  metadata.gz: 07faec03f515851ac25f361b7bbb0d6ac7401901
+  data.tar.gz: 1883a7acca5de06cd16389ce5a9760ff379786b6
 SHA512:
-  metadata.gz: dfbbd01eb04114a1f60bbddaf4afe32df9194c6cfd42b3e35e9e75e961a05a69f95bac1c843f3601b530d2b97a633a82854e029d3a38e4369486b5235cb4d4b6
-  data.tar.gz: 452747578a565fcf4482082b745fcfd9f58d533acbbe96153df6f7d7bf02f0ad0eea5c9bf52631004e5869b9ad69a4242237e7c3619b0f24b8a1d37df3041f4e
+  metadata.gz: 37f2ce80f96aa0f8ec7a4a1da9df2cdda9aa69c7ef3ab599bd2d579872016f9fa6b9890d94f9e34d80fba163b1324d359db82beedaf1ade873eca971ff68291d
+  data.tar.gz: c39261f7f74713222d0c88865220a728a52081b39af7fa6cc5a3e75890f3e1774e9fae3cd7dcdf9944acbcbcc6e282e89f74220ed18e8db3ffcd812ad18ef58c

data/lib/albacore/task_types/nugets_pack.rb

@@ -3,6 +3,7 @@
 require 'rake'
 require 'nokogiri'
 require 'fileutils'
+require 'pathname'
 require 'albacore'
 require 'albacore/paths'
 require 'albacore/cmd_config'
@@ -241,8 +242,12 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         end
       end
 
-      def path_to relative_file_path, cwd
-        File.expand_path( File.join(@opts.get(:original_path), relative_file_path), cwd )
+      def path_to path, cwd
+        if (Pathname.new path).absolute?
+           return path
+        else
+           return File.expand_path( File.join(@opts.get(:original_path), path), cwd )
+        end
       end
 
       # generate all nuspecs

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.5"
+  VERSION = "2.5.6"
 end

data/spec/nugets_pack_spec.rb

@@ -304,6 +304,21 @@ describe ProjectTask, "creating nuget from proj file" do
   end
 end
 
+describe ProjectTask, "path_to should accept both relative and absolute paths" do
+  let :proj_task do
+    curr = File.dirname(__FILE__)
+    ProjectTask.new(Map.new(
+      :files => [File.join( curr, "testdata", "Project.fsproj")], 
+      :original_path => "/original_path/"))
+  end
+  it "should use original_path to resolve path" do
+    expect(proj_task.path_to( "./bin/something.exe", "./tmp/")).to eq "/original_path/bin/something.exe"
+  end
+  it "should return the absolute path when the path to the exe is absolute" do
+    expect(proj_task.path_to( "/bin/something.exe", "./tmp/")).to eq "/bin/something.exe"
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake