serverspec 0.0.17 → 0.0.18

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+before_install:
+  - gem update bundler
+
+script:
+  - bundle exec rake spec
+
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+

data/README.md

@@ -1,6 +1,6 @@
-# Serverspec
+# Serverspec [![BuildStatus](https://secure.travis-ci.org/mizzy/serverspec.png)](http://travis-ci.org/mizzy/serverspec) [![Coverage Status](https://coveralls.io/repos/mizzy/serverspec/badge.png?branch=master)](https://coveralls.io/r/mizzy/serverspec)
 
-RSpec tests for your servers provisioned by Puppet, Chef and so on
+RSpec tests for your servers provisioned by Puppet, Chef or anything else
 
 ----
 
@@ -24,36 +24,49 @@ Or install it yourself as:
 
 ```
 $ serverspec-init
+Input target host name: www.example.jp
+
+Select OS Type of target host:
+
+  1) Red Hat
+  2) Debian
+  3) Gentoo
+  4) Solaris
+  5) None
+
+Select container number: 1
+
  + spec/
  + spec/www.example.jp/
  + spec/www.example.jp/httpd_spec.rb
  + spec/spec_helper.rb
  + Rakefile
 ```
+
 spec/www.example.jp/httpd_spec.rb is a sample spec file and its content is like this.
 
 ```ruby
 require 'spec_helper'
 
-describe 'httpd', :os => :redhat do
+describe 'httpd' do
   it { should be_installed }
   it { should be_enabled   }
   it { should be_running   }
 end
 
-describe 'port 80', :os => :redhat do
+describe 'port 80' do
   it { should be_listening }
 end
 
-describe '/etc/httpd/conf/httpd.conf', :os => :redhat do
+describe '/etc/httpd/conf/httpd.conf' do
   it { should be_file }
   it { should contain "ServerName www.example.jp" }
 end
 ```
 
-You can write spec for testing provisioned servers like this.
+You can write spec for testing servers like this.
 
-You should create ~/.ssh/config like this before running tests.
+You should create ~/.ssh/config like this before running tests because serverspec tests servers through SSH access.
 
 ```
 Host *.example.jp
@@ -79,7 +92,52 @@ Finished in 0.99715 seconds
 
 Serverspec is supporting Red Hat based OS, Debian based OS, Gentoo and Solaris now.
 
-If your target host's OS is Debian, you can write the spec like this.
+If your target host's OS is Debian, you should include Serverspec::DebianHelper like this.
+
+```ruby
+require 'serverspec'
+require 'pathname'
+require 'net/ssh'
+
+RSpec.configure do |c|
+  # Include OS helper
+  c.include(Serverspec::DebianHelper)
+  c.before do
+    host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
+    if c.host != host
+      c.ssh.close if c.ssh
+      c.host  = host
+      options = Net::SSH::Config.for(c.host)
+      user    = options[:user] || Etc.getlogin
+      c.ssh   = Net::SSH.start(c.host, user, options)
+    end
+  end
+end
+```
+
+And you can omit OS type from spec like this.
+
+```ruby
+require 'spec_helper'
+
+describe 'httpd' do
+  it { should be_installed }
+  it { should be_enabled   }
+  it { should be_running   }
+end
+
+describe 'port 80' do
+  it { should be_listening }
+end
+
+describe '/etc/httpd/conf/httpd.conf' do
+  it { should be_file }
+  it { should contain "ServerName www.example.jp" }
+end
+```
+
+You can change the target host's OS per spec like this.
+
 
 ```ruby
 require 'spec_helper'
@@ -136,38 +194,6 @@ end
 
 Or modify spec/spec_helper.rb generated by serverspec-init command like this
 
-```ruby
-require 'serverspec'
-require 'pathname'
-
-RSpec.configure do |c|
-  c.include(Serverspec::DebianHelper)
-  c.before do
-    c.host = File.basename(Pathname.new(example.metadata[:location]).dirname)
-  end
-end
-```
-
-And write the spec like this.
-
-```ruby
-require 'spec_helper'
-
-describe 'httpd' do
-  it { should be_installed }
-  it { should be_enabled   }
-  it { should be_running   }
-end
-
-describe 'port 80' do
-  it { should be_listening }
-end
-
-describe '/etc/httpd/conf/httpd.conf' do
-  it { should be_file }
-  it { should contain "ServerName www.example.jp" }
-end
-```
 
 Choose any style you like.
 

data/lib/serverspec/helper.rb

@@ -1,7 +1,7 @@
 require 'etc'
 
 module Serverspec
-  module Helper
+  module SshHelper
     def ssh_exec(cmd, opt={})
       ssh_exec!("sudo #{cmd}")
     end

data/lib/serverspec/setup.rb

@@ -3,42 +3,64 @@ require 'fileutils'
 module Serverspec
   class Setup
     def self.run
-      %w( spec spec/www.example.jp ).each { |dir| safe_mkdir(dir) }
+      print "Input target host name: "
+      @hostname = gets.chomp
+
+      prompt = <<-EOF
+
+Select OS Type of target host:
+
+  1) Red Hat
+  2) Debian
+  3) Gentoo
+  4) Solaris
+  5) None
+
+Select container number: 
+EOF
+
+      print prompt.chop
+      num = gets.to_i - 1
+      puts
+
+      @os_type = [ 'RedHat', 'Debian', 'Gentoo', 'Solaris', nil ][num]
+      [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
       safe_create_spec
       safe_create_spec_helper
       safe_create_rakefile
     end
 
     def self.safe_create_spec
-            content = <<-EOF
+
+      content = <<-EOF
 require 'spec_helper'
 
-describe 'httpd', :os => :redhat do
+describe 'httpd' do
   it { should be_installed }
   it { should be_enabled   }
   it { should be_running   }
 end
 
-describe 'port 80', :os => :redhat do
+describe 'port 80' do
   it { should be_listening }
 end
 
-describe '/etc/httpd/conf/httpd.conf', :os => :redhat do
+describe '/etc/httpd/conf/httpd.conf' do
   it { should be_file }
-  it { should contain "ServerName www.example.jp" }
+  it { should contain "ServerName #{@hostname}" }
 end
 EOF
 
-      if File.exists? 'spec/www.example.jp/httpd_spec.rb'
-        old_content = File.read('spec/www.example.jp/httpd_spec.rb')
+      if File.exists? "spec/#{@hostname}/httpd_spec.rb"
+        old_content = File.read("spec/#{@hostname}/httpd_spec.rb")
         if old_content != content
-          $stderr.puts "!! spec/www.example.jp/httpd_spec.rb already exists and differs from template"
+          $stderr.puts "!! spec/#{@hostname}/httpd_spec.rb already exists and differs from template"
         end
       else
-        File.open('spec/www.example.jp/httpd_spec.rb', 'w') do |f|
+        File.open("spec/#{@hostname}/httpd_spec.rb", 'w') do |f|
           f.puts content
         end
-        puts ' + spec/www.example.jp/httpd_spec.rb'
+        puts " + spec/#{@hostname}/httpd_spec.rb"
       end
     end
 
@@ -60,6 +82,7 @@ require 'pathname'
 require 'net/ssh'
 
 RSpec.configure do |c|
+  ### include os helper ###
   c.before do
     host  = File.basename(Pathname.new(example.metadata[:location]).dirname)
     if c.host != host
@@ -72,6 +95,11 @@ RSpec.configure do |c|
   end
 end
 EOF
+
+        if not @os_type.nil?
+          content.gsub!(/### include os helper ###/, "c.include(Serverspec::#{@os_type}Helper)")
+        end
+
       if File.exists? 'spec/spec_helper.rb'
         old_content = File.read('spec/spec_helper.rb')
         if old_content != content

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/serverspec.rb

@@ -11,7 +11,7 @@ require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 
 RSpec.configure do |c|
-  c.include(Serverspec::Helper)
+  c.include(Serverspec::SshHelper)
   c.include(Serverspec::RedHatHelper,  :os => :redhat)
   c.include(Serverspec::DebianHelper,  :os => :debian)
   c.include(Serverspec::GentooHelper,  :os => :gentoo)

data/spec/debian/matchers_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Serverspec matchers of Debian family', :os => :debian do
-  let(:test_server_host) { 'serverspec-debian-host' }
-
   it_behaves_like 'support be_enabled matcher', 'rc.local'
   it_behaves_like 'support be_installed matcher', 'openssh-server'
   it_behaves_like 'support be_running matcher', 'ssh'

data/spec/gentoo/matchers_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
-  let(:test_server_host) { 'serverspec-gentoo-host' }
-
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'

data/spec/redhat/commands_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::RedHatHelper
+
+describe commands.check_enabled('httpd') do
+  it { should eq 'chkconfig --list httpd | grep 3:on' }
+end

data/spec/redhat/matchers_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Serverspec matchers of Red Hat family', :os => :redhat do
-  let(:test_server_host) { 'serverspec-redhat-host' }
-
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'
@@ -24,8 +22,8 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support have_cron_entry matcher', 'cron', '* * * * * /usr/bin/foo'
   it_behaves_like 'support have_cron_entry.with_user matcher', 'cron', '* * * * * /usr/bin/foo', 'root'
 
-  it behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
+  it_behaves_like 'support be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
 
-  it behaves_like 'support belong_to_group matcher', 'root', 'root'
+  it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 
 end

data/spec/solaris/matchers_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Serverspec matchers of Solaris family', :os => :solaris do
-  let(:test_server_host) { 'serverspec-solaris-host' }
-
   it_behaves_like 'support be_enabled matcher', 'svc:/network/ssh:default'
   it_behaves_like 'support be_installed matcher', 'service/network/ssh'
   it_behaves_like 'support be_running matcher', 'svc:/network/ssh:default'

data/spec/spec_helper.rb

@@ -5,8 +5,14 @@ PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
-RSpec.configure do |c|
-  c.before do
-    c.host = test_server_host
+module Serverspec
+  module SshHelper
+    def ssh_exec(cmd)
+      if cmd =~ /invalid/
+        { :stdout => nil, :stderr => nil, :exit_code => 1, :exit_signal => nil }
+      else
+        { :stdout => nil, :stderr => nil, :exit_code => 0, :exit_signal => nil }
+      end
+    end
   end
 end

data/spec/support/shared_matcher_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for 'support be_enabled matcher' do |valid_service|
       it { should be_enabled }
     end
 
-    describe 'this-is-dummy-service' do
+    describe 'this-is-invalid-service' do
       it { should_not be_enabled }
     end
   end
@@ -17,7 +17,7 @@ shared_examples_for 'support be_installed matcher' do |valid_package|
       it { should be_installed }
     end
 
-    describe 'this-is-dummy-package' do
+    describe 'this-is-invalid-package' do
       it { should_not be_installed }
     end
   end
@@ -29,7 +29,7 @@ shared_examples_for 'support be_running matcher' do |valid_service|
       it { should be_running }
     end
 
-    describe 'this-is-dummy-daemon' do
+    describe 'this-is-invalid-daemon' do
       it { should_not be_running }
     end
   end
@@ -41,7 +41,7 @@ shared_examples_for 'support be_listening matcher' do |valid_port|
       it { should be_listening }
     end
 
-    describe 'port 9999' do
+    describe 'port invalid' do
       it { should_not be_listening }
     end
   end
@@ -53,7 +53,7 @@ shared_examples_for 'support be_file matcher' do |valid_file|
       it { should be_file }
     end
 
-    describe '/etc/thid_is_dummy_file' do
+    describe '/etc/thid_is_invalid_file' do
       it { should_not be_file }
     end
   end
@@ -65,7 +65,7 @@ shared_examples_for 'support be_directory matcher' do |valid_directory|
       it { should be_directory }
     end
 
-    describe '/etc/thid_is_dummy_directory' do
+    describe '/etc/thid_is_invalid_directory' do
       it { should_not be_directory }
     end
   end
@@ -78,7 +78,7 @@ shared_examples_for 'support contain matcher' do |valid_file, pattern|
     end
 
     describe '/etc/ssh/sshd_config' do
-      it { should_not contain 'This is duymmy text!!' }
+      it { should_not contain 'This is invalid text!!' }
     end
   end
 end
@@ -89,7 +89,7 @@ shared_examples_for 'support be_user matcher' do |valid_user|
       it { should be_user }
     end
 
-    describe 'i_am_dummy_user' do
+    describe 'i_am_invalid_user' do
       it { should_not be_user }
     end
   end
@@ -101,7 +101,7 @@ shared_examples_for 'support be_group matcher' do |valid_group|
       it { should be_group }
     end
 
-    describe 'we_are_dummy_group' do
+    describe 'we_are_invalid_group' do
       it { should_not be_group }
     end
   end
@@ -114,7 +114,7 @@ shared_examples_for 'support be_mode matcher' do |valid_file, mode|
     end
 
     describe '/etc/passwd' do
-      it { should_not be_mode 000 }
+      it { should_not be_mode 'invalid' }
     end
   end
 end
@@ -126,7 +126,7 @@ shared_examples_for 'support be_owned_by matcher' do |valid_file, owner|
     end
 
     describe '/etc/passwd' do
-      it { should_not be_owned_by 'daemon' }
+      it { should_not be_owned_by 'invalid-owner' }
     end
   end
 end
@@ -138,7 +138,7 @@ shared_examples_for 'support be_grouped_into matcher' do |valid_file, group|
     end
 
     describe '/etc/passwd' do
-      it { should_not be_grouped_into 'daemon' }
+      it { should_not be_grouped_into 'invalid-group' }
     end
   end
 end
@@ -150,7 +150,7 @@ shared_examples_for 'support have_cron_entry matcher' do |title, entry|
     end
 
     describe '/etc/passwd' do
-      it { should_not have_cron_entry 'dummy entry' }
+      it { should_not have_cron_entry 'invalid entry' }
     end
   end
 end
@@ -162,7 +162,7 @@ shared_examples_for 'support have_cron_entry.with_user matcher' do |title, entry
     end
 
     describe '/etc/passwd' do
-      it { should_not have_cron_entry('dummy entry').with_user('dummyuser') }
+      it { should_not have_cron_entry('dummy entry').with_user('invaliduser') }
     end
   end
 end
@@ -174,7 +174,7 @@ shared_examples_for 'support be_linked_to matcher' do |file, target|
     end
 
     describe 'this-is-dummy-link' do
-      it { should_not be_linked_to 'dummy target' }
+      it { should_not be_linked_to '/invalid/target' }
     end
   end
 end
@@ -185,7 +185,7 @@ shared_examples_for 'support be_installed_by_gem matcher' do |name|
       it { should be_installed_by_gem }
     end
 
-    describe 'dummygem' do
+    describe 'invalid-gem' do
       it { should_not be_installed_by_gem }
     end
   end
@@ -198,19 +198,19 @@ shared_examples_for 'support be_installed_by_gem.with_version matcher' do |name,
     end
 
     describe name do
-      it { should_not be_installed_by_gem.with_version('dummyversion') }
+      it { should_not be_installed_by_gem.with_version('invalid-version') }
     end
   end
 end
 
-shared_examples_for 'support belong_to_group matcher' do |name, group|
+shared_examples_for 'support belong_to_group matcher' do |user, group|
   describe 'belong_to_group' do
     describe user do
       it { should belong_to_group group }
     end
 
     describe 'dummyuser' do
-      it { should_not belong_to_group 'dummygroup' }
+      it { should_not belong_to_group 'invalid-group' }
     end
   end
 end

metadata

@@ -1,91 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serverspec
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 17
-  version: 0.0.17
+version: !ruby/object:Gem::Version
+  version: 0.0.18
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-29 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for your provisioned servers
-email: 
+email:
 - gosukenator@gmail.com
-executables: 
+executables:
 - serverspec-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -120,47 +119,40 @@ files:
 - serverspec.gemspec
 - spec/debian/matchers_spec.rb
 - spec/gentoo/matchers_spec.rb
+- spec/redhat/commands_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
-has_rdoc: true
 homepage: https://github.com/mizzy/serverspec
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your provisioned servers
-test_files: 
+test_files:
 - spec/debian/matchers_spec.rb
 - spec/gentoo/matchers_spec.rb
+- spec/redhat/commands_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb