capistrano-scm-bamboo 1.3.2 → 1.4.0

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Scm
     module Bamboo
-      VERSION = "1.3.2"
+      VERSION = "1.4.0"
     end
   end
 end

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

@@ -41,15 +41,27 @@ module Capistrano
           end
 
           artifactUrl = artifact[0]["link"]["href"]
-          
           build_actual = result["number"]
+
+          # 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?)
+            %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{plan_key}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
+          else
+            # get the filename
+            f = artifact_content_disposition.match(/filename="(.*?)"/)[1]
+            %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} -O #{f} && mkdir #{destination} && mv #{f} "#{destination}/" && rm -rf "$TMPDIR"}
+          end
           
-          %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{plan_key}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
+          ## previous artifact copy when things were only directories. for posterity only.
+          # %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact/#{plan_key}/shared/build-#{build_actual}/#{variable(:artifact)}/ "#{destination}" && rm -rf "$TMPDIR"}
         rescue ArgumentError => e
           logger.log(Logger::IMPORTANT, e.message)
           exit
         end
-
+        
         def plan_key
           if (variable(:plan_key)) 
             variable(:plan_key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-bamboo
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70097708581460 !ruby/object:Gem::Requirement
+  requirement: &70101407957540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097708581460
+  version_requirements: *70101407957540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70097695945920 !ruby/object:Gem::Requirement
+  requirement: &70101410059920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097695945920
+  version_requirements: *70101410059920
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70097695945500 !ruby/object:Gem::Requirement
+  requirement: &70101410059500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097695945500
+  version_requirements: *70101410059500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097695945080 !ruby/object:Gem::Requirement
+  requirement: &70101410059080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097695945080
+  version_requirements: *70101410059080
 description: ! "\nWith this plugin, you can use Bamboo build artifacts as a repository,
   and\ndeploy your build artifact with Capistrano.\n  "
 email: