serverspec 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9fe2a75c6d320919a500f69560daeb03d40578f
-  data.tar.gz: 6e9a93bed858b0acf275f6c6902671bc91bc0948
+  metadata.gz: ba0bed92e0a41a01612bbd59c78bc09ac212b476
+  data.tar.gz: ad2d1644ed448b7cfb7bff845df475da64c2d2a0
 SHA512:
-  metadata.gz: dce043b1300590b5fa22c2cce66c5afefe7041685ef950323adb701b1fbde6531d4f5e0370a0f6bd7b8049ced8d99223524d2365c32dc3665beeccdd74f07a9d
-  data.tar.gz: 352d489a6ceb5e303ce271b1eb1e734b2e72a7da5e69bfc2277ce4cff232ae0928173ec6c3bcb065104cd0d26931785d52bad819d57eea5329b220f5a34e1f63
+  metadata.gz: 670f031114b3ad140c8fdab04c360f946c46d1a94b64dafd95df75b9c43fae66318f8ba6db70b51adeb958a2f03057597f4e63198d3261c5b95466a6fd6da79d
+  data.tar.gz: 1f0da817ddcc9118f7a2acfc5c2921c7f06fe297eb8e692ac9995cde5660d18798b19f0b74276ed8f878bf8f0a105854a11695909acb137247577839ffeb5539

data/README.md

@@ -6,7 +6,7 @@ You can see the details of serverspec on [serverspec.org](http://serverspec.org/
 
 ----
 
-## Installation
+## Quick Installation
 
 Add this line to your application's Gemfile:
 
@@ -26,6 +26,13 @@ Or install it yourself as:
 
 ```
 $ serverspec-init
+Select OS type:
+
+  1) UN*X
+  2) Windows
+
+Select number: 1
+
 Select a backend type:
 
   1) SSH
@@ -33,6 +40,7 @@ Select a backend type:
 
 Select number: 1
 
+Vagrant instance y/n: n
 Input target host name: www.example.jp
 
  + spec/
@@ -42,7 +50,7 @@ Input target host name: www.example.jp
  + Rakefile
 ```
 
-spec/www.example.jp/httpd_spec.rb is a sample spec file and its content is like this.
+`spec/www.example.jp/httpd_spec.rb` is a sample spec file and its content is like this.
 
 ```ruby
 require 'spec_helper'
@@ -62,16 +70,17 @@ end
 
 describe file('/etc/httpd/conf/httpd.conf') do
   it { should be_file }
-  it { should contain "ServerName www.example.jp" }
+  its(:content) { should match /ServerName www.example.jp/ }
 end
 ```
 
-You can write spec for testing servers like this.
+You can write specs for testing servers like this.
 
-Serverspec with SSH backend logs in to target servers as a user configured in ``~/.ssh/config`` or a current user.If you'd lile to change the user, please edit the below line in ``spec/spec_helper.rb``.
+Serverspec with SSH backend logs in to target servers as a user configured in ``~/.ssh/config`` or a current user. If
+ you'd like to change the user, please edit the below line in ``spec/spec_helper.rb``.
 
 ```ruby
-      user    = options[:user] || Etc.getlogin
+user = options[:user] || Etc.getlogin
 ```
 
 Run tests.
@@ -88,11 +97,11 @@ Finished in 0.99715 seconds
 ----
 ## Multi OS support
 
-Serverspec is supporting Darwin based OS, Red Hat based OS, Debian based OS, Gentoo and Solaris.
+Serverspec supports Darwin based OS, Red Hat based OS, Debian based OS, Gentoo and Solaris.
 
 Serverspec can detect target host's OS automatically.
 
-If you'd like to set target host's OS explicitly, you should include `Serverspec::Helper::OSName` in `spec/spec_helper.rb` like this.
+If you'd like to set target host's OS explicitly, you should include `SpecInfra::Helper::OSName` in `spec/spec_helper.rb` like this.
 
 
 ```ruby
@@ -100,8 +109,8 @@ require 'serverspec'
 require 'pathname'
 require 'net/ssh'
 
-include Serverspec::Helper::Ssh
-include Serverspec::Helper::Debian
+include SpecInfra::Helper::Ssh
+include SpecInfra::Helper::Debian
 
 RSpec.configure do |c|
   # Add SSH before hook in case you use the SSH backend
@@ -119,11 +128,17 @@ RSpec.configure do |c|
 end
 ```
 
-You can select **Serverspec::Helper::RedHat**, **Serverspec::Helper::Debian**, **Serverspec::Helper::Gentoo** , **Serverspec::Helper::Solaris** or **Serverspec::Helper::Darwin**.
+You can select from:
+
+* SpecInfra::Helper::RedHat
+* SpecInfra::Helper::Debian
+* SpecInfra::Helper::Gentoo
+* SpecInfra::Helper::Solaris
+* SpecInfra::Helper::Darwin
 
 ## Vagrant support
 
-Serverspec now has Vagrant support, and can be automatically configured from a Vagrantfile
+Serverspec now has Vagrant support, and can be automatically configured from a Vagrantfile.
 
 ```
 $ serverspec-init
@@ -138,7 +153,7 @@ Vagrant instance y/n: y
 Auto-configure Vagrant from Vagrantfile? y/n: y
 0) web
 1) db
-1
+Choose a VM from the Vagrantfile: 1
  + spec/db/
  + spec/db/httpd_spec.rb
  + spec/spec_helper.rb

data/WINDOWS_SUPPORT.md

@@ -54,8 +54,10 @@ describe package('Adobe AIR') do
 end
 
 describe service('DNS Client') do
+  it { should be_installed }
   it { should be_enabled }
   it { should be_running }
+  it { should have_start_mode("Manual") }
 end
 
 describe port(139) do
@@ -95,6 +97,20 @@ describe windows_feature('Minesweeper') do
   it{ should be_installed.by("dism") }
   it{ should be_installed.by("powershell") }
 end
+
+describe iis_website("Default Website") do
+  it { should exist }
+  it { should be_enabled }
+  it { should be_running }
+  it { should be_in_app_pool "DefaultAppPool" }
+  it { should have_physical_path "c:/inetpub/wwwroot" }
+end
+
+describe iis_app_pool("DefaultAppPool") do
+  it { should exist }
+  it { should have_dotnet_version "2.0" }
+end
+
 ```
 
 ###Notes:

data/lib/serverspec/helper/type.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Helper
     module Type
       types = %w(
-        base cgroup command cron default_gateway file group host interface
+        base cgroup command cron default_gateway file group host iis_website iis_app_pool interface
         ipfilter ipnat iptables kernel_module linux_kernel_parameter lxc mail_alias
         package php_config port process routing_table selinux service user yumrepo
         windows_feature windows_registry_key zfs

data/lib/serverspec/setup.rb

@@ -161,7 +161,9 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/*/*_spec.rb'
 end
-EOF
+
+task :default => :spec
+      EOF
       if File.exists? 'Rakefile'
         old_content = File.read('Rakefile')
         if old_content != content

data/lib/serverspec/type/cgroup.rb

@@ -5,7 +5,7 @@ module Serverspec
       def method_missing(meth)
         if @subsystem.nil?
           @subsystem = meth.to_s
-          return self
+          self
         else
           param = "#{@subsystem}.#{meth.to_s}"
           ret = backend.run_command("cgget -n -r #{param} #{@name} | awk '{print $2}'")

data/lib/serverspec/type/file.rb

@@ -17,9 +17,9 @@ module Serverspec
 
       def contain(pattern, from, to)
         if (from || to).nil?
-          cmd = backend.check_file_contain(@name, pattern)
+          backend.check_file_contain(@name, pattern)
         else
-          cmd = backend.check_file_contain_within(@name, pattern, from, to)
+          backend.check_file_contain_within(@name, pattern, from, to)
         end
       end
 
@@ -67,6 +67,10 @@ module Serverspec
         backend.check_mounted(@name, attr, only_with)
       end
 
+      def match_checksum(checksum)
+        backend.check_file_checksum(@name, checksum)
+      end
+      
       def match_md5checksum(md5sum)
         backend.check_file_md5checksum(@name, md5sum)
       end
@@ -83,7 +87,7 @@ module Serverspec
       end
 
       def version?(version)
-          backend.check_file_version(@name, version)
+        backend.check_file_version(@name, version)
       end
     end
   end

data/lib/serverspec/type/iis_app_pool.rb

@@ -0,0 +1,18 @@
+module Serverspec
+  module Type
+    class IisAppPool < Base
+      def exists?()
+        backend.check_iis_app_pool(@name)
+      end
+
+      def has_dotnet_version?(dotnet)
+          backend.check_iis_app_pool_dotnet(@name, dotnet)
+      end
+
+      def to_s
+        %Q[IIS Application Pool "#{@name}"]
+      end
+  
+    end
+  end
+end

data/lib/serverspec/type/iis_website.rb

@@ -0,0 +1,31 @@
+module Serverspec
+  module Type
+    class IisWebsite < Base
+
+      def exists?()
+        backend.check_iis_website_installed(@name)
+      end
+
+      def enabled?()
+        backend.check_iis_website_enabled(@name)
+      end
+
+      def running?()
+          backend.check_iis_website_running(@name)
+      end
+
+      def in_app_pool?(app_pool)
+        backend.check_iis_website_app_pool(@name, app_pool)
+      end
+
+      def has_physical_path?(path)
+          backend.check_iis_website_path(@name, path)
+      end
+
+      def to_s
+        %Q[IIS Website "#{@name}"]
+      end
+  
+    end
+  end
+end

data/lib/serverspec/type/package.rb

@@ -34,13 +34,13 @@ module Serverspec
           if matches.nil?
             raise ArgumentError, "Malformed version number string #{val}"
           end
-          @epoch = matches[1].to_i
+          @epoch   = matches[1].to_i
           @version = matches[2].to_s
         end
 
         def <=>(other)
           other = Version.new(other) if other.is_a?(String)
-          rv = @epoch <=> other.epoch
+          rv    = @epoch <=> other.epoch
           return rv if rv != 0
 
           self.ver_array <=> other.ver_array
@@ -48,9 +48,9 @@ module Serverspec
 
         def ver_array
           val = @version
-          re = /^(?:(\d+)|(\D+))(.*)$/
+          re  = /^(?:(\d+)|(\D+))(.*)$/
           res = []
-          while !val.empty?
+          until val.empty?
             matches = val.match(re)
             if matches[1].nil?
               # String
@@ -65,7 +65,6 @@ module Serverspec
             val = matches[3].to_s
           end
           res << -1
-          return res
         end
       end
     end

data/lib/serverspec/type/service.rb

@@ -5,6 +5,14 @@ module Serverspec
         backend.check_enabled(@name, level)
       end
 
+      def installed?(name, version)
+        backend.check_service_installed(@name)
+      end
+
+      def has_start_mode?(mode)
+        backend.check_service_start_mode(@name, mode)
+      end
+
       def running?(under)
         if under
           check_method = "check_running_under_#{under}".to_sym

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 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.5.8"
+  spec.add_runtime_dependency "specinfra", ">= 0.7.1"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octorelease"

data/spec/aix/file_spec.rb

@@ -90,7 +90,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/debian/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/freebsd/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/freebsd/package_spec.rb

@@ -13,7 +13,7 @@ end
 
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
-  its(:command) { should eq "pkg_info -Ix httpd"}
+  its(:command) { should eq "pkg_info -I httpd-2.2.15-28.el6"}
 end
 
 describe package('jekyll') do

data/spec/gentoo/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/plamo/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/redhat/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/solaris/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

data/spec/solaris11/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | egrep -e \"-> ./etc/pam.d/system-auth-ac.\"" }
 end
 
 describe file('dummy-link') do

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: highline
   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: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.1
 - !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:
-    - - ~>
+    - - "~>"
       - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octorelease
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RSpec tests for your servers configured by Puppet, Chef or anything else
@@ -116,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -162,6 +162,8 @@ files:
 - lib/serverspec/type/file.rb
 - lib/serverspec/type/group.rb
 - lib/serverspec/type/host.rb
+- lib/serverspec/type/iis_app_pool.rb
+- lib/serverspec/type/iis_website.rb
 - lib/serverspec/type/interface.rb
 - lib/serverspec/type/ipfilter.rb
 - lib/serverspec/type/ipnat.rb
@@ -381,17 +383,17 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else