syncwrap 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7750e1149348fc952ef8d2dd124282861961bc4f
-  data.tar.gz: 1c183faa0793ee65741b64366e1463b3c4593e51
+  metadata.gz: 5a27d83ab1700ae7818a55ebace8c6c9bb29a99b
+  data.tar.gz: dfa29eebe123325201c9747dc6386e8f07072672
 SHA512:
-  metadata.gz: db6263d45a815839d43aed07c08a22cfc5dc578cbcb9c3438e3ab74ba619ba78dd3d8780beaf4648d27336284192cd4112b9e2ce6edd7d3029b5089d6db441fa
-  data.tar.gz: 694c6a0e63d9358f6831f21f16bfe9f2caffcf51c27080689e85545e24a9ce1f4b0c0ec3a44fcaa5610586e92545e1b7ad11c52e4fb696405fdde281fc0c6b1f
+  metadata.gz: b0fe60aaf32e21729609ed41dd05815e1ec09e2718ecaff59e159138dc2e2929f61ebc26f455b52632d64c06bf8f26b9299590a9e0ba257cc87fc86415797b5e
+  data.tar.gz: a5644f8fd7109d47b9e260236035a612db074383c2c36d6bca1374c30bcb641f054196d4cad9e8821ef7d52126e14b29aed4b79e2874e9f7231546de88f61e97

data/History.rdoc

@@ -1,3 +1,26 @@
+=== 2.1.0 (2014-3-5)
+* Simplify existing state handling (i.e. Ubuntu.first_apt?, Users
+  :just_created) by introducing SyncWrap::Component#state
+* Add hashdot_updated state (i.e. jruby update) and use in Iyyov and
+  IyyovDaemon components to signal required restarts.
+* Add :iyyov_root_jobs_installed state keeping to avoid redundant
+  rput's to Iyyov root jobs.rb
+* Add CLI --create-image and AmazonEC2 support
+* Add SyncWrap::GitHelp module for using a git hash as a host/image
+  tag from the profile
+* Add :imaging state awareness to Iyyov and IyyovDaemon: stop (or
+  don't launch) these when imaging
+* Add availability_zone to imported/saved Amazon host properties
+* Fix failure on (EC2) import from Host.initialize order
+* EC2 create_instance maps profile description and tag to tags
+* Add --ssh-session (interactive shell) support to CLI
+* Add --verbose-changes (verbose only for changing rputs) CLI option
+* Drop CLI -I short option for infrequently used --import-hosts
+* Disable EC2 operations, don't fail, if AWS credentials not found
+* Improve Users pem-not-found warning
+* Improve CLI --help summary
+* Upgrade default CRubyVM to 2.0.0-p451
+
 === 2.0.0 (2014-2-26)
 * Major rewrite with only very limited conceptual compatibility with
   1.x. See README, LAYOUT, and examples.

data/Manifest.txt

@@ -22,6 +22,7 @@ lib/syncwrap/component.rb
 lib/syncwrap/context.rb
 lib/syncwrap/distro.rb
 lib/syncwrap/formatter.rb
+lib/syncwrap/git_help.rb
 lib/syncwrap/host.rb
 lib/syncwrap/main.rb
 lib/syncwrap/path_util.rb

data/lib/syncwrap/amazon_ec2.rb

@@ -15,8 +15,10 @@
 #++
 
 require 'time'
+require 'securerandom'
 
 require 'syncwrap/amazon_ws'
+require 'syncwrap/path_util'
 require 'syncwrap/host'
 
 module SyncWrap
@@ -34,6 +36,7 @@ module SyncWrap
   #
   class AmazonEC2
     include AmazonWS
+    include PathUtil
 
     # FIXME: Interim strategy: use AmazonWS and defer deciding final
     # organization.
@@ -58,9 +61,15 @@ module SyncWrap
       # the sync file path.
       if @aws_config
         if sync_file_path
-          aws_configure( File.expand_path( @aws_config, sync_file_path ) )
-        else
+          @aws_config = File.expand_path( @aws_config, sync_file_path )
+        end
+
+        if File.exist?( @aws_config )
           aws_configure( @aws_config )
+        else
+          @aws_config = relativize( @aws_config )
+          warn "WARNING: #{aws_config} not found. EC2 provider operations not available."
+          @aws_config = nil
         end
       end
     end
@@ -68,7 +77,7 @@ module SyncWrap
     # Define a host profile by Symbol key and Hash value.
     #
     # Profiles may inherit properties from a :base_profile, either
-    # specified by that key, or the :default key profile. The
+    # specified by that key, or the :default profile. The
     # base_profile must be defined in advance (above in the sync
     # file). When merging profile to any base_profile, the :roles
     # property is concatenated via set union. All other properties are
@@ -90,7 +99,12 @@ module SyncWrap
       @profiles[ key ] = profile
     end
 
-    def import_hosts( regions, output_file )
+    def get_profile( key )
+      @profiles[ key ] or raise "Profile #{key} not registered"
+    end
+
+    def import_hosts( regions, sync_file )
+      require_configured!
       hlist = import_host_props( regions )
       unless hlist.empty?
 
@@ -101,16 +115,17 @@ module SyncWrap
 
         time = Time.now.utc
         cmt = "\n# Import of AWS #{regions.join ','} on #{time.iso8601}"
-        append_host_definitions( hlist, cmt, output_file )
+        append_host_definitions( hlist, cmt, sync_file )
       end
     end
 
-    def create_hosts( count, profile_key, name, output_file )
-      profile = @profiles[ profile_key ].dup or
-        raise "Profile #{profile_key} not registered"
+    def create_hosts( count, profile, name, sync_file )
+      require_configured!
+      profile = get_profile( profile ) if profile.is_a?( Symbol )
+      profile = profile.dup
 
-      # FIXME: Support profiles overrides.
-      # Also add some targeted CLI overrides (like for :availability_zones)
+      # FIXME: Support profile overrides? Also add some targeted CLI
+      # overrides (like for :availability_zone)?
 
       if profile[ :user_data ] == :ec2_user_sudo
         profile[ :user_data ] = ec2_user_data
@@ -121,31 +136,68 @@ module SyncWrap
 
       count.times do
         hname = if count == 1
-                  if space.host_names.include?( name )
-                    raise "Host #{name} already exists!"
-                  end
+                  raise "Host #{name} already exists!" if space.get_host( name )
                   name
                 else
                   find_name( name )
                 end
         props = aws_create_instance( hname, profile )
         host = space.host( props )
-        append_host_definitions( [ host ], nil, output_file )
-        host[ :just_created ] = true #after so this isn't written
+        append_host_definitions( [ host ], nil, sync_file )
+        host[ :just_created ] = true
+        # Need to use a host prop for this since context(s) do not
+        # exist yet. Note it is set after append_host_definitions, to
+        # avoid permanently writing this property to the sync_file.
+      end
+    end
+
+    # Create a temporary host using the specified profile, yield to
+    # block for provisioning, then create a machine image and
+    # terminate the host. If block returns false, then the image will
+    # not be created nor will the host be terminated.
+    # On success, returns image_id (ami-*) and name.
+    def create_image_from_profile( profile_key, sync_file )
+      require_configured!
+      profile = get_profile( profile_key ).dup
+      tag = profile[ :tag ]
+      profile[ :tag ] = tag = tag.call if tag.is_a?( Proc )
+
+      opts = {}
+      opts[ :name ] = profile_key.to_s
+      opts[ :name ] += ( '-' + tag ) if tag
+      opts[ :description ] = profile[ :description ]
+
+      if image_name_exist?( profile[ :region ], opts[ :name ] )
+        raise "Image name #{opts[:name]} (profile-tag) already exists."
       end
+
+      hname = nil
+      loop do
+        hname = SecureRandom::hex(4)
+        break unless space.get_host( hname )
+      end
+      create_hosts( 1, profile, hname, sync_file )
+      host = space.host( hname, imaging: true )
+
+      success = yield( host )
+
+      if success
+        image_id = create_image( host, opts )
+        terminate_hosts( [ hname ], false, sync_file, false )
+        [ image_id, opts[ :name ] ]
+      end
+
     end
 
-    def terminate_hosts( names, delete_attached_storage, sync_file )
+    def terminate_hosts( names, delete_attached_storage, sync_file, do_wait = true )
+      require_configured!
       names.each do |name|
-        if space.host_names.include?( name )
-          host = space.host( name )
-          raise "Host #{name} missing :id" unless host[:id]
-          raise "Host #{name} missing :region" unless host[:region]
-          aws_terminate_instance( host, delete_attached_storage )
-          delete_host_definition( host, sync_file )
-        else
-          raise "Host #{name} not found in Space, sync file."
-        end
+        host = space.get_host( name )
+        raise "Host #{name} not found in Space, sync file." unless host
+        raise "Host #{name} missing :id" unless host[:id]
+        raise "Host #{name} missing :region" unless host[:region]
+        aws_terminate_instance( host, delete_attached_storage, do_wait )
+        delete_host_definition( host, sync_file )
       end
     end
 
@@ -153,20 +205,26 @@ module SyncWrap
 
     attr_reader :space
 
+    def require_configured!
+      unless @aws_config
+        raise( ":aws_config file not found, " +
+               "operation not supported without AWS credentials" )
+      end
+    end
+
     def find_name( prefix )
-      host_names = space.host_names
       i = 1
       name = nil
       loop do
         name = "%s-%2d" % [ prefix, i ]
-        break if ! host_names.include?( name )
+        break if !space.get_host( name )
         i += 1
       end
       name
     end
 
-    def append_host_definitions( hosts, comment, output_file )
-      File.open( output_file, "a" ) do |out|
+    def append_host_definitions( hosts, comment, sync_file )
+      File.open( sync_file, "a" ) do |out|
         out.puts comment if comment
 
         hosts.each do |host|

data/lib/syncwrap/amazon_ws.rb

@@ -103,7 +103,9 @@ module SyncWrap
       iopts = opts.dup
       iopts.delete( :ebs_volumes )
       iopts.delete( :ebs_volume_options )
-      iopts.delete( :roles )
+      iopts.delete( :roles ) #-> tags
+      iopts.delete( :description ) #-> tags
+      iopts.delete( :tag ) #-> tags
 
       if iopts[ :count ] && iopts[ :count ] != 1
         raise ":count #{iopts[ :count ]} != 1 is not supported"
@@ -125,6 +127,16 @@ module SyncWrap
         inst.add_tag( 'Roles', value: opts[ :roles ].join(' ') )
       end
 
+      if opts[ :description ]
+        inst.add_tag( 'Description', value: opts[ :description ] )
+      end
+
+      tag = opts[ :tag ]
+      if tag
+        tag = tag.call if tag.is_a?( Proc )
+        inst.add_tag( 'Tag', value: tag )
+      end
+
       wait_for_running( inst )
 
       # FIXME: Split method
@@ -150,6 +162,50 @@ module SyncWrap
       instance_to_props( region, inst )
     end
 
+    # Return true if the authenticated AWS user in the sepecified
+    # region already owns an image of the specified name
+    def image_name_exist?( region, name )
+      ec2 = AWS::EC2.new.regions[ region ]
+      images = ec2.images.with_owner( :self )
+      images.any? { |img| img.name == name }
+    end
+
+    # Create an image for the specified host which will be stopped
+    # before imaging and not restarted
+    #
+    # === Options
+    #
+    # :name:: Required, image compatable (i.e. no spaces, identifier) name
+    #
+    # :description:: Image description
+    #
+    def create_image( host, opts = {} )
+      opts = opts.dup
+      name = opts.delete( :name ) or raise "Missing required name for image"
+      region = host[ :region ]
+      ec2 = AWS::EC2.new.regions[ region ]
+      inst = ec2.instances[ host[ :id ] ]
+      raise "Host ID #{host[:id]} does not exist?" unless inst.exists?
+
+      inst.stop
+      stat = wait_until( "instance #{inst.id} to stop", 2.0 ) do
+        s = inst.status
+        s if s == :stopped || s == :terminated
+      end
+      raise "Instance #{inst.id} has status #{stat}" unless stat == :stopped
+
+      image = inst.create_image( name, { no_reboot: true }.merge( opts ) )
+      stat = wait_until( "image #{image.id} to be available", 2.0 ) do
+        s = image.state
+        s if s != :pending
+      end
+      unless stat == :available
+        raise "Image #{image.id} failed: #{image.state_reason}"
+      end
+
+      image.image_id
+    end
+
     # Create a Route53 DNS CNAME from iprops :name to :internet_name.
     # Options are per {AWS::Route53::ResourceRecordSetCollection.create}[http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/Route53/ResourceRecordSetCollection.html#create-instance_method]
     # (currently undocumented) with the following additions:
@@ -197,7 +253,7 @@ module SyncWrap
     # :region and :id.
     #
     # _WARNING_: data _will_ be lost!
-    def aws_terminate_instance( iprops, delete_attached_storage = false )
+    def aws_terminate_instance( iprops, delete_attached_storage = false, do_wait = true )
       ec2 = AWS::EC2.new.regions[ iprops[ :region ] ]
       inst = ec2.instances[ iprops[ :id ] ]
       unless inst.exists?
@@ -215,7 +271,9 @@ module SyncWrap
       end
 
       inst.terminate
-      wait_until( "termination of #{inst.id}", 2.0 ) { inst.status == :terminated }
+      if do_wait || !ebs_volumes.empty?
+        wait_until( "termination of #{inst.id}", 2.0 ) { inst.status == :terminated }
+      end
 
       ebs_volumes = ebs_volumes.map do |vid|
         volume = ec2.volumes[ vid ]
@@ -264,6 +322,7 @@ module SyncWrap
 
       { id:      inst.id,
         region:  region,
+        availability_zone: inst.availability_zone,
         ami:     inst.image_id,
         name:    tags[ 'Name' ],
         internet_name:  inst.dns_name,

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/cli.rb

@@ -33,9 +33,11 @@ module SyncWrap
       @roles = []
       @host_patterns = []
       @create_plan = []
+      @image_plan = []
       @import_regions = []
       @terminate_hosts = []
       @delete_attached_storage = false
+      @ssh_session = nil
       @space = Space.new
     end
 
@@ -43,43 +45,49 @@ module SyncWrap
 
     def parse_cmd( args )
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: syncwrap {options} [Component[.method]] ..."
+        opts.banner = <<-TEXT
+Usage: syncwrap {options} [Component[.method]] ..."
+General options:
+TEXT
+        opts.summary_width = 30
+        opts.summary_indent = "  "
 
         opts.on( "-f", "--file FILE",
-                 "Load FILE for role/host/component definitions",
-                 "(default: './sync.rb')" ) do |f|
+                 "Load FILE for role/host/component/profile",
+                 "definitions. (default: './sync.rb')" ) do |f|
           @sw_file = f
         end
 
         opts.on( "-h", "--hosts PATTERN",
-                 "Constrain hosts by pattern (may use multiple)" ) do |p|
+                 "Constrain hosts by name PATTERN",
+                 "(may use multiple)" ) do |p|
           @host_patterns << Regexp.new( p )
         end
 
         opts.on( "-r", "--hosts-with-role ROLE",
-                 "Constrain hosts by role (may use multiple)" ) do |r|
+                 "Constrain hosts by ROLE (may use multiple)" ) do |r|
           @roles << r.sub(/^:/,'').to_sym
         end
 
-        opts.on( "-n", "--dryrun",
-                 "Run in \"dry run\", or no changes/test mode",
-                 "(typically combined with -v)" ) do
-          @options[ :dryrun ] = true
-        end
-
         opts.on( "-t", "--threads N",
-                 "Specify the number of hosts to process concurrently",
+                 "The number of hosts to process concurrently",
                  "(default: all hosts)",
                   Integer ) do |n|
           @options[ :threads ] = n
         end
 
+        opts.on( "-n", "--dryrun",
+                 "Run in \"dry run\", or no changes/test mode",
+                 "(typically combined with -v)" ) do
+          @options[ :dryrun ] = true
+        end
+
         opts.on( "-e", "--each-component",
-                 "Flush shell commands after each component/method" ) do
+                 "Flush shell commands after each component" ) do
           @options[ :flush_component ] = true
         end
 
-        opts.on( "-s", "--no-coalesce",
+        opts.on( "--no-coalesce",
                  "Do not coalesce streams (as is the default)" ) do
           @options[ :coalesce ] = false
         end
@@ -90,12 +98,17 @@ module SyncWrap
         end
 
         opts.on( "-v", "--verbose",
-                 "Show details of local/remote command execution" ) do
+                 "Show details of rput and remote commands" ) do
           @options[ :verbose ] = true
         end
 
+        opts.on( "-c", "--verbose-changes",
+                 "Be verbose only about actual rput changes" ) do
+          @options[ :verbose_changes ] = true
+        end
+
         opts.on( "-x", "--expand-shell",
-                 "Use -x (expand) instead of -v shell verbose output",
+                 "Use -x (expand) instead of -v shell output",
                  "(sh_verbose: :x, typically combined with -v)" ) do
           @options[ :sh_verbose ] = :x
         end
@@ -127,12 +140,21 @@ module SyncWrap
           @list_hosts = true
         end
 
+        opts.on( "-S", "--ssh-session HOST",
+                 "Only exec an ssh login session on HOST name",
+                 "(ssh args can be passed after an '--')" ) do |h|
+          @ssh_session = h
+        end
+
+        opts.separator( "Provider specific operations and options:" )
+
         opts.on( "-C", "--create-host P",
-                 "Create hosts where P has format: [N*]profile[:name]",
+                 "Create hosts. P has form: [N*]profile[:name]",
                  "  N: number to create (default: 1)",
-                 "  profile: the profile name as setup in the sync file",
-                 "  name: Host name, or prefix in the case on N>1",
-                 "Hosts are appended to the sync file and space" ) do |h|
+                 "  profile: profile name as in sync file",
+                 "  name: Host name, or prefix when N>1",
+                 "Appends hosts to the sync file and space for",
+                 "immediate provisioning." ) do |h|
           first,rest = h.split('*')
           if rest
             count = first.to_i
@@ -145,28 +167,44 @@ module SyncWrap
           @create_plan << [ count, profile, name ]
         end
 
-        opts.on( "-I", "--import-hosts REGIONS",
+        opts.on( "--create-image PROFILE",
+                 "Create a machine image using a temp. host",
+                 "of PROFILE, provisioning only that host,",
+                 "imaging, and terminating." ) do |profile|
+          @image_plan << profile.to_sym
+        end
+
+        opts.on( "--import-hosts REGIONS",
                  "Import hosts form provider 'region' names, ",
                  "append to sync file and exit." ) do |rs|
           @import_regions = rs.split( /[\s,]+/ )
         end
 
         opts.on( "--terminate-host NAME",
-                 "Terminate the specified instance and data via provider",
-                 "WARNING: potential for data loss!" ) do |name|
+                 "Terminate the specified instance and remove ",
+                 "from sync file. WARNING: potential data loss" ) do |name|
           @terminate_hosts << name
         end
 
         opts.on( "--delete-attached-storage",
-                 "When terminating hosts, also delete any attached storage",
-                 "volumes which wouldn't otherwise be deleted.",
-                 "WARNING: Data WILL be lost!" ) do
+                 "When terminating, also delete attached",
+                 "volumes which would not otherwise be",
+                 "deleted. WARNING: Data WILL be lost!" ) do
           @delete_attached_storage = true
         end
 
+        opts.separator <<-TEXT
+
+By default, runs #install on all Components of all hosts, including
+any just created.  This can be limited by specifying --host
+PATTERN(s), --hosts-with-role ROLE(s), specific Component[.method](s)
+or options above which exit early or have constraints noted.
+TEXT
+
       end
 
       @component_plan = opts.parse!( args )
+      # Usually; but treat these as ssh args if --ssh-session
 
     rescue OptionParser::ParseError => e
       $stderr.puts e.message
@@ -194,10 +232,33 @@ module SyncWrap
         exit 0
       end
 
+      if !@image_plan.empty?
+        success = nil
+        p = space.provider
+        @image_plan.each do |profile_key|
+          ami,name = p.create_image_from_profile(profile_key, @sw_file) do |host|
+            space.execute( [ host ], [], @options )
+          end
+          exit( 1 ) unless ami
+          puts "Image #{ami} (#{name}) created for profile #{profile_key}"
+        end
+        exit 0
+      end
+
       @create_plan.each do |count, profile, name|
         space.provider.create_hosts( count, profile, name, @sw_file )
       end
 
+      if @ssh_session
+        host = space.get_host( @ssh_session )
+        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 =~ /^[^\-]/
+        @component_plan = []
+        Kernel.exec( 'ssh', *extra_args, host )
+      end
+
       resolve_hosts
       lookup_component_plan
       resolve_components

data/lib/syncwrap/component.rb

@@ -58,6 +58,14 @@ module SyncWrap
       ctx.host
     end
 
+    # A Hash-like interface of Symbol keys to arbitrary values, backed
+    # read-only by the host properties. Use this for stashing any
+    # execution time state on a per context/host basis; as doing so on
+    # the cross-context Component instances themselves is inadvisable.
+    def state
+      ctx.state
+    end
+
     # Enqueue a bash shell command or script fragment to be run on the
     # host of the current Context. Newlines in command are interpreted
     # as per bash. For example, it is common to use a here-document
@@ -374,6 +382,9 @@ module SyncWrap
     #
     # :verbose::   Output stdout/stderr from rsync (default: false)
     #
+    # :verbose_changes:: Promote to verbose output if there are any
+    #                    changes (default: false).
+    #
     # :erb_process:: If false, treat '.erb' suffixed files as normal
     #                files (default: true)
     #

data/lib/syncwrap/components/cruby_vm.rb

@@ -44,7 +44,7 @@ module SyncWrap
 
     # The ruby version to install, like it appears in source packages
     # from ruby-lang.org.
-    # (Default: 2.0.0-p353)
+    # (Default: 2.0.0-p451)
     attr_accessor :ruby_version
 
     # If true, attempt to uninstall any pre-existing distro packaged
@@ -53,7 +53,7 @@ module SyncWrap
     attr_accessor :do_uninstall_distro_ruby
 
     def initialize( opts = {} )
-      @ruby_version = "2.0.0-p353"
+      @ruby_version = "2.0.0-p451"
       @do_uninstall_distro_ruby = true
 
       super

data/lib/syncwrap/components/hashdot.rb

@@ -42,15 +42,20 @@ module SyncWrap
     # Install hashdot if the binary version doesn't match, otherwise
     # just update the profile config files.
     def install
-      if !test_hashdot_binary || dryrun?
+      if !test_hashdot_binary
         install_system_deps
         install_hashdot
+        changes = [ :installed ]
       else
         # Just update config as needed.
-        rput( 'src/hashdot/profiles/',
-              "#{local_root}/lib/hashdot/profiles/",
-              excludes: :dev, user: :root )
+        changes = rput( 'src/hashdot/profiles/',
+                        "#{local_root}/lib/hashdot/profiles/",
+                        excludes: :dev, user: :root )
       end
+      unless changes.empty?
+        state[ :hashdot_updated ] = changes
+      end
+      changes
     end
 
     def install_system_deps

data/lib/syncwrap/components/iyyov.rb

@@ -41,13 +41,24 @@ module SyncWrap
     def install
       # Shorten if the desired iyyov version is already running
       pid, ver = capture_running_version( 'iyyov' )
-      unless ver == iyyov_version
+      if ver != iyyov_version
         install_run_dir    #as root
         install_iyyov_gem  #as root
         install_iyyov_init #as root
-        iyyov_restart      #as root
+        iyyov_restart unless state[ :imaging ] #as root
+        true
+      elsif state[ :hashdot_updated ] && !state[ :imaging ]
+        iyyov_restart
         true
       end
+
+      # FIXME: There is a potential race condition brewing here. If
+      # Iyyov is restarted, then job changes (i.e. jobs.d files) are
+      # immediately made before Iyyov is done reloading, then those
+      # changes may not be detected. Thus job upgrades may not occur.
+      # This might be best fixed in Iyyov itself.
+
+      iyyov_stop if state[ :imaging ]
       false
     end
 
@@ -84,12 +95,18 @@ module SyncWrap
     # including any forced mtime update.
     def iyyov_install_jobs( force = false )
 
-      changes = rput( 'var/iyyov/jobs.rb', iyyov_run_dir, user: run_user )
+      changes = []
+
+      if force || !state[ :iyyov_root_jobs_installed ]
+        changes += rput( 'var/iyyov/jobs.rb', iyyov_run_dir, user: run_user )
+        state[ :iyyov_root_jobs_installed ] = true
+      end
 
       if force && changes.empty?
         rudo "touch #{iyyov_run_dir}/jobs.rb"
         changes << [ '.f..T......', "#{iyyov_run_dir}/jobs.rb" ]
       end
+
       changes
     end
 

data/lib/syncwrap/components/iyyov_daemon.rb

@@ -80,9 +80,29 @@ module SyncWrap
                          "#{iyyov_run_dir}/jobs.d/#{name_instance}.rb",
                          user: run_user )
         changes += iyyov_install_jobs
-      elsif !changes.empty?
-        rudo( "kill #{pid} || true" ) # ..and let Iyyov restart it
       end
+
+      # If we found a daemon pid then kill if either:
+      #
+      # (1) the version is the same (i.e no other signal via updates
+      #     above for Iyyov) but there was a config change or hashdot
+      #     was updated (i.e. new jruby version). In this case Iyyov
+      #     should be up to restart the daemon.
+      #
+      # (2) We are :imaging, in which case we want a graceful
+      #     shutdown. In this case Iyyov should have already been kill
+      #     signalled itself and will not restart the daemon.
+      #
+      # In all cases there is the potential that the process has
+      # already stopped (i.e. crashed, etc) between above pid capture
+      # and the kill.  Ignore kill failures.
+      if pid &&
+          ( ( ver == version && ( !changes.empty? ||
+                                  state[ :hashdot_updated ] ) ) ||
+            state[ :imaging ] )
+        rudo( "kill #{pid} || true" )
+      end
+
       changes
     end
 

data/lib/syncwrap/components/ubuntu.rb

@@ -16,7 +16,6 @@
 
 require 'syncwrap/component'
 require 'syncwrap/distro'
-require 'thread'
 
 module SyncWrap
 
@@ -26,9 +25,6 @@ module SyncWrap
     include SyncWrap::Distro
 
     def initialize( opts = {} )
-      @apt_update_state_lock = Mutex.new
-      @apt_update_state = {}
-
       super
 
       packages_map.merge!( 'apr'       => 'libapr1',
@@ -70,13 +66,12 @@ module SyncWrap
     protected
 
     def first_apt?
-      @apt_update_state_lock.synchronize do
-        if @apt_update_state[ host ]
-          false
-        else
-          @apt_update_state[ host ] = true
-          true
-        end
+      s = state
+      if s[ :ubuntu_apt_updated ]
+        false
+      else
+        s[ :ubuntu_apt_updated ] = true
+        true
       end
     end
 

data/lib/syncwrap/components/users.rb

@@ -74,9 +74,9 @@ module SyncWrap
         @ssh_user_pem =
           relativize( path_relative_to_caller( @ssh_user_pem, caller ) )
         unless File.exist?( @ssh_user_pem )
-          warn( "WARNING: Users pem #{@ssh_user_pem} not found. " +
-                "Will not use #{@ssh_user}.\n" +
-                "Components may fail without sudo access" )
+          warn( "WARNING: #{@ssh_user_pem} not found, " +
+                "Users will not use #{@ssh_user}.\n" +
+                "         Expect failures if user #{ENV['USER']} isn't already a sudoer." )
           @ssh_user = nil
           @ssh_user_pem = nil
         end
@@ -84,7 +84,7 @@ module SyncWrap
     end
 
     def install
-      ensure_ssh_access if host[ :just_created ] && ssh_access_timeout > 0
+      ensure_ssh_access if state[ :just_created ] && ssh_access_timeout > 0
 
       rdir = find_source( local_home_root )
       users = home_users

data/lib/syncwrap/context.rb

@@ -45,10 +45,15 @@ module SyncWrap
     # The current Host of this context
     attr_reader :host
 
+    # A Hash-like interface of keys/values backed read-only by the
+    # host properties.
+    attr_reader :state
+
     # Construct given host and default_options to use for all #sh and
     # #rput calls.
     def initialize( host, opts = {} )
       @host = host
+      @state = StateHash.new( host )
       reset_queue
       @queue_locked = false
       @default_options = opts
@@ -240,7 +245,9 @@ module SyncWrap
         fmt.lock.unlock if stream_output
       end
 
-      if !stream_output && ( failed || opts[ :verbose ] )
+      if !stream_output &&
+          ( failed || opts[ :verbose ] ||
+            ( opts[ :verbose_changes ] && !outputs.empty? && mode == :rsync ) )
         fmt.sync do
           fmt.write_header( host, mode, opts )
           if mode == :rsync
@@ -257,4 +264,21 @@ module SyncWrap
 
   end
 
+  # The Context#state Hash-like implementation, backed read-only by
+  # the associated host properties.
+  class StateHash
+    def initialize( host )
+      @host = host
+      @props = {}
+    end
+
+    def []( key )
+      @props[ key ] || @host[ key ]
+    end
+
+    def []=( key, val )
+      @props[ key.to_sym ] = val
+    end
+  end
+
 end

data/lib/syncwrap/git_help.rb

@@ -0,0 +1,58 @@
+#--
+# Copyright (c) 2011-2014 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
+# obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.  See the License for the specific language governing
+# permissions and limitations under the License.
+#++
+
+require 'syncwrap/path_util'
+
+module SyncWrap
+
+  # Utility methods for sync file/sources kept in a git repository.
+  module GitHelp
+    extend PathUtil
+
+    # Raises RuntimeError if the git tree at path (default to caller's
+    # path) is not clean
+    def self.require_clean!( path = nil )
+      path ||= caller_path( caller )
+      delta = `cd #{path} && git status --porcelain -- . 2>&1`
+      if delta.split( /^/ ).length > 0
+        warn( "Commit or move these first:\n" + delta )
+        raise "Git repo at #{path} not clean"
+      end
+    end
+
+    # Return the abbreviated SHA-1 hash for the last git commit at
+    # path
+    def self.hash( path = nil )
+      path ||= caller_path( caller )
+      `cd #{path} && git log -n 1 --format='format:%h'`
+    end
+
+    # Return a lambda that will #require_clean! for callers path
+    # before providing #hash. Use this for cases where you only want
+    # to use a git hash when it is an accurate reflection of the local
+    # file state. Since the test is deferred, it will only be required
+    # for actions (i.e. image creation, etc.) that actually use it.
+    def self.clean_hash
+      cpath = caller_path( caller )
+      lambda do
+        require_clean!( cpath )
+        hash( cpath )
+      end
+    end
+
+  end
+
+end

data/lib/syncwrap/host.rb

@@ -32,8 +32,8 @@ module SyncWrap
     def initialize( space, props = {} )
       @space = space
       @props = {}
-      merge_props( props )
       @contents = [ :all ]
+      merge_props( props )
     end
 
     # Return the :name property.

data/lib/syncwrap.rb

@@ -81,7 +81,7 @@ module SyncWrap
 
     # Load the specified file path as per a sync.rb, into this
     # Space. If relative, path is assumed to be relative to the caller
-    # (i.e. Rakefile, etc.) as with the conventional 'sync' directory.
+    # (i.e. Rakefile, etc.) as with the conventional 'sync.rb'.
     def load_sync_file_relative( fpath = './sync.rb' )
       load_sync_file( path_relative_to_caller( fpath, caller ) )
     end
@@ -174,15 +174,16 @@ module SyncWrap
       host
     end
 
+    # Return host by name, or nil if not defined.
+    def get_host( name )
+      @hosts[ name ]
+    end
+
     # All Host instances, in order added.
     def hosts
       @hosts.values
     end
 
-    def host_names
-      @hosts.keys
-    end
-
     # Return an ordered, unique set of component classes, direct or via
     # roles, currently contained by the specified hosts or all hosts.
     def component_classes( hs = hosts )
@@ -379,5 +380,6 @@ module SyncWrap
 
   # Additional autoloads (optional support)
   autoload :AmazonEC2,     'syncwrap/amazon_ec2'
+  autoload :GitHelp,       'syncwrap/git_help'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -187,6 +187,7 @@ files:
 - lib/syncwrap/context.rb
 - lib/syncwrap/distro.rb
 - lib/syncwrap/formatter.rb
+- lib/syncwrap/git_help.rb
 - lib/syncwrap/host.rb
 - lib/syncwrap/main.rb
 - lib/syncwrap/path_util.rb