capistrano-scm-bamboo 1.2.2 → 1.3.0

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Scm
     module Bamboo
-      VERSION = "1.2.2"
+      VERSION = "1.3.0"
     end
   end
 end

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

@@ -8,20 +8,31 @@ module Capistrano
     module SCM
             
       class Bamboo < Base
+
+        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))
+          result = JSON.parse(response.body)
+        end
+
         def head
-          "#{plan_key}-#{variable(:build_number)}"
+          "#{plan_key}-#{query_revision(variable(:build_number))}"
         end
 
         def query_revision(revision)
-          revision
-          # return revision if revision =~ /^\d+$/
-          # raise "invalid revision: #{revision}"
+          if (revision.to_s =~ /\d+$/)
+            revision
+          elsif (revision =~ /latest$/) 
+            result = load_result
+            
+            result["number"]
+          else
+            raise "invalid revision: #{revision}"
+          end
         end
 
         def checkout(revision, destination)
           # TODO: graceful error handling
-          response = Typhoeus::Request.get("#{repository}/result/#{plan_key}/#{variable(:build_number)}.json?expand=artifacts", :username => variable(:scm_username), :password => variable(:scm_passphrase))
-          result = JSON.parse(response.body)
+          result = load_result
           artifact = result["artifacts"]["artifact"].select { |artifact| artifact["name"] == variable(:artifact) }
           artifactUrl = artifact[0]["link"]["href"]
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-bamboo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70212826116280 !ruby/object:Gem::Requirement
+  requirement: &70115304378100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212826116280
+  version_requirements: *70115304378100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70212817034540 !ruby/object:Gem::Requirement
+  requirement: &70115304377680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212817034540
+  version_requirements: *70115304377680
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70212817034120 !ruby/object:Gem::Requirement
+  requirement: &70115304377260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212817034120
+  version_requirements: *70115304377260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212817033700 !ruby/object:Gem::Requirement
+  requirement: &70115304376840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212817033700
+  version_requirements: *70115304376840
 description: ! "\nWith this plugin, you can use Bamboo build artifacts as a repository,
   and\ndeploy your build artifact with Capistrano.\n  "
 email: