serverspec 0.11.5 → 0.12.0

data/spec/spec_helper.rb

@@ -2,14 +2,14 @@ require 'serverspec'
 require 'pathname'
 require 'rspec/mocks/standalone'
 
-include Serverspec::Helper::Exec
+include SpecInfra::Helper::Exec
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 
 
-module Serverspec
+module SpecInfra
   module Backend
     module TestCommandRunner
       def do_run cmd
@@ -19,15 +19,15 @@ module Serverspec
 
         if cmd =~ /invalid/
           {
-            :stdout      => ::Serverspec.configuration.stdout,
-            :stderr      => ::Serverspec.configuration.stderr,
+            :stdout      => ::SpecInfra.configuration.stdout,
+            :stderr      => ::SpecInfra.configuration.stderr,
             :exit_status => 1,
             :exit_signal => nil
           }
         else
           {
-            :stdout      => ::Serverspec.configuration.stdout,
-            :stderr      => ::Serverspec.configuration.stderr,
+            :stdout      => ::SpecInfra.configuration.stdout,
+            :stderr      => ::SpecInfra.configuration.stderr,
             :exit_status => 0,
             :exit_signal => nil
           }
@@ -45,7 +45,9 @@ module Serverspec
       end
     end
   end
+end
 
+module Serverspec
   module Type
     class Base
       def set_command(command)

data/spec/windows/command_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe command('test_cmd /test/path/file') do
   let(:stdout) { "test output 1.2.3\r\n" }

data/spec/windows/file_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe file('/some/valid/file') do
   it { should be_file }

data/spec/windows/group_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe group('test.group') do
   it { should exist }

data/spec/windows/port_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe port(80) do
   it { should be_listening }

data/spec/windows/service_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe service('Test Service') do
   it { should be_enabled }

data/spec/windows/user_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe user('test.user') do
   it { should exist }

data/spec/windows/windows_registry_key_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
+include SpecInfra::Helper::Cmd
+include SpecInfra::Helper::Windows
 
 describe windows_registry_key('PATH/TO/THE_KEY') do
   it { should exist }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,23 +112,6 @@ files:
 - WINDOWS_SUPPORT.md
 - bin/serverspec-init
 - lib/serverspec.rb
-- lib/serverspec/attributes.rb
-- lib/serverspec/backend.rb
-- lib/serverspec/backend/base.rb
-- lib/serverspec/backend/cmd.rb
-- lib/serverspec/backend/exec.rb
-- lib/serverspec/backend/powershell/command.rb
-- lib/serverspec/backend/powershell/script_helper.rb
-- lib/serverspec/backend/powershell/support/check_file_access_rules.ps1
-- lib/serverspec/backend/powershell/support/crop_text.ps1
-- lib/serverspec/backend/powershell/support/find_group.ps1
-- lib/serverspec/backend/powershell/support/find_installed_application.ps1
-- lib/serverspec/backend/powershell/support/find_service.ps1
-- lib/serverspec/backend/powershell/support/find_user.ps1
-- lib/serverspec/backend/powershell/support/find_usergroup.ps1
-- lib/serverspec/backend/powershell/support/is_port_listening.ps1
-- lib/serverspec/backend/ssh.rb
-- lib/serverspec/backend/winrm.rb
 - lib/serverspec/commands/aix.rb
 - lib/serverspec/commands/base.rb
 - lib/serverspec/commands/darwin.rb
@@ -129,31 +126,10 @@ files:
 - lib/serverspec/commands/solaris10.rb
 - lib/serverspec/commands/solaris11.rb
 - lib/serverspec/commands/windows.rb
-- lib/serverspec/configuration.rb
 - lib/serverspec/helper.rb
-- lib/serverspec/helper/aix.rb
-- lib/serverspec/helper/attributes.rb
-- lib/serverspec/helper/base.rb
-- lib/serverspec/helper/cmd.rb
-- lib/serverspec/helper/configuration.rb
-- lib/serverspec/helper/darwin.rb
-- lib/serverspec/helper/debian.rb
-- lib/serverspec/helper/detect_os.rb
-- lib/serverspec/helper/exec.rb
-- lib/serverspec/helper/freebsd.rb
-- lib/serverspec/helper/gentoo.rb
-- lib/serverspec/helper/plamo.rb
-- lib/serverspec/helper/properties.rb
-- lib/serverspec/helper/puppet.rb
-- lib/serverspec/helper/redhat.rb
-- lib/serverspec/helper/smartos.rb
-- lib/serverspec/helper/solaris.rb
-- lib/serverspec/helper/solaris10.rb
-- lib/serverspec/helper/solaris11.rb
-- lib/serverspec/helper/ssh.rb
+- lib/serverspec/helper/backend.rb
+- lib/serverspec/helper/os.rb
 - lib/serverspec/helper/type.rb
-- lib/serverspec/helper/windows.rb
-- lib/serverspec/helper/winrm.rb
 - lib/serverspec/matchers.rb
 - lib/serverspec/matchers/be_enabled.rb
 - lib/serverspec/matchers/be_executable.rb
@@ -174,7 +150,6 @@ files:
 - lib/serverspec/matchers/return_exit_status.rb
 - lib/serverspec/matchers/return_stderr.rb
 - lib/serverspec/matchers/return_stdout.rb
-- lib/serverspec/properties.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb
@@ -291,7 +266,6 @@ files:
 - spec/gentoo/service_spec.rb
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
-- spec/helpers/properties_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb
@@ -496,7 +470,6 @@ test_files:
 - spec/gentoo/service_spec.rb
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
-- spec/helpers/properties_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb

data/lib/serverspec/attributes.rb

@@ -1,17 +0,0 @@
-require 'singleton'
-
-module Serverspec
-  class Attributes
-    include Singleton
-    def initialize
-      @attr = {}
-    end
-    def attributes(attr=nil)
-      if ! attr.nil?
-        @attr = attr
-      end
-      @attr
-    end
-  end
-end
-

data/lib/serverspec/backend.rb

@@ -1,7 +0,0 @@
-require 'serverspec/backend/base'
-require 'serverspec/backend/ssh'
-require 'serverspec/backend/exec'
-require 'serverspec/backend/powershell/script_helper'
-require 'serverspec/backend/powershell/command'
-require 'serverspec/backend/cmd'
-require 'serverspec/backend/winrm'

data/lib/serverspec/backend/base.rb

@@ -1,31 +0,0 @@
-require 'singleton'
-
-module Serverspec
-  module Backend
-    class Base
-      include Singleton
-
-      def set_commands(c)
-        @commands = c
-      end
-
-      def set_example(e)
-        @example = e
-      end
-
-      def commands
-        @commands
-      end
-      
-      def check_zero(cmd, *args)
-        ret = run_command(commands.send(cmd, *args))
-        ret[:exit_status] == 0
-      end
-
-      # Default action is to call check_zero with args
-      def method_missing(meth, *args, &block)
-        check_zero(meth, *args)
-      end
-    end
-  end
-end

data/lib/serverspec/backend/cmd.rb

@@ -1,39 +0,0 @@
-require 'open3'
-
-module Serverspec
-  module Backend
-    class Cmd < Base
-      include PowerShell::ScriptHelper
-
-      def run_command(cmd, opts={})
-        script = create_script(cmd)
-        result = execute_script %Q{powershell -encodedCommand #{encode_script(script)}}
-
-        if @example
-          @example.metadata[:command] = script
-          @example.metadata[:stdout]  = result[:stdout] + result[:stderr]
-        end
-        { :stdout => result[:stdout], :stderr => result[:stderr],
-          :exit_status => result[:status], :exit_signal => nil }
-      end
-
-      def execute_script script
-        if Open3.respond_to? :capture3
-          stdout, stderr, status = Open3.capture3(script)
-          # powershell still exits with 0 even if there are syntax errors, although it spits the error out into stderr
-          # so we have to resort to return an error exit code if there is anything in the standard error
-          status = 1 if status == 0 and !stderr.empty?
-          { :stdout => stdout, :stderr => stderr, :status => status }
-        else
-          stdout = `#{script} 2>&1`
-          { :stdout => stdout, :stderr => nil, :status => $? }
-        end
-      end
-
-      def check_os
-        # Dirty hack for specs
-        'Windows'
-      end
-    end
-  end
-end

data/lib/serverspec/backend/exec.rb

@@ -1,218 +0,0 @@
-require 'singleton'
-
-module Serverspec
-  module Backend
-    class Exec < Base
-
-      def run_command(cmd, opts={})
-        cmd = build_command(cmd)
-        cmd = add_pre_command(cmd)
-        stdout = run_with_no_ruby_environment do
-          `#{build_command(cmd)} 2>&1`
-        end
-        # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
-        #stdout, stderr, status = Open3.capture3(cmd)
-
-        if @example
-          @example.metadata[:command] = cmd
-          @example.metadata[:stdout]  = stdout
-        end
-
-        { :stdout => stdout, :stderr => nil,
-          :exit_status => $?.exitstatus, :exit_signal => nil }
-      end
-
-      def run_with_no_ruby_environment
-        keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
-          RUBYOPT GEM_HOME GEM_PATH GEM_CACHE]
-
-        keys.each { |key| ENV["_SERVERSPEC_#{key}"] = ENV[key] ; ENV.delete(key) }
-        yield
-      ensure
-        keys.each { |key| ENV[key] = ENV.delete("_SERVERSPEC_#{key}") }
-      end
-
-      def build_command(cmd)
-        path = Serverspec.configuration.path || RSpec.configuration.path
-        if path
-          cmd = "env PATH=#{path}:$PATH #{cmd}"
-          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
-          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1env PATH=#{path}:$PATH ")
-        end
-        cmd
-      end
-
-      def add_pre_command(cmd)
-        path = Serverspec.configuration.path || RSpec.configuration.path
-        if Serverspec.configuration.pre_command
-          cmd = "#{Serverspec.configuration.pre_command} && #{cmd}"
-          cmd = "env PATH=#{path}:$PATH #{cmd}" if path
-        end
-        cmd
-      end
-
-      def check_running(process)
-        ret = run_command(commands.check_running(process))
-        
-        # In Ubuntu, some services are under upstart and "service foo status" returns
-        # exit status 0 even though they are stopped.
-        # So return false if stdout contains "stopped/waiting".
-        return false if ret[:stdout] =~ /stopped\/waiting/
-
-        # If the service is not registered, check by ps command
-        if ret[:exit_status] == 1
-          ret = run_command(commands.check_process(process))
-        end
-
-        ret[:exit_status] == 0
-      end
-
-      def check_monitored_by_monit(process)
-        ret = run_command(commands.check_monitored_by_monit(process))
-        return false unless ret[:stdout] != nil && ret[:exit_status] == 0
-
-        retlines = ret[:stdout].split(/[\r\n]+/).map(&:strip)
-        proc_index = retlines.index("Process '#{process}'")
-        return false unless proc_index
-        
-        retlines[proc_index+2].match(/\Amonitoring status\s+monitored\Z/i) != nil
-      end
-
-      def check_readable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0444 != 0
-        when 'owner'
-          mode_octal & 0400 != 0
-        when 'group'
-          mode_octal & 0040 != 0
-        when 'others'
-          mode_octal & 0004 != 0
-        end
-      end
-
-      def check_writable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0222 != 0
-        when 'owner'
-          mode_octal & 0200 != 0
-        when 'group'
-          mode_octal & 0020 != 0
-        when 'others'
-          mode_octal & 0002 != 0
-        end
-      end
-
-      def check_executable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
-        mode = mode.split('')
-        mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
-        case by_whom
-        when nil
-          mode_octal & 0111 != 0
-        when 'owner'
-          mode_octal & 0100 != 0
-        when 'group'
-          mode_octal & 0010 != 0
-        when 'others'
-          mode_octal & 0001 != 0
-        end
-      end
-
-      def check_mounted(path, expected_attr, only_with)
-        ret = run_command(commands.check_mounted(path))
-        if expected_attr.nil? || ret[:exit_status] != 0
-          return ret[:exit_status] == 0
-        end
-
-        mount = ret[:stdout].scan(/\S+/)
-        actual_attr    = { :device => mount[0], :type => mount[4] }
-        mount[5].gsub(/\(|\)/, '').split(',').each do |option|
-          name, val = option.split('=')
-          if val.nil?
-            actual_attr[name.to_sym] = true
-          else
-            val = val.to_i if val.match(/^\d+$/)
-            actual_attr[name.to_sym] = val
-          end
-        end
-
-        if ! expected_attr[:options].nil?
-          expected_attr.merge!(expected_attr[:options])
-          expected_attr.delete(:options)
-        end
-
-        if only_with
-          actual_attr == expected_attr
-        else
-          expected_attr.each do |key, val|
-            return false if actual_attr[key] != val
-          end
-          true
-        end
-      end
-
-      def check_routing_table(expected_attr)
-        return false if ! expected_attr[:destination]
-        ret = run_command(commands.check_routing_table(expected_attr[:destination]))
-        return false if ret[:exit_status] != 0
-
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+\r\n(?:default via (\S+))?/
-        actual_attr = {
-          :destination => $1,
-          :gateway     => $2 ? $2 : $4,
-          :interface   => expected_attr[:interface] ? $3 : nil
-        }
-
-        expected_attr.each do |key, val|
-          return false if actual_attr[key] != val
-        end
-        true
-      end
-
-      def check_os
-        return RSpec.configuration.os if RSpec.configuration.os
-        if run_command('ls /etc/redhat-release')[:exit_status] == 0
-          line = run_command('cat /etc/redhat-release')[:stdout]
-          if line =~ /release (\d[\d.]*)/
-            release = $1
-          end
-          { :family => 'RedHat', :release => release }
-        elsif run_command('ls /etc/system-release')[:exit_status] == 0
-          { :family => 'RedHat', :release => nil } # Amazon Linux
-        elsif run_command('ls /etc/debian_version')[:exit_status] == 0
-          { :family => 'Debian', :release => nil }
-        elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
-          { :family => 'Gentoo', :release => nil }
-        elsif run_command('ls /usr/lib/setup/Plamo-*')[:exit_status] == 0
-          { :family => 'Plamo', :release => nil }
-        elsif run_command('uname -s')[:stdout] =~ /AIX/i
-          { :family => 'AIX', :release => nil }
-        elsif (os = run_command('uname -sr')[:stdout]) && os =~ /SunOS/i
-          if os =~ /5.10/
-            { :family => 'Solaris10', :release => nil }
-          elsif run_command('grep -q "Oracle Solaris 11" /etc/release')[:exit_status] == 0
-            { :family => 'Solaris11', :release => nil }
-          elsif run_command('grep -q SmartOS /etc/release')[:exit_status] == 0
-            { :family => 'SmartOS', :release => nil }
-          else
-            { :family => 'Solaris', :release => nil }
-          end
-        elsif run_command('uname -s')[:stdout] =~ /Darwin/i
-          { :family => 'Darwin', :release => nil }
-        elsif run_command('uname -s')[:stdout] =~ /FreeBSD/i
-          { :family => 'FreeBSD', :release => nil }
-        else
-          { :family => 'Base', :release => nil }
-        end
-      end
-    end
-  end
-end