syncwrap 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae35d27dcde1232833010cd8c54f0ee90cebc534
-  data.tar.gz: 82ab6099f4a345f2f0e44636015450d2ba0a3521
+  metadata.gz: 41675f753b936a41dfa9adc50306cba476cb7809
+  data.tar.gz: 8a61feac7054cf90aa1226abe47fbaf5b1e88913
 SHA512:
-  metadata.gz: 6a2b7367f7d7cde4bad82143a1e0979e240f80cf9d8ae72e13f180da9cda6005e5c8eec13f56c15713cea70c43ade473252d0f870009aef7011c278e290ff403
-  data.tar.gz: 12feeb0d898f1349077b74272db9f106679ba2fc765a8e04705bf31b42a49b03bb6d114aaa59d2cd5292790a50c9cc72c884f1e6646e90436dcc671575834f30
+  metadata.gz: 357c6f3382234c6bf91e49e43434a0056ead68bd30921276101b0e2399011de55d202b9f90fa9a48e016a12e8b34e20445df6dd06ce99121d9b75a5054bf9aca
+  data.tar.gz: 85a464dd1ebe06e37de0973cb90a00bf660eea82807d7cc34ac3da29bbfa93c01ba55a349fe13047d60a71671ccb495b5920fde86d5c0f3221e166e696d73468

data/History.rdoc

@@ -1,3 +1,16 @@
+=== 2.9.1 (2017-8-4)
+* SyncWrap::JRubyVM
+  * Avoid setting Env['GEM_HOME'] in the jruby 9.x installed profile
+    by default. In 2.9.0, this was added as a substitute for the
+    jruby.gem.home system property, which when set caused incessant
+    warnings with 9.x. However setting GEM_HOME also undesirably
+    effects gem bin wrapper install location. Instead just use the
+    default in-dist path of jruby 9.x, and system gems will need to be
+    re-installed with a jruby upgrade.
+  * Add support for fast path gem user_install (no-op if same version
+    specification is found)
+* Fix error message for CLI -S (session) with host not found
+
 === 2.9.0 (2017-7-18)
 * SyncWrap::Debian
   * Fix Debian#dist_if_installed? grep pattern. Was previously giving
@@ -20,7 +33,7 @@
   * Add --yes flag to final lvconvert call, required by later
     versions, compatible with earlier
   * Add thin-provisioning-tools as dependency on Debian, as the included
-    cached_check command is needed for reboot.
+    cache_check command is needed for reboot.
 * SyncWrap::Sudoers
   * Collect all sudoers config details here. This was previously
     spread between SyncWrap::Users and SyncWrap::UserData.

data/lib/syncwrap/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module SyncWrap
-  VERSION='2.9.0'
+  VERSION='2.9.1'
 
   GEM_ROOT = File.dirname(File.dirname(File.dirname(__FILE__))) # :nodoc:
 end

data/lib/syncwrap/cli.rb

@@ -268,7 +268,7 @@ TEXT
 
       if @ssh_session
         host = space.get_host( @ssh_session )
-        host = space.ssh_host_name( host )
+        host &&= space.ssh_host_name( host )
         raise "Host #{@ssh_session} not found in sync file" unless host
         extra_args = @component_plan
         raise "SSH args? #{extra_args.inspect}" if extra_args.first =~ /^[^\-]/

data/lib/syncwrap/components/jruby_vm.rb

@@ -77,8 +77,43 @@ module SyncWrap
       "#{jruby_dist_path}/etc"
     end
 
+    # The jruby system gem home, depending on #jruby_gem_home_prop?
     def jruby_gem_home
-      "#{local_root}/lib/jruby/gems"
+      if jruby_gem_home_prop?
+        "#{local_root}/lib/jruby/gems"
+      else
+        "#{jruby_dist_path}/lib/ruby/gems/shared"
+      end
+    end
+
+    def jruby_user_gem_dir( user )
+      "~#{user}/.gem/jruby/#{ruby_compat_version}"
+    end
+
+    # True if jruby (1.7.x) supports an alternative system gem home
+    # via the jruby.gem.home java property. By default, for jruby
+    # 1.7.x this will be used to move gems outside to allow for
+    # graceful jruby upgrades without needing to reinstall gems.
+    #
+    # Jruby 9.x continues to abide by this property, through 9.1.12.0
+    # atleast, but with an incessant warning, so the setting is
+    # dropped by default.
+    attr_writer :jruby_gem_home_prop
+
+    def jruby_gem_home_prop?
+      @jruby_gem_home_prop ||= version_lt?( jruby_version, [9] )
+    end
+
+    # The ruby compatability version, as can be found in
+    # RbConfig::CONFIG['ruby_version'] on the same ruby, and used as a
+    # sub-directory of the user gem directory. In recent rubies this is 3
+    # version numbers with 0 in the least significant (ruby naming:
+    # TEENY) position, e.g. '2.3.0'. By default, computed based on
+    # jruby_version for known versions.
+    attr_writer :ruby_compat_version
+
+    def ruby_compat_version
+      @ruby_compat_version ||= default_ruby_compat_version
     end
 
     # Install jruby if the jruby_version is not already present.
@@ -132,29 +167,39 @@ module SyncWrap
       version = Array( opts[ :version ] )
       ver = (version.length == 1) && version[0] =~ /^=?\s*([0-9]\S+)/ && $1
 
-      unless ( opts[:check] || opts[:user_install] ||
-               opts[:minimize] == false || opts[:spec_check] == false ||
+      unless ( opts[:check] ||
+               opts[:minimize] == false ||
+               opts[:spec_check] == false ||
                ver.nil? )
 
-        specs = [ "#{jruby_gem_home}/specifications/#{gem}-#{ver}-java.gemspec",
-                  "#{jruby_gem_home}/specifications/#{gem}-#{ver}.gemspec" ]
+        prefix = if opts[:user_install]
+                   jruby_user_gem_dir( opts[:user_install] )
+                 else
+                   jruby_gem_home
+                 end
+
+        specs = [ "#{prefix}/specifications/#{gem}-#{ver}-java.gemspec",
+                  "#{prefix}/specifications/#{gem}-#{ver}.gemspec" ]
+
+        cond = "if [ ! -e #{specs[0]} -a ! -e #{specs[1]} ]; then"
+        shopts = { close: 'fi' }
+        case opts[ :user_install ]
+        when String
+          shopts[ :user ] = opts[ :user_install ]
+        when nil, false
+          shopts[ :user ] = :root
+        end
 
-        sudo( "if [ ! -e '#{specs[0]}' -a ! -e '#{specs[1]}' ]; then",
-              close: "fi" ) do
+        sh( cond, shopts ) do
           super
         end
       else
         super
       end
-
     end
 
     alias :jruby_gem_install :gem_install
 
-    def jruby_gem_home_prop?
-      version_lt?( jruby_version, [9] )
-    end
-
     protected
 
     def min_deps_supported?
@@ -165,6 +210,16 @@ module SyncWrap
       Array( reqs ).flatten.compact.map { |req| "-v'#{req}'" }
     end
 
+    def default_ruby_compat_version
+      if version_lt?( jruby_version, [9] )
+        '1.9'
+      elsif version_lt?( jruby_version, [9,1] )
+        '2.2.0'
+      else
+        '2.3.0'
+      end
+    end
+
   end
 
 end

data/sync/src/hashdot/profiles/jruby.hdp.erb

@@ -1,4 +1,4 @@
-# HashDot launch profile for JRuby (http://jruby.codehaus.org/)
+# HashDot launch profile for JRuby
 #. hashdot.profile = jruby
 
 jruby.home    = <%= jruby_dist_path %>
@@ -8,10 +8,8 @@ jruby.shell   = /bin/sh
 jruby.bindir  = <%= local_root %>/bin
 
 hashdot.profile += jruby-common
-
-# Rubygems Home (Install)
 <% if jruby_gem_home_prop? %>
-jruby.gem.home = <%= local_root %>/lib/jruby/gems
-<% else %>
-hashdot.env.GEM_HOME = <%= local_root %>/lib/jruby/gems
+
+# System Rubygems Home
+jruby.gem.home = <%= jruby_gem_home %>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor