syncwrap 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d848cc57d0687947e9b350e86f3b581088572c42
-  data.tar.gz: fbbf0ae54fe44d9e14162f7e2ebef65c070fd065
+  metadata.gz: 5896d57fe2fbc03aa1b81254619ed604b37ae513
+  data.tar.gz: 8764f0567918f0872297bda1802f179ece696b56
 SHA512:
-  metadata.gz: d5647f57c02531435bced8dcb1373976fadaa162859bb7cf1c3e2bcc683dcb9b672b0ce6a6d4380712b93e68bf2be07257bd5fe5ac519e4beccec9de6593325a
-  data.tar.gz: 2914e8ec77e1c763c6c164a1b7df19bfc27a7c8ac536b1c207f4703dda71e40013bf3f5265e35fc25939920cfc98c4b6209654343cb01b807f68ac0677a09184
+  metadata.gz: a60f4f82c141f4aa2fe773b9a3e484123c8d02333130bf1a59c56df2dd6fe203adf03ff01926f3cdb4f9e4968ebe871ebb671ca914805117ae85a2ad888c33b4
+  data.tar.gz: c3fbff10f3100aa06ab58e0dc286bd29957256e9220f14d036432aaded32f85e681d2a7e078ad07037c30304b8483cf86672b3175536db40b2b6e35293ca8a86

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 2.7.1 (2016-3-2)
+* Fix handling of the -R/--components-in-role flag to correctly limit
+  to hosts including the role, for both execution and listing
+  (-l). Previously errors would occur in execution if a
+  matching (-h) host pattern restriction was not also provided.
+* Fix interpretation of check_install and (deprecated) succeed options
+  when used in calls to dist_install (all distros).
+* Avoid check_install on RHEL when local rpm files or URLs are passed
+  as a package to install. Previously the check_install conditional
+  would always yield true (install needed) for these.
+
 === 2.7.0 (2016-1-21)
 * Add SyncWrap::ZoneBalancer utility for balancing new hosts across
   multiple (AWS) availability zones for fault tolerance.

data/lib/syncwrap/base.rb

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

data/lib/syncwrap/cli.rb

@@ -304,6 +304,7 @@ TEXT
     def list_roles( hosts, multi )
       puts "Included Roles:" if multi
       roles = hosts.map( &:roles ).inject([],:|)
+      roles &= @comp_roles if !@comp_roles.empty?
       table = roles.map do |role|
         row = [ ':' + role.to_s ]
         classes = space.role( role ).map( &:class )
@@ -404,6 +405,12 @@ TEXT
           host.roles.any? { |r| @roles.include?( r ) }
         end
       end
+
+      unless @comp_roles.empty?
+        @hosts.select! do |host|
+          host.roles.any? { |r| @comp_roles.include?( r ) }
+        end
+      end
     end
 
   end

data/lib/syncwrap/components/arch.rb

@@ -42,7 +42,8 @@ module SyncWrap
       opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
       opts.delete( :minimal )
       pkgs.flatten!
-      chk = opts.delete( :check_install ) || opts.delete( :succeed )
+      chk = opts.delete( :check_install )
+      chk = opts.delete( :succeed ) if chk.nil?
       chk = check_install? if chk.nil?
       dist_if_not_installed?( pkgs, chk, opts ) do
         sudo( "pacman -S --noconfirm #{pkgs.join ' '}", opts )

data/lib/syncwrap/components/debian.rb

@@ -66,7 +66,8 @@ module SyncWrap
       args.flatten!
       flags = []
       flags << '--no-install-recommends' if opts.delete( :minimal )
-      chk = opts.delete( :check_install ) || opts.delete( :succeed )
+      chk = opts.delete( :check_install )
+      chk = opts.delete( :succeed ) if chk.nil?
       chk = check_install? if chk.nil?
       dist_if_not_installed?( args, chk, opts ) do
         sudo( "apt-get -yqq update", opts ) if first_apt?

data/lib/syncwrap/components/rhel.rb

@@ -56,7 +56,8 @@ module SyncWrap
       opts = pkgs.last.is_a?( Hash ) && pkgs.pop.dup || {}
       opts.delete( :minimal )
       pkgs.flatten!
-      chk = opts.delete( :check_install ) || opts.delete( :succeed )
+      chk = opts.delete( :check_install )
+      chk = opts.delete( :succeed ) if chk.nil?
       chk = check_install? if chk.nil?
       dist_if_not_installed?( pkgs, chk, opts ) do
         sudo( "yum install -q -y #{pkgs.join( ' ' )}", opts )
@@ -90,7 +91,7 @@ module SyncWrap
     # testing if any specified pkgs are not installed. Otherwise just
     # yield to block.
     def dist_if_not_installed?( pkgs, chk, opts, &block )
-      if chk
+      if chk && pkgs.all? { |p| p !~ /\.rpm$/ && p !~ /^http(s)?:/ }
         qry = "yum list -C -q installed #{pkgs.join ' '}"
         cnt = qry + " | tail -n +2 | wc -l"
         cond = %Q{if [ "$(#{cnt})" != "#{pkgs.count}" ]; then}

data/lib/syncwrap/host.rb

@@ -104,12 +104,10 @@ module SyncWrap
       end
     end
 
-    # Returns components under the specified role
-    def components_in_roles( roles )
-      roles.inject([]) do |m,r|
-        m += space.role( r ) if roles.include?( r )
-        m
-      end
+    # Returns components instances under the specified roles for this
+    # host
+    def components_in_roles( qroles )
+      ( qroles & roles ).inject([]) { |m,r| m += space.role( r ) }
     end
 
     # Return the last component added to this Host prior to the given

data/test/test_space.rb

@@ -100,13 +100,16 @@ class TestSpace < MiniTest::Unit::TestCase
   def test_host_direct_components
     c1 = CompOne.new
     c2 = CompTwo.new
+    c3 = CompThree.new
     sp.role( :test, c2 )
+    sp.role( :alt,  c3 )
     assert_equal( [ c2 ], sp.role( :test ) )
 
     c2b = CompTwo.new
     host = sp.host( 'localhost', c1, :test, c2b )
     assert_equal( [ c1, c2, c2b ], host.components )
     assert_equal( [ c2 ], host.components_in_roles( [ :test ] ) )
+    assert_equal( [], host.components_in_roles( [ :alt ] ) )
     assert_equal( c1, host.component( CompOne ) )
     assert_equal( c2b, host.component( CompTwo ) ) #last instance
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - David Kellum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor