rouster 0.57 → 0.61

data/test/unit/testing/resources/rhel-systemv

@@ -0,0 +1,40 @@
+acpid (pid  945) is running...
+atd (pid  1010) is running...
+auditd (pid  853) is running...
+Stopped
+cgred is stopped
+crond (pid  999) is running...
+ip6tables: Firewall is not running.
+iptables: Firewall is not running.
+Kdump is not operational
+mdmonitor is stopped
+netconsole module not loaded
+Configured devices:
+lo eth0
+Currently active devices:
+lo eth0
+rpc.svcgssd is stopped
+rpc.mountd is stopped
+nfsd is stopped
+rpc.statd (pid  905) is running...
+ntpd (pid  1587) is running...
+portreserve is stopped
+master is stopped
+puppet is stopped
+rdisc is stopped
+restorecond is stopped
+rhsmcertd (pid 1023) is running...
+rpcbind (pid  887) is running...
+rpc.gssd is stopped
+rpc.idmapd is stopped
+rpc.svcgssd is stopped
+rsyslogd (pid  869) is running...
+sandbox is stopped
+saslauthd is stopped
+sendmail (pid  981) is running...
+sm-client (pid  990) is running...
+snmpd (pid  1569) is running...
+snmptrapd is stopped
+openssh-daemon (pid  965) is running...
+svnserve is stopped
+tgtd is stopped

data/test/unit/testing/resources/rhel-upstart

@@ -0,0 +1,20 @@
+rc stop/waiting
+tty (/dev/tty3) start/running, process 1601
+tty (/dev/tty2) start/running, process 1597
+tty (/dev/tty1) start/running, process 1595
+tty (/dev/tty6) start/running, process 1609
+tty (/dev/tty5) start/running, process 1607
+tty (/dev/tty4) start/running, process 1603
+plymouth-shutdown stop/waiting
+control-alt-delete stop/waiting
+rcS-emergency stop/waiting
+kexec-disable stop/waiting
+quit-plymouth stop/waiting
+rcS stop/waiting
+prefdm stop/waiting
+named start/running, process 8959
+init-system-dbus stop/waiting
+splash-manager stop/waiting
+start-ttys stop/waiting
+rcS-sulogin stop/waiting
+serial stop/waiting

data/test/unit/testing/test_get_services.rb

@@ -0,0 +1,151 @@
+require sprintf('%s/../../../path_helper', File.dirname(File.expand_path(__FILE__)))
+
+require 'rouster'
+require 'rouster/puppet'
+require 'rouster/testing'
+require 'test/unit'
+
+class TestUnitGetPackages < Test::Unit::TestCase
+
+  def setup
+    # expose private methods
+    Rouster.send(:public, *Rouster.private_instance_methods)
+    Rouster.send(:public, *Rouster.protected_instance_methods)
+
+    @app = Rouster.new(:name => 'app', :unittest => true, :verbosity => 4)
+
+  end
+
+  def test_rhel_systemv
+    @app.instance_variable_set(:@ostype, :redhat)
+    services = {}
+
+    raw = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))
+
+    assert_nothing_raised do
+      services = @app.get_services(false, true, :systemv, raw)
+    end
+
+    expected = {
+      'acpid'      => 'running', # acpid (pid  945) is running...
+      'ip6tables'  => 'stopped', # ip6tables: Firewall is not running.
+      'Kdump'      => 'stopped', # Kdump is not operational
+      'mdmonitor'  => 'stopped', # mdmonitor is stopped
+      'netconsole' => 'stopped', # netconsole module not loaded
+    }
+
+    expected.each_pair do |service,state|
+      assert(services.has_key?(service), "service[#{service}]")
+      assert_equal(services[service], state, "service[#{service}] state[#{state}]")
+    end
+
+  end
+
+  def test_rhel_upstart
+    @app.instance_variable_set(:@ostype, :redhat)
+    services = {}
+
+    raw = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-upstart', File.dirname(File.expand_path(__FILE__))))
+
+    assert_nothing_raised do
+      services = @app.get_services(false, true, :upstart, raw)
+    end
+
+    expected = {
+      'rc'    => 'stopped', # rc stop/waiting
+      'named' => 'running', # named start/running, process 8959
+      'tty'   => 'running', # tty (/dev/tty3) start/running, process 1601
+    }
+
+    expected.each_pair do |service,state|
+      assert(services.has_key?(service), "service[#{service}]")
+      assert_equal(services[service], state, "service[#{service}] state[#{state}]")
+    end
+
+  end
+
+  def test_rhel_both
+    @app.instance_variable_set(:@ostype, :redhat)
+    services = {}
+
+    systemv_contents  = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))
+    upstart_contents = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-upstart', File.dirname(File.expand_path(__FILE__))))
+
+    # TODO this isn't a great test, because the implementation will never have both outputs in the same control loop
+    raw = systemv_contents
+    raw << upstart_contents
+
+    assert_nothing_raised do
+      services = @app.get_services(false, true, :all, raw)
+    end
+
+    expected = {
+      'acpid' => 'running', # initd
+      'cgred' => 'stopped', # initd
+      'named' => 'running', # upstart
+      # 'rc'    => 'stopped', # upstart -- this is getting mishandled, see comment on line #74 and test_rhel_both_real for reasons this doesn't matter
+    }
+
+    expected.each_pair do |service,state|
+      assert(services.has_key?(service), "service[#{service}]")
+      assert_equal(services[service], state, "service[#{service}] state[#{state}]}")
+    end
+
+  end
+
+  def test_rhel_both_real
+    @app.instance_variable_set(:@ostype, :redhat)
+    services = {}
+
+    systemv_contents  = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemv', File.dirname(File.expand_path(__FILE__))))
+    upstart_contents = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-upstart', File.dirname(File.expand_path(__FILE__))))
+
+    expected = {
+        'acpid' => 'running', # initd
+        'cgred' => 'stopped', # initd
+        'named' => 'running', # upstart
+        'rc'    => 'stopped', # upstart
+    }
+
+    assert_nothing_raised do
+      systemv = @app.get_services(false, true, :systemv, systemv_contents)
+      upstart = @app.get_services(false, true, :upstart, upstart_contents)
+
+      services = systemv.merge(upstart) # TODO how do we ensure merge order doesn't mislead us?
+    end
+
+    expected.each_pair do |service,state|
+      assert(services.has_key?(service), "service[#{service}]")
+      assert_equal(services[service], state, "service[#{service}] state[#{state}]}")
+    end
+
+
+  end
+
+  def test_osx_launchd
+    @app.instance_variable_set(:@ostype, :osx)
+    services = {}
+
+    raw = File.read(sprintf('%s/../../../test/unit/testing/resources/osx-launchd', File.dirname(File.expand_path(__FILE__))))
+
+    assert_nothing_raised do
+      services = @app.get_services(false, true, :launchd, raw)
+    end
+
+    expected = {
+      'com.bigfix.BESAgent'            => 'running', # 100	-	com.bigfix.BESAgent
+      'com.trendmicro.mpm.icore.agent' => 'stopped', # -	0	com.trendmicro.mpm.icore.agent
+    }
+
+    expected.each_pair do |service,state|
+      assert(services.has_key?(service), "service[#{service}]")
+      assert_equal(services[service], state, "service[#{service}] state[#{state}]")
+    end
+
+  end
+
+  def teardown
+    # noop
+  end
+
+end

data/test/unit/testing/test_validate_package.rb

@@ -15,8 +15,26 @@ class TestValidatePackage < Test::Unit::TestCase
     fake_facts = { 'is_virtual' => 'true', 'timezone' => 'PDT', 'uptime_days' => 42 }
 
     fake_packages = {
-      'abrt'     => '2.0.8-15.el6.centos.x86_64',
-      'usermode' => '1.102-3',
+      'abrt'     => {
+        :version => '2.0.8-15',
+        :arch    => 'x86_64',
+      },
+
+      'usermode' => {
+        :version => '1.102-3',
+        :arch    => 'noarch',
+      },
+
+      'glibc' => [
+        {
+          :version => '2.12-1.132',
+          :arch    => 'x86_64',
+        },
+        {
+          :version => '2.12-1.132',
+          :arch    => 'i686',
+        }
+      ]
     }
 
     @app = Rouster.new(:name => 'app', :unittest => true)
@@ -29,7 +47,8 @@ class TestValidatePackage < Test::Unit::TestCase
     assert(@app.validate_package('abrt', { :ensure => true, :version => '2.0.8-15.el6.centos.x86_64' } ))
     assert(@app.validate_package('abrt', { :ensure => 'present' } ))
     assert(@app.validate_package('abrt', { :exists => true } ))
-    assert(@app.validate_package('abrt', { :version => '> 1.0'} ))
+    assert(@app.validate_package('abrt', { :version => '> 1.0' } ))
+    assert(@app.validate_package('abrt', { :arch => 'x86_64' } ))
 
     assert(@app.validate_package('usermode', { :version => '1.102-3' } ))
     assert(@app.validate_package('usermode', { :version => '> 0.5' } )) # specifying 1 here fails because 1.102-3.to_i is 1
@@ -37,14 +56,23 @@ class TestValidatePackage < Test::Unit::TestCase
     assert(@app.validate_package('usermode', { :version => '< 5.0' } ))
 
     assert(@app.validate_package('hds', { :exists => false } ))
-    assert(@app.validate_package('hds', { :ensure => 'absent'}))
+    assert(@app.validate_package('hds', { :ensure => 'absent'} ))
 
   end
 
   def test_positive_constrained
-
     assert(@app.validate_package('abrt', { :ensure => true, :constrain => 'is_virtual true' } ))
+  end
+
+  def test_arch_determination
+    # determine whether a package is installed with a particular arch, while remaining flexible
+    assert(@app.validate_package('glibc', { :ensure => true, :arch => 'x86_64' } ))
+    assert(@app.validate_package('glibc', { :ensure => true, :arch => 'i686' } ))
+    assert(@app.validate_package('glibc', { :ensure => true, :arch => [ 'i686', 'x86_64' ] } ))
+    assert(@app.validate_package('glibc', { :ensure => true } ))
 
+    assert_equal(false, @app.validate_package('glibc', { :ensure => true, :arch => [ 'noarch' ] } ))
+    assert_equal(false, @app.validate_package('glibc', { :ensure => true, :arch => 'review' } ))
   end
 
   def test_negative_basic
@@ -52,14 +80,12 @@ class TestValidatePackage < Test::Unit::TestCase
     assert_equal(false, @app.validate_package('abrt', { :version => 'foo.bar'} ))
     assert_equal(false, @app.validate_package('abrt', { :ensure => 'absent' } ))
     assert_equal(false, @app.validate_package('abrt', { :exists => false } ))
-
+    assert_equal(false, @app.validate_package('abrt', { :arch => 'noarch' } ))
   end
 
   def test_negative_constrained
-
-    assert(@app.validate_package('abrt', { :ensure => false, :constrain => 'is_virtual false' }))
-    assert(@app.validate_package('abrt', { :ensure => true,  :constrain => 'is_virtual false' }))
-
+    assert(@app.validate_package('abrt', { :ensure => false, :constrain => 'is_virtual false' } ))
+    assert(@app.validate_package('abrt', { :ensure => true,  :constrain => 'is_virtual false' } ))
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.57'
+  version: '0.61'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,10 +116,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - Vagrantfile
+- examples/aws.rb
 - examples/bootstrap.rb
 - examples/demo.rb
 - examples/error.rb
@@ -131,6 +134,7 @@ files:
 - lib/rouster/tests.rb
 - lib/rouster/vagrant.rb
 - path_helper.rb
+- plugins/aws.rb
 - rouster.gemspec
 - test/basic.rb
 - test/functional/deltas/test_get_crontab.rb
@@ -165,13 +169,16 @@ files:
 - test/puppet/manifests/manifest.pp
 - test/puppet/modules/role/manifests/ui.pp
 - test/puppet/test_apply.rb
-- test/puppet/test_roles.rb
 - test/tunnel_vs_scp.rb
 - test/unit/puppet/test_get_puppet_star.rb
 - test/unit/test_generate_unique_mac.rb
 - test/unit/test_new.rb
 - test/unit/test_parse_ls_string.rb
 - test/unit/test_traverse_up.rb
+- test/unit/testing/resources/osx-launchd
+- test/unit/testing/resources/rhel-systemv
+- test/unit/testing/resources/rhel-upstart
+- test/unit/testing/test_get_services.rb
 - test/unit/testing/test_meets_constraint.rb
 - test/unit/testing/test_validate_cron.rb
 - test/unit/testing/test_validate_file.rb
@@ -200,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: Rouster
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Rouster is an abstraction layer for Vagrant

data/test/puppet/test_roles.rb

@@ -1,186 +0,0 @@
-require sprintf('%s/../../path_helper', File.dirname(File.expand_path(__FILE__)))
-
-require 'rouster'
-require 'rouster/puppet'
-require 'rouster/testing'
-
-require 'test/unit'
-
-class TestPuppetRoles < Test::Unit::TestCase
-
-  def setup
-
-    piab_vagrantfile = sprintf('%s/../../../piab/Vagrantfile', File.dirname(File.expand_path(__FILE__)))
-
-    unless File.file?(piab_vagrantfile)
-      skip(sprintf('missing SFDC specific Vagrantfile[%s], skipping', piab_vagrantfile))
-    end
-
-    assert_nothing_raised do
-      @ppm = Rouster.new(:name => 'ppm', :vagrantfile => piab_vagrantfile)
-      @ppm.up()
-      @ppm.remove_existing_certs('ppm')
-      #@ppm.rebuild() unless @ppm.status.eql?('running') # destroy / rebuild
-    end
-
-    assert_nothing_raised do
-      @app = Rouster.new(:name => 'app', :vagrantfile => piab_vagrantfile)
-    end
-
-    assert_nothing_raised do
-		  @ppm.run_puppet('master', { :expected_exitcode => [0,2] })
-    end
-
-    assert_match(/Finished catalog run in/, @ppm.get_output())
-
-    # define base here
-    @expected_packages = {
-      'puppet' => { :ensure => true },
-      'facter' => { :ensure => 'present' }
-    }
-
-    @expected_files = {
-      '/etc/passwd' => {
-        :contains => [ 'vagrant', 'root'],
-        :ensure   => 'file',
-        :group    => 'root',
-        :mode     => '0644',
-        :owner    => 'root'
-      },
-
-      '/tmp' => {
-        :ensure => 'directory',
-        :group  => 'root',
-        :owner  => 'root',
-      }
-    }
-
-    @expected_groups   = {
-        'root' => { :ensure => 'true' }
-    }
-
-    @expected_services = Hash.new()
-    @expected_users    = {
-        'root' => {
-            :ensure => 'present',
-            :group  => 'root',
-        }
-    }
-
-    # manually specified testing
-    @expected_files.each_pair do |f,e|
-      assert_equal(true, @ppm.validate_file(f,e))
-    end
-
-    @expected_groups.each_pair do |g,e|
-      assert_equal(true, @ppm.validate_group(g,e))
-    end
-
-    @expected_packages.each_pair do |p,e|
-      assert_equal(true, @ppm.validate_package(p, e))
-    end
-
-    @expected_services.each_pair do |s,e|
-      assert_equal(true, @ppm.validate_service(s,e))
-    end
-
-    @expected_users.each_pair do |u,e|
-      assert_equal(true, @ppm.validate_user(u,e))
-    end
-
-  end
-
-  def test_app
-    app_expected_packages = {
-      'rsync'    => { :ensure => 'present' }
-    }.merge(@expected_packages)
-
-    app_expected_files = {
-      '/etc/hosts' => {
-          :contains => [ 'localhost', 'app' ],
-          :ensure   => 'present',
-          :group    => 'root',
-          :owner    => 'root',
-      },
-    }.merge(@expected_files)
-
-    app_expected_groups   = {
-      'vagrant' => {
-        :ensure => 'present',
-      }
-    }.merge(@expected_groups)
-
-    app_expected_services = {}.merge(@expected_services)
-
-    app_expected_users    = {
-      'vagrant' => {
-        :ensure => 'present',
-      },
-    }.merge(@expected_users)
-
-    assert_nothing_raised do
-      @app.up()
-      @app.run_puppet('master', { :expected_exitcode => [0, 2] })
-    end
-
-    assert_match(/Finished catalog run in/, @app.get_output())
-
-    # manually specified testing
-    app_expected_files.each_pair do |f,e|
-      assert_equal(true, @app.validate_file(f,e))
-    end
-
-    app_expected_groups.each_pair do |g,e|
-       assert_equal(true, @app.validate_group(g,e))
-    end
-
-    app_expected_packages.each_pair do |p,e|
-      assert_equal(true, @app.validate_package(p, e))
-    end
-
-    app_expected_services.each_pair do |s,e|
-      assert_equal(true, @app.validate_service(s,e))
-    end
-
-    app_expected_users.each_pair do |u,e|
-      assert_equal(true, @app.validate_user(u,e))
-    end
-
-  end
-
-  def dont_test_app_automated
-    catalog      = @app.get_catalog()
-    expectations = @app.parse_catalog(catalog)
-
-    assert_nothing_raised do
-      @app.up()
-      @app.run_puppet('master', { :expected_exitcode => 2 })
-    end
-
-    assert_match(/Finished catalog run in/, @app.get_output())
-
-    expectations.each_pair do |k,v|
-      res = nil
-      case v[:type]
-        when :dir, :file
-          res = @app.validate_file(k, v)
-        when :group
-          res = @app.validate_group(k, v)
-        when :package
-          res = @app.validate_package(k, v)
-        when :user
-          res = @app.validate_user(k, v)
-        when :service
-          res = @app.validate_service(k, v)
-      end
-
-      assert_equal(true, res, sprintf('failed[%s]: %s',v, res))
-    end
-
-  end
-
-  def teardown
-    # noop
-  end
-
-end