capistrano-scm-bamboo 1.0.1 → 1.0.3

data/capistrano-scm-bamboo.gemspec

@@ -23,6 +23,7 @@ deploy your build artifact with Capistrano.
 
   # specify any dependencies here; for example:
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "httparty"
+  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "typhoeus"
   s.add_development_dependency "rspec"
 end

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

@@ -1,4 +1,5 @@
-require 'HTTParty'
+require 'typhoeus'
+require 'json'
 
 require 'capistrano/recipes/deploy/scm/base'
 
@@ -7,42 +8,32 @@ module Capistrano
     module SCM
             
       class Bamboo < Base
-        include HTTParty
-        base_uri repository
-        basic_auth scm_username, scm_passphrase
-        
         def head
-          last_deploy_build
+          "#{variable(:plan_key)}-#{variable(:build_number)}"
         end
 
         def query_revision(revision)
-          return revision if revision =~ /^\d+$/
-          raise "invalid revision: #{revision}"
+          revision
+          # return revision if revision =~ /^\d+$/
+          # raise "invalid revision: #{revision}"
         end
 
         def checkout(revision, destination)
-          result = Bamboo.get('/rest/api/latest/result/CLOUD-ROUTER/18?expand=artifacts')
-          artifacts = result["result"]["artifacts"]["artifact"]
-          artifact = artifacts.select { |artifact| artifact["name"] == "router-target" }
-
+          response = Typhoeus::Request.get("#{repository}/result/#{variable(:plan_key)}/#{variable(:build_number)}.json?expand=artifacts", :username => variable(:scm_username), :password => variable(:scm_passphrase))
+          result = JSON.parse(response.body)
+          artifact = result["artifacts"]["artifact"].select { |artifact| artifact["name"] == variable(:artifact) }
           artifactUrl = artifact[0]["link"]["href"]
           
-          %Q{TMPDIR=`mktemp -d` &&
-            cd "$TMPDIR" &&
-            wget -m -nH #{artifact_url}' &&
-            unzip archive.zip &&
-            mv archive "#{destination}" &&
-            rm -rf "$TMPDIR"
-          }
+          %Q{TMPDIR=`mktemp -d` && cd $TMPDIR && wget -m -nH -q #{artifactUrl} && mv artifact "#{destination}" && rm -rf "$TMPDIR"}
         end
 
         alias_method :export, :checkout
 
-        def log(from, to=nil)
-          log_build_message(from, to)
-          log_scm_message(from, to)
-          'true'
-        end
+        # def log(from, to=nil)
+        #   log_build_message(from, to)
+        #   log_scm_message(from, to)
+        #   'true'
+        # end
 
         def diff(from, to=nil)
           logger.info 'bamboo does not support diff'
@@ -116,26 +107,6 @@ module Capistrano
         #   raise 'can not find a build suitable for deploy'
         # end
 
-        # def get_build_number_from_rss_all_title(title)
-        #   /#(\d+) \([^(]+$/.match(title)[1]
-        # end
-
-        # def get_build_number_from_rss_changelog_title(title)
-        #   /^#(\d+) /.match(title)[1]
-        # end
-
-        # def rss_all
-        #   begin
-        #     @rss_all ||= open(repository + '/rssAll', auth_opts).read()
-        #   rescue => e
-        #     raise Capistrano::Error, "open url #{repository + '/rssAll'} failed: #{e}"
-        #   end
-        # end
-
-        # def rss_changelog
-        #   @rss_changelog ||= open(repository + '/rssChangelog', auth_opts).read()
-        # end
-
         # def auth_opts
         #   if jenkins_username and jenkins_password
         #     {:http_basic_authentication => [jenkins_username, jenkins_password]}
@@ -175,11 +146,6 @@ module Capistrano
         #                           end
         #                         end
         # end
-
-        # def jenkins_hostname
-        #   @jenkins_hostname ||= URI.parse(repository).host
-        # end
-        
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Scm
     module Bamboo
-      VERSION = "1.0.1"
+      VERSION = "1.0.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-bamboo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70308702739540 !ruby/object:Gem::Requirement
+  requirement: &70204008772920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308702739540
+  version_requirements: *70204008772920
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70308702737040 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70204008771920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308702737040
+  version_requirements: *70204008771920
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &70204008771140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70204008771140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70308702736000 !ruby/object:Gem::Requirement
+  requirement: &70204008770700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308702736000
+  version_requirements: *70204008770700
 description: ! "\nWith this plugin, you can use Bamboo build artifacts as a repository,
   and\ndeploy your build artifact with Capistrano.\n  "
 email: