capistrano-scm-jenkins 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04edc4112c4c07cb04de8d2464b3035f5d74a9c4
-  data.tar.gz: 3604822a8ee58b02d3d1e2ba179ed416845c92f2
+  metadata.gz: 330c9690618bd67702215220bd3405cca27dc320
+  data.tar.gz: 321660d2fc8ced158e36f833d3706358a3fab91d
 SHA512:
-  metadata.gz: e485c60bc446f0ad1ab649eba89316cb554d016d49a8476fa21f91c47f54406d0ab4a15b2ce1ce9891520435001bceef544de1186b3c0d4979a755b7bccba6b6
-  data.tar.gz: f892d06dc57bd330c3fb02badcae65c06606d3d727202d6e72cbd820d6d3a43b2379630654eca66b5cbeb82c8ed4012059e66490e43d2182b4439adaa965cf3e
+  metadata.gz: 33b8df5ecd0997e78c1518a954172889c5179b83fc2afbd20f160b628c1d7cbeb5adcabbfe5ec2b6a4d3ce012c0cc00a3944964b76275043f73b9faa8441a761
+  data.tar.gz: 678b9004ac4fa0b71b5dd066f0ae3a3daeb75c1e6e7b389dcf0fe27603e3ab7de3cd61a74e523f0dcfbbaa089c3398dad24709bccad818390cd3017fc98a8cac

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 branches:
-        only:
-                - master
+  only:
+    - master
 rvm:
-        - 1.9.2
-        - 1.9.3
-        - 2.0.0
-        - 2.1.0
-        - jruby-19mode
-        - rbx
-        - ree
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - rbx-2
+  - ree

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.3.3)
+    capistrano-scm-jenkins (0.4.0)
       capistrano (~> 3.2.1)
 
 GEM
@@ -11,8 +11,9 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
+    colorize (0.7.3)
     diff-lcs (1.2.5)
-    i18n (0.6.9)
+    i18n (0.6.11)
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
@@ -20,21 +21,22 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
     rake (10.3.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sshkit (1.4.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    sshkit (1.5.1)
+      colorize
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-      term-ansicolor
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    tins (1.3.0)
 
 PLATFORMS
   ruby

data/NEWS.md

@@ -1,7 +1,15 @@
-## 0.3.2 (2014-05-23)
+## 0.4.0 (2014-10-29)
+
+* Change default for `:jenkins_artifact_file` to `*zip*/archive.zip` (h/t @lostintime on #22)
+
+## 0.3.3 (2014-05-23)
 
 * Fix bypassing of SSL verification using cURL (thanks @xsk)
 
+## 0.3.2 (2014-05-21)
+
+* Properly bump gem version (same changes as v0.3.1)
+
 ## 0.3.1 (2014-05-21)
 
 * Ensure gemspec dependencies are properly set for Cap ~> 3.2.1

data/README.md

@@ -49,6 +49,9 @@ set :jenkins_pass, 'pass'
 # Deploy a single file.
 # set :jenkins_artifact_file, 'my-api/target/webapp.war'
 #
+# Deploy a specific build number
+# set(:jenkins_build_number, ENV['REVISION']) if ENV['REVISION']
+#
 # Bypass SSL verification
 # set :jenkins_insecure, true
 ```

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

@@ -1,3 +1,3 @@
 module CapistranoScmJenkins
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/lib/capistrano/jenkins.rb

@@ -63,31 +63,36 @@ class Capistrano::Jenkins < Capistrano::SCM
     end
   end
 
+  def artifact_is_zip?
+    artifact_ext == ".zip"
+  end
+
+  def artifact_file_opt
+    fetch(:jenkins_artifact_file, "*zip*/archive.zip")
+  end
+
   def artifact_filename
-    @artifact_filename = File.basename(fetch(:jenkins_artifact_file))
+    @artifact_filename = File.basename(artifact_file_opt)
   end
 
   def artifact_ext
     @artifact_ext = File.extname(artifact_filename)
   end
 
-  def artifact_url
-    artifact            = fetch(:jenkins_artifact_file)
-    artifact_url_prefix = "#{repo_url}/lastBuild/artifact"
+  def artifact_build_number_opt
+    fetch(:jenkins_build_number, 'lastBuild')
+  end
 
-    if artifact
-      "#{artifact_url_prefix}/#{artifact}"
-    else
-      "#{artifact_url_prefix}/*zip*/archive.zip"
-    end
+  def artifact_build_number
+    @artifact_build_number ||= jenkins_api_res['number']
   end
 
-  def last_build_number
-    @last_build_number = jenkins_api_res['number']
+  def artifact_url
+    "#{repo_url}/#{artifact_build_number_opt}/artifact/#{artifact_file_opt}"
   end
 
   def jenkins_api_res
-    jenkins_job_api_url = "#{repo_url}/lastBuild/api/json"
+    jenkins_job_api_url = "#{repo_url}/#{artifact_build_number_opt}/api/json"
 
     res ||= open(jenkins_job_api_url, auth_opts.merge(ssl_opts)).read
 
@@ -107,6 +112,12 @@ class Capistrano::Jenkins < Capistrano::SCM
       build_status = res['result'].downcase
 
       if allowed_statuses.include? build_status
+        if artifact_is_zip?
+          unless test! "hash unzip 2>/dev/null"
+            abort 'unzip required, but not found'
+          end
+        end
+
         true
       else
         abort 'Latest build status isn\'t green!'
@@ -128,11 +139,21 @@ class Capistrano::Jenkins < Capistrano::SCM
     end
 
     def release
-      context.execute :cp, "#{fetch(:application)}#{artifact_ext}", release_path
+      downloaded_artifact = "#{fetch(:application)}#{artifact_ext}"
+
+      if artifact_is_zip?
+        # is an archive - unpack and deploy
+        context.execute :rm, "-rf \"out/\""
+        context.execute :unzip, "\"#{downloaded_artifact}\" -d out/"
+        context.execute :mv, "out/#{fetch(:jenkins_artifact_path, "*")} \"#{release_path}\""
+        context.execute :rm, "-rf \"out/\""
+      else
+        context.execute :cp, downloaded_artifact, release_path
+      end
     end
 
     def fetch_revision
-      "build #{last_build_number}"
+      "build-#{artifact_build_number}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - LI Daobing
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano