specinfra 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1723c36eee1bc0172723b6f7b25e523dea4ea64e
-  data.tar.gz: 038004ce1ec9c778c815c2432103943688c93e06
+  metadata.gz: c43b0fc54df451fdfd3f4d2277ccd43b086903b4
+  data.tar.gz: 0ea1cdca32da29426db6c404424fe88eb0a5ce04
 SHA512:
-  metadata.gz: 8f1bc4cce205831e97c2ea9c2c775def26160abbb9e0de7bcb4b3d2af80a02bdf469fd7496a8c20138328ae1b6df2da210775d645c3b548c6ef27155c8e96486
-  data.tar.gz: 2cf652b80148120f9603ad1757677e4ea3b80b2c648cc6cac066b97046e2463bef8ebe7ff2cc9c10ac750958e58d3876354bfb58bb2b787b5dbb5b49d69173dd
+  metadata.gz: fe76cc14f1638e62d32e5e617d7efd61d333245228c5d4d4a6c3cb9ee52f39eb662b7bea29993e0bbf116afe34754f85a3080a1ef3d779817686d6d878a3adbf
+  data.tar.gz: 31590df84b9539f7a2f1a3d2e4f8d34021a182a3f87d0f38ebd86db16de9c85a44fc9b505de1aac2464192e71ed95ecd66766822b657d3fc9cc07cc07be2f13a

data/Rakefile

@@ -10,8 +10,17 @@ namespace :spec do
     t.pattern = "spec/helper/*_spec.rb"
   end
 
-  RSpec::Core::RakeTask.new(:backend) do |t|
-    t.pattern = "spec/backend/*/*_spec.rb"
+  task :backend => 'backend:all'
+  namespace :backend do
+    backends = %w[exec ssh]
+
+    task :all => backends
+
+    backends.each do |backend|
+      RSpec::Core::RakeTask.new(backend) do |t|
+        t.pattern = "spec/backend/#{backend}/*_spec.rb"
+      end
+    end
   end
 
   RSpec::Core::RakeTask.new(:configuration) do |t|

data/lib/specinfra/backend/base.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'specinfra/command_result'
 
 module SpecInfra
   module Backend
@@ -18,8 +19,7 @@ module SpecInfra
       end
       
       def check_zero(cmd, *args)
-        ret = run_command(commands.send(cmd, *args))
-        ret[:exit_status] == 0
+        run_command(commands.send(cmd, *args)).success?
       end
 
       # Default action is to call check_zero with args

data/lib/specinfra/backend/cmd.rb

@@ -13,8 +13,8 @@ module SpecInfra
           @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 }
+        CommandResult.new :stdout => result[:stdout], :stderr => result[:stderr],
+          :exit_status => result[:status]
       end
 
       def execute_script script

data/lib/specinfra/backend/docker.rb

@@ -54,8 +54,8 @@ module SpecInfra
           begin
             stdout, stderr = container.attach
             result = container.wait
-            return {:stdout => stdout.join, :stderr => stderr.join,
-              :exit_status => result['StatusCode'], :exit_signal => nil}
+            return CommandResult.new :stdout => stdout.join, :stderr => stderr.join,
+              :exit_status => result['StatusCode']
           rescue
             container.kill
           end

data/lib/specinfra/backend/dockerfile.rb

@@ -10,8 +10,7 @@ module SpecInfra
 
       def run_command(cmd, opts={})
         @lines << "RUN #{cmd}"
-        { :stdout => nil, :stderr => nil,
-          :exit_status => 0, :exit_signal => nil }
+        CommandResult.new
       end
 
       def from(base)

data/lib/specinfra/backend/exec.rb

@@ -19,8 +19,7 @@ module SpecInfra
           @example.metadata[:stdout]  = stdout
         end
 
-        { :stdout => stdout, :stderr => nil,
-          :exit_status => $?.exitstatus, :exit_signal => nil }
+        CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
       end
 
       def run_with_no_ruby_environment
@@ -58,21 +57,21 @@ module SpecInfra
         # 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/
+        return false if ret.stdout =~ /stopped\/waiting/
 
         # If the service is not registered, check by ps command
-        if ret[:exit_status] == 1
+        if ret.exit_status == 1
           ret = run_command(commands.check_process(process))
         end
 
-        ret[:exit_status] == 0
+        ret.success?
       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
+        return false unless ret.stdout != nil && ret.success?
 
-        retlines = ret[:stdout].split(/[\r\n]+/).map(&:strip)
+        retlines = ret.stdout.split(/[\r\n]+/).map(&:strip)
         proc_index = retlines.index("Process '#{process}'")
         return false unless proc_index
         
@@ -80,7 +79,7 @@ module SpecInfra
       end
 
       def check_readable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
+        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
@@ -96,7 +95,7 @@ module SpecInfra
       end
 
       def check_writable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
+        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
@@ -112,7 +111,7 @@ module SpecInfra
       end
 
       def check_executable(file, by_whom)
-        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
+        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
@@ -129,11 +128,11 @@ module SpecInfra
 
       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
+        if expected_attr.nil? || ret.failure?
+          return ret.success?
         end
 
-        mount = ret[:stdout].scan(/\S+/)
+        mount = ret.stdout.scan(/\S+/)
         actual_attr    = { :device => mount[0], :type => mount[4] }
         mount[5].gsub(/\(|\)/, '').split(',').each do |option|
           name, val = option.split('=')
@@ -163,11 +162,11 @@ module SpecInfra
       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
+        return false if ret.failure?
 
-        ret[:stdout].gsub!(/\r\n/, "\n")
+        ret.stdout.gsub!(/\r\n/, "\n")
 
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
+        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
         actual_attr = {
           :destination => $1,
           :gateway     => $2 ? $2 : $4,
@@ -182,47 +181,47 @@ module SpecInfra
 
       def check_os
         return SpecInfra.configuration.os if SpecInfra.configuration.os
-        if run_command('ls /etc/redhat-release')[:exit_status] == 0
-          line = run_command('cat /etc/redhat-release')[:stdout]
+        if run_command('ls /etc/redhat-release').success?
+          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
+        elsif run_command('ls /etc/system-release').success?
           { :family => 'RedHat', :release => nil } # Amazon Linux
-        elsif run_command('ls /etc/debian_version')[:exit_status] == 0
+        elsif run_command('ls /etc/debian_version').success?
           lsb_release = run_command("lsb_release -i")
-          if lsb_release[:exit_status] == 0
-            distro = $' if lsb_release[:stdout] =~ /:/
+          if lsb_release.success?
+            distro = $' if lsb_release.stdout =~ /:/
           else
             lsb_release = run_command("cat /etc/lsb-release")
-            if lsb_release[:exit_status] == 0
-              lsb_release[:stdout].each_line do |line|
+            if lsb_release.success?
+              lsb_release.stdout.each_line do |line|
                 distro = $' if line =~ /^DISTRIB_ID=/
               end
             end
           end
           distro ||= 'Debian'
           { :family => distro.strip, :release => nil }
-        elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
+        elsif run_command('ls /etc/gentoo-release').success?
           { :family => 'Gentoo', :release => nil }
-        elsif run_command('ls /usr/lib/setup/Plamo-*')[:exit_status] == 0
+        elsif run_command('ls /usr/lib/setup/Plamo-*').success?
           { :family => 'Plamo', :release => nil }
-        elsif run_command('uname -s')[:stdout] =~ /AIX/i
+        elsif run_command('uname -s').stdout =~ /AIX/i
           { :family => 'AIX', :release => nil }
-        elsif (os = run_command('uname -sr')[:stdout]) && os =~ /SunOS/i
+        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
+          elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
             { :family => 'Solaris11', :release => nil }
-          elsif run_command('grep -q SmartOS /etc/release')[:exit_status] == 0
+          elsif run_command('grep -q SmartOS /etc/release').success?
             { :family => 'SmartOS', :release => nil }
           else
             { :family => 'Solaris', :release => nil }
           end
-        elsif run_command('uname -s')[:stdout] =~ /Darwin/i
+        elsif run_command('uname -s').stdout =~ /Darwin/i
           { :family => 'Darwin', :release => nil }
-        elsif run_command('uname -s')[:stdout] =~ /FreeBSD/i
+        elsif run_command('uname -s').stdout =~ /FreeBSD/i
           { :family => 'FreeBSD', :release => nil }
         else
           { :family => 'Base', :release => nil }

data/lib/specinfra/backend/powershell/script_helper.rb

@@ -73,11 +73,11 @@ exit $exitCode
           ret = run_command(commands.check_running(process))
 
           # If the service is not registered, check the process
-          if ret[:exit_status] == 1
+          if ret.exit_status == 1
             ret = run_command(commands.check_process(process))
           end
 
-          ret[:exit_status] == 0
+          ret.success?
         end
       end
     end

data/lib/specinfra/backend/shellscript.rb

@@ -10,8 +10,7 @@ module SpecInfra
 
       def run_command(cmd, opts={})
         @lines << cmd
-        { :stdout => nil, :stderr => nil,
-          :exit_status => 0, :exit_signal => nil }
+        CommandResult.new
       end
 
       class Writer

data/lib/specinfra/backend/ssh.rb

@@ -15,7 +15,7 @@ module SpecInfra
           @example.metadata[:stdout]  = ret[:stdout]
         end
 
-        ret
+        CommandResult.new ret
       end
 
       def build_command(cmd)

data/lib/specinfra/backend/winrm.rb

@@ -18,8 +18,8 @@ module SpecInfra
           @example.metadata[:stdout]  = stdout + stderr
         end
 
-        { :stdout => stdout, :stderr => stderr,
-          :exit_status => result[:exitcode], :exit_signal => nil }
+        CommandResult.new :stdout => stdout, :stderr => stderr,
+          :exit_status => result[:exitcode]
       end
     end
   end

data/lib/specinfra/command_result.rb

@@ -0,0 +1,28 @@
+module SpecInfra
+  class CommandResult
+    attr_reader :stdout, :stderr, :exit_status, :exit_signal
+
+    def initialize(args = {})
+      @stdout = args[:stdout] || ''
+      @stderr = args[:stderr] || ''
+      @exit_status = args[:exit_status] || 0
+      @exit_signal = args[:exit_signal]
+    end
+
+    def success?
+      @exit_status == 0
+    end
+
+    def failure?
+      @exit_status != 0
+    end
+
+    def [](x)
+      warn "CommandResult#[] is obsolete. Use accessors instead. in #{caller[0]}"
+      case x
+      when :stdout, :stderr, :exit_status, :exit_signal
+      self.send(x)
+      end
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/specinfra.rb

@@ -2,6 +2,7 @@ require "specinfra/version"
 require "specinfra/helper"
 require "specinfra/backend"
 require "specinfra/command"
+require "specinfra/command_result"
 require "specinfra/configuration"
 
 include SpecInfra

data/spec/backend/exec/build_command_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::Exec
+
+describe 'build command with path' do
+  before :each do
+    RSpec.configure do |c|
+      c.path = '/sbin:/usr/sbin'
+    end
+  end
+
+  context 'command pattern 1' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test -f /etc/passwd' }
+  end
+
+  context 'command pattern 2' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+      it { should eq 'env PATH=/sbin:/usr/sbin:$PATH test ! -f /etc/selinux/config || (env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- disabled && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+  end
+
+  context 'command pattern 3' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 && ! env PATH=/sbin:/usr/sbin:$PATH dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.path = nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,8 +7,7 @@ module SpecInfra
   module Backend
     class Ssh
       def run_command(cmd, opts={})
-        { :stdout => nil, :stderr => nil,
-          :exit_status => 0, :exit_signal => nil }
+        CommandResult.new :stdout => nil, :exit_status => 0
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/specinfra/command/solaris11.rb
 - lib/specinfra/command/ubuntu.rb
 - lib/specinfra/command/windows.rb
+- lib/specinfra/command_result.rb
 - lib/specinfra/configuration.rb
 - lib/specinfra/helper.rb
 - lib/specinfra/helper/backend.rb
@@ -111,6 +112,7 @@ files:
 - lib/specinfra/helper/properties.rb
 - lib/specinfra/properties.rb
 - lib/specinfra/version.rb
+- spec/backend/exec/build_command_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb
@@ -142,6 +144,7 @@ signing_key:
 specification_version: 4
 summary: Common layer for serverspec and configspec
 test_files:
+- spec/backend/exec/build_command_spec.rb
 - spec/backend/ssh/build_command_spec.rb
 - spec/configuration_spec.rb
 - spec/helper/backend_spec.rb