rouster 0.67 → 0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f9824019bc7951750f51019efd7d5d7e174d33
-  data.tar.gz: babacb0d00e65d6ea702886286940e6bdf61f9d0
+  metadata.gz: f2922e8289682a6859c9e8425df652eb5af74b93
+  data.tar.gz: 2862b48d598fd179b986458f214232f65ca483cf
 SHA512:
-  metadata.gz: 8fbed7fb6d5e19c71ad2488c0a50b9aa387ab5474363f4dc1c318c9cae9dba9b1c632bb2f6202a8e3d909cc7b92d54d489ad19ef9417f06a92c7b8eaa2bed2e0
-  data.tar.gz: d5ad29bdf90c6ef7c9896720ce2a16eff88833dc9e1c71e708b131a7c8edc6824546998ba086ae31de76966106458992ce23198a7b709a3d8be8f3de3617b516
+  metadata.gz: 34ce58498c46e4eccc008177db64cefdfc5e1f4ae66df0e7a34cd1abbac60b2bd12929f6b60e31b418153deb7c9a946c6c955f0d210c6fc3d9851a9dbc319485
+  data.tar.gz: 40599a85f744aea565ce406870890b8ad92620cc7aba21f02e4eb721aa3368d80208c176790e003a650e4e00f7afdb268cf0b167fa22732900bed1ba8e10b85c

data/Rakefile

@@ -39,26 +39,31 @@ 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,21 +10,16 @@ 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|
@@ -33,7 +28,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_hostname] || hash[:box_name]
+      worker.vm.host_name      = 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,30 +4,110 @@ require 'rouster'
 require 'rouster/puppet'
 require 'rouster/tests'
 
-centos6 = Rouster.new(:name => 'app', :verbosity => 4, :sudo => true)
-centos7 = Rouster.new(:name => 'centos7', :verbosity => 4, :sudo => true)
+app = Rouster.new(:name => 'app', :verbosity => 4, :sudo => true)
+ppm = Rouster.new(:name => 'ppm', :verbosity => 1, :sudo => true)
 
-workers = [centos6, centos7]
+# 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.each do |w|
   p '%s config: ' % w.name
   p w
 
-  p 'uptime:     %s' % w.run('uptime')
-  p 'os type:    %s' % w.os_type
-  p 'os version: %s' % w.os_version(w.os_type)
-
   p 'status: %s' % w.status()
+  p 'upping the box'
+  w.up()
 
-  p 'services:'
-  p w.get_services()
+  p sprintf('%s status: %s', w.name, w.status())
+  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
 
-  p 'rebooting...'
-  w.restart(120)
+  p 'suspending the box'
+  w.suspend()
 
-  p 'status: %s' % w.status()
-  p 'uptime: %s' % w.run('uptime')
+  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'))
+
+  ## 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 sprintf('%s status: %s', w.name, w.status())
+  p sprintf('%s available via ssh: %s', w.name, w.is_available_via_ssh?())
+
+  # bring it back again
+  p 'upping the box again'
+  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?())
 
 end
 
-exit
+exit

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.67
+  VERSION = 0.68
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -41,6 +41,7 @@ class Rouster
   # * [sudo]                - boolean of whether or not to prefix commands run in VM with 'sudo', default is true
   # * [vagrantfile]         - the full or relative path to the Vagrantfile to use, if not specified, will look for one in 5 directories above current location
   # * [vagrant_concurrency] - boolean controlling whether Rouster will attempt to run `vagrant *` if another vagrant process is already running, default is false
+  # * [vagrant_reboot]      - particularly sticky systems restart better if Vagrant does it for us, default is false
   # * [verbosity]           - an integer representing console level logging, or an array of integers representing console,file level logging - DEBUG (0) < INFO (1) < WARN (2) < ERROR (3) < FATAL (4)
   def initialize(opts = nil)
     @cache_timeout       = opts[:cache_timeout].nil? ? false : opts[:cache_timeout]
@@ -53,6 +54,7 @@ class Rouster
     @unittest            = opts[:unittest].nil? ? false : opts[:unittest]
     @vagrantfile         = opts[:vagrantfile].nil? ? traverse_up(Dir.pwd, 'Vagrantfile', 5) : opts[:vagrantfile]
     @vagrant_concurrency = opts[:vagrant_concurrency].nil? ? false : opts[:vagrant_concurrency]
+    @vagrant_reboot      = opts[:vagrant_reboot].nil? ? false : opts[:vagrant_reboot]
 
     # TODO kind of want to invert this, 0 = trace, 1 = debug, 2 = info, 3 = warning, 4 = error
     # could do `fixed_ordering = [4, 3, 2, 1, 0]` and use user input as index instead, so an input of 4 (which should be more verbose), yields 0
@@ -653,19 +655,25 @@ class Rouster
       return nil
     end
 
-    case os_type
-      when :osx
-        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)
+    if @vagrant_reboot
+      # leading vagrant handle this through 'reload --no-provision'
+      self.reload
+    else
+      # trying to do it ourselves
+      case os_type
+        when :osx
+          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', expected_exitcodes)
         else
-          self.run('shutdown -rf now')
-        end
-      when :solaris
-        self.run('shutdown -y -i5 -g0', expected_exitcodes)
-      else
-        raise InternalError.new(sprintf('unsupported OS[%s]', @ostype))
+          raise InternalError.new(sprintf('unsupported OS[%s]', @ostype))
+      end
     end
 
     @ssh, @ssh_info = nil # severing the SSH tunnel, getting ready in case this box is brought back up on a different port

data/lib/rouster/vagrant.rb

@@ -159,6 +159,22 @@ class Rouster
     return status
   end
 
+  ##
+  # reload
+  #
+  # runs `vagrant reload <name> [--no-provision]` from the Vagrantfile path
+  # +no_provision+ Boolean whether or not to stop reprovisioning
+  def reload(no_provision = true)
+
+    if self.is_passthrough?
+      @logger.warn(sprintf('calling [vagrant reload] on a passthrough host is a noop', face))
+      return nil
+    end
+
+    @logger.info('reload()')
+    self.vagrant(sprintf('reload %s %s', @name, no_provision ? '--no-provision' : ''))
+  end
+
   ##
   # suspend
   #

data/test/unit/testing/test_meets_constraint.rb

@@ -18,11 +18,6 @@ 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'))
@@ -57,4 +52,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.67'
+  version: '0.68'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -220,4 +220,3 @@ signing_key:
 specification_version: 4
 summary: Rouster is an abstraction layer for Vagrant
 test_files: []
-has_rdoc: