capistrano-strategy-jenkins_artifact 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5db36572a0cb054e66d71245118d6daa2aa93b
-  data.tar.gz: b8b8d7af57076fdc8a497934478ad52d4d70a2b4
+  metadata.gz: 735fcaef2ef6c36ee11f1cbe77b41d8c6d65651e
+  data.tar.gz: 5b4a9cdd23177d053c78fe239ae49be6c3446436
 SHA512:
-  metadata.gz: afb7ace0e506779442a5c0cccdc8abffbfa3f277c1195e48129c0578984a8384fb29e63ae0f607b5451559119abcd157a28aef8b888c65a0b7eea36ea57f7f5c
-  data.tar.gz: 92c4db0b7d0419254396df95be93f67bc7d9cc04d983dc80562340f88628396810f613bedb0f16d62580943ffcb7619aa426d7e9a0546362f908158a9c81800c
+  metadata.gz: ab11f0e76ba394e7db82a20ed3af0578938a221ed7b4d860fc03c3dc3994554bd70913f394243443493a38eb42f7f55603670abbb3ac77b964d4c167a2563a66
+  data.tar.gz: '08c7002716da41011cbe0a2c99aa7341a7e7d4fd00c2d8dfb5699e2ffb17f26e0bf8830f24d2d2a0b2f1350b089fb13e39edd51089e128c8c8368b6d32a1a5e2'

data/README.md

@@ -1,4 +1,4 @@
-# Capistrano::Strategy::JenkinsArtifact [![Build Status][travis-badge]][travis-url]
+# Capistrano::Strategy::JenkinsArtifact [![Build Status][travis-badge]][travis-url] [![Gem Version](https://badge.fury.io/rb/capistrano-strategy-jenkins_artifact.svg)](https://badge.fury.io/rb/capistrano-strategy-jenkins_artifact)
 
 Capistrano 2 strategy that uses Jenkins' artifact as a distribution provider.
 

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.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["aereal"]
   spec.email         = ["aereal@aereal.org"]
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jenkins_api_client"
+  spec.add_runtime_dependency "json"
   spec.add_development_dependency "capistrano", "< 3.0.0"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

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

@@ -1,26 +1,40 @@
 require 'uri'
+require 'net/https'
 
 require 'capistrano/recipes/deploy/strategy/base'
-require 'jenkins_api_client'
 
-class ::JenkinsApi::Client::Job
-  def self.get_artifact_url_by_build(build, &finder)
-    finder ||= ->(_) { true }
-    matched_artifact   = build['artifacts'].find(&finder)
-    raise 'Specified artifact not found in current build !!' unless matched_artifact
-    relative_build_path = matched_artifact['relativePath']
-    jenkins_path          = build['url']
-    artifact_path         = URI.escape("#{jenkins_path}artifact/#{relative_build_path}")
-    return artifact_path
+class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::Strategy::Base
+  module ApiClient
+    # jenkins_origin: URI
+    # => Maybe[$parsed_body: Hash]
+    def self.get_last_successful_build(jenkins_origin, dir_name)
+      uri = jenkins_origin.clone
+      uri.path += "/job/#{URI.encode_www_form_component(dir_name)}/lastSuccessfulBuild/api/json"
+      req = Net::HTTP::Get.new(uri.path)
+      res = Net::HTTP.start(uri.host, uri.port) {|session|
+        session.use_ssl = uri.scheme == 'https'
+        session.request(req)
+      }
+      case res
+      when Net::HTTPSuccess
+        if /\Aapplication\/json\b/ === (res.content_type || '')
+          JSON.parse(res.body)
+        end
+      end
+    end
   end
 
-  def get_last_successful_build(job_name)
-    @logger.info "Obtaining last successful build number of #{job_name}"
-    @client.api_get_request("/job/#{path_encode(job_name)}/lastSuccessfulBuild")
+  module Helpers
+    def self.get_artifact_url_by_build(build, &finder)
+      finder ||= ->(_) { true }
+      matched_artifact   = build['artifacts'].find(&finder)
+      raise 'Specified artifact not found in current build !!' unless matched_artifact
+      relative_build_path = matched_artifact['relativePath']
+      jenkins_path          = build['url']
+      artifact_path         = URI.escape("#{jenkins_path}artifact/#{relative_build_path}")
+      return artifact_path
+    end
   end
-end
-
-class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::Strategy::Base
 
   def _guess_compression_type(filename)
     case filename.downcase
@@ -56,16 +70,14 @@ class ::Capistrano::Deploy::Strategy::JenkinsArtifact < ::Capistrano::Deploy::St
     end
 
     jenkins_origin = fetch(:jenkins_origin) or abort ":jenkins_origin configuration must be defined"
-    client = JenkinsApi::Client.new(server_url: jenkins_origin.to_s)
-
-    last_successful_build = client.job.get_last_successful_build(dir_name)
+    last_successful_build = ApiClient.get_last_successful_build(jenkins_origin, dir_name)
     build_at = Time.at(last_successful_build['timestamp'] / 1000)
 
     set(:artifact_url) do
       artifact_finder = exists?(:artifact_relative_path) ?
         ->(artifact) { artifact['relativePath'] == fetch(:artifact_relative_path) } :
         ->(artifact) { true }
-      uri = JenkinsApi::Client::Job.get_artifact_url_by_build(last_successful_build, &artifact_finder)
+      uri = Helpers.get_artifact_url_by_build(last_successful_build, &artifact_finder)
       abort "No artifact found for #{dir_name}" if uri.empty?
       URI.parse(uri).tap {|uri|
         uri.scheme = jenkins_origin.scheme

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-strategy-jenkins_artifact
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - aereal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jenkins_api_client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Capistrano 2 strategy that uses Jenkins' artifact as a distribution provider.