rouster 0.61 → 0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37f795615a19e7523b738d759e48f3e61fdc81c
-  data.tar.gz: 898b4400f00d4675061d9dd5e0716fc9a7ec21ce
+  metadata.gz: 8bce9804eb72b059c106b689793f06a26a55dcdb
+  data.tar.gz: 278dadb5f13e14a71ea84adecc751989f74ee810
 SHA512:
-  metadata.gz: 7442ac64dc582dbc03be7aaecc9f481ca7f9d1d0c43608faab5ea3f947ae4a696a0ab1c6d2467223b289e09faa762adfbdd24db8e2d5f8949f174f35922a73d4
-  data.tar.gz: 13e407ab375276b8bf8c2054008668d2471e2be685224b3da62424cd6d92ff83ee3ceddadb6e0388db7df715d5ea654753dece45c374d2ce2348b302f3a26c4e
+  metadata.gz: ae9a583d9d11112ada1f3a17295f41f6d8d5563af4e389af2b1a090f9327a6b5441929199d205bcca341b770e68128cf0514ed7953b154f861651e5d0ab6067e
+  data.tar.gz: 2f012c9ca78fb82ff64c079ad5e262b77203021e74de3d0e20a1444a20d62633ba7119dbd962b57577fba4f77896930199cd61ba76e9555b85ec1787418fcc23

data/README.md

@@ -29,7 +29,7 @@ The first implementation of Rouster was in Perl, called [Salesforce::Vagrant](ht
   * log4r
   * net-scp
   * net-ssh
-  * fog (only if using AWS)
+  * fog (only if using AWS or OpenStack)
 
 Note: Rouster should work exactly the same on Windows as it does on \*nix and OSX (minus rouster/deltas.rb functionality, at least currently),
 but no real testing has been done to confirm this. Please file issues as appropriate.
@@ -149,13 +149,14 @@ app.destroy()
 
 ### advanced instantiation (passthroughs!)
 
-detailed options in ```examples/passthrough.rb``` and ```examples/aws.rb```
+detailed options in ```examples/passthrough.rb```, ```examples/aws.rb``` and ```examples/openstack.rb```
 
 since Rouster only requires an SSH connection to control a machine, why stop at Vagrant?
 
 ```rb
 require 'rouster'
 require 'rouster/plugins/aws'
+require 'rouster/plugins/openstack'
 
 # control the machine rouster itself is running on
 local = Rouster.new(:name => 'local', :passthrough => { :type => :local } }
@@ -195,6 +196,38 @@ aws_start_me_up = Rouster.new(
   }
 )
 
+# create a remote OpenStack instance
+ostack = Rouster.new(
+  :name      => 'ostack-testing',
+  :passthrough => {
+    :type                => :openstack,
+    :openstack_auth_url  => 'http://hostname.domain.com:5000/v2.0/tokens',
+    :openstack_username  => 'some_console_user',
+    :openstack_tenant    => 'tenant_id',
+    :user                => 'some_ssh_userid', 
+    :keypair             => 'keypair_name',
+    :image_ref           => 'c0340afb-577d-4db6-1234-aebdd6d1838f',
+    :flavor_ref          => '547d9af5-096c-44a3-1234-7d23162556b8',
+    :openstack_api_key   => 'some_api_key',
+    :key                 => '/path/to/private/key.pem',
+  },
+  :sudo => true, # false by default, enabling requires that sshd is not enforcing 'requiretty'
+)
+
+# control a running OpenStack instance
+openstack_already_running = Rouster.new(
+  :name      => 'ostack-copy',
+  :passthrough => {
+    :type                => :openstack,
+    :openstack_auth_url  => 'http://hostname.domain.com:5000/v2.0/tokens',
+    :openstack_username  => 'some_console_user',
+    :openstack_tenant    => 'tenant_id',
+    :user                => 'ssh_user',
+    :keypair             => 'keypair_name',
+    :instance            => 'your-instance-id',
+  },
+)
+
 ```
 
 ### functional puppet test
@@ -353,3 +386,17 @@ irb(main):004:0> pp (Rouster.new(:name => 'aws', :passthrough => { :type => :aws
 ...
 ]
 ```
+
+## Openstack methods
+
+```rb
+[
+  :ostack_connect,
+  :ostack_describe_instance,
+  :ostack_destroy,
+  :ostack_get_instance_id,
+  :ostack_get_ip,
+  :ostack_status,
+  :ostack_up
+]
+```

data/Rakefile

@@ -6,6 +6,10 @@ task :buildgem do
   sh 'gem build rouster.gemspec'
 end
 
+task :clean do
+  sh 'rm /tmp/rouster-*'
+end
+
 task :default do
   sh 'ruby test/basic.rb'
 end

data/examples/openstack.rb

@@ -0,0 +1,61 @@
+require sprintf('%s/../%s', File.dirname(File.expand_path(__FILE__)), 'path_helper')
+
+require 'rouster'
+require 'plugins/openstack' # brings in fog and some helpers
+
+ostack = Rouster.new(
+  :name      => 'ostack-testing',
+  :sudo      => false,
+  :logfile   => true,
+  :passthrough => {
+    :type                => :openstack,                                   # Indicate OpenStack provider
+    :openstack_auth_url  => 'http://hostname.acme.com:5000/v2.0/tokens',  # OpenStack API endpoint
+    :openstack_username  => 'some_user',                                  # OpenStack console username
+    :openstack_tenant    => 'tenant_id',                                  # Tenant ID
+    :user                => 'ssh_user_id',                                # SSH login ID
+    :keypair             => 'openstack_key_name',                         # Name of ssh keypair in OpenStack
+    :image_ref           => 'c0340afb-577d-1234-87b2-aebdd6d1838f',       # Image ID in OpenStack
+    :flavor_ref          => '547d9af5-096c-1234-98df-7d23162556b8',       # Flavor ID in OpenStack
+    :openstack_api_key   => 'secret_openstack_key',                       # OpenStack console password
+    :key                 => '/path/to/ssh_keys.pem',                      # SSH key filename
+  },
+  :sshtunnel => false,
+  :verbosity => 1,
+)
+
+p "UP(): #{ostack.up}"
+p "STATUS(): #{ostack.status}"
+
+ostack_copy = Rouster.new(
+  :name      => 'ostack-copy',
+  :sudo      => false,
+  :logfile   => true,
+  :passthrough => {
+    :type                => :openstack,                                   # Indicate OpenStack provider
+    :openstack_auth_url  => 'http://hostname.acme.com:5000/v2.0/tokens',  # OpenStack API endpoint
+    :openstack_username  => 'some_user',                                  # OpenStack console username
+    :openstack_tenant    => 'tenant_id',                                  # Tenant ID
+    :user                => 'ssh_user_id',                                # SSH login ID
+    :keypair             => 'openstack_key_name',                         # Name of ssh keypair in OpenStack
+    :openstack_api_key   => 'secret_openstack_key',                       # OpenStack console password
+    :instance            => ostack.ostack_get_instance_id,                # ID of a running OpenStack instance.
+  },
+  :sshtunnel => false,
+  :verbosity => 1,
+)
+
+[ ostack, ostack_copy ].each do |o|
+  p "ostack_get_instance_id: #{o.ostack_get_instance_id}"
+
+  p "status: #{o.status}"
+
+  p "ostack_get_ip(): #{o.ostack_get_ip()}"
+
+  p "run(uptime): #{o.run('uptime')}"
+  p "get(/etc/hosts): #{o.get('/etc/hosts')}"
+  p "put(/etc/hosts, /tmp): #{o.put('/etc/hosts', '/tmp')}"
+
+end
+
+p "DESTROY(): #{ostack.destroy}"
+exit

data/lib/rouster.rb

@@ -12,7 +12,7 @@ require 'rouster/vagrant'
 class Rouster
 
   # sporadically updated version number
-  VERSION = 0.61
+  VERSION = 0.62
 
   # custom exceptions -- what else do we want them to include/do?
   class ArgumentError        < StandardError; end # thrown by methods that take parameters from users
@@ -145,6 +145,7 @@ class Rouster
         aws_defaults = {
           :ami                   => 'ami-7bdaa84b', # RHEL 6.5 x64 in us-west-2
           :dns_propagation_sleep => 30, # how much time to wait after ELB creation before attempting to connect
+          :elb_cleanup           => false,
           :key_id                => ENV['AWS_ACCESS_KEY_ID'],
           :min_count             => 1,
           :max_count             => 1,
@@ -187,9 +188,30 @@ class Rouster
 
         raise ArgumentError.new('AWS passthrough requires valid :sshkey specification, should be path to private half') unless File.file?(@passthrough[:key])
         @sshkey = @passthrough[:key]
+      elsif @passthrough[:type].eql?(:openstack)
+        @logger.debug(sprintf('instantiating an %s passthrough worker', @passthrough[:type]))
+        @sshkey = @passthrough[:key]
+
+        ostack_defaults = {
+          :ssh_port => 22,
+        }
+        @passthrough = ostack_defaults.merge(@passthrough)
 
+        [:openstack_auth_url, :openstack_username, :openstack_tenant, :openstack_api_key,
+          :key ].each do |r|
+            raise ArgumentError.new(sprintf('OpenStack passthrough requires %s specification', r)) if @passthrough[r].nil?
+        end
+
+        if @passthrough.has_key?(:image_ref)
+          @logger.debug(':image_ref specified, will start new Nova instance')
+        elsif @passthrough.has_key?(:instance)
+          @logger.debug(':instance specified, will connect to existing OpenStack instance')
+          inst_details = self.ostack_describe_instance(@passthrough[:instance])
+          raise ArgumentError.new(sprintf('No such instance found in OpenStack - %s', @passthrough[:instance])) if inst_details.nil?
+          @passthrough[:host] = inst_details.addresses["NextGen"][0]["addr"]
+        end
       else
-        raise ArgumentError.new(sprintf('passthrough :type [%s] unknown, allowed: :aws, :local, :remote', @passthrough[:type]))
+        raise ArgumentError.new(sprintf('passthrough :type [%s] unknown, allowed: :aws, :openstack, :local, :remote', @passthrough[:type]))
       end
 
     else

data/lib/rouster/deltas.rb

@@ -70,6 +70,12 @@ class Rouster
         next if line.match(/^#|^\s+$/)
         elements = line.split("\s")
 
+        if elements.size < 5
+          # this is usually (only?) caused by ENV_VARIABLE=VALUE directives
+          @logger.debug(sprintf('line [%s] did not match format expectations for a crontab entry, skipping', line))
+          next
+        end
+
         command = elements[5..elements.size].join(' ')
 
         res[u] ||= Hash.new

data/lib/rouster/testing.rb

@@ -234,10 +234,10 @@ class Rouster
             local = true
             begin
               self.run(sprintf("grep -c '%s' %s", regex, name))
-            rescue
+            rescue => e
               local = false
             end
-            next if local.false?
+            break if local.false?
           end
         when :notcontains, :doesntcontain # TODO determine the appropriate attribute title here
           v = v.class.eql?(Array) ? v : [v]
@@ -246,10 +246,10 @@ class Rouster
             begin
               self.run(sprintf("grep -c '%s' %s", regex, name))
               local = false
-            rescue
+            rescue => e
               local = true
             end
-            next if local.false?
+            break if local.false?
           end
         when :mode, :permissions
           if properties.nil?

data/lib/rouster/vagrant.rb

@@ -48,8 +48,14 @@ class Rouster
     @logger.info('up()')
 
     # don't like putting this here, may be refactored
-    if self.is_passthrough? and (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
-      self.aws_up()
+    if self.is_passthrough? 
+      if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
+         self.aws_up()
+      elsif (self.passthrough[:type].equal?(:openstack))
+         self.ostack_up()
+      else
+         self.vagrant(sprintf('up %s', @name))
+      end
     else
       self.vagrant(sprintf('up %s', @name))
     end
@@ -81,8 +87,14 @@ class Rouster
     @logger.info('destroy()')
 
     # don't like putting this here, may be refactored
-    if self.is_passthrough? and (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
-      self.aws_destroy()
+    if self.is_passthrough? 
+      if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
+        self.aws_destroy()
+      elsif self.is_passthrough? and self.passthrough[:type].equal?(:openstack)
+        self.ostack_destroy()
+      else
+        raise InternalError.new(sprintf('failed to execute destroy(), unsupported passthrough type %s', self.passthrough[:type]))
+      end
     else
       self.vagrant(sprintf('destroy -f %s', @name))
     end
@@ -109,8 +121,14 @@ class Rouster
 
     # don't like putting this here, may be refactored
     @logger.info('status()')
-    if self.is_passthrough? and (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
-      status = self.aws_status()
+    if self.is_passthrough? 
+      if (self.passthrough[:type].equal?(:aws) or self.passthrough[:type].equal?(:raiden))
+        status = self.aws_status()
+      elsif self.passthrough[:type].equal?(:openstack)
+        status = self.ostack_status()
+      else
+        raise InternalError.new(sprintf('failed to execute status(), unsupported passthrough type %s', self.passthrough[:type]))
+      end
     else
       self.vagrant(sprintf('status %s', @name))
 
@@ -274,5 +292,4 @@ class Rouster
     end
   end
 
-
-end
+end

data/plugins/aws.rb

@@ -176,11 +176,9 @@ class Rouster
 
     server = @ec2.terminate_instances(self.aws_get_instance)
 
-    if @passthrough.has_key?(:created_elb)
-      elb = @passthrough[:created_elb]
-
-      @logger.info(sprintf('deleting ELB[%s]', elb))
-      @elb.delete_load_balancer(elb)
+    if self.passthrough[:created_elb] && self.passthrough[:elb_cleanup]
+      @logger.info(sprintf('deleting ELB[%s]', self.passthrough[:created_elb]))
+      @elb.delete_load_balancer(self.passthrough[:created_elb])
     end
 
     self.aws_status
@@ -264,6 +262,8 @@ class Rouster
     @logger.debug(sprintf('sleeping[%s] to allow DNS propagation', self.passthrough[:dns_propagation_sleep]))
     sleep self.passthrough[:dns_propagation_sleep]
 
+    self.passthrough[:created_elb] = elbname
+
     return dnsname
   end
 

data/plugins/openstack.rb

@@ -0,0 +1,129 @@
+#!/usr/bin/ruby
+## plugins/openstack.rb - provide helper functions for Rouster objects running on OpenStack/Compute
+
+require sprintf('%s/../%s', File.dirname(File.expand_path(__FILE__)), 'path_helper')
+
+require 'fog'
+require 'uri'
+
+class Rouster
+
+  attr_reader :nova     # expose OpenStack workers
+  attr_reader :instance_data # the result of the runInstances request
+
+  # return a hash containing meta-data items
+  def ostack_get_instance_id ()
+    # The instance id is kept in @passthrough[:instance] or
+    # can be obtained from @instance_data which has all instance
+    # details.
+    if ! @instance_data.nil? and ! @instance_data.id.nil?
+      return @instance_data.id # we already know the id
+    elsif @passthrough.has_key?(:instance)
+      return @passthrough[:instance] # we know the id we want
+    else
+      @logger.debug(sprintf('unable to determine id from instance_data[%s] or passthrough specification[%s]', @instance_data, @passthrough))
+      return nil # we don't have an id yet, likely a up() call
+    end
+  end
+
+  def ostack_up
+    # wait for machine to transition to running state and become sshable (TODO maybe make the second half optional)
+    self.ostack_connect
+    # This will check if instance_id has been provided. If so, it will check on status of the instance.
+    status = self.status()
+    if status.eql?('running')
+      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
+    else
+      server = @nova.servers.create(:name => @name, :flavor_ref => @passthrough[:flavor_ref],
+                  :image_ref => @passthrough[:image_ref], :key_name => @passthrough[:keypair])
+      server.wait_for { ready? }
+      @instance_data = server
+      self.passthrough[:host] = server.addresses["NextGen"][0]["addr"]
+      self.passthrough[:instance] = self.ostack_get_instance_id
+    end
+    self.passthrough[:instance]
+  end
+  
+  def ostack_get_ip()
+    self.passthrough[:host]
+  end
+
+  def ostack_destroy
+    server = self.ostack_describe_instance
+    raise sprintf("instance[%s] not found by destroy()", self.ostack_get_instance_id) if server.nil?
+    server.destroy
+    @instance_data = nil
+    self.passthrough.delete(:instance)
+  end
+
+  def ostack_describe_instance(instance_id = ostack_get_instance_id)
+
+    if @cache_timeout
+      if @cache.has_key?(:ostack_describe_instance)
+        if (Time.now.to_i - @cache[:ostack_describe_instance][:time]) < @cache_timeout
+          @logger.debug(sprintf('using cached ostack_describe_instance?[%s] from [%s]', @cache[:ostack_describe_instance][:instance], @cache[:ostack_describe_instance][:time]))
+          return @cache[:ostack_describe_instance][:instance]
+        end
+      end
+    end
+    # We don't have a instance.
+    return nil if instance_id.nil?
+    self.ostack_connect
+    response = @nova.servers.get(instance_id)
+    return nil if response.nil?
+    @instance_data = response
+
+    if @cache_timeout
+      @cache[:ostack_describe_instance] = Hash.new unless @cache[:ostack_describe_instance].class.eql?(Hash)
+      @cache[:ostack_describe_instance][:time] = Time.now.to_i
+      @cache[:ostack_describe_instance][:instance] = response
+      @logger.debug(sprintf('caching is_available_via_ssh?[%s] at [%s]', @cache[:ostack_describe_instance][:instance], @cache[:ostack_describe_instance][:time]))
+    end
+
+    @instance_data
+  end
+
+  def ostack_status
+    self.ostack_describe_instance
+    return 'not-created' if @instance_data.nil?
+    if @instance_data.state.eql?('ACTIVE')
+       # Make this consistent with AWS response.
+       return 'running'
+    else
+       return  @instance_data.state
+    end
+  end
+
+
+  # TODO this will throw at the first error - should we catch?
+  # run some commands, return an array of the output
+  def ostack_bootstrap (commands)
+    self.ostack_connect
+    commands = (commands.is_a?(Array)) ? commands : [ commands ]
+    output   = Array.new
+
+    commands.each do |command|
+      output << self.run(command)
+    end
+
+    return output
+  end
+
+  def ostack_connect
+    # Instantiates an Object which can communicate with OS Compute.
+    # No instance specific information is set at this time.
+    return @nova unless @nova.nil?
+
+    config = {
+      :provider            => 'openstack',                           # OpenStack Fog provider
+      :openstack_auth_url  => self.passthrough[:openstack_auth_url], # OpenStack Keystone endpoint
+      :openstack_username  => self.passthrough[:openstack_username], # Your OpenStack Username
+      :openstack_tenant    => self.passthrough[:openstack_tenant],   # Your tenant id
+      :openstack_api_key   => self.passthrough[:openstack_api_key],  # Your OpenStack Password
+      :connection_options  => self.passthrough[:connection_options]  # Optional
+    }
+    @nova = Fog::Compute.new(config)
+  end
+end

data/test/functional/deltas/test_get_crontab.rb

@@ -127,7 +127,7 @@ class TestDeltasGetCrontab < Test::Unit::TestCase
     @app.run("crontab -u #{user} #{tmp}")
 
     assert_nothing_raised do
-      res = @app.get_crontab('puppet')
+      res = @app.get_crontab(user)
     end
 
     assert_equal(Hash, res.class)
@@ -136,6 +136,24 @@ class TestDeltasGetCrontab < Test::Unit::TestCase
 
   end
 
+  def test_non_matching_lines
+    res  = nil
+    user = 'root'
+    tmp  = sprintf('/tmp/rouster.tmp.crontab.%s.%s.%s', user, Time.now.to_i, $$)
+
+    @app.run("echo 'PATH=/sbin:/usr/bin:/usr/local/bin' > #{tmp}")
+    @app.run("echo '5 5 * * * echo #{user}' >> #{tmp}")
+    @app.run("crontab -u #{user} #{tmp}")
+
+    assert_nothing_raised do
+      res = @app.get_crontab(user, false)
+    end
+
+    assert_equal(Hash, res.class)
+    assert(res.has_key?('echo root'))
+
+  end
+
   def teardown
     @app = nil
   end

data/test/functional/deltas/test_get_groups.rb

@@ -54,7 +54,7 @@ class TestDeltasGetGroups < Test::Unit::TestCase
     if @app.os_type.eql?(:redhat)
       @app.run(sprintf('groupadd %s', new_group))
     else
-      skip('only doing group creation on RHEL hosts')
+      omit('only doing group creation on RHEL hosts')
     end
 
     assert_nothing_raised do

data/test/functional/test_new.rb

@@ -142,11 +142,11 @@ class TestNew < Test::Unit::TestCase
 
   def test_good_remote_passthrough
 
-    skip('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
+    omit('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
 
     host = '127.0.0.1'
     `ssh -i #{@@user_sshkey} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{host} exit` # if this succeeds, we want to exit immediately so we don't get hung
-    skip("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
+    omit("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
 
     assert_nothing_raised do
       @app = Rouster.new(
@@ -172,11 +172,11 @@ class TestNew < Test::Unit::TestCase
 
   def test_paranoia_remote_passthrough
 
-    skip('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
+    omit('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
 
     host = '127.0.0.1'
     `ssh -i #{@@user_sshkey} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{host} exit` # if this succeeds, we want to exit immediately so we don't get hung
-    skip("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
+    omit("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
 
     assert_nothing_raised do
       @app = Rouster.new(

data/test/functional/test_passthroughs.rb

@@ -54,11 +54,11 @@ class TestPassthroughs < Test::Unit::TestCase
 
   def test_functional_remote_passthrough
 
-    skip('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
+    omit('not running test_good_remote_passthrough, autogenerated a fake ssh key') if File.file?(@@user_sshkey) and File.read(@@user_sshkey).eql?("")
 
     host = '127.0.0.1'
     `ssh -i #{@@user_sshkey} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null #{host} exit`
-    skip("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
+    omit("found an ssh key, but it doesn't appear to be valid for this host") unless $?.success?
 
     assert_nothing_raised do
       @remote = Rouster.new(

data/test/functional/test_validate_file.rb

@@ -24,8 +24,6 @@ class TestValidateFileFunctional < Test::Unit::TestCase
   end
 
   # TODO tests
-  # :contains string
-  # :contains array
   # :exists vs. :ensure -> what options are supported?
   # :mode vs. :permissions
   # :size
@@ -56,6 +54,57 @@ class TestValidateFileFunctional < Test::Unit::TestCase
 
   end
 
+  def test_happy_contains_string
+    file         = '/etc/hosts'
+    expectations = {
+      :ensure   => 'file',
+      :contains => 'localhost'
+    }
+
+    assert_equal(true, @app.validate_file(file, expectations, false, true))
+
+  end
+
+  def test_contains_array_ordering
+
+    file = '/etc/hosts'
+
+    expectation1 = {
+      :ensure   => 'file',
+      :contains => [ 'localhost', 'foobar' ]
+    }
+
+    expectation2 = {
+      :ensure => 'file',
+      :contains => [ 'foobar', 'localhost' ]
+    }
+
+    [expectation1, expectation2].each do |expectation|
+      assert_equal(false, @app.validate_file(file, expectation, false, true))
+    end
+
+  end
+
+  def test_not_contains_array_ordering
+    file = '/etc/hosts'
+
+
+    expectation1 = {
+      :ensure      => 'file',
+      :notcontains => [ 'localhost', 'foobar']
+    }
+
+    expectation2 = {
+      :ensure      => 'file',
+      :notcontains => [ 'foobar', 'localhost' ],
+    }
+
+    [expectation1, expectation2].each do |expectation|
+      assert_equal(false, @app.validate_file(file, expectation, false, true))
+    end
+
+  end
+
   def test_happy_symlink
     file = '/tmp/bang'
 

data/test/unit/test_new.rb

@@ -51,7 +51,7 @@ class TestNew < Test::Unit::TestCase
   def test_default_overrides_aws_passthrough
 
     key = sprintf('%s/.ssh/id_rsa', ENV['HOME'])
-    skip(sprintf('no suitable private key found at [%s]', key)) unless File.file?(key)
+    omit(sprintf('no suitable private key found at [%s]', key)) unless File.file?(key)
 
     @app = Rouster.new(
       :name => 'aws',

data/test/unit/test_parse_ls_string.rb

@@ -353,7 +353,7 @@ class TestParseLsString < Test::Unit::TestCase
   def test_suid
     str = "drwxr-sr-x 2 root root 4096 Oct  7 17:09 /etc/nagios/objects\n"
 
-    skip('need to improve (read: implement) actual suid support')
+    omit('need to improve (read: implement) actual suid support')
 
     expectation = {
       :directory?  => true,

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

@@ -22,6 +22,7 @@ portreserve is stopped
 master is stopped
 puppet is stopped
 rdisc is stopped
+redis-server (pid  7295) is running...
 restorecond is stopped
 rhsmcertd (pid 1023) is running...
 rpcbind (pid  887) is running...

data/test/unit/testing/test_get_services.rb

@@ -27,11 +27,12 @@ class TestUnitGetPackages < Test::Unit::TestCase
     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
+      '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
+      'redis-server' => 'running' # redis-server (pid  11285) is running...
     }
 
     expected.each_pair do |service,state|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouster
 version: !ruby/object:Gem::Version
-  version: '0.61'
+  version: '0.62'
 platform: ruby
 authors:
 - Conor Horan-Kates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -126,6 +126,7 @@ files:
 - examples/bootstrap.rb
 - examples/demo.rb
 - examples/error.rb
+- examples/openstack.rb
 - examples/passthrough.rb
 - lib/rouster.rb
 - lib/rouster/deltas.rb
@@ -135,6 +136,7 @@ files:
 - lib/rouster/vagrant.rb
 - path_helper.rb
 - plugins/aws.rb
+- plugins/openstack.rb
 - rouster.gemspec
 - test/basic.rb
 - test/functional/deltas/test_get_crontab.rb
@@ -207,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: Rouster
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rouster is an abstraction layer for Vagrant