rouster 0.63 → 0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6f24bd67f15a77eb224c1d7113697ddf655644
-  data.tar.gz: e12f55be25bb6e83b69df057f6f9b5aca70d364e
+  metadata.gz: 008791a032a42eb032e726fc8f87a7ff0b8a6fcd
+  data.tar.gz: 034c72fff747de93fb5fd4d3067d95af5dacf9c9
 SHA512:
-  metadata.gz: 1dbdd864b27dae6c8de015f027c4935e1ef328ff8a03b22ad6812f6d7b3ee64c99dfe106da9e427e6c7d53d83b09e82484d382df72c2e7c29c4b8a577cfcb515
-  data.tar.gz: ce7bbaa357a902683f9ac0d3e2bf5eba3f48c60c50aa9dde5e0d5b7145939ec62d7790ff65eabf6c72c737a28c8bf638bb7feac23a76fa5ffd66618cde0e3e2b
+  metadata.gz: 97db5c53999f5a51747cfc5047bbc237b92dbe17b605c23ac749ee5687518e621a4391aa43efbeebe723b9d575780f77ac2fff3aa7d8df7836277d3cb0239ab1
+  data.tar.gz: 878f36117813b34e06d99b3ba9fd44ab5c5a25c14e76b6c9b316eb833148afb544a2fd00ab61052f733ac7d572fd7618f55e556e9a696a9860c6e2bfa138f2a0

data/Gemfile

@@ -6,7 +6,6 @@ gem 'json'
 gem 'log4r', '~> 1.1.9'
 gem 'net-scp'
 gem 'net-ssh'
-gem 'rake', '= 10.4.2'
 
 group :development do
   gem 'test-unit', '~> 3.0.0'

data/Gemfile.lock

@@ -52,7 +52,6 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     power_assert (0.1.4)
-    rake (10.4.2)
     test-unit (3.0.2)
       power_assert
 
@@ -65,8 +64,4 @@ DEPENDENCIES
   log4r (~> 1.1.9)
   net-scp
   net-ssh
-  rake (= 10.4.2)
   test-unit (~> 3.0.0)
-
-BUNDLED WITH
-   1.10.6

data/Rakefile

@@ -24,8 +24,8 @@ end
 
 task :examples do
   Dir['examples/**/*.rb'].each do |example|
-	  sh "ruby #{example}"
-	end
+    sh "ruby #{example}"
+  end
 end
 
 task :vdestroy do

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.63
+  VERSION = 0.64
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -514,18 +514,21 @@ class Rouster
     files = {
       :ubuntu  => '/etc/os-release', # debian too
       :solaris => '/etc/release',
-      :redhat  => '/etc/redhat-release', # centos too
+      :rhel    => ['/etc/os-release', '/etc/redhat-release'], # and centos
       :osx     => '/System/Library/CoreServices/SystemVersion.plist',
     }
 
     res = :invalid
 
-    files.each do |os, file|
-      if self.is_file?(file)
-        @logger.debug(sprintf('determined OS to be[%s] via[%s]', os, file))
-        res = os
-        break
+    files.each_pair do |os, f|
+      [ f ].flatten.each do |candidate|
+        if self.is_file?(candidate)
+          next if candidate.eql?('/etc/os-release') and ! self.is_in_file?(candidate, os.to_s, 'i') # CentOS detection
+          @logger.debug(sprintf('determined OS to be[%s] via[%s]', os, candidate))
+          res = os
+        end
       end
+      break unless res.eql?(:invalid)
     end
 
     @logger.error(sprintf('unable to determine OS, looking for[%s]', files)) if res.eql?(:invalid)
@@ -628,7 +631,7 @@ class Rouster
     case os_type
       when :osx
         self.run('shutdown -r now')
-      when :redhat, :ubuntu, :debian
+      when :rhel, :ubuntu, :debian
         self.run('/sbin/shutdown -rf now')
       when :solaris
         self.run('shutdown -y -i5 -g0')

data/lib/rouster/deltas.rb

@@ -315,7 +315,7 @@ class Rouster
 
       end
 
-    elsif os.eql?(:redhat)
+    elsif os.eql?(:rhel)
       raw = self.run('rpm -qa --qf "%{n}@%{v}@%{arch}\n"')
       raw.split("\n").each do |line|
         next if line.match(/(.*?)\@(.*?)\@(.*)/).nil?
@@ -383,7 +383,7 @@ class Rouster
     res = Hash.new()
     os  = self.os_type()
 
-    if os.eql?(:redhat) or os.eql?(:ubuntu) or os.eql?(:debian)
+    if os.eql?(:rhel) or os.eql?(:ubuntu) or os.eql?(:debian)
 
       raw = self.run('netstat -ln')
 
@@ -472,7 +472,7 @@ class Rouster
         :systemv => 'service --status-all 2>&1',
         :upstart => 'initctl list',
       },
-      :redhat => {
+      :rhel => {
         :systemv => '/sbin/service --status-all',
         :upstart => 'initctl list',
       },
@@ -592,7 +592,7 @@ class Rouster
           end
         end
 
-      elsif os.eql?(:redhat)
+      elsif os.eql?(:rhel)
 
         raw.split("\n").each do |line|
           if provider.eql?(:systemv)

data/lib/rouster/tests.rb

@@ -257,8 +257,9 @@ class Rouster
   # parameters
   # * <file> - path of filename to examine
   # * <regex> - regular expression/string to be passed to grep
+  # * <flags> - flags to include in grep command
   # * [scp] - downloads file to host machine before grepping (functionality not implemented, was planned when a new SSH connection was required for each run() command, not sure it is necessary any longer)
-  def is_in_file?(file, regex, scp=false)
+  def is_in_file?(file, regex, flags='', scp=false)
 
     res = nil
 
@@ -268,7 +269,7 @@ class Rouster
     end
 
     begin
-      command = sprintf("grep -c '%s' %s", regex, file)
+      command = sprintf("grep -c%s '%s' %s", flags, regex, file)
       res     = self.run(command)
     rescue Rouster::RemoteExecutionError
       return false
@@ -380,7 +381,7 @@ class Rouster
       os = self.os_type()
 
       case os
-        when :redhat, :osx, :ubuntu, :debian
+        when :rhel, :osx, :ubuntu, :debian
           res = self.run(sprintf('ps ax | grep -c %s', name))
         else
           raise InternalError.new(sprintf('currently unable to determine running process list on OS[%s]', os))

data/test/functional/deltas/test_get_groups.rb

@@ -51,7 +51,7 @@ class TestDeltasGetGroups < Test::Unit::TestCase
     new_group = sprintf('rouster-%s', Time.now.to_i)
 
     ## create a group here
-    if @app.os_type.eql?(:redhat)
+    if @app.os_type.eql?(:rhel)
       @app.run(sprintf('groupadd %s', new_group))
     else
       omit('only doing group creation on RHEL hosts')

data/test/functional/deltas/test_get_os.rb

@@ -11,7 +11,7 @@ class TestValidateFileFunctional < Test::Unit::TestCase
   FLAG_FILES = {
     :ubuntu  => '/etc/os-release', # debian too
     :solaris => '/etc/release',
-    :redhat  => '/etc/redhat-release', # centos too
+    :rhel    => '/etc/redhat-release', # centos too
     :osx     => '/System/Library/CoreServices/SystemVersion.plist',
   }
 

data/test/functional/deltas/test_get_packages.rb

@@ -66,7 +66,7 @@ class TestDeltasGetPackages < Test::Unit::TestCase
     end
 
     # RHEL processing doesn't do anything different in deep/not-deep calls
-    if ! (@app.os_type.eql?(:redhat) or @app.os_type.eql?(:ubuntu))
+    if ! (@app.os_type.eql?(:rhel) or @app.os_type.eql?(:ubuntu))
       res.each_key do |k|
         assert_not_nil(res[k])
         assert_match(/\?/, res[k][:arch])
@@ -101,7 +101,7 @@ class TestDeltasGetPackages < Test::Unit::TestCase
   def test_arch_determination
     after, install = nil, nil
 
-    if @app.os_type.eql?(:redhat)
+    if @app.os_type.eql?(:rhel)
       packages = [ 'glibc.x86_64', 'glibc.i686' ]
       install  = @app.run(sprintf('yum install -y %s', packages.join(' '))) # TODO these are already in the base, but just to be safe
       after    = @app.get_packages(false, false)

data/test/functional/test_is_in_file.rb

@@ -0,0 +1,40 @@
+require sprintf('%s/../../path_helper', File.dirname(File.expand_path(__FILE__)))
+
+require 'rouster'
+require 'rouster/tests'
+require 'test/unit'
+
+class TestIsInFile < Test::Unit::TestCase
+
+  SHIBBOLETH = 'foobar'
+
+  def setup
+    assert_nothing_raised do
+      # no reason not to do this as a passthrough once we can
+      @app = Rouster.new(:name => 'app', :sudo => false)
+      @app.up()
+    end
+
+    # create some temporary files
+    @dir_tmp = sprintf('/tmp/rouster-%s.%s', $$, Time.now.to_i)
+    @app.run(sprintf('mkdir %s', @dir_tmp))
+
+    @file = sprintf('%s/file', @dir_tmp)
+    @app.run(sprintf('echo "%s" >> %s', SHIBBOLETH, @file))
+  end
+
+  def teardown; end
+
+  def test_positive
+
+    assert_equal(true, @app.is_in_file?(@file, SHIBBOLETH))
+
+  end
+
+  def test_negative
+
+    assert_equal(false, @app.is_in_file?(@file, 'fizzbuzz'))
+
+  end
+
+end

data/test/unit/testing/test_get_services.rb

@@ -17,7 +17,7 @@ class TestUnitGetPackages < Test::Unit::TestCase
   end
 
   def test_rhel_systemv
-    @app.instance_variable_set(:@ostype, :redhat)
+    @app.instance_variable_set(:@ostype, :rhel)
     services = {}
 
     raw = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))
@@ -43,7 +43,7 @@ class TestUnitGetPackages < Test::Unit::TestCase
   end
 
   def test_rhel_upstart
-    @app.instance_variable_set(:@ostype, :redhat)
+    @app.instance_variable_set(:@ostype, :rhel)
     services = {}
 
     raw = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-upstart', File.dirname(File.expand_path(__FILE__))))
@@ -66,7 +66,7 @@ class TestUnitGetPackages < Test::Unit::TestCase
   end
 
   def test_rhel_both
-    @app.instance_variable_set(:@ostype, :redhat)
+    @app.instance_variable_set(:@ostype, :rhel)
     services = {}
 
     systemv_contents  = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))
@@ -95,7 +95,7 @@ class TestUnitGetPackages < Test::Unit::TestCase
   end
 
   def test_rhel_both_real
-    @app.instance_variable_set(:@ostype, :redhat)
+    @app.instance_variable_set(:@ostype, :rhel)
     services = {}
 
     systemv_contents  = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.63'
+  version: '0.64'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -155,6 +155,7 @@ files:
 - test/functional/test_inspect.rb
 - test/functional/test_is_dir.rb
 - test/functional/test_is_file.rb
+- test/functional/test_is_in_file.rb
 - test/functional/test_new.rb
 - test/functional/test_passthroughs.rb
 - test/functional/test_put.rb