rouster 0.7 → 0.41

data/lib/rouster/tests.rb

@@ -30,11 +30,6 @@ class Rouster
       return self.deltas[:files][dir]
     end
 
-    if self.unittest and cache
-      # preventing a functional test fallthrough
-      return nil
-    end
-
     begin
       raw = self.run(sprintf('ls -ld %s', dir))
     rescue Rouster::RemoteExecutionError
@@ -44,7 +39,7 @@ class Rouster
     if raw.match(/No such file or directory/)
       res = nil
     elsif raw.match(/Permission denied/)
-      @logger.info(sprintf('dir(%s) output[%s], try with sudo', dir, raw)) unless self.uses_sudo?
+      @log.info(sprintf('dir(%s) output[%s], try with sudo', dir, raw)) unless self.uses_sudo?
       res = nil
     else
       res = parse_ls_string(raw)
@@ -67,11 +62,12 @@ 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='*', insensitive=true, recursive=false)
+  def dirs(dir, wildcard='*', 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 %s '%s'", dir, recursive ? '' : '-maxdepth 1', insensitive ? '-iname' : '-name', wildcard))
+    raw = self.run(sprintf("find %s %s -type d -name '%s'", dir, recursive ? '' : '-maxdepth 1', wildcard))
     res = Array.new
 
     raw.split("\n").each do |line|
@@ -108,11 +104,6 @@ class Rouster
       return self.deltas[:files][file]
     end
 
-    if self.unittest and cache
-      # preventing a functional test fallthrough
-      return nil
-    end
-
     begin
       raw = self.run(sprintf('ls -l %s', file))
     rescue Rouster::RemoteExecutionError
@@ -120,7 +111,7 @@ class Rouster
     end
 
     if raw.match(/No such file or directory/)
-      @logger.info(sprintf('is_file?(%s) output[%s], try with sudo', file, raw)) unless self.uses_sudo?
+      @log.info(sprintf('is_file?(%s) output[%s], try with sudo', file, raw)) unless self.uses_sudo?
       res = nil
     elsif raw.match(/Permission denied/)
       res = nil
@@ -144,11 +135,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='*', insensitive=true, recursive=false)
+  def files(dir, wildcard='*', 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 %s '%s'", dir, recursive ? '' : '-maxdepth 1', insensitive ? '-iname' : '-name', wildcard))
+    raw = self.run(sprintf("find %s %s -type f -name '%s'", dir, recursive ? '' : '-maxdepth 1', wildcard))
     res = Array.new
 
     raw.split("\n").each do |line|
@@ -166,13 +157,7 @@ class Rouster
   # parameters
   # * <dir> - path of directory to validate
   def is_dir?(dir)
-    res = nil
-    begin
-      res = self.dir(dir)
-    rescue => e
-      return false
-    end
-
+    res = self.dir(dir)
     res.class.eql?(Hash) ? res[:directory?] : false
   end
 
@@ -226,14 +211,7 @@ class Rouster
   # parameters
   # * <file> - path of filename to validate
   def is_file?(file)
-    res = nil
-
-    begin
-      res = self.file(file)
-    rescue => e
-      return false
-    end
-
+    res = self.file(file)
     res.class.eql?(Hash) ? res[:file?] : false
   end
 
@@ -257,19 +235,18 @@ 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, flags='', scp=false)
+  def is_in_file?(file, regex, scp=false)
 
     res = nil
 
     if scp
       # download the file to a temporary directory
-      @logger.warn('is_in_file? scp option not implemented yet')
+      @log.warn('is_in_file? scp option not implemented yet')
     end
 
     begin
-      command = sprintf("grep -c%s '%s' %s", flags, regex, file)
+      command = sprintf("grep -c '%s' %s", regex, file)
       res     = self.run(command)
     rescue Rouster::RemoteExecutionError
       return false
@@ -374,14 +351,14 @@ class Rouster
   # * RedHat
   # * Ubuntu
   def is_process_running?(name)
-    # TODO support Solaris
-    # TODO do better validation than just grepping for a matching filename, start with removing 'grep' from output
+    # TODO support other flavors - this will work on RHEL and OSX
+    # TODO do better validation than just grepping for a matching filename
     begin
 
       os = self.os_type()
 
       case os
-        when :rhel, :osx, :ubuntu, :debian
+        when :redhat, :osx, :ubuntu
           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))
@@ -468,25 +445,6 @@ class Rouster
     end
   end
 
-  ##
-  # is_symlink?
-  #
-  # uses file() to return boolean indicating whether parameter passed is a symlink
-  #
-  # parameters
-  # * <file> - path of filename to validate
-  def is_symlink?(file)
-    res = nil
-
-    begin
-      res = self.file(file)
-    rescue => e
-      return false
-    end
-
-    res.class.eql?(Hash) ? res[:symlink?] : false
-  end
-
   ##
   # is_user?
   #
@@ -584,8 +542,8 @@ class Rouster
             value += 4
           when 'w'
             value += 2
-          when 'x', 't', 's'
-            # is 't' / 's' really right here? copying Salesforce::Vagrant
+          when 'x', 't'
+            # is 't' really right here? copying Salesforce::Vagrant
             value += 1
           when '-'
             # noop
@@ -599,27 +557,18 @@ class Rouster
     end
 
     res[:mode]  = mode
+    res[:name]  = tokens[-1] # TODO better here: this does not support files/dirs with spaces
     res[:owner] = tokens[2]
     res[:group] = tokens[3]
     res[:size]  = tokens[4]
 
     res[:directory?]  = tokens[0][0].chr.eql?('d')
     res[:file?]       = ! res[:directory?]
-    res[:symlink?]    = tokens[0][0].chr.eql?('l')
     res[:executable?] = [ tokens[0][3].chr.eql?('x'), tokens[0][6].chr.eql?('x'), tokens[0][9].chr.eql?('x') || tokens[0][9].chr.eql?('t') ]
     res[:writeable?]  = [ tokens[0][2].chr.eql?('w'), tokens[0][5].chr.eql?('w'), tokens[0][8].chr.eql?('w') ]
     res[:readable?]   = [ tokens[0][1].chr.eql?('r'), tokens[0][4].chr.eql?('r'), tokens[0][7].chr.eql?('r') ]
 
-    # TODO better here: this does not support files/dirs with spaces
-    if res[:symlink?]
-      # not sure if we should only be adding this value if we're a symlink, or adding it to all results and just using nil if not a link
-      res[:target] = tokens[-1]
-      res[:name]   = tokens[-3]
-    else
-      res[:name] = tokens[-1]
-    end
-
     res
   end
 
-end
+end

data/path_helper.rb

@@ -1,15 +1,17 @@
 # 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__), 'plugins'])
-$LOAD_PATH << File.expand_path(sprintf('%s/..', File.dirname(__FILE__)))
-$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.join([File.dirname(__FILE__), "lib"])
 
 require 'rubygems'
 
-# debugging help
+## this is really optional, so don't die if we don't have it
+begin
+  require 'ruby-debug'
+rescue LoadError
+end
 
+# debugging help
 class Object
   def my_methods
     # Cookbook implementation

data/rouster.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.homepage      = 'http://github.com/chorankates/rouster'
   s.summary       = 'Rouster is an abstraction layer for Vagrant'
   s.description   = 'Rouster allows you to programmatically control and interact with your existing Vagrant virtual machines'
-  s.license       = 'BSD 3-Clause'
 
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project         = 'Rouster'
@@ -23,8 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh'
   s.add_dependency 'rake'
 
-  s.add_development_dependency 'test-unit', '~> 2.0'
-  s.add_development_dependency 'reek'
+  s.add_development_dependency 'test-unit'
 
   s.files = `git ls-files`.split("\n")
 end

data/test/basic.rb

@@ -5,9 +5,6 @@ require 'rouster/puppet'
 require 'rouster/testing'
 require 'rouster/tests'
 
-#a = Rouster.new(:name => 'app', :verbosity => 1, :vagrantfile => '../piab/Vagrantfile', :retries => 3)
-#p = Rouster.new(:name => 'ppm', :verbosity => 1, :vagrantfile => '../piab/Vagrantfile')
-#r = Rouster.new(:name => 'app', :verbosity => 1, :vagrantfile => 'Vagrantfile')
-l = Rouster.new(:name => 'local', :passthrough => { :type => :local }, :verbosity => 3)
+p = Rouster.new(:name => 'app', :verbosity => 0)
 
 p 'DBGZ' if nil?

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', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
@@ -39,79 +39,7 @@ class TestDeltasGetGroups < Test::Unit::TestCase
 
   end
 
-  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?(:rhel)
-      @app.run(sprintf('groupadd %s', new_group))
-    else
-      omit('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
+  # TODO add some non-caching tests
 
   def teardown
     @app = nil

data/test/functional/deltas/test_get_packages.rb

@@ -4,13 +4,11 @@ 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', :cache_timeout => 10)
+      @app = Rouster.new(:name => 'app')
     end
 
     @app.up()
@@ -31,16 +29,9 @@ class TestDeltasGetPackages < Test::Unit::TestCase
     res.each_key do |k|
       assert_not_nil(res[k])
 
-      if res[k].is_a?(Array)
-        res[k].each do |l|
-          assert(l.has_key?(:arch))
-          assert(l.has_key?(:version))
-        end
-      else
-        assert(res[k].has_key?(:arch))
-        assert(res[k].has_key?(:version))
-      end
-
+      # 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
     end
 
   end
@@ -58,79 +49,6 @@ 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
-
-    # RHEL processing doesn't do anything different in deep/not-deep calls
-    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])
-      end
-    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 test_arch_determination
-    after, install = nil, nil
-
-    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)
-
-      assert(after.has_key?('glibc'))
-      assert(after['glibc'].is_a?(Array))
-      assert_equal(after['glibc'].length, 2)
-      assert_not_equal(after['glibc'][0][:arch], after['glibc'][1][:arch])
-    elsif @app.os_type.eql?(:ubuntu)
-      packages = @app.get_packages(false, false)
-
-      assert(packages.has_key?('xml-core'))
-      assert(packages.has_key?('whiptail'))
-      assert(packages['xml-core'].has_key?(:version))
-      assert(packages['whiptail'].has_key?(:version))
-
-      assert_equal(packages['xml-core'][:arch], 'all')
-      assert_equal(packages['whiptail'][:arch], 'amd64')
-
-    else
-      # TODO should throw a flag here..
-      assert_nothing_raised do
-        @app.get_packages(false, true)
-        @app.get_packages(false, false)
-      end
-    end
-
-  end
-
   def teardown
     @app = nil
   end