serverspec 0.5.8 → 0.6.0

data/spec/solaris/commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Serverspec commands of Solaris family' do
   it_behaves_like 'support command check_directory', '/var/log'
 
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
-  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
   it_behaves_like 'support command check_mounted', '/'
 

data/spec/solaris/service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec service matchers of Red Hat family' do
+describe 'Serverspec service matchers of Solaris' do
   it_behaves_like 'support service enabled matcher', 'sshd'
   it_behaves_like 'support service running matcher', 'sshd'
   it_behaves_like 'support service running under supervisor matcher', 'sshd'

data/spec/support/shared_commands_examples.rb

@@ -4,8 +4,8 @@ shared_examples_for 'support command check_installed_by_gem' do |package|
 end
 
 shared_examples_for 'support command check_installed_by_gem with_version' do |package, version|
-  subject { commands.check_installed_by_gem(package) }
-  it { should eq "gem list --local | grep -w -- ^#{package} | grep -w -- ^#{version}" }
+  subject { commands.check_installed_by_gem(package, version) }
+  it { should eq "gem list --local | grep -w -- ^#{package} | grep -w -- #{version}" }
 end
 
 shared_examples_for 'support command check_installed_by_npm' do |package|

data/spec/support/shared_cron_examples.rb

@@ -1,11 +1,11 @@
 shared_examples_for 'support cron have_entry matcher' do |entry|
   describe 'have_cron_entry' do
     describe cron do
-      it { should have_cron_entry entry }
+      it { should have_entry entry }
     end
 
     describe cron do
-      it { should_not have_cron_entry 'invalid entry' }
+      it { should_not have_entry 'invalid entry' }
     end
   end
 end
@@ -13,11 +13,11 @@ end
 shared_examples_for 'support cron have_entry with user matcher' do |entry, user|
   describe 'have_cron_entry' do
     describe cron do
-      it { should have_cron_entry(entry).with_user(user) }
+      it { should have_entry(entry).with_user(user) }
     end
 
     describe cron do
-      it { should_not have_cron_entry('invalid entry').with_user(user) }
+      it { should_not have_entry('invalid entry').with_user(user) }
     end
   end
 end

data/spec/support/shared_group_examples.rb

@@ -3,11 +3,11 @@ include Serverspec::Helper::Exec
 shared_examples_for 'support user exist matcher' do |name|
   describe 'user exist' do
     describe user(name) do
-      it { should be_user }
+      it { should exist }
     end
 
     describe user('invalid-user') do
-      it { should_not be_user }
+      it { should_not exist }
     end
   end
 end

data/spec/support/shared_iptables_examples.rb

@@ -13,11 +13,11 @@ end
 shared_examples_for 'support iptables have_rule with_table and with_chain matcher' do |rule, table, chain|
   describe 'have_rule with_table and with_chain' do
     describe iptables do
-      it { should have_iptables_rule(rule).with_table(table).with_chain(chain) }
+      it { should have_rule(rule).with_table(table).with_chain(chain) }
     end
 
     describe iptables do
-      it { should_not have_iptables_rule('invalid-rule').with_table(table).with_chain(chain) }
+      it { should_not have_rule('invalid-rule').with_table(table).with_chain(chain) }
     end
   end
 end

data/spec/support/shared_package_examples.rb

@@ -4,7 +4,7 @@ shared_examples_for 'support package installed matcher' do |name|
       it { should be_installed }
     end
 
-    describe 'invalid-package' do
+    describe package('invalid-package') do
       it { should_not be_installed }
     end
   end
@@ -16,7 +16,7 @@ shared_examples_for 'support package installed by gem matcher' do |name|
       it { should be_installed.by('gem') }
     end
 
-    describe 'invalid-gem' do
+    describe package('invalid-gem') do
       it { should_not be_installed.by('gem') }
     end
   end
@@ -28,7 +28,7 @@ shared_examples_for 'support package installed by gem with version matcher' do |
       it { should be_installed.by('gem').with_version(version) }
     end
 
-    describe package(name) do
+    describe package('invalid-gem-package') do
       it { should_not be_installed.by('gem').with_version('invalid-version') }
     end
   end
@@ -40,7 +40,7 @@ shared_examples_for 'support package installed by npm matcher' do |name|
       it { should be_installed.by('npm') }
     end
 
-    describe 'invalid-npm' do
+    describe package('invalid-npm-package') do
       it { should_not be_installed.by('npm') }
     end
   end

data/spec/support/shared_user_examples.rb

@@ -1,11 +1,11 @@
 shared_examples_for 'support group exist matcher' do |name|
   describe 'group exist' do
     describe group(name) do
-      it { should be_group }
+      it { should exist }
     end
 
     describe group('invalid-group') do
-      it { should_not be_group }
+      it { should_not exist }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -144,7 +144,6 @@ files:
 - lib/serverspec/attributes.rb
 - lib/serverspec/backend.rb
 - lib/serverspec/backend/exec.rb
-- lib/serverspec/backend/puppet.rb
 - lib/serverspec/backend/ssh.rb
 - lib/serverspec/commands/base.rb
 - lib/serverspec/commands/darwin.rb
@@ -154,7 +153,6 @@ files:
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/solaris.rb
 - lib/serverspec/configuration.rb
-- lib/serverspec/filter.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/attributes.rb
 - lib/serverspec/helper/base.rb
@@ -164,52 +162,24 @@ files:
 - lib/serverspec/helper/detect_os.rb
 - lib/serverspec/helper/exec.rb
 - lib/serverspec/helper/gentoo.rb
-- lib/serverspec/helper/obsoleted.rb
 - lib/serverspec/helper/puppet.rb
 - lib/serverspec/helper/redhat.rb
 - lib/serverspec/helper/solaris.rb
 - lib/serverspec/helper/ssh.rb
 - lib/serverspec/helper/type.rb
 - lib/serverspec/matchers.rb
-- lib/serverspec/matchers/be_default_gateway.rb
-- lib/serverspec/matchers/be_directory.rb
-- lib/serverspec/matchers/be_disabled.rb
-- lib/serverspec/matchers/be_enabled.rb
-- lib/serverspec/matchers/be_enforcing.rb
 - lib/serverspec/matchers/be_executable.rb
-- lib/serverspec/matchers/be_file.rb
-- lib/serverspec/matchers/be_group.rb
-- lib/serverspec/matchers/be_grouped_into.rb
 - lib/serverspec/matchers/be_installed.rb
-- lib/serverspec/matchers/be_linked_to.rb
-- lib/serverspec/matchers/be_listening.rb
-- lib/serverspec/matchers/be_mode.rb
 - lib/serverspec/matchers/be_mounted.rb
-- lib/serverspec/matchers/be_owned_by.rb
-- lib/serverspec/matchers/be_permissive.rb
 - lib/serverspec/matchers/be_reachable.rb
 - lib/serverspec/matchers/be_readable.rb
 - lib/serverspec/matchers/be_resolvable.rb
 - lib/serverspec/matchers/be_running.rb
-- lib/serverspec/matchers/be_user.rb
 - lib/serverspec/matchers/be_writable.rb
-- lib/serverspec/matchers/be_zfs.rb
 - lib/serverspec/matchers/belong_to_group.rb
 - lib/serverspec/matchers/contain.rb
-- lib/serverspec/matchers/get_stdout.rb
-- lib/serverspec/matchers/have_authorized_key.rb
-- lib/serverspec/matchers/have_cron_entry.rb
 - lib/serverspec/matchers/have_entry.rb
-- lib/serverspec/matchers/have_gid.rb
-- lib/serverspec/matchers/have_home_directory.rb
-- lib/serverspec/matchers/have_ipfilter_rule.rb
-- lib/serverspec/matchers/have_ipnat_rule.rb
-- lib/serverspec/matchers/have_iptables_rule.rb
-- lib/serverspec/matchers/have_login_shell.rb
 - lib/serverspec/matchers/have_rule.rb
-- lib/serverspec/matchers/have_svcprop.rb
-- lib/serverspec/matchers/have_svcprops.rb
-- lib/serverspec/matchers/have_uid.rb
 - lib/serverspec/matchers/match_md5checksum.rb
 - lib/serverspec/matchers/return_exit_status.rb
 - lib/serverspec/matchers/return_stderr.rb
@@ -245,7 +215,6 @@ files:
 - spec/darwin/file_spec.rb
 - spec/darwin/group_spec.rb
 - spec/darwin/host_spec.rb
-- spec/darwin/matchers_spec.rb
 - spec/darwin/package_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/routing_table_spec.rb
@@ -260,7 +229,6 @@ files:
 - spec/debian/host_spec.rb
 - spec/debian/iptables_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
-- spec/debian/matchers_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/routing_table_spec.rb
@@ -276,7 +244,6 @@ files:
 - spec/gentoo/host_spec.rb
 - spec/gentoo/iptables_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
-- spec/gentoo/matchers_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/selinux_spec.rb
@@ -292,7 +259,6 @@ files:
 - spec/redhat/host_spec.rb
 - spec/redhat/iptables_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
-- spec/redhat/matchers_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/routing_table_spec.rb
@@ -308,7 +274,6 @@ files:
 - spec/solaris/host_spec.rb
 - spec/solaris/ipfilter_spec.rb
 - spec/solaris/ipnat_spec.rb
-- spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
@@ -326,7 +291,6 @@ files:
 - spec/support/shared_host_examples.rb
 - spec/support/shared_iptables_examples.rb
 - spec/support/shared_linux_kernel_parameter_examples.rb
-- spec/support/shared_matcher_examples.rb
 - spec/support/shared_package_examples.rb
 - spec/support/shared_port_examples.rb
 - spec/support/shared_routing_table_examples.rb
@@ -354,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
@@ -368,7 +332,6 @@ test_files:
 - spec/darwin/file_spec.rb
 - spec/darwin/group_spec.rb
 - spec/darwin/host_spec.rb
-- spec/darwin/matchers_spec.rb
 - spec/darwin/package_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/routing_table_spec.rb
@@ -383,7 +346,6 @@ test_files:
 - spec/debian/host_spec.rb
 - spec/debian/iptables_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
-- spec/debian/matchers_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/routing_table_spec.rb
@@ -399,7 +361,6 @@ test_files:
 - spec/gentoo/host_spec.rb
 - spec/gentoo/iptables_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
-- spec/gentoo/matchers_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/selinux_spec.rb
@@ -415,7 +376,6 @@ test_files:
 - spec/redhat/host_spec.rb
 - spec/redhat/iptables_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
-- spec/redhat/matchers_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/routing_table_spec.rb
@@ -431,7 +391,6 @@ test_files:
 - spec/solaris/host_spec.rb
 - spec/solaris/ipfilter_spec.rb
 - spec/solaris/ipnat_spec.rb
-- spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/routing_table_spec.rb
@@ -449,7 +408,6 @@ test_files:
 - spec/support/shared_host_examples.rb
 - spec/support/shared_iptables_examples.rb
 - spec/support/shared_linux_kernel_parameter_examples.rb
-- spec/support/shared_matcher_examples.rb
 - spec/support/shared_package_examples.rb
 - spec/support/shared_port_examples.rb
 - spec/support/shared_routing_table_examples.rb

data/lib/serverspec/backend/puppet.rb

@@ -1,108 +0,0 @@
-require 'puppet'
-require 'puppet/type/file'
-require 'puppet/type/group'
-require 'puppet/type/user'
-require 'puppet/type/package'
-require 'puppet/type/service'
-
-module Serverspec
-  module Backend
-    class Puppet < Exec # Use Exec methods as fallbacks
-
-      def check_directory(example, directory)
-        d = ::Puppet::Type::File.new(:name => directory, :ensure => 'directory')
-        d.insync?(d.retrieve)
-      end
-
-      def check_enabled(example, service)
-        s = ::Puppet::Type::Service.new(:name => service, :enable => 'true')
-        s.insync?(s.retrieve)
-      end
-
-      def check_file(example, file)
-        f = ::Puppet::Type::File.new(:name => file, :ensure => 'file')
-        f.insync?(f.retrieve)
-      end
-
-      def check_group(example, group)
-        g = ::Puppet::Type::Group.new(:name => group)
-        g_real = g.retrieve
-        if g.provider.exists?
-          g.insync?(g_real)
-        else
-          false
-        end
-      end
-
-      def check_grouped(example, file, group)
-        f = ::Puppet::Type::File.new(:name => file, :group => group)
-        f.insync?(f.retrieve)
-      end
-
-      def check_installed(example, package)
-        p = ::Puppet::Type::Package.new(:name => package)
-        p_real = p.retrieve
-        if p.exists?
-          p.insync?(p_real)
-        else
-          false
-        end
-      end
-
-      def check_installed_by_gem(example, package, version)
-        p = ::Puppet::Type::Package.new(:name => package, :provider => 'gem',
-                                        :ensure => version || 'present')
-        p_real = p.retrieve
-        if p.exists?
-          p.insync?(p_real)
-        else
-          false
-        end
-      end
-
-      def check_link(example, link, target)
-        f = ::Puppet::Type::File.new(:name => link, :ensure => 'link', :target => target)
-        f.insync?(f.retrieve)
-      end
-
-      # check_listening: inherited
-
-      def check_mode(example, file, mode)
-        f = ::Puppet::Type::File.new(:name => file, :mode => mode)
-        f.insync?(f.retrieve)
-      end
-
-      def check_owner(example, file, owner)
-        f = ::Puppet::Type::File.new(:name => file, :owner => owner)
-        f.insync?(f.retrieve)
-      end
-
-      def check_running(example, process)
-        s = ::Puppet::Type::Service.new(:name => process, :ensure => 'running')
-        s.insync?(s.retrieve)
-      end
-
-      def check_user(example, user)
-        u = ::Puppet::Type::User.new(:name => user)
-        u_real = u.retrieve
-        if u.provider.exists?
-          u.insync?(u_real)
-        else
-          false
-        end
-      end
-
-      # check_belonging_group: inherited, TODO
-      #def check_belonging_group(user, group)
-      #  return false unless check_user(user)
-      #  u = ::Puppet::Type::User.new(:name => user)
-      #  u_real = u.retrieve
-      #  # Get groups and compare
-      #end
-
-      # check_cron_entry: inherited
-
-      # check_iptables_rule: inherited
-    end
-  end
-end

data/lib/serverspec/filter.rb

@@ -1,21 +0,0 @@
-module Serverspec
-  class Filter
-    def self.filter_subject example
-      description_args = example.metadata[:example_group][:example_group][:description_args].join(' ')
-
-      # Linux kernel parameters
-      %w( abi crypto debug dev fs kernel net sunrpc vm ).each do |param|
-        if description_args.match(/^#{param}\./)
-          ret = backend.run_command("/sbin/sysctl -q -n #{description_args}")
-          val = ret[:stdout].strip
-          val = val.to_i if val.match(/^\d+$/)
-          subject = Serverspec::Subject.new
-          subject.value(val)
-          return subject
-        end
-      end
-
-      example.metadata[:example_group][:description_args].join(' ')
-    end
-  end
-end