serverspec 0.4.12 → 0.4.13

data/Rakefile

@@ -6,11 +6,15 @@ task :spec => 'spec:all'
 namespace :spec do
   oses = %w( darwin debian gentoo redhat solaris )
 
-  task :all => oses.map {|os| "spec:#{os}" }
+  task :all => [ oses.map {|os| "spec:#{os}" }, :others].flatten
 
   oses.each do |os|
     RSpec::Core::RakeTask.new(os.to_sym) do |t|
       t.pattern = "spec/#{os}/*_spec.rb"
     end
   end
+
+  RSpec::Core::RakeTask.new(:others) do |t|
+    t.pattern = "spec/{helpers,backend}/*_spec.rb"
+  end
 end

data/lib/serverspec.rb

@@ -25,6 +25,7 @@ RSpec.configure do |c|
   c.add_setting :host,          :default => nil
   c.add_setting :ssh,           :default => nil
   c.add_setting :sudo_password, :default => nil
+  c.add_setting :path,          :default => nil
   c.before :each do
     if described_class.nil?
       puts

data/lib/serverspec/backend/exec.rb

@@ -10,7 +10,7 @@ module Serverspec
       end
 
       def run_command(cmd, opts={})
-        stdout = `PATH=/sbin:/usr/sbin:$PATH #{cmd} 2>&1`
+        stdout = `#{build_command(cmd)} 2>&1`
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
         #stdout, stderr, status = Open3.capture3(cmd)
 
@@ -23,6 +23,13 @@ module Serverspec
           :exit_status => $?, :exit_signal => nil }
       end
 
+      def build_command(cmd)
+        if ! RSpec.configuration.path.nil?
+          cmd = "PATH=#{RSpec.configuration.path}:$PATH #{cmd}"
+        end
+        cmd
+      end
+
       def check_zero(cmd, *args)
         ret = run_command(commands.send(cmd, *args))
         ret[:exit_status] == 0

data/lib/serverspec/backend/ssh.rb

@@ -4,7 +4,7 @@ module Serverspec
   module Backend
     class Ssh < Exec
       def run_command(cmd, opt={})
-        cmd = "PATH=/sbin:/usr/sbin:$PATH #{cmd}"
+        cmd = build_command(cmd)
         cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
         ret = ssh_exec!(cmd)
         if ! @example.nil?

data/lib/serverspec/helper/base.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Helper
+    module Base
+      def commands
+        Serverspec::Commands::Base.new
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/backend/exec_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+require 'serverspec/helper/exec'
+require 'serverspec/helper/base'
+include Serverspec::Helper::Exec
+include Serverspec::Helper::Base
+
+describe 'Default path setting' do
+  subject { backend.build_command('service httpd status') }
+  it { should eq 'service httpd status' }
+end
+
+describe 'Custom path setting' do
+  before :all do
+    RSpec.configure do |c|
+      c.path = '/usr/local/rbenv/shims:/sbin:/usr/sbin'
+    end
+  end
+  subject { backend.build_command('service httpd status') }
+  it { should eq 'PATH=/usr/local/rbenv/shims:/sbin:/usr/sbin:$PATH service httpd status' }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -156,6 +156,7 @@ files:
 - lib/serverspec/filter.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/attributes.rb
+- lib/serverspec/helper/base.rb
 - lib/serverspec/helper/darwin.rb
 - lib/serverspec/helper/debian.rb
 - lib/serverspec/helper/detect_os.rb
@@ -233,6 +234,7 @@ files:
 - lib/serverspec/type/zfs.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
+- spec/backend/exec_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb
@@ -354,6 +356,7 @@ signing_key:
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
 test_files:
+- spec/backend/exec_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb