capistrano-strategy-jenkins_artifact 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8c96f8b6ac33c572302110649f7f28e085388e
-  data.tar.gz: c5b909e7c364ee9d6ebfbcd556fb5222b7a2203c
+  metadata.gz: 744ee059d6ce8d3548ae4f3c5e30db351bb83a60
+  data.tar.gz: 47d593834c80450a81ea66d806ec93a50094a22d
 SHA512:
-  metadata.gz: cec6f8ee6002b11712cd81a021f66a18269354fba78d998bcce3315a0d25124825aca547106f0017e1927306f2c42e3f25a2ff3b5dc39095dbdd4739eebdc72d
-  data.tar.gz: c6a77f098ed3f8c0e005c423aedbd8e35f02f1caed67f114333c291ed503d6fbbbf0a75b46a2c7dd7c3a9162f029272a072e4c4d5882bed945a347f301f17b3e
+  metadata.gz: eec41b4c0c6a02d098a35afb900a36a5c4331ec1edc1dd733d63fe09f330817bb6897b1d346f93969d9baa777b43beaf04155b7279d18c0ac3a3de4127d478db
+  data.tar.gz: ccb873421905baa73e518db02d672bf4d3cad9c12ee68f34c2af96349dbb4d8cafa1967f91dfab23f041d068b73a61c9440b0ba42d2457c0ecfd05e386de70b8

data/.travis.yml

@@ -4,6 +4,11 @@ cache:
     - vendor/bundle
 language: ruby
 rvm:
-  - 2.2.1
-before_install: gem install bundler -v 1.11.2
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+matrix:
+  allow_failures:
+    - rvm: 2.4.0 # Currently json.gem fails to build
+before_install: gem install bundler
 script: bundle exec rake test

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.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["aereal"]
   spec.email         = ["aereal@aereal.org"]
 
@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "webmock"
 end

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

@@ -4,16 +4,13 @@ require 'capistrano/recipes/deploy/strategy/base'
 require 'jenkins_api_client'
 
 class ::JenkinsApi::Client::Job
-  def get_last_successful_build_number(job_name, branch)
+  def get_last_successful_build(job_name)
     @logger.info "Obtaining last successful build number of #{job_name}"
-    res = @client.api_get_request("/job/#{path_encode(job_name)}/lastSuccessfulBuild")
-    res['number']
+    @client.api_get_request("/job/#{path_encode(job_name)}/lastSuccessfulBuild")
   end
 
-  def find_artifact_with_path(job_name, relative_path)
-    current_build_number  = get_current_build_number(job_name)
-    job_path              = "job/#{path_encode job_name}/"
-    response_json         = @client.api_get_request("/#{job_path}#{current_build_number}")
+  def find_last_successful_artifact_with_path(job_name, relative_path)
+    response_json = get_last_successful_build(job_name)
     if response_json['artifacts'].none? {|a| a['relativePath'] == relative_path }
       abort "Specified artifact not found in curent_build !!"
     end
@@ -21,9 +18,43 @@ class ::JenkinsApi::Client::Job
     artifact_path         = URI.escape("#{jenkins_path}artifact/#{relative_path}")
     return artifact_path
   end
+
+  def find_last_successful_artifact(job_name)
+    last_successful_build  = get_last_successful_build(job_name)
+    relative_build_path   = last_successful_build['artifacts'][0]['relativePath']
+    jenkins_path          = last_successful_build['url']
+    artifact_path         = URI.escape("#{jenkins_path}artifact/#{relative_build_path}")
+    return artifact_path
+  end
 end
 
 class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::Strategy::Base
+
+  def _guess_compression_type(filename)
+    case filename.downcase
+    when /\.tar\.gz$/, /\.tgz$/
+      :gzip
+    when /\.tar\.bz2$/, /\.tbz$/
+      :bzip2
+    when /\.tar\.xz$/, /\.txz$/
+      :xz
+    when /\.tar$/
+      :raw
+    else
+      :bzip2
+    end
+  end
+
+  def _compression_type_to_switch(type)
+    case type
+    when :gzip  then 'z'
+    when :bzip2 then 'j'
+    when :xz    then 'J'
+    when :raw   then '' # raw tarball
+    else abort "Invalid compression type: #{type}"
+    end
+  end
+
   def deploy!
     dir_name = exists?(:is_multibranch_job) && fetch(:is_multibranch_job) ? fetch(:branch) : fetch(:build_project)
 
@@ -32,9 +63,9 @@ class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::St
     set(:artifact_url) do
       uri = ''
       if exists?(:artifact_relative_path)
-        uri = client.job.find_artifact_with_path(dir_name, fetch(:artifact_relative_path))
+        uri = client.job.find_last_successful_artifact_with_path(dir_name, fetch(:artifact_relative_path))
       else
-        uri = client.job.find_artifact(dir_name)
+        uri = client.job.find_last_successful_artifact(dir_name)
       end
       abort "No artifact found for #{dir_name}" if uri.empty?
       URI.parse(uri).tap {|uri|
@@ -44,9 +75,14 @@ class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::St
       }.to_s
     end
 
-    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)
+    last_successful_build = client.job.get_last_successful_build(dir_name)
+    deploy_at = Time.at(last_successful_build['timestamp'] / 1000)
+
+    compression_type = fetch(
+      :artifact_compression_type,
+      _guess_compression_type(fetch(:artifact_url))
+    )
+    compression_switch = _compression_type_to_switch(compression_type)
 
     set(:release_name, deploy_at.strftime('%Y%m%d%H%M%S'))
     set(:release_path, "#{fetch(:releases_path)}/#{fetch(:release_name)}")
@@ -55,7 +91,7 @@ class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::St
     run <<-SCRIPT
       mkdir -p #{fetch(:release_path)} && \
       (curl -s #{fetch(:artifact_url)} | \
-      tar --strip-components=1 -C #{fetch(:release_path)} -jxf -)
+      tar --strip-components=1 -C #{fetch(:release_path)} -#{compression_switch}xf -)
     SCRIPT
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-strategy-jenkins_artifact
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - aereal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jenkins_api_client
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capistrano 2 strategy that uses Jenkins' artifact as a distribution provider.
 email:
 - aereal@aereal.org
@@ -115,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Capistrano 2 strategy that uses Jenkins' artifact as a distribution provider.