serverspec 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0aa6233f171389a2eb290151b5e8e788f58def0
-  data.tar.gz: 747b9ef75c761e72c0cf5640bb6be9976f7879e2
+  metadata.gz: 3cc50787ae240d064c0e341a21d4cf65c2b2b3e4
+  data.tar.gz: c32f7dcc3513b788bc938f192626d950420aad4b
 SHA512:
-  metadata.gz: 70c31af75bc88fae10615394c152ac5ca1e353cab34dd3a2026dbfbc704409437184280f48b0d1bb0fa2211372988321de385cd729707b6759b87f475149a34d
-  data.tar.gz: 7ab52436a7093e421177bf3986a4f783a558d1657bcdbcf9d07c440e927179e02ab02117c617e89ca4b22252c0667bd52b6e13390c4c3e92cc363cf813ae39a7
+  metadata.gz: 26aa8da0bf28a3cbc26b7bf1a9ca727649d6c40e8d460fbd0e1538ed827cbc067c3b0e444d5a71093ef0f5b40d92272251c9b1a76868803928e4708b5f658c21
+  data.tar.gz: f3505fc995a4856f1ef838cac007c2668d3b960f00e17fb07d3df2a5ebdac3d5c5748efc76a48f2e441bd271272c53c57efc894320b5399fed98fbac4765a1e2

data/lib/serverspec/type/cgroup.rb

@@ -9,7 +9,7 @@ module Serverspec
         else
           param = "#{@subsystem}.#{meth.to_s}"
           ret = backend.run_command("cgget -n -r #{param} #{@name} | awk '{print $2}'")
-          val = ret[:stdout].strip
+          val = ret.stdout.strip
           val = val.to_i if val.match(/^\d+$/)
           val
         end

data/lib/serverspec/type/command.rb

@@ -6,9 +6,9 @@ module Serverspec
       def return_stdout?(content)
         ret = backend.run_command(@name)
         if content.instance_of?(Regexp)
-          ret[:stdout] =~ content
+          ret.stdout =~ content
         else
-          ret[:stdout].strip == content
+          ret.stdout.strip == content
         end
       end
 
@@ -18,20 +18,20 @@ module Serverspec
         # See http://stackoverflow.com/questions/7937651/receiving-extended-data-with-ssh-using-twisted-conch-as-client
         # So I use stdout instead of stderr
         if content.instance_of?(Regexp)
-          ret[:stdout] =~ content
+          ret.stdout =~ content
         else
-          ret[:stdout].strip == content
+          ret.stdout.strip == content
         end
       end
 
       def return_exit_status?(status)
         ret = backend.run_command(@name)
-        ret[:exit_status].to_i == status
+        ret.exit_status.to_i == status
       end
 
       def stdout
         if @result.nil?
-          @result = backend.run_command(@name)[:stdout]
+          @result = backend.run_command(@name).stdout
         end
         @result
       end

data/lib/serverspec/type/default_gateway.rb

@@ -3,13 +3,13 @@ module Serverspec
     class DefaultGateway < Base
       def ipaddress
         ret = backend.run_command(commands.check_routing_table('default'))
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
+        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $2 ? $2 : $4
       end
 
       def interface
         ret = backend.run_command(commands.check_routing_table('default'))
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
+        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $3
       end
 

data/lib/serverspec/type/file.rb

@@ -77,7 +77,7 @@ module Serverspec
 
       def content
         if @content.nil?
-          @content = backend.run_command(commands.get_file_content(@name))[:stdout]
+          @content = backend.run_command(commands.get_file_content(@name)).stdout
         end
         @content
       end

data/lib/serverspec/type/interface.rb

@@ -3,7 +3,7 @@ module Serverspec
     class Interface < Base
       def speed
         ret = backend.run_command(commands.get_interface_speed_of(@name))
-        val = ret[:stdout].strip
+        val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val
       end

data/lib/serverspec/type/linux_kernel_parameter.rb

@@ -3,7 +3,7 @@ module Serverspec
     class LinuxKernelParameter < Base
       def value
         ret = backend.run_command("/sbin/sysctl -q -n #{@name}")
-        val = ret[:stdout].strip
+        val = ret.stdout.strip
         val = val.to_i if val.match(/^\d+$/)
         val
       end

data/lib/serverspec/type/package.rb

@@ -16,7 +16,7 @@ module Serverspec
       end
 
       def version
-        ret = backend.run_command(commands.get_package_version(@name))[:stdout].strip
+        ret = backend.run_command(commands.get_package_version(@name)).stdout.strip
         if ret.empty?
           nil
         else

data/lib/serverspec/type/php_config.rb

@@ -3,7 +3,7 @@ module Serverspec
     class PhpConfig < Base
       def value
         ret = backend.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
-        val = ret[:stdout]
+        val = ret.stdout
         val = val.to_i if val.match(/^\d+$/)
         val
       end

data/lib/serverspec/type/process.rb

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

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.14.4"
+  VERSION = "0.15.0"
 end

data/serverspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "rspec", ">= 2.13.0"
   spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "specinfra", ">= 0.1.0"
+  spec.add_runtime_dependency "specinfra", ">= 0.5.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/spec_helper.rb

@@ -17,21 +17,13 @@ module SpecInfra
           @example.metadata[:subject].set_command(cmd)
         end
 
-        if cmd =~ /invalid/
-          {
-            :stdout      => ::SpecInfra.configuration.stdout,
-            :stderr      => ::SpecInfra.configuration.stderr,
-            :exit_status => 1,
-            :exit_signal => nil
-          }
-        else
-          {
-            :stdout      => ::SpecInfra.configuration.stdout,
-            :stderr      => ::SpecInfra.configuration.stderr,
-            :exit_status => 0,
-            :exit_signal => nil
-          }
-        end
+        CommandResult.new({
+          :stdout      => ::SpecInfra.configuration.stdout,
+          :stderr      => ::SpecInfra.configuration.stderr,
+          :exit_status => cmd =~ /invalid/ ? 1 : 0,
+          :exit_signal => nil,
+        })
+
       end
     end
     [Exec, Ssh, Cmd, WinRM].each do |clz|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement