capistrano-jdk-installer 0.0.1 → 0.0.2

data/README.md

@@ -36,14 +36,14 @@ To enable this recipe, add following in your `config/deploy.rb`.
 
 Following options are available to manage your JDK installation.
 
- * `:java_version_name` - preferred JDK version. this value must be defined in JSON response from `:java_installer_uri`.
+ * `:java_version_name` - preferred JDK version. this value must be defined in JSON response from `:java_installer_json_uri`.
  * `:java_oracle_username` - your credential to be used to download JDK archive from oracle.com.
  * `:java_oracle_password` - your credential to be used to download JDK archive from oracle.com.
  * `:java_license_title` - the license title of JDK which you will accept.
  * `:java_accept_license` - specify whether you accept the JDK license. `false` by default.
  * `:java_setup_locally` - specify whether you want to setup JDK on local machine. `false` by default.
  * `:java_setup_remotely` - specify whether you want to setup JDK on remote machines. `true` by default.
- * `:java_installer_uri` - `http://updates.jenkins-ci.org/updates/hudson.tools.JDKInstaller.json` by default.
+ * `:java_installer_json_uri` - `http://updates.jenkins-ci.org/updates/hudson.tools.JDKInstaller.json` by default.
  * `:java_installer_json_cache` - the cache file path of "hudson.tools.JDKINstaller.json".
  * `:java_installer_json_expires` - the cache TTL. cache `86400` seconds by default.
  * `:java_home` - the path to the `JAVA_HOME` on remote machines.

data/lib/capistrano-jdk-installer.rb

@@ -45,7 +45,7 @@ module Capistrano
           logger.debug "transfering: #{[:up, from, to, targets, options.merge(:logger => logger).inspect ] * ', '}"
         else
           stat = File.stat(from)
-          chdcksum_cmd = fetch(:java_checksum_cmd, 'md5sum')
+          checksum_cmd = fetch(:java_checksum_cmd, 'md5sum')
           checksum = run_locally("( cd #{File.dirname(from)} && #{checksum_cmd} #{File.basename(from)} )").strip
           targets = targets.reject { |ssh|
             begin
@@ -240,12 +240,15 @@ module Capistrano
               agent.user_agent = 'Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)'
               agent.cookie_jar.add!(Mechanize::Cookie.new('gpw_e24', '.', :domain => 'oracle.com', :path => '/', :secure => false, :for_domain => true))
             }
-            agent.ssl_version = :TLSv1
+            agent.ssl_version = :TLSv1 # we have to declare TLS version explicitly to avoid problems on LP:965371
             agent
           }
-          _cset(:java_installer_uri, "http://updates.jenkins-ci.org/updates/hudson.tools.JDKInstaller.json")
+          _cset(:java_installer_json_uri) {
+            # fetch :java_installer_uri first for backward compatibility
+            fetch(:java_installer_uri, "http://updates.jenkins-ci.org/updates/hudson.tools.JDKInstaller.json")
+          }
           _cset(:java_installer_json_cache) {
-            File.join(java_tools_path_local, File.basename(URI.parse(java_installer_uri).path))
+            File.join(java_tools_path_local, File.basename(URI.parse(java_installer_json_uri).path))
           }
           _cset(:java_installer_json_expires, 86400)
           _cset(:java_installer_json) {
@@ -258,7 +261,7 @@ module Capistrano
               execute = []
               execute << "mkdir -p #{File.dirname(java_installer_json_cache)}"
               execute << "rm -f #{java_installer_json_cache}"
-              execute << "wget --no-verbose -O #{java_installer_json_cache} #{java_installer_uri}"
+              execute << "wget --no-verbose -O #{java_installer_json_cache} #{java_installer_json_uri}"
               if dry_run
                 logger.debug(execute.join(' && '))
               else
@@ -310,7 +313,7 @@ module Capistrano
           ## settings for remote machines
           _cset(:java_deployee_platform) { java_platform(capture('uname -s').strip, capture('uname -m').strip) }
           _cset(:java_deployee_archive_uri) {
-            regex = Regexp.new(Regexp.quote(java_depoyee_platform), Regexp::IGNORECASE)
+            regex = Regexp.new(Regexp.quote(java_deployee_platform), Regexp::IGNORECASE)
             data = java_platform_data(regex)
             data['filepath']
           }
@@ -344,10 +347,11 @@ module Capistrano
           }
 
           task(:install_locally, :except => { :no_release => true}) {
-            command = (<<-EOS).gsub(/\s+/, ' ')
+            command = (<<-EOS).gsub(/\s+/, ' ').strip
               if ! test -d #{java_home_local}; then
                 #{extract_archive(java_deployer_archive_local, java_home_local)} &&
-                #{java_cmd_local} -version;
+                ( #{java_cmd_local} -version || rm -rf #{java_home_local} ) &&
+                test -d #{java_home_local};
               fi;
             EOS
             if dry_run
@@ -374,10 +378,11 @@ module Capistrano
           }
 
           task(:install, :roles => :app, :except => { :no_release => true }) {
-            command = (<<-EOS).gsub(/\s+/, ' ')
+            command = (<<-EOS).gsub(/\s+/, ' ').strip
               if ! test -d #{java_home}; then
                 #{extract_archive(java_deployee_archive, java_home)} &&
-                #{java_cmd} -version;
+                ( #{java_cmd} -version || rm -rf #{java_home} ) &&
+                test -d #{java_home};
               fi;
             EOS
             run(command)

data/lib/capistrano-jdk-installer/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module JDKInstaller
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-jdk-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: