syncwrap 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521c163fcf6e3d89223fbc6dc5791b4f9010978d
-  data.tar.gz: 9842766eb24481a03bad1c8b21dfcc2ed7cedd77
+  metadata.gz: 081970fc00b932bd2296f5a2678b029a2ce0d89d
+  data.tar.gz: 74a6e24b78b9983bc8b54c2486d997a62b08efd4
 SHA512:
-  metadata.gz: 97ef2d6fadd8dd574f121392e6d93f12af4f30eec886e9c9cc327ef3c63ba5b229cf60d35e8ab6c31aa8ca8138c10de9701fd15782192b453d96db35fd1c7118
-  data.tar.gz: 831d26efc475c9ce0ceaa79f13342d4bf324bdde23cd2f57a465e8a358bbf0afef9b4f0a087967b13d46910622b46feaa1cdd7aa70038681e5c57e7b9582833e
+  metadata.gz: 1831e1c8dfeae16ee2b24d56bfb6388bbd468cbb381e974d05adf6b7c198495f8b2c6d30a9d75f58ab19c4da1f715fe3e84500b5ed098a55fe8c0c477a5f3252
+  data.tar.gz: 459cbbf8efd87fef6fa95692caa6ab72886b4d72f70c6e65d72af351452dae89de978c1e04fd267bf211de1080764a40b84a36f9ce6cc276c605fbe143ca4f1c

data/History.rdoc

@@ -1,5 +1,15 @@
+=== 2.5.1 (2015-10-19)
+* Add SyncWrap::RHEL#dist_uninstall :succeed flag for removing
+  packages which may not exist
+* Fix for CRubyVM on minimal CentOS 7.1: Use above :succeed flag on
+  distro ruby uninstall, add ruby 2.2
+* Fix --delete-attached-storage on AWS HVM by broadening pattern of
+  device names
+* Fix a timing issue observed with SyncWrap::AmazonEC2 instance
+  creation
+
 === 2.5.0 (2015-3-20)
-* Merge 9.4 release postgresql.conf additions (comments only).
+* Merge 9.4 release postgresql.conf additions (comments only)
 * Add :manifest option to rput and SourceTree (with ./Manifest.txt default)
 * Upgrade SyncWrap::JRubyVM default version to 1.7.19
 

data/lib/syncwrap/amazon_ws.rb

@@ -126,6 +126,10 @@ module SyncWrap
 
       inst = ec2.instances.create( iopts )
 
+      wait_until( "instance #{inst.id} to register" ) do
+        inst.status != :pending
+      end
+
       inst.add_tag( 'Name', value: name )
 
       if opts[ :roles ]
@@ -257,10 +261,10 @@ module SyncWrap
     end
 
     # Terminate an instance and wait for it to be terminated. If
-    # requested, /dev/sdh# attached EBS volumes which are not
-    # otherwise marked for :delete_on_termination will _also_ be
-    # terminated.  The minimum required properties in iprops are
-    # :region and :id.
+    # requested, /dev/sdh# (PV style) or /dev/sd[f-p] attached EBS
+    # volumes which are not otherwise marked for
+    # :delete_on_termination will _also_ be terminated.  The minimum
+    # required properties in iprops are :region and :id.
     #
     # _WARNING_: data _will_ be lost!
     def aws_terminate_instance( iprops, delete_attached_storage = false, do_wait = true )
@@ -274,7 +278,10 @@ module SyncWrap
       if delete_attached_storage
         ebs_volumes = inst.block_devices.map do |dev|
           ebs = dev[ :ebs ]
-          if ebs && dev[:device_name] =~ /dh\d+$/ && !ebs[:delete_on_termination]
+
+          if ebs && !ebs[:delete_on_termination] &&
+             ( dev[:device_name] =~ /dh\d+$/ ||
+               dev[:device_name] =~ /sd[f-p]$/ )
             ebs[ :volume_id ]
           end
         end.compact

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/components/arch.rb

@@ -29,6 +29,7 @@ module SyncWrap
     end
 
     def dist_uninstall( *pkgs )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
       sudo "pacman -R --noconfirm #{pkgs.join ' '}"
     end
 

data/lib/syncwrap/components/cruby_vm.rb

@@ -93,9 +93,11 @@ module SyncWrap
 
     def uninstall_distro_ruby
       if distro.is_a?( RHEL )
-        dist_uninstall( %w[ ruby ruby18 ruby19 ruby20 ruby21 ] )
+        dist_uninstall( %w[ ruby ruby18 ruby19 ruby20 ruby21 ruby22 ],
+                        succeed: true )
       else
-        dist_uninstall( %w[ ruby ruby1.8 ruby1.9 ruby1.9.1 ruby1.9.3 ruby2.0 ruby2.1 ] )
+        dist_uninstall( %w[ ruby ruby1.8 ruby1.9 ruby1.9.1
+                            ruby1.9.3 ruby2.0 ruby2.1 ruby2.2 ] )
       end
     end
 

data/lib/syncwrap/components/debian.rb

@@ -51,8 +51,10 @@ module SyncWrap
       sudo( "apt-get -yq install #{args.join ' '}" )
     end
 
-    # Uninstall the specified package names.
+    # Uninstall the specified package names. A trailing hash is
+    # interpreted as options.
     def dist_uninstall( *pkgs )
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
       sudo "aptitude -yq purge #{pkgs.join ' '}"
     end
 

data/lib/syncwrap/components/rhel.rb

@@ -51,9 +51,24 @@ module SyncWrap
       end
     end
 
-    # Uninstall the specified package names.
+    # Uninstall the specified package names. A trailing hash is
+    # interpreted as options, see below.
+    #
+    # ==== Options
+    # :succeed:: Succeed even if no such packages are installed
+    #
+    # Other options will be ignored.
     def dist_uninstall( *pkgs )
-      sudo "yum remove -q -y #{pkgs.join( ' ' )}"
+      opts = pkgs.last.is_a?( Hash ) && pkgs.pop || {}
+      if opts[ :succeed ]
+        sudo <<-SH
+          if yum list -q installed #{pkgs.join( ' ' )} >/dev/null 2>&1; then
+            yum remove -q -y #{pkgs.join( ' ' )}
+          fi
+        SH
+      else
+        sudo "yum remove -q -y #{pkgs.join( ' ' )}"
+      end
     end
 
     # Install a System V style init.d service script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A rather direct provisioning and deployment system in ruby, bash over ssh,