serverspec 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6465c0cb3fd1e3c207bfab4b6de1e09771b4b0e8
-  data.tar.gz: b28a47a69b3c7fc326e3ef0155d4c7d722443f71
+  metadata.gz: 593c624ff578dd19f008494d2c96baffdac588f2
+  data.tar.gz: 02e72fd3e80fb95ba6baaa8b9179648f31bed28b
 SHA512:
-  metadata.gz: 3c8cdd616012454564afcc9593b5a91431bd46ba001ccb8bec99cd63d89faa5fe7500e714baeb6eaffeb1539a468630b6e2b37ac490be21893fbf75908c97672
-  data.tar.gz: 8d607e79f5876652dbda649c88b206c63fb0601be455d39cc5025917f12222a6e29bd599c0760febcbc25b75f846f44380df33f4ac0c92eb32aaf7d0267b9cdb
+  metadata.gz: d8e3c139f6303c2845fdeea770cd3d1515e7c10fa4a54a7e6892b7abe556c982061fbf90b8a68878d28d00469c83c59b0a4b53f8b5b8ee9d52d62f9ec8fc5555
+  data.tar.gz: 173e75bf9d20f30f1f29b978d68d6d7105fdffb9f30432f4d6e8a73cc785a7da02e5e02f37f23664d0d2cd11b39b3ea285fc45af55798d585dc568ff55cf0924

data/Rakefile

@@ -6,8 +6,9 @@ task :spec => 'spec:all'
 
 namespace :spec do
   oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd freebsd10)
+  backends = %w( exec ssh cmd winrm powershell )
 
-  task :all => [ oses.map {|os| "spec:#{os}" }, :exec, :ssh, :cmd, :winrm, :powershell, :helper ].flatten
+  task :all => [ oses.map {|os| "spec:#{os}" }, backends, :helper, :unit ].flatten
 
   oses.each do |os|
     RSpec::Core::RakeTask.new(os.to_sym) do |t|
@@ -15,7 +16,7 @@ namespace :spec do
     end
   end
 
-  [:exec, :ssh, :cmd, :winrm, :powershell].each do |backend|
+  backends.each do |backend|
     RSpec::Core::RakeTask.new(backend) do |t|
       t.pattern = "spec/backend/#{backend.to_s}/*_spec.rb"
     end
@@ -24,4 +25,8 @@ namespace :spec do
   RSpec::Core::RakeTask.new(:helper) do |t|
     t.pattern = "spec/helper/*_spec.rb"
   end
+
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "spec/unit/*_spec.rb"
+  end
 end

data/lib/serverspec/helper/os.rb

@@ -1,20 +1,20 @@
 module Serverspec
   module Helper
     [
-     'DetectOS',
-     'AIX',
-     'Darwin',
-     'Debian',
-     'FreeBSD',
-     'FreeBSD10',
-     'Gentoo',
-     'Plamo',
-     'RedHat',
-     'SmartOS',
-     'Solaris',
-     'Solaris10',
-     'Solaris11',
-     'Windows',
+      'DetectOS',
+      'AIX',
+      'Darwin',
+      'Debian',
+      'FreeBSD',
+      'FreeBSD10',
+      'Gentoo',
+      'Plamo',
+      'RedHat',
+      'SmartOS',
+      'Solaris',
+      'Solaris10',
+      'Solaris11',
+      'Windows',
     ].each do |os|
       eval <<-EOF
         module #{os}

data/lib/serverspec/matchers/be_executable.rb

@@ -2,9 +2,11 @@ RSpec::Matchers.define :be_executable do
   match do |file|
     file.executable?(@by_whom, @by_user)
   end
+
   chain :by do |by_whom|
     @by_whom = by_whom
   end
+
   chain :by_user do |by_user|
     @by_user = by_user
   end

data/lib/serverspec/matchers/be_installed.rb

@@ -10,5 +10,4 @@ RSpec::Matchers.define :be_installed do
   chain :with_version do |version|
     @version = version
   end
-
 end

data/lib/serverspec/matchers/be_mounted.rb

@@ -2,10 +2,12 @@ RSpec::Matchers.define :be_mounted do
   match do |path|
     path.mounted?(@attr, @only_with)
   end
+
   chain :with do |attr|
     @attr      = attr
     @only_with = false
   end
+
   chain :only_with do |attr|
     @attr      = attr
     @only_with = true

data/lib/serverspec/matchers/be_reachable.rb

@@ -15,4 +15,3 @@ RSpec::Matchers.define :be_reachable  do
     @attr = attr
   end
 end
-

data/lib/serverspec/matchers/be_readable.rb

@@ -2,9 +2,11 @@ RSpec::Matchers.define :be_readable do
   match do |file|
     file.readable?(@by_whom, @by_user)
   end
+
   chain :by do |by_whom|
     @by_whom = by_whom
   end
+
   chain :by_user do |by_user|
     @by_user = by_user
   end

data/lib/serverspec/matchers/be_resolvable.rb

@@ -2,8 +2,8 @@ RSpec::Matchers.define :be_resolvable do
   match do |name|
     name.resolvable?(@type)
   end
+
   chain :by do |type|
     @type = type
   end
 end
-

data/lib/serverspec/matchers/be_writable.rb

@@ -2,9 +2,11 @@ RSpec::Matchers.define :be_writable do
   match do |file|
     file.writable?(@by_whom, @by_user)
   end
+
   chain :by do |by_whom|
     @by_whom = by_whom
   end
+
   chain :by_user do |by_user|
     @by_user = by_user
   end

data/lib/serverspec/matchers/belong_to_group.rb

@@ -3,4 +3,3 @@ RSpec::Matchers.define :belong_to_group do |group|
     user.belongs_to_group?(group)
   end
 end
-

data/lib/serverspec/matchers/contain.rb

@@ -2,17 +2,21 @@ RSpec::Matchers.define :contain do |pattern|
   match do |file|
     file.contain(pattern, @from, @to)
   end
+
   # for contain(pattern).from(/A/).to(/B/)
   chain :from do |from|
     @from = Regexp.new(from).inspect
   end
+
   chain :to do |to|
     @to = Regexp.new(to).inspect
   end
+
   # for contain(pattern).after(/A/)
   chain :after do |after|
     @from = Regexp.new(after).inspect
   end
+
   # for contain(pattern).before(/B/)
   chain :before do |before|
     @to = Regexp.new(before).inspect

data/lib/serverspec/matchers/have_entry.rb

@@ -1,11 +1,12 @@
 RSpec::Matchers.define :have_entry do |entry|
   match do |subject|
     if subject.class.name == 'Serverspec::Type::Cron'
-       subject.has_entry?(@user, entry)
+      subject.has_entry?(@user, entry)
     elsif subject.respond_to?(:has_entry?)
       subject.has_entry?(entry)
     end
   end
+
   # For cron type
   chain :with_user do |user|
     @user = user

data/lib/serverspec/matchers/have_rule.rb

@@ -6,9 +6,11 @@ RSpec::Matchers.define :have_rule do |rule|
       subject.has_rule?(rule)
     end
   end
+
   chain :with_table do |table|
     @table = table
   end
+
   chain :with_chain do |chain|
     @chain = chain
   end

data/lib/serverspec/type/command.rb

@@ -1,43 +1,42 @@
 module Serverspec
   module Type
     class Command < Base
-      attr_accessor :result
-
       def return_stdout?(content)
-        ret = backend.run_command(@name)
         if content.instance_of?(Regexp)
-          ret.stdout =~ content
+          stdout =~ content
         else
-          ret.stdout.strip == content
+          stdout.strip == content
         end
       end
 
       def return_stderr?(content)
-        ret = backend.run_command(@name)
         if content.instance_of?(Regexp)
-          ret.stderr =~ content
+          stderr =~ content
         else
-          ret.stderr.strip == content
+          stderr.strip == content
         end
       end
 
       def return_exit_status?(status)
-        ret = backend.run_command(@name)
-        ret.exit_status.to_i == status
+        exit_status == status
       end
 
       def stdout
-        if @result.nil?
-          @result = backend.run_command(@name).stdout
-        end
-        @result
+        command_result.stdout
       end
 
       def stderr
-        if @result.nil?
-          @result = backend.run_command(@name).stderr
-        end
-        @result
+        command_result.stderr
+      end
+
+      def exit_status
+        command_result.exit_status.to_i
+      end
+
+      private
+
+      def command_result()
+	@command_result ||= backend.run_command(@name)
       end
     end
   end

data/lib/serverspec/type/file.rb

@@ -70,7 +70,7 @@ module Serverspec
       def match_checksum(checksum)
         backend.check_file_checksum(@name, checksum)
       end
-      
+
       def match_md5checksum(md5sum)
         backend.check_file_md5checksum(@name, md5sum)
       end

data/lib/serverspec/type/iis_app_pool.rb

@@ -6,13 +6,12 @@ module Serverspec
       end
 
       def has_dotnet_version?(dotnet)
-          backend.check_iis_app_pool_dotnet(@name, 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

@@ -11,7 +11,7 @@ module Serverspec
       end
 
       def running?()
-          backend.check_iis_website_running(@name)
+        backend.check_iis_website_running(@name)
       end
 
       def in_app_pool?(app_pool)
@@ -19,13 +19,12 @@ module Serverspec
       end
 
       def has_physical_path?(path)
-          backend.check_iis_website_path(@name, path)
+        backend.check_iis_website_path(@name, path)
       end
 
       def to_s
         %Q[IIS Website "#{@name}"]
       end
-  
     end
   end
 end

data/lib/serverspec/type/iptables.rb

@@ -4,6 +4,7 @@ module Serverspec
       def has_rule?(rule, table, chain)
         backend.check_iptables_rule(rule, table, chain)
       end
+
       def to_s
         'iptables'
       end

data/lib/serverspec/type/process.rb

@@ -1,7 +1,6 @@
 module Serverspec
   module Type
     class Process < Base
-
       def running?
         pid = backend.run_command(commands.get_process(@name, :format => "pid=")).stdout
         not pid.empty?
@@ -20,7 +19,7 @@ module Serverspec
       end
 
       def get_column(keyword)
-        ret = backend.run_command(commands.get_process(@name, :format => "#{keyword}="))
+        ret = backend.get_process(@name, :format => "#{keyword}=")
         val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val

data/lib/serverspec/type/windows_feature.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class WindowsFeature < Base
       def installed?(provider, version)
-          backend.check_windows_feature_enabled(@name, provider)
+        backend.check_windows_feature_enabled(@name, provider)
       end
     end
   end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/serverspec.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "specinfra", ">= 1.0.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
+  spec.add_development_dependency "octokit", "~> 2.7.2"
   spec.add_development_dependency "octorelease"
 end

data/spec/unit/command_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Serverspec::Type::Command do
+  subject { command('echo banana') }
+
+  before :each do
+    allow(subject.backend).to receive(:run_command).and_return(
+        CommandResult.new({
+          :stdout      => "banana\n",
+          :stderr      => "split\n",
+          :exit_status => "42",         # Command should convert this to an integer
+        })
+    )
+  end
+
+  it 'has stdout' do
+    expect(subject.stdout).to be == "banana\n"
+  end
+
+  it 'has stderr' do
+    expect(subject.stderr).to be == "split\n"
+  end
+
+  it 'has exit_status' do
+    expect(subject.exit_status).to be == 42
+  end
+
+  it 'does not conflate stdout and stderr' do
+    expect(subject.stdout).to eq("banana\n")
+    expect(subject.stderr).to eq("split\n")
+  end
+
+  it 'runs the command lazily' do
+    expect(subject.backend).to receive(:run_command).exactly(0).times
+
+    # Not sending any messages to the subject.
+  end
+
+  it 'does not run the command more than once' do
+    expect(subject.backend).to receive(:run_command).once
+
+    # We can send all these messages, but the command is invoked only once.
+    subject.stdout
+    subject.stderr
+    subject.exit_status
+    subject.return_stdout? 'foo'
+    subject.return_stderr? 'foo'
+    subject.return_exit_status? 0
+  end
+
+  describe '#return_stdout?' do
+    it 'matches against a string, stripping whitespace' do
+      expect(subject.return_stdout? 'banana').to be_true
+      expect(subject.return_stdout? 'pancake').to be_false
+    end
+
+    it 'matches against a regex' do
+      expect(subject.return_stdout? /anan/).to be_true
+      expect(subject.return_stdout? /^anan/).to be_false
+    end
+  end
+
+  describe '#return_stderr?' do
+    it 'matches against a string, stripping whitespace' do
+      expect(subject.return_stderr? 'split').to be_true
+      expect(subject.return_stderr? 'pancake').to be_false
+    end
+
+    it 'matches against a regex' do
+      expect(subject.return_stderr? /pli/).to be_true
+      expect(subject.return_stderr? /^pli/).to be_false
+    end
+  end
+
+  describe '#return_stderr?' do
+    it 'matches against an integer' do
+      expect(subject.return_exit_status? 42).to be_true
+      expect(subject.return_exit_status? 43).to be_false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: octorelease
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +380,7 @@ files:
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/powershell_command_runner.rb
+- spec/unit/command_spec.rb
 - spec/windows/command_spec.rb
 - spec/windows/file_spec.rb
 - spec/windows/group_spec.rb
@@ -578,6 +593,7 @@ test_files:
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/powershell_command_runner.rb
+- spec/unit/command_spec.rb
 - spec/windows/command_spec.rb
 - spec/windows/file_spec.rb
 - spec/windows/group_spec.rb