capistrano-scm-bamboo 1.4.3 → 1.4.4

data/lib/capistrano-scm-bamboo/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Scm
     module Bamboo
-      VERSION = "1.4.3"
+      VERSION = "1.4.4"
     end
   end
 end

data/lib/capistrano/recipes/deploy/scm/bamboo.rb

@@ -14,7 +14,7 @@ module Capistrano
         end
 
         def load_result
-          response = Typhoeus::Request.get("#{repository}/result/#{plan_key}/#{variable(:build_number)}.json?expand=artifacts", :username => variable(:scm_username), :password => variable(:scm_passphrase))
+          response = Typhoeus::Request.get("#{repository}/result/#{plan_key}/#{variable(:build_number)}.json?expand=artifacts", :userpwd => "#{variable(:scm_username)}:#{variable(:scm_passphrase)}")
           result = JSON.parse(response.body)
         end
 
@@ -49,12 +49,14 @@ module Capistrano
 
           # now do clever hackiness to detect whether this is a directory to be synced, or a single inline file/attachment
           artifact_headers = Typhoeus::Request.head(artifactUrl).headers_hash
-          # if there's a content disposition of attachment, downolad the file directly. if inline, then ?. if no content disposition, then wget the whole directory.
-          artifact_content_disposition = artifact_headers["Content-Disposition"]
-          if (artifact_content_disposition.empty?)
+
+          if (!artifact_headers.include?("Content-Disposition"))
             @artifact_name = variable(:artifact)
             %Q{TMPDIR=`mktemp -d -t tmp.XXXXXXXXXX` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{plan_key}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
           else
+            # if there's a content disposition of attachment, downolad the file directly. if inline, then ?. if no content disposition, then wget the whole directory.
+            artifact_content_disposition = artifact_headers["Content-Disposition"]
+
             # get the filename
             @artifact_name = artifact_content_disposition.match(/filename="(.*?)"/)[1]
             %Q{TMPDIR=`mktemp -d -t tmp.XXXXXXXXXX` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} -O #{@artifact_name} && mkdir #{destination} && mv #{@artifact_name} "#{destination}/" && rm -rf "$TMPDIR"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-bamboo
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors: