rouster 0.64 → 0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 008791a032a42eb032e726fc8f87a7ff0b8a6fcd
-  data.tar.gz: 034c72fff747de93fb5fd4d3067d95af5dacf9c9
+  metadata.gz: 82f9824019bc7951750f51019efd7d5d7e174d33
+  data.tar.gz: babacb0d00e65d6ea702886286940e6bdf61f9d0
 SHA512:
-  metadata.gz: 97db5c53999f5a51747cfc5047bbc237b92dbe17b605c23ac749ee5687518e621a4391aa43efbeebe723b9d575780f77ac2fff3aa7d8df7836277d3cb0239ab1
-  data.tar.gz: 878f36117813b34e06d99b3ba9fd44ab5c5a25c14e76b6c9b316eb833148afb544a2fd00ab61052f733ac7d572fd7618f55e556e9a696a9860c6e2bfa138f2a0
+  metadata.gz: 8fbed7fb6d5e19c71ad2488c0a50b9aa387ab5474363f4dc1c318c9cae9dba9b1c632bb2f6202a8e3d909cc7b92d54d489ad19ef9417f06a92c7b8eaa2bed2e0
+  data.tar.gz: d5ad29bdf90c6ef7c9896720ce2a16eff88833dc9e1c71e708b131a7c8edc6824546998ba086ae31de76966106458992ce23198a7b709a3d8be8f3de3617b516

data/Gemfile

@@ -11,6 +11,5 @@ group :development do
   gem 'test-unit', '~> 3.0.0'
 end
 
-group :aws do
-  gem 'fog'
-end
+gem 'fog', '= 1.24.0', :groups => [:aws, :openstack]
+

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
@@ -39,32 +39,26 @@ end
 Rake::TestTask.new(:test => :vdestroy) do |t|
   t.libs << 'lib'
   t.test_files = FileList['test/**/test_*.rb']
-  t.verbose = true
 end
 
 Rake::TestTask.new do |t|
   t.name = 'unit'
   t.libs << 'lib'
   t.test_files = FileList['test/unit/**/test_*.rb']
-  t.verbose = true
 end
 
 Rake::TestTask.new(:functional => :vdestroy) do |t|
   t.libs << 'lib'
   t.test_files = FileList['test/functional/**/test_*.rb']
-  t.verbose = true
 end
 
 Rake::TestTask.new(:deltas => :vdestroy) do |t|
   t.libs << 'lib'
   t.test_files = FileList['test/functional/deltas/test_*.rb']
-  t.verbose = true
 end
 
 Rake::TestTask.new do |t|
   t.name = 'puppet'
   t.libs << 'lib'
   t.test_files = FileList['test/puppet/test*.rb']
-  t.verbose = true
 end
-

data/Vagrantfile

@@ -10,16 +10,21 @@ boxes = {
     :box_url  => 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210.box',
   },
 
-  :ubuntu12  => {
-      :box_name => 'ubuntu12',
-      :box_url => 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210.box',
+  :ubuntu12 => {
+    :box_name => 'ubuntu12',
+    :box_url  => 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210.box',
   },
 
-  :ubuntu13     => {
+  :ubuntu13 => {
     :box_name => 'ubuntu13',
     :box_url  => 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-puppet.box',
   },
 
+  :centos7 => {
+    :box_name => 'centos7b',
+    :box_url  => 'https://atlas.hashicorp.com/centos/boxes/7/versions/1610.01/providers/virtualbox.box',
+  },
+
 }
 
 Vagrant::Config.run do |config|
@@ -28,7 +33,7 @@ Vagrant::Config.run do |config|
 
       worker.vm.box            = hash[:box_name]
       worker.vm.box_url        = hash[:box_url]
-      worker.vm.host_name      = hash[:box_name]
+      worker.vm.host_name      = hash[:box_hostname] || hash[:box_name]
       worker.vm.network        :hostonly, sprintf('10.0.1.%s', rand(253).to_i + 2)
       worker.ssh.forward_agent = true
 

data/examples/bootstrap.rb

@@ -4,110 +4,30 @@ require 'rouster'
 require 'rouster/puppet'
 require 'rouster/tests'
 
-app = Rouster.new(:name => 'app', :verbosity => 4, :sudo => true)
-ppm = Rouster.new(:name => 'ppm', :verbosity => 1, :sudo => true)
+centos6 = Rouster.new(:name => 'app', :verbosity => 4, :sudo => true)
+centos7 = Rouster.new(:name => 'centos7', :verbosity => 4, :sudo => true)
 
-# passthrough boxes do not need to specify a name
-# commented out currently because passthrough is not MVP
-#lpt = Rouster.new(:passthrough => 'local', :verbosity => 4)
-#rpt = Rouster.new(:passthrough => 'remote', :verbosity => 4, :sshkey => '~/.ssh/id_dsa')
-
-workers = [app]
+workers = [centos6, centos7]
 
 workers.each do |w|
   p '%s config: ' % w.name
   p w
 
-  p 'status: %s' % w.status()
-  p 'upping the box'
-  w.up()
-
-  p sprintf('%s status: %s', w.name, w.status())
-  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
-
-  p 'suspending the box'
-  w.suspend()
-
-  p sprintf('%s status: %s', w.name, w.status())
-  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
-
-  p 'bringing the box back'
-  w.up()
-
-  p sprintf('%s status: %s', w.name, w.status())
-  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
-
-  ## expected success
-  p sprintf('is_dir?(/tmp): %s', w.is_dir?('/tmp'))
-  p sprintf('is_exectuable?(/sbin/service: %s', w.is_executable?('/sbin/service'))
-  p sprintf('is_file?(/etc/hosts): %s', w.is_file?('/etc/hosts'))
-  p sprintf('is_group?(root): %s', w.is_group?('root'))
-  p sprintf('is_in_file?(/etc/hosts, puppet): %s', w.is_in_file?('/etc/hosts', 'puppet'))
-  p sprintf('is_in_path?(ping): %s', w.is_in_path?('ping'))
-  p sprintf('is_package?(libpcap): %s', w.is_package?('libpcap'))
-  p sprintf('is_port_open?(9999): %s', w.is_port_open?(9999))
-  p sprintf('is_port_active?(22): %s', w.is_port_active?(22))
-  p sprintf('is_process_running?(sshd): %s', w.is_process_running?('sshd'))
-  p sprintf('is_readable?(/etc/hosts): %s', w.is_readable?('/etc/hosts'))
-  p sprintf('is_service?(iptables): %s', w.is_service?('iptables'))
-  p sprintf('is_service_running?(iptables): %s', w.is_service_running?('iptables'))
-  p sprintf('is_user?(root): %s', w.is_user?('root'))
-  p sprintf('is_writeable?(/etc/hosts): %s', w.is_writeable?('/etc/hosts'))
+  p 'uptime:     %s' % w.run('uptime')
+  p 'os type:    %s' % w.os_type
+  p 'os version: %s' % w.os_version(w.os_type)
 
-  ## expected failure
-  p sprintf('is_dir?(/dne): %s', w.is_dir?('/dne'))
-  p sprintf('is_executable?(fizzybang): %s', w.is_executable?('fizzybang'))
-  p sprintf('is_file?(/dne/fizzy): %s', w.is_file?('/dne/fizzy'))
-  p sprintf('is_group?(three-amigos): %s', w.is_group?('three-amigos'))
-  p sprintf('is_in_file?(/etc/hosts, this content is not there): %s', w.is_in_file?('/etc/hosts', 'this content is not there'))
-  p sprintf('is_in_file?(/dne/fizzy, this file is not there): %s', w.is_in_file?('/dne/fizzy', 'this file is not there'))
-  p sprintf('is_in_path?(fizzy): %s', w.is_in_path?('fizzy'))
-  p sprintf('is_package?(fizzybang): %s', w.is_package?('fizzybang'))
-  p sprintf('is_port_open?(123, udp): %s', w.is_port_open?(123, 'udp'))
-  p sprintf('is_port_open?(22): %s', w.is_port_open?(22))
-  p sprintf('is_process_running?(fizzy): %s', w.is_process_running?('fizzy'))
-  p sprintf('is_readable?(/dne/fizzy): %s', w.is_readable?('/dne/fizzy'))
-  p sprintf('is_service?(syslogd): %s', w.is_service?('syslogd'))
-  p sprintf('is_service_running?(smartd): %s', w.is_service_running?('smartd'))
-  p sprintf('is_user?(toor): %s', w.is_user?('toor'))
-  #p sprintf('is_writable?(/etc/hosts): %s', w.is_writeable?('/etc/hosts')) # running as sudo, so everything is writeable -- can we test this with a file in a path that DNE?
-
-  # put a file on the box and then bring it back
-  w.put(__FILE__, '/tmp/foobar')
-  w.get('/tmp/foobar', 'foobar_from_piab_host.tmp')
-
-  # output should be the same
-  p sprintf('%s uname -a via run:    %s', w.name, w.run('uname -a'))
-  p sprintf('%s uname -a via output: %s', w.name, w.get_output())
-
-  begin
-    p sprintf('%s fizzy:    %s', w.name, w.run('fizzy'))
-  rescue => e
-    p e
-  end
-
-  begin
-    p sprintf('%s ls /dne/  %s', w.name, w.run('ls /dne/'))
-  rescue => e
-    p e
-  end
-
-  p sprintf('%s ls /dne/ expected exit code 2: %s', w.name, w.run('ls /dne/', 2))
-
-  # tear the box down
-  p 'destroying the box'
-  w.destroy()
+  p 'status: %s' % w.status()
 
-  p sprintf('%s status: %s', w.name, w.status())
-  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
+  p 'services:'
+  p w.get_services()
 
-  # bring it back again
-  p 'upping the box again'
-  w.up()
+  p 'rebooting...'
+  w.restart(120)
 
-  p sprintf('%s status: %s', w.name, w.status())
-  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
+  p 'status: %s' % w.status()
+  p 'uptime: %s' % w.run('uptime')
 
 end
 
-exit
+exit

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.64
+  VERSION = 0.67
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -76,7 +76,9 @@ class Rouster
       @verbosity_logfile = 2 # this is kind of arbitrary, but won't actually be created unless opts[:logfile] is also passed
     end
 
-    @ostype = nil
+    @ostype    = nil
+    @osversion = nil
+
     @output = Array.new
     @cache  = Hash.new
     @deltas = Hash.new
@@ -410,14 +412,8 @@ class Rouster
         elsif line.match(/Port (\d*?)$/)
           h[:ssh_port] = $1
         elsif line.match(/IdentityFile (.*?)$/)
-          key = $1
-          unless @sshkey.eql?(key)
-            h[:identity_file] = key
-          else
-            @logger.info(sprintf('using specified key[%s] instead of discovered key[%s]', @sshkey, key))
-            h[:identity_file] = @sshkey
-          end
-
+          h[:identity_file] = $1
+          @logger.info(sprintf('vagrant specified key[%s] differs from provided[%s], will use both', @sshkey, h[:identity_file]))
         end
       end
 
@@ -477,7 +473,7 @@ class Rouster
           @ssh_info[:hostname],
           @ssh_info[:user],
           :port => @ssh_info[:ssh_port],
-          :keys => [@sshkey],
+          :keys => [ @sshkey, @ssh_info[:identity_file] ].uniq, # try to use what the user specified first, but fall back to what vagrant says
           :paranoid => false
         )
       else
@@ -511,16 +507,9 @@ class Rouster
       return @ostype
     end
 
-    files = {
-      :ubuntu  => '/etc/os-release', # debian too
-      :solaris => '/etc/release',
-      :rhel    => ['/etc/os-release', '/etc/redhat-release'], # and centos
-      :osx     => '/System/Library/CoreServices/SystemVersion.plist',
-    }
-
     res = :invalid
 
-    files.each_pair do |os, f|
+    Rouster.os_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
@@ -531,12 +520,48 @@ class Rouster
       break unless res.eql?(:invalid)
     end
 
-    @logger.error(sprintf('unable to determine OS, looking for[%s]', files)) if res.eql?(:invalid)
+    @logger.error(sprintf('unable to determine OS, looking for[%s]', Rouster.os_files)) if res.eql?(:invalid)
 
     @ostype = res
     res
   end
 
+  ##
+  # os_version
+  #
+  #
+  def os_version(os_type)
+    return @osversion if @osversion
+
+    res = :invalid
+
+    [ Rouster.os_files[os_type] ].flatten.each do |candidate|
+      if self.is_file?(candidate)
+        next if candidate.eql?('/etc/os-release') and ! self.is_in_file?(candidate, os_type.to_s, 'i') # CentOS detection
+        contents = self.run(sprintf('cat %s', candidate))
+        if os_type.eql?(:ubuntu)
+          version = $1 if contents.match(/.*VERSION\="(\d+\.\d+).*"/) # VERSION="13.10, Saucy Salamander"
+          res = version unless version.nil?
+        elsif os_type.eql?(:rhel)
+          version = $1 if contents.match(/.*VERSION\="(\d+)"/) # VERSION="7 (Core)"
+          version = $1 if version.nil? and contents.match(/.*(\d+.\d+)/) # CentOS release 6.4 (Final)
+          res = version unless version.nil?
+        elsif os_type.eql?(:osx)
+          version = $1 if contents.match(/<key>ProductVersion<\/key>.*<string>(.*)<\/string>/m) # <key>ProductVersion</key>\n          <string>10.12.1</string>
+          res = version unless version.nil?
+        end
+
+      end
+      break unless res.eql?(:invalid)
+    end
+
+    @logger.error(sprintf('unable to determine OS version, looking for[%s]', Rouster.os_files[os_type])) if res.eql?(:invalid)
+
+    @osversion = res
+
+    res
+  end
+
   ##
   # get
   #
@@ -620,7 +645,7 @@ class Rouster
   #
   # parameters
   # * [wait] - number of seconds to wait until is_available_via_ssh?() returns true before assuming failure
-  def restart(wait=nil)
+  def restart(wait=nil, expected_exitcodes = [0])
     @logger.debug('restart()')
 
     if self.is_passthrough? and self.passthrough[:type].eql?(:local)
@@ -630,11 +655,15 @@ class Rouster
 
     case os_type
       when :osx
-        self.run('shutdown -r now')
-      when :rhel, :ubuntu, :debian
-        self.run('/sbin/shutdown -rf now')
+        self.run('shutdown -r now', expected_exitcodes)
+      when :rhel, :ubuntu
+        if os_type.eql?(:rhel) and os_version(os_type).match(/7/)
+          self.run('shutdown --halt --reboot now', expected_exitcodes << 256)
+        else
+          self.run('shutdown -rf now')
+        end
       when :solaris
-        self.run('shutdown -y -i5 -g0')
+        self.run('shutdown -y -i5 -g0', expected_exitcodes)
       else
         raise InternalError.new(sprintf('unsupported OS[%s]', @ostype))
     end
@@ -783,6 +812,15 @@ class Rouster
     nil
   end
 
+  def self.os_files
+    {
+      :ubuntu  => '/etc/os-release', # debian too
+      :solaris => '/etc/release',
+      :rhel    => ['/etc/os-release', '/etc/redhat-release'], # and centos
+      :osx     => '/System/Library/CoreServices/SystemVersion.plist',
+    }
+  end
+
 end
 
 class Object

data/lib/rouster/deltas.rb

@@ -473,7 +473,8 @@ class Rouster
         :upstart => 'initctl list',
       },
       :rhel => {
-        :systemv => '/sbin/service --status-all',
+        :systemd => 'systemctl list-units --type=service --no-pager',
+        :systemv => 'service --status-all',
         :upstart => 'initctl list',
       },
 
@@ -493,6 +494,11 @@ class Rouster
       raise InternalError.new(sprintf('unable to get service information from VM operating system[%s]', os)) if provider.eql?(:invalid)
       raise ArgumentError.new(sprintf('unable to find command provider[%s] for [%s]', provider, os))  if commands[os][provider].nil?
 
+      unless seed or self.is_in_path?(commands[os][provider].split(' ').first)
+        @logger.info(sprintf('skipping provider[%s], not in $PATH[%s]', provider, commands[os][provider]))
+        next
+      end
+
       @logger.info(sprintf('get_services using provider [%s] on [%s]', provider, os))
 
       # TODO while this is true, what if self.user is 'root'.. -- the problem is we don't have self.user, and we store this data differently depending on self.passthrough?
@@ -665,6 +671,26 @@ class Rouster
 
             res[service] = mode unless res.has_key?(service)
 
+          elsif provider.eql?(:systemd)
+            # UNIT              LOAD   ACTIVE   SUB      DESCRIPTION
+            # nfs-utils.service loaded inactive dead     NFS server and client services
+            # crond.service     loaded active   running  Command Scheduler
+
+            if line.match(/^\W*(.*?)\.service\s+(?:.*?)\s+(.*?)\s+(.*?)\s+(?:.*?)$/) # 5 space separated characters
+              service = $1
+              active  = $2
+              sub     = $3
+
+              if humanize
+                mode = sub.match('running') ? 'running' : 'stopped'
+                mode = 'unsure'  unless mode.eql?('stopped') or mode.eql?('running')
+              end
+
+              res[service] = mode
+            else
+              # not logging here, there is a bunch of garbage output at the end of the output that we can't seem to suppress
+              next
+            end
 
           end
 

data/plugins/openstack.rb

@@ -37,15 +37,25 @@ class Rouster
       self.connect_ssh_tunnel
     else
       server = @nova.servers.create(:name => @name, :flavor_ref => @passthrough[:flavor_ref],
-                  :image_ref => @passthrough[:image_ref], :key_name => @passthrough[:keypair])
+                  :image_ref => @passthrough[:image_ref], :key_name => @passthrough[:keypair], :user_data => @passthrough[:user_data])
       server.wait_for { ready? }
       @instance_data = server
-      self.passthrough[:host] = server.addresses["NextGen"][0]["addr"]
+      if defined?(self.addresses['NextGen'][0]['addr'])
+        self.passthrough[:host] = self.addresses['NextGen'][0]['addr']
+      else
+        server.addresses.each_key do |address_key|
+          if defined?(server.addresses[address_key])
+            self.passthrough[:host] = server.addresses[address_key][0]['addr']
+          end
+        end
+      end
       self.passthrough[:instance] = self.ostack_get_instance_id
+      @logger.debug(sprintf('Connecting to running instance [%s] while calling ostack_up()', self.passthrough[:instance]))
+      self.connect_ssh_tunnel
     end
     self.passthrough[:instance]
   end
-  
+
   def ostack_get_ip()
     self.passthrough[:host]
   end

data/test/functional/deltas/test_get_os.rb

@@ -7,14 +7,6 @@ require 'test/unit'
 
 class TestValidateFileFunctional < Test::Unit::TestCase
 
-  # TODO this should probably be further abstracted into the implementation, but this is fine for now
-  FLAG_FILES = {
-    :ubuntu  => '/etc/os-release', # debian too
-    :solaris => '/etc/release',
-    :rhel    => '/etc/redhat-release', # centos too
-    :osx     => '/System/Library/CoreServices/SystemVersion.plist',
-  }
-
   def setup
     # expose private methods
     Rouster.send(:public, *Rouster.private_instance_methods)
@@ -25,10 +17,12 @@ class TestValidateFileFunctional < Test::Unit::TestCase
 
   def teardown
     # put the flag file back in place
-    FLAG_FILES.each_pair do |_os, ff|
-      bkup = sprintf('%s.bkup', ff)
-      if @app.is_file?(bkup)
-        @app.run(sprintf('mv %s %s', bkup, ff))
+    Rouster.os_files.each_pair do |_os, ff|
+      [ ff ].flatten.each do |f|
+        bkup = sprintf('%s.bkup', f)
+        if @app.is_file?(bkup)
+          @app.run(sprintf('mv %s %s', bkup, f))
+        end
       end
     end
   end
@@ -39,6 +33,10 @@ class TestValidateFileFunctional < Test::Unit::TestCase
     assert_not_nil(type, sprintf('unable to determine vm[%s] OS', @app))
     assert_not_equal(:invalid, type)
 
+    version = @app.os_version(type)
+    assert_not_nil(version, sprintf('unable to determine vm[%s] OS version', @app))
+    assert_not_equal(:invalid, version)
+
     assert_nothing_raised do
       @app.get_services
     end
@@ -47,9 +45,11 @@ class TestValidateFileFunctional < Test::Unit::TestCase
 
   def test_unhappy_path
     # move the flag file out of the way
-    FLAG_FILES.each_pair do |_os, ff|
-      if @app.is_file?(ff)
-        @app.run(sprintf('mv %s %s.bkup', ff, ff))
+    Rouster.os_files.each_pair do |_os, ff|
+      [ ff ].flatten.each do |f|
+        if @app.is_file?(ff)
+          @app.run(sprintf('mv %s %s.bkup', f, f))
+        end
       end
     end
 
@@ -58,7 +58,7 @@ class TestValidateFileFunctional < Test::Unit::TestCase
     assert_equal(:invalid, type, sprintf('got wrong value for unmarked OS[%s]', type))
 
     e = assert_raise do
-        @app.get_services
+      @app.get_services
     end
 
     assert_equal(Rouster::InternalError, e.class, sprintf('wrong exception raised[%s] [%s]', e.class, e.message))

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

@@ -0,0 +1,46 @@
+  UNIT                                           LOAD   ACTIVE SUB     DESCRIPTION
+  crond.service                                  loaded active running Command Scheduler
+  dbus.service                                   loaded active running D-Bus System Message Bus
+  getty@tty1.service                             loaded active running Getty on tty1
+  gssproxy.service                               loaded active running GSSAPI Proxy Daemon
+● kdump.service                                  loaded failed failed  Crash recovery kernel arming
+  kmod-static-nodes.service                      loaded active exited  Create list of required static device nodes for the current kernel
+  lldpad.service                                 loaded active running Link Layer Discovery Protocol Agent Daemon.
+  mdmonitor.service                              loaded active running Software RAID monitoring and management
+  network.service                                loaded active running LSB: Bring up/down networking
+  nfs-config.service                             loaded active exited  Preprocess NFS configuration
+  ntpd.service                                   loaded active running Network Time Service
+  postfix.service                                loaded active running Postfix Mail Transport Agent
+  rhel-dmesg.service                             loaded active exited  Dump dmesg to /var/log/dmesg
+  rhel-import-state.service                      loaded active exited  Import network configuration from initramfs
+  rhel-readonly.service                          loaded active exited  Configure read-only root support
+  rsyslog.service                                loaded active running System Logging Service
+  sshd.service                                   loaded active running OpenSSH server daemon
+  systemd-fsck-root.service                      loaded active exited  File System Check on Root Device
+  systemd-fsck@dev-disk-by\x2dlabel-boot.service loaded active exited  File System Check on /dev/disk/by-label/boot
+systemd-journal-flush.service                  loaded active exited  Flush Journal to Persistent Storage
+  systemd-journald.service                       loaded active running Journal Service
+  systemd-logind.service                         loaded active running Login Service
+  systemd-random-seed.service                    loaded active exited  Load/Save Random Seed
+  systemd-remount-fs.service                     loaded active exited  Remount Root and Kernel File Systems
+  systemd-sysctl.service                         loaded active exited  Apply Kernel Variables
+  systemd-tmpfiles-setup-dev.service             loaded active exited  Create Static Device Nodes in /dev
+  systemd-tmpfiles-setup.service                 loaded active exited  Create Volatile Files and Directories
+  systemd-udev-trigger.service                   loaded active exited  udev Coldplug all Devices
+  systemd-udevd.service                          loaded active running udev Kernel Device Manager
+  systemd-update-utmp.service                    loaded active exited  Update UTMP about System Boot/Shutdown
+  systemd-user-sessions.service                  loaded active exited  Permit User Sessions
+  systemd-vconsole-setup.service                 loaded active exited  Setup Virtual Console
+  tuned.service                                  loaded active running Dynamic System Tuning Daemon
+  vboxadd-service.service                        loaded active running LSB: VirtualBox Additions service
+  vboxadd-x11.service                            loaded active exited  LSB: VirtualBox Linux Additions kernel modules
+  vboxadd.service                                loaded active exited  LSB: VirtualBox Linux Additions kernel modules
+
+LOAD   = Reflects whether the unit definition was properly loaded.
+ACTIVE = The high-level unit activation state, i.e. generalization of SUB.
+SUB    = The low-level unit activation state, values depend on unit type.
+
+36 loaded units listed. Pass --all to see loaded but inactive units, too.
+To show all installed unit files use 'systemctl list-unit-files'.
+
+

data/test/unit/testing/test_get_services.rb

@@ -42,6 +42,31 @@ class TestUnitGetPackages < Test::Unit::TestCase
 
   end
 
+  def test_rhel_systemd
+    @app.instance_variable_set(:@ostype, :rhel)
+    @app.instance_variable_set(:@osversion, '7')
+    services = {}
+
+    raw = File.read(sprintf('%s/../../../test/unit/testing/resources/rhel-systemd', File.dirname(File.expand_path(__FILE__))))
+
+    assert_nothing_raised do
+      services = @app.get_services(false, true, :systemd, raw)
+    end
+
+    expected = {
+      'kdump'                => 'stopped', # ● kdump.service                                  loaded failed failed  Crash recovery kernel arming
+      'rhel-dmesg'           => 'stopped', #   rhel-dmesg.service                             loaded active exited  Dump dmesg to /var/log/dmesg
+      'sshd'                 => 'running', #   sshd.service                                   loaded active running OpenSSH server daemon
+      'systemd-journal-flush'=> 'stopped', # this is a test for output without leading spaces
+    }
+
+    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, :rhel)
     services = {}
@@ -134,8 +159,8 @@ class TestUnitGetPackages < Test::Unit::TestCase
     end
 
     expected = {
-      'com.bigfix.BESAgent'            => 'running', # 100	-	com.bigfix.BESAgent
-      'com.trendmicro.mpm.icore.agent' => 'stopped', # -	0	com.trendmicro.mpm.icore.agent
+      '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|
@@ -150,3 +175,4 @@ class TestUnitGetPackages < Test::Unit::TestCase
   end
 
 end
+

data/test/unit/testing/test_meets_constraint.rb

@@ -18,6 +18,11 @@ class TestMeetsConstraint < Test::Unit::TestCase
     @app.facts = fake_facts
   end
 
+  def test_multiple_positive
+    assert(@app.meets_constraint?([['is_virtual', 'true'], ['timezone', 'PDT',]]))
+  end
+
+
   def test_positive
 
     assert(@app.meets_constraint?('is_virtual', 'true'))
@@ -52,4 +57,4 @@ class TestMeetsConstraint < Test::Unit::TestCase
     # noop
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.64'
+  version: '0.67'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -183,6 +183,7 @@ files:
 - test/unit/test_parse_ls_string.rb
 - test/unit/test_traverse_up.rb
 - test/unit/testing/resources/osx-launchd
+- test/unit/testing/resources/rhel-systemd
 - test/unit/testing/resources/rhel-systemv
 - test/unit/testing/resources/rhel-upstart
 - test/unit/testing/test_get_services.rb
@@ -219,3 +220,4 @@ signing_key:
 specification_version: 4
 summary: Rouster is an abstraction layer for Vagrant
 test_files: []
+has_rdoc: