capistrano-strategy-jenkins_artifact 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1666d310444ef061c387edb1d9a231242c0da5f7
-  data.tar.gz: 6f2148ddc3011d63230ebcbb1e9606deec81a341
+  metadata.gz: de8c96f8b6ac33c572302110649f7f28e085388e
+  data.tar.gz: c5b909e7c364ee9d6ebfbcd556fb5222b7a2203c
 SHA512:
-  metadata.gz: 978b52fe45eb6f924f132439391ac7f2fa013c961b6b0c3c86d8ec19099e7d54d165205691a8bdfdc688dcdfe3cdb4d215e9ea44b3fbc3e698f513f6c1ed494c
-  data.tar.gz: 46f331f96c5ccfef9f0ffa0a31905409850e58e5ac41cc601382b79b35dec945afbe1d6b6cc7fc97fba61e45f2ebdf902618e863a48e14a78c9bd1c50d7a8187
+  metadata.gz: cec6f8ee6002b11712cd81a021f66a18269354fba78d998bcce3315a0d25124825aca547106f0017e1927306f2c42e3f25a2ff3b5dc39095dbdd4739eebdc72d
+  data.tar.gz: c6a77f098ed3f8c0e005c423aedbd8e35f02f1caed67f114333c291ed503d6fbbbf0a75b46a2c7dd7c3a9162f029272a072e4c4d5882bed945a347f301f17b3e

data/README.md

@@ -22,7 +22,19 @@ Or install it yourself as:
 
 In your `Capfile` (`config/deploy.rb`, or `config/deploy/**/*.rb`):
 
+### General job
+
+```ruby
+set :jenkins_origin, URI.parse('http://ci.example.com')
+set :build_project, 'build-artifact-job'
+set :deploy_via, :jenkins_artifact
+```
+
+### Multibranch job
+
 ```ruby
+set :jenkins_origin, URI.parse('http://ci.example.com/job/multibranch-job')
+set :is_multibranch_job, true
 set :deploy_via, :jenkins_artifact
 ```
 

data/capistrano-strategy-jenkins_artifact.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-strategy-jenkins_artifact"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["aereal"]
   spec.email         = ["aereal@aereal.org"]
 

data/lib/capistrano/recipes/deploy/strategy/jenkins_artifact.rb

@@ -25,16 +25,18 @@ end
 
 class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::Strategy::Base
   def deploy!
+    dir_name = exists?(:is_multibranch_job) && fetch(:is_multibranch_job) ? fetch(:branch) : fetch(:build_project)
+
     jenkins_origin = fetch(:jenkins_origin) or abort ":jenkins_origin configuration must be defined"
     client = JenkinsApi::Client.new(server_url: jenkins_origin.to_s)
     set(:artifact_url) do
       uri = ''
       if exists?(:artifact_relative_path)
-        uri = client.job.find_artifact_with_path(fetch(:build_project), fetch(:artifact_relative_path))
+        uri = client.job.find_artifact_with_path(dir_name, fetch(:artifact_relative_path))
       else
-        uri = client.job.find_artifact(fetch(:build_project))
+        uri = client.job.find_artifact(dir_name)
       end
-      abort "No artifact found for #{fetch(:build_project)}" if uri.empty?
+      abort "No artifact found for #{dir_name}" if uri.empty?
       URI.parse(uri).tap {|uri|
         uri.scheme = jenkins_origin.scheme
         uri.host = jenkins_origin.host
@@ -42,8 +44,8 @@ class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::St
       }.to_s
     end
 
-    build_num = client.job.get_last_successful_build_number(fetch(:build_project), "origin/#{fetch(:branch)}")
-    timestamp = client.job.get_build_details(fetch(:build_project), build_num)['timestamp']
+    build_num = client.job.get_last_successful_build_number(dir_name, "origin/#{fetch(:branch)}")
+    timestamp = client.job.get_build_details(dir_name, build_num)['timestamp']
     deploy_at = Time.at(timestamp / 1000)
 
     set(:release_name, deploy_at.strftime('%Y%m%d%H%M%S'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-strategy-jenkins_artifact
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - aereal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client