capistrano-jdk-installer 0.0.4 → 0.0.5

data/README.md

@@ -30,7 +30,7 @@ To enable this recipe, add following in your `config/deploy.rb`.
     require 'capistrano-jdk-installer'
     set(:java_version_name, "7u6")
     set(:java_oracle_username, "foo@example.com") # your ID on oracle.com
-    set(:java_oracle_password, "setcret") # your password on oracle.com
+    set(:java_oracle_password, "secret") # your password on oracle.com
     set(:java_license_title, "Oracle Binary Code License Agreement for Java SE")
     set(:java_accept_license, true)
 

data/capistrano-jdk-installer.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('capistrano')
-  gem.add_dependency('json')
-  gem.add_dependency('net-sftp', '>= 2.0.0')
-  gem.add_dependency('mechanize', '>= 2.0.0')
+  gem.add_dependency("capistrano")
+  gem.add_dependency("capistrano-file-transfer-ext", "~> 0.0.3")
+  gem.add_dependency("json")
+  gem.add_dependency("mechanize", "~> 2.0.0")
 end

data/lib/capistrano-jdk-installer.rb

@@ -1,10 +1,9 @@
 require "capistrano-jdk-installer/version"
-require 'capistrano/transfer'
-require 'json'
-require 'logger'
-require 'mechanize'
-require 'net/sftp'
-require 'uri'
+require "capistrano/configuration/actions/file_transfer_ext"
+require "json"
+require "logger"
+require "mechanize"
+require "uri"
 
 module Capistrano
   module JDKInstaller
@@ -37,40 +36,6 @@ module Capistrano
       end
     end
 
-    def upload_archive(from, to, options={}, &block)
-      mode = options.delete(:mode)
-      run("mkdir -p #{File.dirname(to)}")
-      execute_on_servers(options) { |servers|
-        targets = servers.map { |server| sessions[server] }
-        if dry_run
-          logger.debug "transfering: #{[:up, from, to, targets, options.merge(:logger => logger).inspect ] * ', '}"
-        else
-          stat = File.stat(from)
-          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
-              sftp = Net::SFTP::Session.new(ssh).connect!
-              remote_stat = sftp.stat!(to)
-              if stat.size == remote_stat.size
-                remote_checksum = ssh.exec!("( cd #{File.dirname(to)} && #{checksum_cmd} #{File.basename(to)} )").strip
-                checksum == remote_checksum # skip upload if file size and checksum are same between local and remote
-              else
-                false
-              end
-            rescue Net::SFTP::StatusException
-              false # upload again if the remote file is absent
-            end
-          }
-          Capistrano::Transfer.process(:up, from, to, targets, options.merge(:logger => logger), &block)
-        end
-      }
-      if mode
-        mode = mode.is_a?(Numeric) ? mode.to_s(8) : mode.to_s
-        run("chmod #{mode} #{to}", options)
-      end
-    end
-
     def extract_archive(archive, destination)
       case archive
       when /\.(bin|sh)$/
@@ -270,7 +235,7 @@ module Capistrano
           _cset(:java_installer_json) {
             # should not update cache directly from wget.
             # wget will save response to the file even if the request fails.
-            tempfile = "#{java_installer_json_cache}.#{$$}"
+            tempfile = `mktemp /tmp/capistrano-jdk-installer.XXXXXXXXXX`.chomp
             begin
               if not File.file?(java_installer_json_cache) or File.mtime(java_installer_json_cache)+java_installer_json_expires < Time.now
                 execute = []
@@ -400,7 +365,7 @@ module Capistrano
             if fetch(:java_setup_remotely, true)
               transaction {
                 download
-                upload_archive(java_deployee_archive_local, java_deployee_archive)
+                transfer_if_modified(:up, java_deployee_archive_local, java_deployee_archive)
                 install
                 setup_locally if fetch(:java_setup_locally, false)
               }

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-jdk-installer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -28,29 +28,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: capistrano-file-transfer-ext
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,13 +58,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: a capistrano recipe to download and install JDK for your projects.