capistrano-jdk-installer 0.0.2 → 0.0.3

data/README.md

@@ -51,6 +51,10 @@ Following options are available to manage your JDK installation.
  * `:java_cmd` - the `java` command on remote machines.
  * `:java_cmd_local` - the `java` command on local machine.
  * `:java_checksum_cmd` - use specified command to compare JDK archives. use `md5sum` by default.
+ * `:java_version` - specify a string to identify JDK version. by default, it will be generated from `:java_version_name`.
+ * `:java_release` - specify a string to identify JDK release. by default, it will be generated from `:java_version_name`.
+ * `:java_deployer_file` - specify a string to identify JDK archive. by default, it will be generated from `:java_version_name`.
+ * `:java_deployee_file` - specify a string to identify JDK archive. by default, it will be generated from `:java_version_name`.
 
 ## Contributing
 

data/lib/capistrano-jdk-installer.rb

@@ -39,6 +39,7 @@ module Capistrano
 
     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
@@ -72,7 +73,7 @@ module Capistrano
 
     def extract_archive(archive, destination)
       case archive
-      when /\.bin$/
+      when /\.(bin|sh)$/
         "( cd #{File.dirname(destination)} && yes | sh #{archive} )"
       when /\.dmg$/
         if java_update_number
@@ -110,8 +111,8 @@ module Capistrano
             File.join(File.expand_path('.'), 'tools', 'java')
           }
           _cset(:java_home) {
-            case java_deployee_platform
-            when /Mac OS X/i
+            case java_deployee_file
+            when /macosx/i
               if java_update_number
                 File.join("/Library", "Java", "JavaVirtualMachines",
                           "jdk%s_%02d.jdk" % [java_inner_version, java_update_number],
@@ -130,8 +131,8 @@ module Capistrano
             end
           }
           _cset(:java_home_local) {
-            case java_deployer_platform
-            when /Mac OS X/i
+            case java_deployer_file
+            when /macosx/i
               if java_update_number
                 File.join("/Library", "Java", "JavaVirtualMachines",
                           "jdk%s_%02d.jdk" % [java_inner_version, java_update_number],
@@ -160,42 +161,35 @@ module Capistrano
           }
           _cset(:java_version_info) {
             case java_version_name
-            when /^(1\.4\.(\d+))(?:_([0-9]+))?$/ then [ $1, '1.4', $2, $3 ]
-            when /^(1\.5\.(\d+))(?:_([0-9]+))?$/ then [ $1, '5', $2, $3 ]
-            when /^(\d+)(?:u(\d+))?$/            then [ "1.#{$1}.0", $1, nil, $2 ]
+            when /^(1\.4\.(\d+))(?:[_u]([0-9]+))?$/ then [ $1, '1.4', $2, $3 ]
+            when /^(1\.5\.(\d+))(?:[_u]([0-9]+))?$/ then [ $1, '5', $2, $3 ]
+            when /^(\d+)(?:u(\d+))?$/               then [ "1.#{$1}.0", $1, 0, $2 ]
             else
               abort("Could not parse JDK version name: #{java_version_name}")
             end
           }
           _cset(:java_inner_version) { java_version_info[0] } # e.g. "1.7.0"
-          _cset(:java_major_version) { java_version_info[1] } # e.g. "7"
-          _cset(:java_minor_version) { java_version_info[2] } # e.g. nil
-          _cset(:java_update_number) { java_version_info[3] } # e.g. "6"
+          _cset(:java_major_version) { java_version_info[1] } # e.g. 7
+          _cset(:java_minor_version) { java_version_info[2] } # e.g. 0
+          _cset(:java_update_number) { java_version_info[3] } # e.g. 6
           _cset(:java_version) {
             "JDK #{java_major_version}"
           }
           _cset(:java_release) {
             case java_major_version
-            when '1.4'
+            when '1.4', '5'
+              jdk = java_major_version == '1.4' ? 'j2sdk' : 'jdk'
               if java_update_number
-                "Java SE Development Kit #{java_inner_version.gsub('.', '_')}_#{java_update_number}"
+                '%s-%s_%02d-oth-JPR' % [jdk, java_inner_version, java_update_number]
               else
-                "Java SE Development Kit #{java_inner_version.gsub('.', '_')}"
+                '%s-%s-oth-JPR' % [jdk, java_inner_version]
               end
-            when '5'
-              if java_update_number
-                "Java SE Development Kit #{java_major_version}.#{java_minor_version} Update #{java_update_number}"
-              else
-                "Java SE Development Kit #{java_major_version}.#{java_minor_version}"
-              end
-            when '6', '7'
+            else
               if java_update_number
-                "Java SE Development Kit #{java_major_version}u#{java_update_number}"
+                'jdk-%du%d-oth-JPR' % [java_major_version, java_update_number]
               else
-                "Java SE Development Kit #{java_major_version}"
+                'jdk-%d-oth-JPR' % [java_major_version]
               end
-            else
-              abort("Unknown JDK version: #{java_major_version}")
             end
           }
           def java_platform(ostype, arch)
@@ -203,35 +197,56 @@ module Capistrano
             when /^Darwin$/i
               case arch
               when /^i[3-7]86$/i, /^x86_64$/i
-                'Mac OS X x64'
+                "macosx-x64"
               else
-                "Mac OS X #{arch}"
+                "macosx-#{arch.downcase}"
               end
             when /^Linux$/i
               case arch
               when /^i[3-7]86$/i
-                'Linux x86'
+                "linux-i586"
               when /^x86_64$/i
-                'Linux x64'
+                case java_major_version
+                when '1.4', '5'
+                  "linux-amd64"
+                else
+                  "linux-x64"
+                end
               else
-                "Linux #{arch}"
+                "linux-#{arch.downcase}"
               end
             when /^Solaris$/i
               case arch
               when /^sparc$/i
-                "Solaris SPARC"
+                "solaris-sparc"
               when /^sparcv9$/i
-                "Solaris SPARC 64-bit"
+                "solaris-sparcv9"
               when /^i[3-7]86$/i
-                "Solaris x86"
+                "solaris-i586"
               when /^x86_64$/i
-                "Solaris x64"
+                "solaris-x64"
               else
-                "Solaris #{arch}"
+                "solaris-#{arch.downcase}"
+              end
+            end
+          end
+          def java_file(ostype, arch)
+            case java_major_version
+            when '1.4', '5'
+              jdk = java_major_version == '1.4' ? 'j2sdk' : 'jdk'
+              if java_update_number
+                '%s-%s_%02d-%s' % [jdk, java_inner_version.gsub('.', '_'), java_update_number, java_platform(ostype, arch)]
+              else
+                '%s-%s-%s' % [jdk, java_inner_version.gsub('.', '_'), java_platform(ostype, arch)]
+              end
+            else
+              if java_update_number
+                'jdk-%du%d-%s' % [java_major_version, java_update_number, java_platform(ostype, arch)]
+              else
+                'jdk-%d-%s' % [java_major_version, java_platform(ostype, arch)]
               end
             end
           end
-
           ## hudson.tools.JDKInstaller.json
           _cset(:java_mechanize_agent) {
             Mechanize.log = ::Logger.new(STDERR)
@@ -277,30 +292,44 @@ module Capistrano
             abort("Unknown JSON format version: #{version}") if version != 2
             regex = Regexp.new(Regexp.quote(java_version), Regexp::IGNORECASE)
             data = java_installer_json['data']
-            data.find { |datum| regex === datum['name'].strip }
+            logger.info("Requested JDK version is #{java_version.dump}.")
+            data.find { |datum|
+              logger.debug("Checking JDK version: #{datum['name'].strip}")
+              regex === datum['name'].strip
+            }
           }
           _cset(:java_release_data) {
+            abort("No such JDK version found: #{java_version}") unless java_version_data
             regex = Regexp.new(Regexp.quote(java_release), Regexp::IGNORECASE)
             releases = java_version_data['releases']
-            releases.find { |release| regex === release['name'].strip or regex === release['title'].strip }
+            logger.info("Requested JDK release is #{java_release.dump}.")
+            releases.find { |release|
+              logger.debug("Checking JDK release: #{release['title'].strip} (#{release['name'].strip})")
+              regex === release['name'].strip or regex === release['title'].strip
+            }
           }
           _cset(:java_release_license_title) {
+            abort("No such JDK release found: #{java_version}/#{java_release}") unless java_release_data
             java_release_data['lictitle']
           }
-          def java_platform_data(regex)
+          def java_file_data(name)
+            abort("No such JDK release found: #{java_version}/#{java_release}") unless java_release_data
+            regex = Regexp.new(Regexp.quote(name.to_s), Regexp::IGNORECASE)
+            logger.info("Requested JDK file is #{name.dump}.")
             files = java_release_data['files']
-            data = files.find { |data|
-              regex === data['title']
+            files.find { |data|
+              logger.debug("Checking JDK file: #{data['title'].strip} (#{data['name'].strip})")
+              regex === data['name'] or regex === data['title']
             }
-            abort("Not supported on specified JDK release: #{regex.inspect}") unless data
-            data
           end
  
           ## settings for local machine
-          _cset(:java_deployer_platform) { java_platform(`uname -s`.strip, `uname -m`.strip) }
+          _cset(:java_deployer_file) {
+            java_file(`uname -s`.strip, `uname -m`.strip)
+          }
           _cset(:java_deployer_archive_uri) {
-            regex = Regexp.new(Regexp.quote(java_deployer_platform), Regexp::IGNORECASE)
-            data = java_platform_data(regex)
+            data = java_file_data(java_deployer_file)
+            abort("No such JDK release found for specified platform: #{java_version}/#{java_release}/#{java_deployer_file}") unless data
             data['filepath']
           }
           _cset(:java_deployer_archive) {
@@ -311,10 +340,12 @@ module Capistrano
           }
 
           ## settings for remote machines
-          _cset(:java_deployee_platform) { java_platform(capture('uname -s').strip, capture('uname -m').strip) }
+          _cset(:java_deployee_file) {
+            java_file(capture('uname -s').strip, capture('uname -m').strip)
+          }
           _cset(:java_deployee_archive_uri) {
-            regex = Regexp.new(Regexp.quote(java_deployee_platform), Regexp::IGNORECASE)
-            data = java_platform_data(regex)
+            data = java_file_data(java_deployee_file)
+            abort("No such JDK release found for specified platform: #{java_version}/#{java_release}/#{java_deployee_file}") unless data
             data['filepath']
           }
           _cset(:java_deployee_archive) {
@@ -333,14 +364,11 @@ module Capistrano
           ## tasks
           desc("Install java locally.")
           task(:setup_locally, :except => { :no_release => true }) {
-            if fetch(:java_setup_locally, false)
-              transaction {
-                download_locally
-                install_locally
-              }
-            end
+            transaction {
+              download_locally
+              install_locally
+            }
           }
-          after 'deploy:setup', 'java:setup'
 
           task(:download_locally, :except => { :no_release => true }) {
             download_archive(java_deployer_archive_uri, java_deployer_archive_local)
@@ -368,6 +396,7 @@ module Capistrano
                 download
                 upload_archive(java_deployee_archive_local, java_deployee_archive)
                 install
+                setup_locally if fetch(:java_setup_locally, false)
               }
             end
           }

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

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

metadata

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