capistrano-scm-jenkins 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330c9690618bd67702215220bd3405cca27dc320
-  data.tar.gz: 321660d2fc8ced158e36f833d3706358a3fab91d
+  metadata.gz: e3eddcc06310bc70b74ca2571546e19e4d24d62f
+  data.tar.gz: 990e07c5aad6d6b388baedb8e36959eee74e76ec
 SHA512:
-  metadata.gz: 33b8df5ecd0997e78c1518a954172889c5179b83fc2afbd20f160b628c1d7cbeb5adcabbfe5ec2b6a4d3ce012c0cc00a3944964b76275043f73b9faa8441a761
-  data.tar.gz: 678b9004ac4fa0b71b5dd066f0ae3a3daeb75c1e6e7b389dcf0fe27603e3ab7de3cd61a74e523f0dcfbbaa089c3398dad24709bccad818390cd3017fc98a8cac
+  metadata.gz: 5fed3f286ee7b3153431081cc024b17333491f7f8cd7ede7e1ade0d4b872d2f94d2b77df61283b2b905754667e4695386fa0112bfa3dbbea40f8c627b118cbf9
+  data.tar.gz: 80757c0847d24f6406afafb2310d9d54f0851ff093a93fa2cfea0150118fab06024a66c88bd4530fceb0eeec354a48e98252e4e52f4eb0a463039228857c5282

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-scm-jenkins (0.4.0)
+    capistrano-scm-jenkins (0.5.0)
       capistrano (~> 3.2.1)
 
 GEM

data/NEWS.md

@@ -1,3 +1,9 @@
+## 0.5.0 (2014-11-11)
+
+* Clean up some Ruby code, thanks to RuboCop
+* Provide a mechanism, using `:deployed_artifact_filename`, to control the name of the deployed artifact’s filename
+    - Ties in nicely with [`capistrano-jetty`](https://github.com/evertrue/capistrano-jetty) & [`capistrano-storm`](https://github.com/evertrue/capistrano-storm)
+
 ## 0.4.0 (2014-10-29)
 
 * Change default for `:jenkins_artifact_file` to `*zip*/archive.zip` (h/t @lostintime on #22)

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

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

data/lib/capistrano/jenkins.rb

@@ -64,11 +64,11 @@ class Capistrano::Jenkins < Capistrano::SCM
   end
 
   def artifact_is_zip?
-    artifact_ext == ".zip"
+    artifact_ext == '.zip'
   end
 
   def artifact_file_opt
-    fetch(:jenkins_artifact_file, "*zip*/archive.zip")
+    fetch(:jenkins_artifact_file, '*zip*/archive.zip')
   end
 
   def artifact_filename
@@ -113,7 +113,7 @@ class Capistrano::Jenkins < Capistrano::SCM
 
       if allowed_statuses.include? build_status
         if artifact_is_zip?
-          unless test! "hash unzip 2>/dev/null"
+          unless test! 'hash unzip 2>/dev/null'
             abort 'unzip required, but not found'
           end
         end
@@ -133,22 +133,20 @@ class Capistrano::Jenkins < Capistrano::SCM
 
     def update
       # grab the newest artifact
-      context.execute :curl, "--silent --fail --show-error #{curl_auth} " +
-        "#{artifact_url} -o #{fetch(:application)}#{artifact_ext} " +
-        "#{"--insecure" if fetch(:jenkins_insecure)}"
+      context.execute :curl, "--silent --fail --show-error #{curl_auth} " \
+        "#{artifact_url} -o #{fetch(:deployed_artifact_filename, artifact_filename)} " \
+        "#{'--insecure' if fetch(:jenkins_insecure)}"
     end
 
     def release
-      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/\""
+        context.execute :rm, '-rf', 'out'
+        context.execute :unzip, fetch(:deployed_artifact_filename, artifact_filename), '-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
+        context.execute :cp, fetch(:deployed_artifact_filename, artifact_filename), release_path
       end
     end
 

metadata

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