serverspec 0.12.0 → 0.13.0

data/lib/serverspec.rb

@@ -6,24 +6,8 @@ require 'serverspec/matchers'
 require 'serverspec/helper'
 require 'serverspec/setup'
 require 'serverspec/subject'
-require 'serverspec/commands/base'
-require 'serverspec/commands/linux'
-require 'serverspec/commands/redhat'
-require 'serverspec/commands/debian'
-require 'serverspec/commands/gentoo'
-require 'serverspec/commands/plamo'
-require 'serverspec/commands/aix'
-require 'serverspec/commands/solaris'
-require 'serverspec/commands/solaris10'
-require 'serverspec/commands/solaris11'
-require 'serverspec/commands/smartos'
-require 'serverspec/commands/darwin'
-require 'serverspec/commands/windows'
-require 'serverspec/commands/freebsd'
 require 'rspec/core/formatters/base_formatter'
 
-SPEC_TYPE = 'Serverspec'
-
 module RSpec
   module Core
     module Formatters

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/serverspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "rspec", ">= 2.13.0"
   spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "specinfra", ">= 0.0.2"
+  spec.add_runtime_dependency "specinfra", ">= 0.0.6"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/backend/exec/configuration_spec.rb

@@ -18,6 +18,13 @@ describe 'path is set' do
   end
 end
 
+describe 'path is reset to nil' do
+  context file('/etc/passwd') do
+    it { should be_file }
+    its(:command) { should eq 'test -f /etc/passwd' }
+  end
+end
+
 describe 'pre_command is set' do
   let(:pre_command) { 'source ~/.zshrc' }
   context file('/etc/passwd') do

data/spec/windows/file_spec.rb

@@ -155,7 +155,7 @@ describe file('/some/test/file') do
       :match_md5checksum => '35435ea447c19f0ea5ef971837ab9ced',
       :match_sha256checksum => '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a'
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_error Serverspec::Commands::Windows::NotSupportedError
+      expect { should self.send(method, *args) }.to raise_error SpecInfra::Command::Windows::NotSupportedError
     end
   end
 end

data/spec/windows/group_spec.rb

@@ -22,8 +22,7 @@ describe group('test.group') do
     {
       :have_gid => [nil],
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_error Serverspec::Commands::Windows::NotSupportedError
+      expect { should self.send(method, *args) }.to raise_error SpecInfra::Command::Windows::NotSupportedError
     end
   end
 end
-

data/spec/windows/user_spec.rb

@@ -38,7 +38,7 @@ describe user('test.user') do
       :have_login_shell => [nil],
       :have_authorized_key => [nil],
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_error Serverspec::Commands::Windows::NotSupportedError
+      expect { should self.send(method, *args) }.to raise_error SpecInfra::Command::Windows::NotSupportedError
     end
   end
 end

metadata

@@ -1,107 +1,122 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: serverspec
-version: !ruby/object:Gem::Version
-  version: 0.12.0
+version: !ruby/object:Gem::Version 
+  hash: 43
+  prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-04 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 2
+        - 13
+        - 0
         version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: specinfra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: specinfra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 0
+        - 6
+        version: 0.0.6
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: RSpec tests for your servers configured by Puppet, Chef or anything else
-email:
+email: 
 - gosukenator@gmail.com
-executables:
+executables: 
 - serverspec-init
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -112,20 +127,6 @@ files:
 - WINDOWS_SUPPORT.md
 - bin/serverspec-init
 - lib/serverspec.rb
-- lib/serverspec/commands/aix.rb
-- lib/serverspec/commands/base.rb
-- lib/serverspec/commands/darwin.rb
-- lib/serverspec/commands/debian.rb
-- lib/serverspec/commands/freebsd.rb
-- lib/serverspec/commands/gentoo.rb
-- lib/serverspec/commands/linux.rb
-- lib/serverspec/commands/plamo.rb
-- lib/serverspec/commands/redhat.rb
-- lib/serverspec/commands/smartos.rb
-- lib/serverspec/commands/solaris.rb
-- lib/serverspec/commands/solaris10.rb
-- lib/serverspec/commands/solaris11.rb
-- lib/serverspec/commands/windows.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/backend.rb
 - lib/serverspec/helper/os.rb
@@ -359,31 +360,41 @@ files:
 - spec/windows/service_spec.rb
 - spec/windows/user_spec.rb
 - spec/windows/windows_registry_key_spec.rb
+has_rdoc: true
 homepage: http://serverspec.org/
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
-test_files:
+test_files: 
 - spec/aix/command_spec.rb
 - spec/aix/cron_spec.rb
 - spec/aix/default_gateway_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 752400de68f58e7d7e2605e2d7249e19c7e9031f
-  data.tar.gz: ad2e694640b507b888251fc6e34af0df35164f1a
-SHA512:
-  metadata.gz: c9d8eb41562f89d01e9a3d13c482b213b05dbf8f8bcfa78da00c3890cb08b1443652c151fae61e81f71cdb2487f77c2ec6b175fd02f78b145f899f582dc2a7ce
-  data.tar.gz: 0ee62224c780f3e79f0152bcb382d4141435cde8accbd12f3e52511d73a2d70c0bd5762caeb8cfac7eda16458a63264524e3bf4ce79fd811b9e08f7683ff0dfb

data/lib/serverspec/commands/aix.rb

@@ -1,69 +0,0 @@
-require 'shellwords'
-
-module Serverspec
-  module Commands
-    class AIX < Base
-      class NotImplementedError < Exception; end
-
-      def check_access_by_user(file, user, access)
-        "su -s sh -c \"test -#{access} #{file}\" #{user}"
-      end
-
-      def check_enabled(service,level=nil)
-         "lssrc -s #{escape(service)} | grep active"
-      end
-       
-      def check_running(service)
-         "ps -ef | grep -v grep | grep #{escape(service)}"
-      end
-
-      def check_installed(package,version)
-        
-        if version
-            "lslpp -L #{escape(package)} | awk '{print $2}' |  grep -w -- #{version}"
-         else
-            "lslpp -L #{escape(package)}"
-         end
-      end
-
-      def check_listening(port)
-        regexp = "*.#{port} "
-        "netstat -an -f inet | awk '{print $4}' | grep  -- #{regexp}"
-        #"netstat -an -f inet | awk '{print $4}' | grep  -- #{escape(regexp)}"
-      end
-
-      def check_belonging_group(user, group)
-        "lsuser -a groups #{escape(user)} | awk -F'=' '{print $2}'| sed -e 's/,/ /g' |grep -w  -- #{escape(group)}"
-      end
-
-      def check_gid(group, gid)
-        regexp = "^#{group}"
-        "cat etc/group | grep -w -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
-      end
-
-      def check_login_shell(user, path_to_shell)
-        "lsuser -a shell #{escape(user)} |awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_shell)}"
-      end
-
-      def check_home_directory(user, path_to_home)
-        "lsuser -a home #{escape(user)} | awk -F'=' '{print $2}' | grep -w -- #{escape(path_to_home)}"
-      end
-
-      def check_mode(file, mode)
-        raise NotImplementedError.new
-      end
-
-      def check_owner(file, owner)
-        regexp = "^#{owner}$"
-        "ls -al #{escape(file)} | awk '{print $3}' | grep -- #{escape(regexp)}"
-      end
-
-      def check_grouped(file, group)
-        regexp = "^#{group}$"
-        "ls -al #{escape(file)} | awk '{print $4}' | grep -- #{escape(regexp)}"
-      end
-
-
-    end
-  end
-end

data/lib/serverspec/commands/base.rb

@@ -1,305 +0,0 @@
-require 'shellwords'
-
-module Serverspec
-  module Commands
-    class Base
-      class NotImplementedError < Exception; end
-
-      def escape(target)
-        str = case target
-              when Regexp
-                target.source
-              else
-                target.to_s
-              end
-
-        Shellwords.shellescape(str)
-      end
-
-      def check_enabled(service, level=3)
-        raise NotImplementedError.new
-      end
-
-      def check_yumrepo(repository)
-        raise NotImplementedError.new
-      end
-
-      def check_yumrepo_enabled(repository)
-        raise NotImplementedError.new
-      end
-
-      def check_mounted(path)
-        regexp = "on #{path}"
-        "mount | grep -w -- #{escape(regexp)}"
-      end
-
-      def check_routing_table(destination)
-        "ip route | grep -E '^#{destination} |^default '"
-      end
-
-      def check_reachable(host, port, proto, timeout)
-        if port.nil?
-          "ping -n #{escape(host)} -w #{escape(timeout)} -c 2"
-        else
-          "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
-        end
-      end
-
-      def check_resolvable(name, type)
-        if type == "dns"
-          "nslookup -timeout=1 #{escape(name)}"
-        elsif type == "hosts"
-          "grep -w -- #{escape(name)} /etc/hosts"
-        else
-          "getent hosts #{escape(name)}"
-        end
-      end
-
-      def check_file(file)
-        "test -f #{escape(file)}"
-      end
-
-      def check_socket(file)
-        "test -S #{escape(file)}"
-      end
-
-      def check_directory(directory)
-        "test -d #{escape(directory)}"
-      end
-
-      def check_user(user)
-        "id #{escape(user)}"
-      end
-
-      def check_group(group)
-        "getent group | grep -wq -- #{escape(group)}"
-      end
-
-      def check_installed(package, version=nil)
-        raise NotImplementedError.new
-      end
-
-      def check_listening(port)
-        regexp = ":#{port} "
-        "netstat -tunl | grep -- #{escape(regexp)}"
-      end
-
-      def check_listening_with_protocol(port, protocol)
-        regexp = "^#{protocol} .*:#{port} "
-        "netstat -tunl | grep -- #{escape(regexp)}"
-      end
-
-      def check_running(service)
-        "service #{escape(service)} status"
-      end
-
-      def check_running_under_supervisor(service)
-        "supervisorctl status #{escape(service)} | grep RUNNING"
-      end
-
-      def check_running_under_upstart(service)
-        "initctl status #{escape(service)} | grep running"
-      end
-
-      def check_monitored_by_monit(service)
-        "monit status"
-      end
-
-      def check_monitored_by_god(service)
-        "god status #{escape(service)}"
-      end
-
-      def check_process(process)
-        "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
-      end
-
-      def check_file_contain(file, expected_pattern)
-        "#{check_file_contain_with_regexp(file, expected_pattern)} || #{check_file_contain_with_fixed_strings(file, expected_pattern)}"
-      end
-
-      def check_file_contain_with_regexp(file, expected_pattern)
-        "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
-      end
-
-      def check_file_contain_with_fixed_strings(file, expected_pattern)
-        "grep -qF -- #{escape(expected_pattern)} #{escape(file)}"
-      end
-
-      def check_file_md5checksum(file, expected)
-        regexp = "^#{expected}"
-        "md5sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
-      end
-
-      def check_file_sha256checksum(file, expected)
-        regexp = "^#{expected}"
-        "sha256sum #{escape(file)} | grep -iw -- #{escape(regexp)}"
-      end
-
-      def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
-        from ||= '1'
-        to ||= '$'
-        sed = "sed -n #{escape(from)},#{escape(to)}p #{escape(file)}"
-        checker_with_regexp = check_file_contain_with_regexp("-", expected_pattern)
-        checker_with_fixed  = check_file_contain_with_fixed_strings("-", expected_pattern)
-        "#{sed} | #{checker_with_regexp} || #{sed} | #{checker_with_fixed}"
-      end
-
-      def check_mode(file, mode)
-        regexp = "^#{mode}$"
-        "stat -c %a #{escape(file)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_owner(file, owner)
-        regexp = "^#{owner}$"
-        "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_grouped(file, group)
-        regexp = "^#{group}$"
-        "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_cron_entry(user, entry)
-        entry_escaped = entry.gsub(/\*/, '\\*')
-        if user.nil?
-          "crontab -l | grep -- #{escape(entry_escaped)}"
-        else
-          "crontab -u #{escape(user)} -l | grep -- #{escape(entry_escaped)}"
-        end
-      end
-
-      def check_link(link, target)
-        "stat -c %N #{escape(link)} | grep -- #{escape(target)}"
-      end
-
-      def check_installed_by_gem(name, version=nil)
-        regexp = "^#{name}"
-        cmd = "gem list --local | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_installed_by_npm(name, version=nil)
-        cmd = "npm ls #{escape(name)} -g"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_installed_by_pecl(name, version=nil)
-        regexp = "^#{name}"
-        cmd = "pecl list | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_installed_by_pear(name, version=nil)
-        regexp = "^#{name}"
-        cmd = "pear list | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_installed_by_pip(name, version=nil)
-        regexp = "^#{name}"
-        cmd = "pip list | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_installed_by_cpan(name, version=nil)
-        regexp = "^#{name}"
-        cmd = "cpan -l | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
-        cmd
-      end
-
-      def check_belonging_group(user, group)
-        "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
-      end
-
-      def check_gid(group, gid)
-        regexp = "^#{group}"
-        "getent group | grep -w -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
-      end
-
-      def check_uid(user, uid)
-        regexp = "^uid=#{uid}("
-        "id #{escape(user)} | grep -- #{escape(regexp)}"
-      end
-
-      def check_login_shell(user, path_to_shell)
-        "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
-      end
-
-      def check_home_directory(user, path_to_home)
-        "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep -w -- #{escape(path_to_home)}"
-      end
-
-      def check_authorized_key(user, key)
-        key.sub!(/\s+\S*$/, '') if key.match(/^\S+\s+\S+\s+\S*$/)
-        "grep -w -- #{escape(key)} ~#{escape(user)}/.ssh/authorized_keys"
-      end
-
-      def check_iptables_rule(rule, table=nil, chain=nil)
-        raise NotImplementedError.new
-      end
-
-      def check_zfs(zfs, property=nil, value=nil)
-        raise NotImplementedError.new
-      end
-
-      def get_mode(file)
-        "stat -c %a #{escape(file)}"
-      end
-
-      def check_ipfilter_rule(rule)
-        raise NotImplementedError.new
-      end
-
-      def check_ipnat_rule(rule)
-        raise NotImplementedError.new
-      end
-
-      def check_svcprop(svc, property, value)
-        raise NotImplementedError.new
-      end
-
-      def check_svcprops(svc, property)
-        raise NotImplementedError.new
-      end
-
-      def check_selinux(mode)
-        raise NotImplementedError.new
-      end
-
-      def check_access_by_user(file, user, access)
-        raise NotImplementedError.new
-      end
-
-      def check_kernel_module_loaded(name)
-        raise NotImplementedError.new
-      end
-
-      def check_ipv4_address(interface, ip_address)
-        raise NotImplementedError.new
-      end
-
-      def check_mail_alias(recipient, target)
-        target = "[[:space:]]#{target}"
-        "getent aliases #{escape(recipient)} | grep -- #{escape(target)}$"
-      end
-
-      def get_file_content(file)
-        "cat #{file}"
-      end
-
-      def check_container(container)
-        raise NotImplementedError.new
-      end
-
-      def check_cotainer_running(container)
-        raise NotImplementedError.new
-      end
-    end
-  end
-end