syncwrap 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77f5ce5aa53289eeb185d2eae6cc57f1409c80b
-  data.tar.gz: 1b4f72235707a1e8c57cacf696c50011f2482b2f
+  metadata.gz: d848cc57d0687947e9b350e86f3b581088572c42
+  data.tar.gz: fbbf0ae54fe44d9e14162f7e2ebef65c070fd065
 SHA512:
-  metadata.gz: 97bde28072609b93f183ea46f154fc92e8a0affa9ba9c373acd341eb48e70d02d11f3c288105c6efd9034708f0388053c22918c10b3a1f8f57d55ea91fd6c40e
-  data.tar.gz: 490597d2d2564ed30fb028d67e39650d7d13cc6d6f325443ddf8143a8ec08b998af2d446b205c6e4534a700f61fb2fde6873a986f898fa1ca015fe436c58948c
+  metadata.gz: d5647f57c02531435bced8dcb1373976fadaa162859bb7cf1c3e2bcc683dcb9b672b0ce6a6d4380712b93e68bf2be07257bd5fe5ac519e4beccec9de6593325a
+  data.tar.gz: 2914e8ec77e1c763c6c164a1b7df19bfc27a7c8ac536b1c207f4703dda71e40013bf3f5265e35fc25939920cfc98c4b6209654343cb01b807f68ac0677a09184

data/History.rdoc

@@ -1,3 +1,47 @@
+=== 2.7.0 (2016-1-21)
+* Add SyncWrap::ZoneBalancer utility for balancing new hosts across
+  multiple (AWS) availability zones for fault tolerance.
+* Update SyncWrap::PostgreSQL for support of version 9.5. Changes,
+  including postgresql.conf updates, remain backward compatible with
+  9.1+ and SyncWrap 2.3.0+
+* Add a check_install option to Distro#dist_install for all
+  distros. This adds bash conditionals to check for the presence of
+  system packages before invoking the package manager install/update
+  commands. If already installed, this can greatly improve
+  provisioning speed and will not perform updates which might be
+  better left to when provisioning new hosts. The option is off by
+  default for now, but is used for some more complete component
+  dependencies (see below). To enable it globally,
+  add `options( check_install: true )` to your sync.rb file.
+* Make SyncWrap::RHEL#dist_uninstall :succeed (don't fail even if no
+  packages are present) the default. This option is now deprecated on
+  dist_uninstall.
+* Use `apt-get remove`, instead of aptitude on Debian and Ubuntu.
+* Since Debian's `apt-get remove` and Arch's `pacman -R` fail if any
+  specified package is not found, test if each package is installed
+  before removing it. The leniency of dist_uninstall is now consistent
+  across all distros.
+* Some minimal distros like Debian 8 might not include rsync in a base
+  image. Add a conditional dist_install of rsync to the
+  SyncWrap::Users component before attempting to rput user home
+  dirs. A distro component needs to be included before Users for
+  this to occur. Backward compatibility is maintained when this is not
+  the case.
+* Some minimal distro base images might not include curl. Add
+  dist_install of curl to components that use it, either as part of
+  build dependencies, or separately using the new check_install
+  feature (see above) to minimize performance impact.
+* Add preliminary support for non-default or multiple VPCs, or mixed
+  EC2-VPC and EC2-Classic deployments via the vpc and subnet_id
+  profile properties with the SyncWrap::AmazonEC2 provider.
+* Add workaround for crash on jruby 9.0.0-4 with (wrapped) sync file
+  load (See jruby#3180 and #3609). Tests show wrapped load working
+  correctly on jruby 1.7.24 and 9.0.5 snapshots.
+* Upgrade SyncWrap::JRubyVM default version to 1.7.23 (+ hash for 1.7.24)
+* Upgrade SyncWrap::CRubyVM default version to 2.1.8
+* Fix tmpdir access issue with rput with templates to localhost and
+  alt non-root :user option.
+
 === 2.6.2 (2015-12-3)
 * By way of comparability to RHEL 7, SyncWrap::AmazonLinux with a
   specified amazon_version property >= '2014.03' would incorrectly

data/Manifest.txt

@@ -34,6 +34,7 @@ lib/syncwrap/shell.rb
 lib/syncwrap/systemd.rb
 lib/syncwrap/user_data.rb
 lib/syncwrap/version_support.rb
+lib/syncwrap/zone_balancer.rb
 lib/syncwrap/components/amazon_linux.rb
 lib/syncwrap/components/arch.rb
 lib/syncwrap/components/bundle.rb
@@ -101,6 +102,7 @@ test/test_shell.rb
 test/test_space.rb
 test/test_space_main.rb
 test/test_version_support.rb
+test/test_zone_balancer.rb
 test/zfile
 test/sync/d1/bar
 test/sync/d1/foo.erb

data/README.rdoc

@@ -36,8 +36,8 @@ command queue, and a few powerful methods like rput (augmented rsync).
 * Independent of (but easily integrated into) rake
 
 * Depends only on ruby 1.9+ stdlib Open3 for interaction with bash,
-  ssh and rsync. Actually, really works on jruby 1.6.8 (--1.9 mode)
-  and 1.7+
+  ssh and rsync. Also works on jruby 1.7.x, 9.x and recent rubinuous
+  (see Travis CI variants).
 
 == Synopsis
 
@@ -139,7 +139,7 @@ yourself.
 
 == License
 
-Copyright (c) 2011-2015 David Kellum
+Copyright (c) 2011-2016 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/bin/syncwrap

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/syncwrap/amazon_ec2.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/amazon_ws.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -59,43 +59,75 @@ module SyncWrap
                               symbolize_names: true ) )
     end
 
-    # Create a security_group given name and options. :region is the
-    # only required option, :description is good to have. Currently
-    # this is a no-op if the security group already exists.
+    # Create a security_group given name and options.  Currently this
+    # is a no-op if the security group of the given name already
+    # exists (in the given or default VPC or without,
+    # e.g. EC2-Classic). In either case the associated SecurityGroup
+    # object is returned.
+    #
+    # === Options
+    #
+    # See
+    # {AWS::EC2::SecurityGroupCollection.create}[http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/SecurityGroupCollection.html#create-instance_method]
+    # with the following additions/differences:
+    #
+    # :region:: Required
+    #
+    # :vpc:: The VPC ID in which to create the group. Required if host
+    #        is to be launched in a subnet of a non-default VPC.
+    #
+    # :description:: Optional text description. Set to name if unspecified.
     def aws_create_security_group( name, opts = {} )
       opts = opts.dup
       region = opts.delete( :region )
+      vpc = opts[ :vpc ]
       ec2 = AWS::EC2.new.regions[ region ]
-      unless ec2.security_groups.find { |sg| sg.name == name }
-        sg = ec2.security_groups.create( name, opts )
 
-        # FIXME: Allow ssh on the "default" region named group
+      sg = ec2.security_groups.find do |sg|
+        sg.name == name && ( vpc.nil? || sg.vpc_id == vpc )
+      end
+      unless sg
+        sg = ec2.security_groups.create( name, opts )
+        # Allow ssh on the special "default" region named group
         if name == region
           sg.authorize_ingress(:tcp, 22)
         end
       end
+      sg
     end
 
     # Create an instance, using name as the Name tag and assumed
-    # host name. For options see
+    # host name.
+    #
+    # === Options
+    #
+    # See
     # {AWS::EC2::InstanceCollection.create}[http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/InstanceCollection.html#create-instance_method]
     # with the following additions/differences:
     #
     # :count:: must be 1 or unspecified.
+    #
     # :region:: Default 'us-east-1'
-    # :security_groups:: As per aws-sdk, but the special :default value
-    #                    is replaced with a single security group with
-    #                    same name as the :region.
-    # :ebs_volumes:: The number of EBS volumes to create and attach to this instance.
+    #
+    # :security_groups:: Array of Security Group names. The special
+    #                    :default value is replaced with a single
+    #                    security group with same name as the :region.
+    #
+    # :ebs_volumes:: The number of EBS volumes to create and attach to
+    #                this instance.
+    #
     # :ebs_volume_options:: A nested Hash of options, as per
     #                       {AWS::EC2::VolumeCollection.create}[http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/VolumeCollection.html#create-instance_method]
     #                       with custom default :size 16 GB, and the same
     #                       :availibility_zone as the instance.
+    #
     # :ebs_mounts:: Device mounting scheme. The value :sdf_p indicates
     #               "/dev/sd[f-p]", and should be used for HVM instances.
     #               The default scheme is currently :sdh1_6 "/dev/sdh[1-6]".
     #               See {EC2: Block Device Mapping}[http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html]
+    #
     # :lvm_volumes:: Ignored here.
+    #
     # :roles:: Array of role Strings or Symbols (applied as Roles tag)
     def aws_create_instance( name, opts = {} )
       opts = deep_merge_hashes( @default_instance_options, opts )
@@ -111,18 +143,20 @@ module SyncWrap
       iopts.delete( :roles ) #-> tags
       iopts.delete( :description ) #-> tags
       iopts.delete( :tag ) #-> tags
+      iopts.delete( :vpc )
 
       if iopts[ :count ] && iopts[ :count ] != 1
         raise ":count #{iopts[ :count ]} != 1 is not supported"
       end
 
-      iopts[ :security_groups ].map! do |sg|
-        sg == :default ? region : sg
+      iopts[ :security_groups ].map! do |gname|
+        gname = region if gname == :default
+        aws_create_security_group( gname,
+                                   region: region, vpc: opts[ :vpc ] )
       end
 
-      iopts[ :security_groups ].each do |sg|
-        aws_create_security_group( sg, region: region )
-      end
+      az = iopts[ :availability_zone ]
+      iopts[ :availability_zone ] = az.call if az.is_a?( Proc )
 
       inst = ec2.instances.create( iopts )
 

data/lib/syncwrap/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,7 +15,7 @@
 #++
 
 module SyncWrap
-  VERSION='2.6.2'
+  VERSION='2.7.0'
 
   GEM_ROOT = File.dirname(File.dirname(File.dirname(__FILE__))) # :nodoc:
 end

data/lib/syncwrap/cli.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/syncwrap/component.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -233,6 +233,11 @@ module SyncWrap
       ctx.verbose?
     end
 
+    # Return any value of :check_install set in default options.
+    def check_install?
+      ctx.check_install?
+    end
+
     # Return the path to the the specified src, as first found in the
     # :sync_paths option as per #rput, Source Resolution.  Return nil
     # if not found.  This allows optional, local behavior based on the

data/lib/syncwrap/components/amazon_linux.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/arch.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -29,17 +29,60 @@ module SyncWrap
       true
     end
 
+    # Install the specified package names. A trailing hash is
+    # interpreted as options, see below.
+    #
+    # ==== Options
+    #
+    # :check_install:: Short-circuit if all packages already
+    #                  installed. Thus no upgrades will be performed.
+    #
+    # Additional options are passed to the sudo calls.
     def dist_install( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
-      sudo "pacman -S --noconfirm #{pkgs.join ' '}"
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
+      opts.delete( :minimal )
+      pkgs.flatten!
+      chk = opts.delete( :check_install ) || opts.delete( :succeed )
+      chk = check_install? if chk.nil?
+      dist_if_not_installed?( pkgs, chk, opts ) do
+        sudo( "pacman -S --noconfirm #{pkgs.join ' '}", opts )
+      end
     end
 
+    # Uninstall the specified package names. A trailing hash is
+    # interpreted as options, passed to the sudo calls.
     def dist_uninstall( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
-      sudo "pacman -R --noconfirm #{pkgs.join ' '}"
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
+      opts.delete( :succeed )
+      pkgs.flatten!
+      pkgs.each do |pkg|
+        dist_if_installed?( pkg, opts ) do
+          sudo( "pacman -R --noconfirm #{pkg}", opts )
+        end
+      end
+    end
+
+    # If chk is true, then wrap block in a sudo bash conditional
+    # testing if any specified pkgs are not installed. Otherwise just
+    # yield to block.
+    def dist_if_not_installed?( pkgs, chk, opts, &block )
+      if chk
+        c = "if ! pacman -Q #{pkgs.join ' '} >/dev/null 2>&1; then"
+        sudo( c, opts.merge( close: 'fi' ), &block )
+      else
+        block.call
+      end
+    end
+
+    # Wrap block in a sudo bash conditional testing if the single
+    # specified pkg is installed. Otherwise just yield to block.
+    def dist_if_installed?( pkg, opts, &block )
+      c = "if pacman -Q #{pkg} >/dev/null 2>&1; then"
+      sudo( c, opts.merge( close: 'fi' ), &block )
     end
 
     alias_method :dist_service, :dist_service_via_systemctl
+
   end
 
 end

data/lib/syncwrap/components/bundle.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/bundled_iyyov_daemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/bundler_gem.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/centos.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/commercial_jdk.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -71,6 +71,7 @@ module SyncWrap
         join( ' ' )
 
       sudo( "if [ ! -d #{jdk_dir} ]; then", close: "fi" ) do
+        dist_install( 'curl', minimal: true, check_install: true )
         sudo <<-SH
           curl -sSL -o #{distro} #{jdk_url}
         SH

data/lib/syncwrap/components/cruby_vm.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -46,19 +46,23 @@ module SyncWrap
     include RubySupport
     include HashSupport
 
-    # Default version of #ruby_version to install
-    DEFAULT_VERSION = '2.1.7'
+    # Default #ruby_version to install
+    DEFAULT_VERSION = '2.1.8'
 
-    # SHA256 #hash for DEFAULT_VERSION
-    DEFAULT_VERSION_HASH =
-      'f59c1596ac39cc7e60126e7d3698c19f482f04060674fdfe0124e1752ba6dd81'
+    # A set of known (sha256) cryptographic hashes, keyed by version
+    # string.
+    KNOWN_HASHES = {
+      '2.1.7' =>
+      'f59c1596ac39cc7e60126e7d3698c19f482f04060674fdfe0124e1752ba6dd81',
+      '2.1.8' =>
+      'afd832b8d5ecb2e3e1477ec6a9408fdf9898ee73e4c5df17a2b2cb36bd1c355d' }
 
     # The ruby version to install, as it appears in source packages
     # from ruby-lang.org. Note that starting with 2.1.0, the patch
     # release (p#) no longer appears in package names.
     # (Default: DEFAULT_VERSION)
     #
-    # Example values: '2.0.0-p481', '2.1.7'
+    # Example values: '2.0.0-p481', '2.1.8'
     attr_accessor :ruby_version
 
     # If true, attempt to uninstall any pre-existing distro packaged
@@ -68,6 +72,7 @@ module SyncWrap
 
     # A cryptographic hash value (hexadecimal, some standard length)
     # to use for verifying the 'source.tar.gz' package.
+    # (Default: KNOWN_HASHES[ ruby_version ])
     attr_writer :hash
 
     def initialize( opts = {} )
@@ -78,7 +83,7 @@ module SyncWrap
     end
 
     def hash
-      @hash || ( ruby_version == DEFAULT_VERSION && DEFAULT_VERSION_HASH )
+      @hash || KNOWN_HASHES[ ruby_version ]
     end
 
     def install
@@ -110,11 +115,10 @@ module SyncWrap
 
     def uninstall_distro_ruby
       if distro.is_a?( RHEL )
-        dist_uninstall( %w[ ruby ruby18 ruby19 ruby20 ruby21 ruby22 ],
-                        succeed: true )
+        dist_uninstall( %w[ ruby ruby18 ruby19 ruby20 ruby21 ruby22 ruby23 ] )
       else
         dist_uninstall( %w[ ruby ruby1.8 ruby1.9 ruby1.9.1
-                            ruby1.9.3 ruby2.0 ruby2.1 ruby2.2 ] )
+                            ruby1.9.3 ruby2.0 ruby2.1 ruby2.2 ruby2.3 ] )
       end
     end
 

data/lib/syncwrap/components/debian.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -54,22 +54,58 @@ module SyncWrap
     # well.  A trailing hash is interpreted as options, see below.
     #
     # ==== Options
+    #
+    # :check_install:: Short-circuit if all packages already
+    #                  installed. Thus no upgrades will be performed.
+    #
     # :minimal:: Eqv to --no-install-recommends
     #
-    # Other options will be ignored.
+    # Additional options are passed to the sudo calls.
     def dist_install( *args )
-      opts = args.last.is_a?( Hash ) && args.pop || {}
-      args.unshift "--no-install-recommends" if opts[ :minimal ]
-
-      sudo( "apt-get -yqq update" ) if first_apt?
-      sudo( "apt-get -yq install #{args.join ' '}" )
+      opts = args.last.is_a?( Hash ) && args.pop.dup || {}
+      args.flatten!
+      flags = []
+      flags << '--no-install-recommends' if opts.delete( :minimal )
+      chk = opts.delete( :check_install ) || opts.delete( :succeed )
+      chk = check_install? if chk.nil?
+      dist_if_not_installed?( args, chk, opts ) do
+        sudo( "apt-get -yqq update", opts ) if first_apt?
+        sudo( "apt-get -yq install #{(flags + args).join ' '}", opts )
+      end
     end
 
     # Uninstall the specified package names. A trailing hash is
-    # interpreted as options.
+    # interpreted as options, passed to the sudo calls.
     def dist_uninstall( *pkgs )
-      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
-      sudo "aptitude -yq purge #{pkgs.join ' '}"
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
+      opts.delete( :succeed )
+      pkgs.flatten!
+      pkgs.each do |pkg|
+        dist_if_installed?( pkg, opts ) do
+          sudo( "apt-get -yq --purge remove #{pkg}", opts )
+        end
+      end
+    end
+
+    # If chk is true, then wrap block in a sudo bash conditional
+    # testing if any specified pkgs are not installed. Otherwise just
+    # yield to block.
+    def dist_if_not_installed?( pkgs, chk, opts, &block )
+      if chk
+        qry = "dpkg-query -W -f '${db:Status-Status}\\n' #{pkgs.join ' '}"
+        cnt = qry + " | grep -c -E '^installed$'"
+        cond = %Q{if [ "$(#{cnt})" != "#{pkgs.count}" ]; then}
+        sudo( cond, opts.merge( close: 'fi' ), &block )
+      else
+        block.call
+      end
+    end
+
+    def dist_if_installed?( pkg, opts, &block )
+      qry = "dpkg-query -W -f '${db:Status-Status}\\n' #{pkg}"
+      tst = qry + " | grep -q 'installed'"
+      cond = "if #{tst}; then"
+      sudo( cond, opts.merge( close: 'fi' ), &block )
     end
 
     # Install a System V style init.d service script

data/lib/syncwrap/components/etc_hosts.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/geminabox.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/hashdot.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -30,7 +30,7 @@ module SyncWrap
   class Hashdot < Component
     include HashSupport
 
-    # Default version of #hashdot_version to install
+    # Default #hashdot_version to install
     DEFAULT_VERSION = '1.4.0'
 
     # SHA256 #hash for DEFAULT_VERSION

data/lib/syncwrap/components/iyyov.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/iyyov_daemon.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/syncwrap/components/jruby_vm.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011-2015 David Kellum
+# Copyright (c) 2011-2016 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -31,18 +31,22 @@ module SyncWrap
     include RubySupport
     include HashSupport
 
-    # Default version of #jruby_version to install
-    DEFAULT_VERSION = '1.7.22'
+    # Default #jruby_version to install
+    DEFAULT_VERSION = '1.7.23'
 
-    # The #hash for DEFAULT_VERSION. Prefer sha256 but sha1 is what is
-    # currently published.
-    DEFAULT_VERSION_HASH = '6b9e310a04ad8173d0d6dbe299da04c0ef85fc15'
+    # A set of known cryptographic hashes, keyed by version
+    # string. Note, we prefer sha256 but sha1 is what is currently
+    # published.
+    KNOWN_HASHES = { '1.7.22' => '6b9e310a04ad8173d0d6dbe299da04c0ef85fc15',
+                     '1.7.23' => '2b5e796feeed2bcfab02f8bf2ff3d77ca318e310',
+                     '1.7.24' => '0c321d2192768dfec419bee6b44c7190f4db32e1' }
 
     # JRuby version to install (default: DEFAULT_VERSION)
     attr_accessor :jruby_version
 
     # A cryptographic hash value (hexadecimal, some standard length)
     # to use for verifying the 'jruby-bin-*.tar.gz' package.
+    # (Default: KNOWN_HASHES[ jruby_version ])
     attr_writer :hash
 
     def initialize( opts = {} )
@@ -53,7 +57,7 @@ module SyncWrap
     end
 
     def hash
-      @hash || ( jruby_version == DEFAULT_VERSION && DEFAULT_VERSION_HASH )
+      @hash || KNOWN_HASHES[ jruby_version ]
     end
 
     def jruby_dist_path
@@ -86,6 +90,8 @@ module SyncWrap
       root = "#{local_root}/lib/jruby"
       distro = "/tmp/jruby-bin-#{jruby_version}.tar.gz"
 
+      dist_install( 'curl', minimal: true, check_install: true )
+
       sudo <<-SH
         if [ ! -d #{jruby_dist_path} ]; then
           mkdir -p #{root}