serverspec 2.0.0.beta16 → 2.0.0.beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c1597c8e26e6e700e5f728f8a4408a0c39bdf2
-  data.tar.gz: 05986fefb3d7c4a7d9d82092b0eab11b375b0234
+  metadata.gz: 873dab8b4bb7288f62a1999e0e1d545b822b7746
+  data.tar.gz: f30d9f80fc651c0ed80fd4abbec0a59418ee6e35
 SHA512:
-  metadata.gz: 2a2d5c0786c4e5b0c62b12afee0d6244bdf96465c3bcace2ae391708cd3a10f88e64b4a7a053ab108ea11c2e561871975475dc2f124e3ccbf0105efcfb04b9c6
-  data.tar.gz: aea96827f97bd51e9bbfb891d0a470e079efd4ede3b51f162d752ad871bd5a8123c0b45f3e1003105f0c284874ecb8ba8c07f98f92648c94acc3a3fac1cd817c
+  metadata.gz: 4f4a49792ab4facfa84f282090f0d6762f6de74f2c3611f99f0d92b5ef3aacebb49b9ba82b311cb2f407a3706cd208e1d8e3f9e3bc8f33e964de29fa2389fc2a
+  data.tar.gz: bf85e074cffb9c5d281db1fba3f983b0b02d75d75c7b5e65b07571b1b6c5db5fcafd92310071895714c3158797642029254c41f7a2b7ddc325b90031c0ff55cb

data/lib/serverspec.rb

@@ -3,7 +3,7 @@ require 'specinfra'
 require 'rspec'
 require 'rspec/its'
 require 'serverspec/version'
-require 'serverspec/matchers'
+require 'serverspec/matcher'
 require 'serverspec/helper'
 require 'serverspec/setup'
 require 'serverspec/subject'
@@ -15,11 +15,12 @@ module RSpec::Core::Notifications
     def failure_lines
       @failure_lines ||=
         begin
-          lines = ["Failure/Error: #{read_failed_line.strip}"]
+          lines = ["On host `#{Specinfra.configuration.host}`"]
+          lines << "Failure/Error: #{read_failed_line.strip}"
           lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
           exception.message.to_s.split("\n").each do |line|
-          lines << "  #{line}" if exception.message
-        end
+            lines << "  #{line}" if exception.message
+          end
           lines << "  #{example.metadata[:command]}"
           lines << "  #{example.metadata[:stdout]}" if example.metadata[:stdout]
           lines << "  #{example.metadata[:stderr]}" if example.metadata[:stderr]

data/lib/serverspec/matcher.rb

@@ -0,0 +1,41 @@
+# file
+require 'serverspec/matcher/be_mounted'
+require 'serverspec/matcher/contain'
+require 'serverspec/matcher/be_readable'
+require 'serverspec/matcher/be_writable'
+require 'serverspec/matcher/be_executable'
+require 'serverspec/matcher/match_md5checksum'
+require 'serverspec/matcher/match_sha256checksum'
+
+# port
+require 'serverspec/matcher/be_listening'
+
+# host
+require 'serverspec/matcher/be_resolvable'
+require 'serverspec/matcher/be_reachable'
+
+# package
+require 'serverspec/matcher/be_installed'
+
+# service
+require 'serverspec/matcher/be_enabled'
+require 'serverspec/matcher/be_running'
+
+# user
+require 'serverspec/matcher/belong_to_group'
+require 'serverspec/matcher/belong_to_primary_group'
+
+require 'serverspec/matcher/return_exit_status'
+require 'serverspec/matcher/return_stdout'
+require 'serverspec/matcher/return_stderr'
+
+# ipfiter, ipnat, iptables
+require 'serverspec/matcher/have_rule'
+
+# cron, routing_table
+require 'serverspec/matcher/have_entry'
+
+# iis_website
+require 'serverspec/matcher/have_site_application'
+require 'serverspec/matcher/have_site_bindings'
+require 'serverspec/matcher/have_virtual_dir'

data/lib/serverspec/matcher/have_site_application.rb

@@ -0,0 +1,18 @@
+RSpec::Matchers.define :have_site_application do |app|
+  match do |subject|
+    if subject.class.name == 'Serverspec::Type::IisWebsite'
+      subject.has_site_application?(app, @pool, @physical_path)
+    else
+      className = subject.class.name
+      raise "not supported class #{className}"
+    end
+  end
+
+  chain :with_pool do |pool|
+    @pool = pool
+  end
+  
+  chain :with_physical_path do |physical_path|
+    @physical_path = physical_path
+  end
+end

data/lib/serverspec/matcher/have_site_bindings.rb

@@ -0,0 +1,22 @@
+RSpec::Matchers.define :have_site_bindings do |port|
+  match do |subject|
+    if subject.class.name == 'Serverspec::Type::IisWebsite'
+      subject.has_site_bindings?(port, @protocol, @ipaddress, @host_header)
+    else
+      className = subject.class.name
+      raise "not supported class #{className}"
+    end
+  end
+
+  chain :with_protocol do |protocol|
+    @protocol = protocol
+  end
+
+  chain :with_ipaddress do |ipaddress|
+    @ipaddress = ipaddress
+  end
+
+  chain :with_host_header do |host_header|
+    @host_header = host_header
+  end
+end

data/lib/serverspec/matcher/have_virtual_dir.rb

@@ -0,0 +1,14 @@
+RSpec::Matchers.define :have_virtual_dir do |vdir|
+  match do |subject|
+    if subject.class.name == 'Serverspec::Type::IisWebsite'
+      subject.has_virtual_dir?(vdir, @path)
+    else
+      className = subject.class.name
+      raise "not supported class #{className}"
+    end
+  end
+
+  chain :with_path do |path|
+    @path = path
+  end
+end

data/lib/serverspec/type/iis_app_pool.rb

@@ -9,6 +9,34 @@ module Serverspec
         @runner.check_iis_app_pool_has_dotnet_version(@name, dotnet)
       end
 
+      def has_32bit_enabled?()
+        @runner.check_iis_app_pool_has_32bit_enabled(@name)
+      end
+
+      def has_idle_timeout?(minutes)
+        @runner.check_iis_app_pool_has_idle_timeout(@name, minutes)
+      end
+
+      def has_identity_type?(identity_type)
+        @runner.check_iis_app_pool_has_identity_type(@name, identity_type)
+      end
+
+      def has_periodic_restart?(minutes)
+        @runner.check_iis_app_pool_has_periodic_restart(@name, minutes)
+      end
+
+      def has_user_profile_enabled?()
+        @runner.check_iis_app_pool_has_user_profile(@name)
+      end
+
+      def has_username?(username)
+        @runner.check_iis_app_pool_has_username(@name, username)
+      end
+
+      def has_managed_pipeline_mode?(mode)
+        @runner.check_iis_app_pool_has_managed_pipeline_mode(@name, mode)
+      end
+
       def to_s
         %Q[IIS Application Pool "#{@name}"]
       end

data/lib/serverspec/type/iis_website.rb

@@ -22,9 +22,22 @@ module Serverspec
         @runner.check_iis_website_has_physical_path(@name, path)
       end
 
+      def has_site_bindings?(port, protocol, ipaddress, host_header)
+        @runner.check_iis_website_has_site_bindings(@name, port, protocol, ipaddress, host_header)
+      end
+      
+      def has_virtual_dir?(vdir, path)
+        @runner.check_iis_website_has_virtual_dir(@name, vdir, path)
+      end
+      
+      def has_site_application?(app, pool, physical_path)
+        @runner.check_iis_website_has_site_application(@name, app, pool, physical_path)
+      end
+
       def to_s
         %Q[IIS Website "#{@name}"]
       end
     end
   end
 end
+

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta16"
+  VERSION = "2.0.0.beta17"
 end

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta16"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta29"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/type/darwin/package_spec.rb

@@ -18,3 +18,10 @@ describe package('httpd') do
   it { should_not be_installed.with_version('invalid-version') }
 end
 
+describe package('httpd') do
+  it { should be_installed.by('homebrew') }
+end
+
+describe package('httpd') do
+  it { should be_installed.by('pkgutil') }
+end

data/spec/type/freebsd/file_spec.rb

@@ -2,6 +2,44 @@ require 'spec_helper'
 
 set :os, :family => 'freebsd'
 
-describe file('/tmp') do
-  it { should be_mode 777 }
+describe file('/etc/passwd') do
+  it { should be_mode 644 }
+end
+
+describe file('/etc/passwd') do
+  it { should_not be_mode 'invalid' }
+end
+
+describe file('/etc/passwd') do
+  it { should be_owned_by 'root' }
+end
+
+describe file('/etc/passwd') do
+  it { should_not be_owned_by 'invalid-owner' }
+end
+
+describe file('/etc/passwd') do
+  it { should be_grouped_into 'root' }
+end
+
+describe file('/etc/passwd') do
+  it { should_not be_grouped_into 'invalid-group' }
+end
+
+describe file('/sbin/nologin') do
+  it { should be_linked_to '/usr/sbin/nologin' }
+end
+
+describe file('dummy-link') do
+  it { should_not be_linked_to '/invalid/target' }
+end
+
+describe file('/etc/passwd') do
+  let(:stdout) { Time.now.to_i.to_s }
+  its(:mtime) { should > DateTime.now - 1 }
+end
+
+describe file('/etc/passwod') do
+  let(:stdout) { 100.to_s }
+  its(:size) { should > 0 }
 end

data/spec/type/windows/iis_app_pool_spec.rb

@@ -5,10 +5,13 @@ set :backend, :cmd
 set :os, :family => 'windows'
 
 describe iis_app_pool('Default App Pool') do
-  it{ should exist }
+  it { should exist }
+  it { should have_dotnet_version('2.0') }
+  it { should have_32bit_enabled }
+  it { should have_idle_timeout(5) }
+  it { should have_identity_type('foo') }
+  it { should have_periodic_restart(60) }
+  it { should have_user_profile_enabled }
+  it { should have_username('user') }
+  it { should have_managed_pipeline_mode('mode') }
 end
-
-describe iis_app_pool('Default App Pool') do
-  it{ should have_dotnet_version('2.0') }
-end
-

data/spec/type/windows/iis_webisite_spec.rb

@@ -5,22 +5,12 @@ set :backend, :cmd
 set :os, :family => 'windows'
 
 describe iis_website('Default Website') do
-  it{ should exist }
+  it { should exist }
+  it { should be_enabled }
+  it { should be_running }
+  it { should be_in_app_pool('Default App Pool') }
+  it { should have_physical_path('C:\\inetpub\\www') } 
+  it { should have_site_bindings('port').with_protocol('protocol').with_ipaddress('ipaddress').with_host_header('host_header') }
+  it { should have_virtual_dir('vdir').with_path('path') }
+  it { should have_site_application('app').with_pool('pool').with_physical_path('physical_path') }
 end
-
-describe iis_website('Default Website') do
-  it{ should be_enabled }
-end
-
-describe iis_website('Default Website') do
-  it{ should be_running }
-end
-
-describe iis_website('Default Website') do
-  it{ should be_in_app_pool('Default App Pool') }
-end
-
-describe iis_website('Default Website') do
-  it{ should have_physical_path('C:\\inetpub\\www') } 
-end
-

data/wercker.yml

@@ -26,6 +26,10 @@ build:
         name: Run vagrant up centos65
         code: vagrant up centos65 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb centos65
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos65
         code: vagrant reload centos65
@@ -38,6 +42,10 @@ build:
         name: Run vagrant up centos70
         code: vagrant up centos70 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb centos70
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload centos70
         code: vagrant reload centos70
@@ -50,6 +58,10 @@ build:
         name: Run vagrant up ubuntu1404
         code: vagrant up ubuntu1404 --provider=digital_ocean
         cwd: $WORKING_DIR
+    - script:
+        name: Run itamae
+        code: bundle exec ./itamae.rb ubuntu1404
+        cwd: $WORKING_DIR
     - script:
         name: Run vagrant reload ubuntu1404
         code: vagrant reload ubuntu1404

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta16
+  version: 2.0.0.beta17
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta16
+        version: 2.0.0.beta29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta16
+        version: 2.0.0.beta29
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,27 +103,30 @@ files:
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/properties.rb
 - lib/serverspec/helper/type.rb
-- lib/serverspec/matchers.rb
-- lib/serverspec/matchers/be_enabled.rb
-- lib/serverspec/matchers/be_executable.rb
-- lib/serverspec/matchers/be_installed.rb
-- lib/serverspec/matchers/be_listening.rb
-- lib/serverspec/matchers/be_mounted.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_writable.rb
-- lib/serverspec/matchers/belong_to_group.rb
-- lib/serverspec/matchers/belong_to_primary_group.rb
-- lib/serverspec/matchers/contain.rb
-- lib/serverspec/matchers/have_entry.rb
-- lib/serverspec/matchers/have_rule.rb
-- lib/serverspec/matchers/match_md5checksum.rb
-- lib/serverspec/matchers/match_sha256checksum.rb
-- lib/serverspec/matchers/return_exit_status.rb
-- lib/serverspec/matchers/return_stderr.rb
-- lib/serverspec/matchers/return_stdout.rb
+- lib/serverspec/matcher.rb
+- lib/serverspec/matcher/be_enabled.rb
+- lib/serverspec/matcher/be_executable.rb
+- lib/serverspec/matcher/be_installed.rb
+- lib/serverspec/matcher/be_listening.rb
+- lib/serverspec/matcher/be_mounted.rb
+- lib/serverspec/matcher/be_reachable.rb
+- lib/serverspec/matcher/be_readable.rb
+- lib/serverspec/matcher/be_resolvable.rb
+- lib/serverspec/matcher/be_running.rb
+- lib/serverspec/matcher/be_writable.rb
+- lib/serverspec/matcher/belong_to_group.rb
+- lib/serverspec/matcher/belong_to_primary_group.rb
+- lib/serverspec/matcher/contain.rb
+- lib/serverspec/matcher/have_entry.rb
+- lib/serverspec/matcher/have_rule.rb
+- lib/serverspec/matcher/have_site_application.rb
+- lib/serverspec/matcher/have_site_bindings.rb
+- lib/serverspec/matcher/have_virtual_dir.rb
+- lib/serverspec/matcher/match_md5checksum.rb
+- lib/serverspec/matcher/match_sha256checksum.rb
+- lib/serverspec/matcher/return_exit_status.rb
+- lib/serverspec/matcher/return_stderr.rb
+- lib/serverspec/matcher/return_stdout.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb

data/lib/serverspec/matchers.rb

@@ -1,36 +0,0 @@
-# file
-require 'serverspec/matchers/be_mounted'
-require 'serverspec/matchers/contain'
-require 'serverspec/matchers/be_readable'
-require 'serverspec/matchers/be_writable'
-require 'serverspec/matchers/be_executable'
-require 'serverspec/matchers/match_md5checksum'
-require 'serverspec/matchers/match_sha256checksum'
-
-# port
-require 'serverspec/matchers/be_listening'
-
-# host
-require 'serverspec/matchers/be_resolvable'
-require 'serverspec/matchers/be_reachable'
-
-# package
-require 'serverspec/matchers/be_installed'
-
-# service
-require 'serverspec/matchers/be_enabled'
-require 'serverspec/matchers/be_running'
-
-# user
-require 'serverspec/matchers/belong_to_group'
-require 'serverspec/matchers/belong_to_primary_group'
-
-require 'serverspec/matchers/return_exit_status'
-require 'serverspec/matchers/return_stdout'
-require 'serverspec/matchers/return_stderr'
-
-# ipfiter, ipnat, iptables
-require 'serverspec/matchers/have_rule'
-
-# cron, routing_table
-require 'serverspec/matchers/have_entry'