rouster 0.42 → 0.53

data/lib/rouster/tests.rb

@@ -67,12 +67,11 @@ class Rouster
   # * <dir> - path to directory to act on, full path or relative to ~vagrant/
   # * [wildcard] - glob of directories to match, defaults to '*'
   # * [recursive] - boolean controlling whether or not to look in directories recursively, defaults to false
-  def dirs(dir, wildcard='*', recursive=false)
+  def dirs(dir, wildcard='*', insensitive=true, recursive=false)
     # TODO use a numerical, not boolean value for 'recursive' -- and rename to 'depth' ?
-    # TODO should we be running -iname ?
     raise InternalError.new(sprintf('invalid dir specified[%s]', dir)) unless self.is_dir?(dir)
 
-    raw = self.run(sprintf("find %s %s -type d -name '%s'", dir, recursive ? '' : '-maxdepth 1', wildcard))
+    raw = self.run(sprintf("find %s %s -type d %s '%s'", dir, recursive ? '' : '-maxdepth 1', insensitive ? '-iname' : '-name', wildcard))
     res = Array.new
 
     raw.split("\n").each do |line|
@@ -145,11 +144,11 @@ class Rouster
   # * <dir> - directory to look in, full path or relative to ~vagrant/
   # * [wildcard] - glob of files to match, defaults to '*'
   # * [recursive] - boolean controlling whether or not to look in directories recursively, defaults to false
-  def files(dir, wildcard='*', recursive=false)
+  def files(dir, wildcard='*', insensitive=true, recursive=false)
     # TODO use a numerical, not boolean value for 'recursive'
     raise InternalError.new(sprintf('invalid dir specified[%s]', dir)) unless self.is_dir?(dir)
 
-    raw = self.run(sprintf("find %s %s -type f -name '%s'", dir, recursive ? '' : '-maxdepth 1', wildcard))
+    raw = self.run(sprintf("find %s %s -type f %s '%s'", dir, recursive ? '' : '-maxdepth 1', insensitive ? '-iname' : '-name', wildcard))
     res = Array.new
 
     raw.split("\n").each do |line|
@@ -167,7 +166,13 @@ class Rouster
   # parameters
   # * <dir> - path of directory to validate
   def is_dir?(dir)
-    res = self.dir(dir)
+    res = nil
+    begin
+      res = self.dir(dir)
+    rescue => e
+      return false
+    end
+
     res.class.eql?(Hash) ? res[:directory?] : false
   end
 
@@ -221,7 +226,14 @@ class Rouster
   # parameters
   # * <file> - path of filename to validate
   def is_file?(file)
-    res = self.file(file)
+    res = nil
+
+    begin
+      res = self.file(file)
+    rescue => e
+      return false
+    end
+
     res.class.eql?(Hash) ? res[:file?] : false
   end
 
@@ -368,7 +380,7 @@ class Rouster
       os = self.os_type()
 
       case os
-        when :redhat, :osx, :ubuntu
+        when :redhat, :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))
@@ -552,8 +564,8 @@ class Rouster
             value += 4
           when 'w'
             value += 2
-          when 'x', 't'
-            # is 't' really right here? copying Salesforce::Vagrant
+          when 'x', 't', 's'
+            # is 't' / 's' really right here? copying Salesforce::Vagrant
             value += 1
           when '-'
             # noop
@@ -581,4 +593,4 @@ class Rouster
     res
   end
 
-end
+end

data/path_helper.rb

@@ -1,17 +1,16 @@
 # heavily influenced by https://github.com/puppetlabs/hiera/blob/master/spec/spec_helper.rb
 
 # this gets us Rouster, still need to figure out how to find vagrant
-$LOAD_PATH << File.join([File.dirname(__FILE__), "lib"])
+$LOAD_PATH << File.join([File.dirname(__FILE__), 'lib'])
 
 require 'rubygems'
 
-## this is really optional, so don't die if we don't have it
+# debugging help
 begin
-  require 'ruby-debug'
+  require 'debugger'
 rescue LoadError
 end
 
-# debugging help
 class Object
   def my_methods
     # Cookbook implementation

data/rouster.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh'
   s.add_dependency 'rake'
 
-  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'test-unit', '~> 2.0'
+  s.add_development_dependency 'reek'
 
   s.files = `git ls-files`.split("\n")
 end

data/test/functional/deltas/test_get_crontab.rb

@@ -8,7 +8,7 @@ class TestDeltasGetCrontab < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 20)
     end
 
     @app.up()
@@ -92,6 +92,29 @@ class TestDeltasGetCrontab < Test::Unit::TestCase
 
   end
 
+  def test_happy_path_cache_invalidated
+
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_crontab('root', true)
+    end
+
+    first_cache_time = @app.cache[:crontab]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_crontab('root', true)
+    end
+
+    second_cache_time = @app.cache[:crontab]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+
+  end
+
   def teardown
     @app = nil
   end

data/test/functional/deltas/test_get_groups.rb

@@ -8,7 +8,7 @@ class TestDeltasGetGroups < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
     end
 
     @app.up()
@@ -39,7 +39,79 @@ class TestDeltasGetGroups < Test::Unit::TestCase
 
   end
 
-  # TODO add some non-caching tests
+  def test_without_caching
+    old_groups, new_groups = nil, nil
+
+    assert_nothing_raised do
+      old_groups = @app.get_groups(false)
+    end
+
+    assert_nil(@app.deltas[:groups])
+
+    new_group = sprintf('rouster-%s', Time.now.to_i)
+
+    ## create a group here
+    if @app.os_type.eql?(:redhat)
+      @app.run(sprintf('groupadd %s', new_group))
+    else
+      skip('only doing group creation on RHEL hosts')
+    end
+
+    assert_nothing_raised do
+      new_groups = @app.get_groups(false)
+    end
+
+    assert_nil(@app.deltas[:groups])
+    assert_not_nil(new_groups[new_group])
+    assert_not_equal(old_groups, new_groups)
+
+  end
+
+  def test_deep_inspection
+    deep, shallow = nil, nil
+
+    assert_nothing_raised do
+      deep    = @app.get_groups(false, true)
+      shallow = @app.get_groups(false, false)
+    end
+
+    assert_not_equal(deep, shallow)
+
+    ## this is not really the best test
+    deep_none, shallow_none = 0, 0
+
+    deep.each_key do |group|
+      deep_none += 1 if deep[group][:users][0].eql?('NONE')
+    end
+
+    shallow.each_key do |group|
+      shallow_none += 1 if shallow[group][:users][0].eql?('NONE')
+    end
+
+    assert(shallow_none > deep_none)
+  end
+
+  def test_happy_path_cache_invalidation
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_groups(true, false)
+    end
+
+    first_cache_time = @app.cache[:groups]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_groups(true, false)
+    end
+
+    second_cache_time = @app.cache[:groups]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+
+  end
 
   def teardown
     @app = nil

data/test/functional/deltas/test_get_packages.rb

@@ -4,11 +4,13 @@ require 'rouster'
 require 'rouster/deltas'
 require 'test/unit'
 
+# TODO need to figure out how to add package strings on our own for better testing (i.e. sfdc-razorpolicy-rhel-6.2-batch-1.0-17.noarch)
+
 class TestDeltasGetPackages < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
     end
 
     @app.up()
@@ -28,10 +30,7 @@ class TestDeltasGetPackages < Test::Unit::TestCase
 
     res.each_key do |k|
       assert_not_nil(res[k])
-
-      # this is not the best validation, but is not the worst either
-      assert_match(/^\d+\./, res[k]) # start with a number
-      assert_match(/\.(x86|i686|x86_64|noarch)$/, res[k]) # end with an arch type
+      assert_match(/^\d+/, res[k]) # start with a number
     end
 
   end
@@ -49,6 +48,45 @@ class TestDeltasGetPackages < Test::Unit::TestCase
     assert_equal(false, @app.deltas.has_key?(:packages))
   end
 
+  def test_without_deep_inspection
+    res = nil
+
+    assert_nothing_raised do
+      res = @app.get_packages(true, false)
+    end
+
+    res.each_key do |k|
+      assert_not_nil(res[k])
+
+      #assert_match(/\d*\..*/, res[k]) # testing the regular expression used in deltas.rb itself
+      assert_match(/\?/, res[k])
+    end
+
+  end
+
+  def test_happy_path_cache_invalidation
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_packages(true, false)
+    end
+
+    first_cache_time = @app.cache[:packages]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_packages(true, false)
+    end
+
+    second_cache_time = @app.cache[:packages]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+    assert(second_cache_time > first_cache_time)
+
+  end
+
   def teardown
     @app = nil
   end

data/test/functional/deltas/test_get_ports.rb

@@ -8,7 +8,7 @@ class TestDeltasGetPorts < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
     end
 
     @app.up()
@@ -95,6 +95,7 @@ class TestDeltasGetPorts < Test::Unit::TestCase
     }
 
     @app.deltas[:ports] = stock
+    @app.cache[:ports]  = Time.now.to_i # since we're faking the contents, we also need to fake other artifacts that would have been generated
 
     assert_equal(true, @app.is_port_open?(1234, 'tcp', true))
     assert_equal(true, @app.is_port_active?(22, 'tcp', true))
@@ -107,11 +108,35 @@ class TestDeltasGetPorts < Test::Unit::TestCase
     assert_equal(false, @app.is_port_active?(1234, 'tcp', true))
 
     # caching/argument default validation -- can't currently do this, don't know what ports will be open on others systems
+    # TODO but can fix this by running some ncatish commands
     #assert_equal(true, @app.is_port_active?(22))
     #assert_equal(true, @app.is_port_open?(1234))
 
   end
 
+  def test_happy_path_cache_invalidation
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_ports(true)
+    end
+
+    first_cache_time = @app.cache[:ports]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_ports(true)
+    end
+
+    second_cache_time = @app.cache[:ports]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+    assert(second_cache_time > first_cache_time)
+
+  end
+
   def teardown
     @app = nil
   end

data/test/functional/deltas/test_get_services.rb

@@ -8,13 +8,12 @@ class TestDeltasGetServices < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
     end
 
     @app.up()
 
-    # eventually this should be standardized (and symbolized?)
-    @allowed_states = %w(exists operational running stopped)
+    @allowed_states = %w(exists installed operational running stopped unsure)
   end
 
   def test_happy_path
@@ -29,11 +28,45 @@ class TestDeltasGetServices < Test::Unit::TestCase
 
     res.each_key do |k|
       assert_not_nil(res[k])
+      assert(@allowed_states.member?(res[k]))
     end
 
   end
 
-  # TODO add some caching tests
+  def test_happy_path_caching
+
+    assert_nil(@app.deltas[:services])
+
+    assert_nothing_raised do
+      @app.get_services(true)
+    end
+
+    assert_equal(Hash, @app.deltas[:services].class)
+
+  end
+
+  def test_happy_path_cache_invalidation
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_services(true)
+    end
+
+    first_cache_time = @app.cache[:services]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_services(true)
+    end
+
+    second_cache_time = @app.cache[:services]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+    assert(second_cache_time > first_cache_time)
+
+  end
 
   def teardown
     @app = nil

data/test/functional/deltas/test_get_users.rb

@@ -8,7 +8,7 @@ class TestDeltasGetUsers < Test::Unit::TestCase
 
   def setup
     assert_nothing_raised do
-      @app = Rouster.new(:name => 'app')
+      @app = Rouster.new(:name => 'app', :cache_timeout => 10)
     end
 
     @app.up()
@@ -36,7 +36,40 @@ class TestDeltasGetUsers < Test::Unit::TestCase
 
   end
 
-  # TODO add some caching tests
+  def test_happy_path_caching
+
+    assert_nil(@app.deltas[:users])
+
+    assert_nothing_raised do
+      @app.get_users(true)
+    end
+
+    assert_equal(Hash, @app.deltas[:users].class)
+
+  end
+
+  def test_happy_path_cache_invalidation
+    res1, res2 = nil, nil
+
+    assert_nothing_raised do
+      res1 = @app.get_users(true)
+    end
+
+    first_cache_time = @app.cache[:users]
+
+    sleep (@app.cache_timeout + 1)
+
+    assert_nothing_raised do
+      res2 = @app.get_users(true)
+    end
+
+    second_cache_time = @app.cache[:users]
+
+    assert_equal(res1, res2)
+    assert_not_equal(first_cache_time, second_cache_time)
+    assert(second_cache_time > first_cache_time)
+
+  end
 
   def teardown
     @app = nil