capistrano-jdk-installer 0.0.3 → 0.0.4

data/README.md

@@ -45,7 +45,8 @@ Following options are available to manage your JDK installation.
  * `:java_setup_remotely` - specify whether you want to setup JDK on remote machines. `true` 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_installer_json_expires` - the cache TTL. cache `259200` seconds by default.
+ * `:java_installer_json_keep_stale` - use stale cache when `:java_installer_json_uri` is down. `true` by default.
  * `:java_home` - the path to the `JAVA_HOME` on remote machines.
  * `:java_home_local` - the path to the `JAVA_HOME` on local machine.
  * `:java_cmd` - the `java` command on remote machines.

data/lib/capistrano-jdk-installer.rb

@@ -265,27 +265,33 @@ module Capistrano
           _cset(:java_installer_json_cache) {
             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_expires, 259200) # 3 days
+          _cset(:java_installer_json_keep_stale, true) # keep staled cache even if wget fails
           _cset(:java_installer_json) {
-            if File.file?(java_installer_json_cache)
-              refresh = File.mtime(java_installer_json_cache) + java_installer_json_expires < Time.now
-            else
-              refresh = true
-            end
-            if refresh
-              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_json_uri}"
-              if dry_run
-                logger.debug(execute.join(' && '))
-              else
-                run_locally(execute.join(' && '))
+            # should not update cache directly from wget.
+            # wget will save response to the file even if the request fails.
+            tempfile = "#{java_installer_json_cache}.#{$$}"
+            begin
+              if not File.file?(java_installer_json_cache) or File.mtime(java_installer_json_cache)+java_installer_json_expires < Time.now
+                execute = []
+                execute << "mkdir -p #{File.dirname(java_installer_json_cache)}"
+                success_cmd = "mv -f #{tempfile} #{java_installer_json_cache}"
+                failure_cmd = java_installer_json_keep_stale ? 'true' : 'false'
+                execute << "( wget --no-verbose -O #{tempfile} #{java_installer_json_uri} && #{success_cmd} || #{failure_cmd} )"
+
+                if dry_run
+                  logger.debug(execute.join(' && '))
+                else
+                  run_locally(execute.join(' && '))
+                end
               end
+              abort("No such file: #{java_installer_json_cache}") unless File.file?(java_installer_json_cache)
+              json = File.read(java_installer_json_cache)
+              json = json.sub(/\A[^{]*/, '').sub(/[^}]*\z/, '').strip # remove leading & trailing JS code from response
+              JSON.load(json)
+            ensure
+              run_locally("rm -f #{tempfile}") unless dry_run
             end
-            json = File.read(java_installer_json_cache)
-            json = json.sub(/\A[^{]*/, '').sub(/[^}]*\z/, '') # remove leading & trailing JS code from response
-            JSON.load(json)
           }
           _cset(:java_version_data) {
             version = java_installer_json['version']

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

@@ -1,5 +1,5 @@
 module Capistrano
   module JDKInstaller
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-jdk-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano