serverspec 0.2.7 → 0.2.8

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 Vagrantfile
+vendor/

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# Serverspec [![BuildStatus](https://secure.travis-ci.org/mizzy/serverspec.png)](http://travis-ci.org/mizzy/serverspec)
 
 RSpec tests for your servers provisioned by Puppet, Chef or anything else
 
@@ -37,11 +37,11 @@ Input target host name: www.example.jp
 
 Select OS type of target host:
 
-  1) Red Hat
-  2) Debian
-  3) Gentoo
-  4) Solaris
-  5) None
+  1) Auto Detect
+  2) Red Hat
+  3) Debian
+  4) Gentoo
+  5) Solaris
 
 Select number: 1
 
@@ -99,9 +99,12 @@ Finished in 0.99715 seconds
 ----
 ## Multi OS support
 
-Serverspec is supporting Red Hat based OS, Debian based OS, Gentoo and Solaris now.
+Serverspec is supporting 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` like this.
 
-If your target host's OS is Debian, you should include `Serverspec::Helper::Debian` like this.
 
 ```ruby
 require 'serverspec'
@@ -128,49 +131,6 @@ RSpec.configure do |c|
 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'
-
-describe 'httpd', :os => :debian do
-  it { should be_installed }
-  it { should be_enabled   }
-  it { should be_running   }
-end
-
-describe 'port 80', :os => :debian do
-  it { should be_listening }
-end
-
-describe '/etc/httpd/conf/httpd.conf', :os => :debian do
-  it { should be_file }
-  it { should contain "ServerName www.example.jp" }
-end
-```
-
 See details on [serverspec.org](http://serverspec.org)
 
 ----

data/lib/serverspec.rb

@@ -17,6 +17,7 @@ RSpec.configure do |c|
   c.include(Serverspec::Helper::Debian,  :os => :debian)
   c.include(Serverspec::Helper::Gentoo,  :os => :gentoo)
   c.include(Serverspec::Helper::Solaris, :os => :solaris)
+  c.add_setting :os,            :default => nil
   c.add_setting :host,          :default => nil
   c.add_setting :ssh,           :default => nil
   c.add_setting :sudo_password, :default => nil

data/lib/serverspec/backend/exec.rb

@@ -93,6 +93,18 @@ module Serverspec
         end
       end
 
+      def check_os
+        if do_check('ls /etc/redhat-release')[:exit_code] == 0
+          'RedHat'
+        elsif do_check('ls /etc/debian_version')[:exit_code] == 0
+          'Debian'
+        elsif do_check('ls /etc/gentoo-release')[:exit_code] == 0
+          'Gentoo'
+        elsif do_check('uname -s')[:stdout] =~ /SunOS/i
+          'Solaris'
+        end
+      end
+
     end
   end
 end

data/lib/serverspec/helper.rb

@@ -10,6 +10,7 @@ require 'serverspec/helper/redhat'
 require 'serverspec/helper/debian'
 require 'serverspec/helper/gentoo'
 require 'serverspec/helper/solaris'
+require 'serverspec/helper/detect_os'
 
 # Obsoleted helpers
 require 'serverspec/helper/obsoleted'

data/lib/serverspec/helper/detect_os.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module DetectOS
+      def commands
+        self.class.const_get('Serverspec').const_get('Commands').const_get(RSpec.configuration.os).new
+      end
+    end
+  end
+end

data/lib/serverspec/helper/exec.rb

@@ -1,8 +1,8 @@
 module Serverspec
   module Helper
     module Exec
-      def backend
-        Serverspec::Backend::Exec.new(commands)
+      def backend(commmands_object=nil)
+        Serverspec::Backend::Exec.new(commands_object || commands)
       end
     end
   end

data/lib/serverspec/helper/ssh.rb

@@ -1,8 +1,8 @@
 module Serverspec
   module Helper
     module Ssh
-      def backend
-        Serverspec::Backend::Ssh.new(commands)
+      def backend(commands_object=nil)
+        Serverspec::Backend::Ssh.new(commands_object || commands)
       end
     end
   end

data/lib/serverspec/setup.rb

@@ -28,11 +28,11 @@ EOF
 
 Select OS type of target host:
 
-  1) Red Hat
-  2) Debian
-  3) Gentoo
-  4) Solaris
-  5) None
+  1) Auto Detect
+  2) Red Hat
+  3) Debian
+  4) Gentoo
+  5) Solaris
 
 Select number: 
 EOF
@@ -41,7 +41,7 @@ EOF
       num = gets.to_i - 1
       puts
 
-      @os_type = [ 'RedHat', 'Debian', 'Gentoo', 'Solaris', nil ][num]
+      @os_type = [ 'DetectOS', 'RedHat', 'Debian', 'Gentoo', 'Solaris' ][num]
 
       [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
       safe_create_spec
@@ -121,9 +121,9 @@ EOF
       options = Net::SSH::Config.for(c.host)
       user    = options[:user] || Etc.getlogin
       c.ssh   = Net::SSH.start(c.host, user, options)
+      c.os    = backend(Serverspec::Commands::Base).check_os
     end
-  end
-")
+  end")
             when 'Puppet'
               content.gsub!(/### include requirements ###/, "require 'puppet'\nrequire 'serverspec/backend/puppet'
 ")

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,89 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: serverspec
-version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 8
+  version: 0.2.8
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-13 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: RSpec tests for your servers provisioned by Puppet, Chef or anything
-  else
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: RSpec tests for your servers provisioned by Puppet, Chef or anything else
+email: 
 - gosukenator@gmail.com
-executables:
+executables: 
 - serverspec-init
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -103,6 +104,7 @@ files:
 - lib/serverspec/commands/solaris.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/debian.rb
+- lib/serverspec/helper/detect_os.rb
 - lib/serverspec/helper/exec.rb
 - lib/serverspec/helper/gentoo.rb
 - lib/serverspec/helper/obsoleted.rb
@@ -150,32 +152,41 @@ files:
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
+has_rdoc: true
 homepage: http://serverspec.org/
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-test_files:
+test_files: 
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/gentoo/commands_spec.rb