serverspec 0.4.14 → 0.5.0

data/Rakefile

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

data/lib/serverspec.rb

@@ -14,8 +14,20 @@ require 'serverspec/commands/debian'
 require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 require 'serverspec/commands/darwin'
+require 'serverspec/configuration'
+
+include Serverspec
+
+module Serverspec
+  class << self
+    def configuration
+      Serverspec::Configuration
+    end
+  end
+end
 
 RSpec.configure do |c|
+  c.include(Serverspec::Helper::Configuration)
   c.include(Serverspec::Helper::RedHat,  :os => :redhat)
   c.include(Serverspec::Helper::Debian,  :os => :debian)
   c.include(Serverspec::Helper::Gentoo,  :os => :gentoo)
@@ -25,7 +37,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
+  Serverspec.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
   c.before :each do
     if described_class.nil?
       puts

data/lib/serverspec/backend/exec.rb

@@ -10,6 +10,8 @@ module Serverspec
       end
 
       def run_command(cmd, opts={})
+        cmd = build_command(cmd)
+        cmd = add_pre_command(cmd)
         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)
@@ -24,8 +26,18 @@ module Serverspec
       end
 
       def build_command(cmd)
-        if ! RSpec.configuration.path.nil?
-          cmd = "PATH=#{RSpec.configuration.path}:$PATH #{cmd}"
+        path = Serverspec.configuration.path || RSpec.configuration.path
+        if path
+          cmd = "PATH=#{path}:$PATH #{cmd}"
+        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 = "PATH=#{path}:$PATH #{cmd}" if path
         end
         cmd
       end

data/lib/serverspec/backend/ssh.rb

@@ -5,7 +5,7 @@ module Serverspec
     class Ssh < Exec
       def run_command(cmd, opt={})
         cmd = build_command(cmd)
-        cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
+        cmd = add_pre_command(cmd)
         ret = ssh_exec!(cmd)
         if ! @example.nil?
           @example.metadata[:command] = cmd
@@ -14,6 +14,18 @@ module Serverspec
         ret
       end
 
+      def build_command(cmd)
+        cmd = super(cmd)
+        cmd = "sudo #{cmd}" if RSpec.configuration.ssh.options[:user] != 'root'
+        cmd
+      end
+
+      def add_pre_command(cmd)
+        cmd = super(cmd)
+        cmd = "sudo #{cmd}" if RSpec.configuration.ssh.options[:user] != 'root'
+        cmd
+      end
+
       private
       def ssh_exec!(command)
         stdout_data = ''

data/lib/serverspec/configuration.rb

@@ -0,0 +1,12 @@
+module Serverspec
+  module Configuration
+    class << self
+      VALID_OPTIONS_KEYS = [:path, :pre_command].freeze
+      attr_accessor(*VALID_OPTIONS_KEYS)
+    
+      def defaults
+        VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }
+      end
+    end
+  end
+end

data/lib/serverspec/helper.rb

@@ -22,3 +22,5 @@ require 'serverspec/helper/attributes'
 # Subject type helper
 require 'serverspec/helper/type'
 include Serverspec::Helper::Type
+
+require 'serverspec/helper/configuration'

data/lib/serverspec/helper/configuration.rb

@@ -0,0 +1,36 @@
+module Serverspec
+  module Helper
+    module Configuration
+      def subject
+        build_configurations
+        super
+      end
+
+      # You can create a set of configurations provided to all specs in your spec_helper:
+      #
+      #   RSpec.configure { |c| c.pre_command = "source ~/.zshrc" }
+      #
+      # Any configurations you provide with `let(:option_name)` in a spec will
+      # automatically be merged on top of the configurations.
+      #
+      # @example
+      #
+      #   describe 'Gem' do
+      #     let(:pre_command) { "source ~/.zshrc" }
+      #
+      #     %w(pry awesome_print bundler).each do |p|
+      #       describe package(p) do
+      #         it { should be_installed.by('gem') }
+      #       end
+      #     end
+      #   end
+      def build_configurations
+        Serverspec::Configuration.defaults.keys.each do |c|
+          value = self.respond_to?(c.to_sym) ?
+          self.send(c) : RSpec.configuration.send(c)
+          Serverspec::Configuration.send(:"#{c}=", value)
+        end
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.14"
+  VERSION = "0.5.0"
 end

data/spec/backend/exec/configuration_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+require 'serverspec/helper/base'
+include Serverspec::Helper::Base
+include Serverspec::Helper::Exec
+
+describe 'configurations are not set' do
+  context package('httpd') do
+    its(:command) { should eq 'command' }
+  end
+end
+
+describe 'path is set' do
+  let(:path) { '/sbin:/usr/sbin' }
+  context package('httpd') do
+    its(:command) { should eq 'PATH=/sbin:/usr/sbin:$PATH command' }
+  end
+end
+
+describe 'pre_command is set' do
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'source ~/.zshrc && command' }
+  end
+end
+
+describe 'path and pre_command are set' do
+  let(:path) { '/sbin:/usr/sbin' }
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'PATH=/sbin:/usr/sbin:$PATH source ~/.zshrc && PATH=/sbin:/usr/sbin:$PATH command' }
+  end
+end

data/spec/backend/ssh/configuration_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+require 'serverspec/helper/base'
+include Serverspec::Helper::Base
+include Serverspec::Helper::Ssh
+
+ssh = double
+
+describe 'configurations are not set' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'root'  } }
+      c.ssh = ssh
+    end
+  end
+
+  context package('httpd') do
+    its(:command) { should eq 'command' }
+  end
+end
+
+describe 'path is set' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'root'  } }
+      c.ssh = ssh
+    end
+  end
+
+  let(:path) { '/sbin:/usr/sbin' }
+  context package('httpd') do
+    its(:command) { should eq 'PATH=/sbin:/usr/sbin:$PATH command' }
+  end
+end
+
+describe 'pre_command is set and user is root' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'root' } }
+      c.ssh = ssh
+    end
+  end
+
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'source ~/.zshrc && command' }
+  end
+end
+
+describe 'pre_command is set and user is non-root' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+    end
+  end
+
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'sudo source ~/.zshrc && sudo command' }
+  end
+end
+
+describe 'path pre_command and set and user is non-root' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+    end
+  end
+
+  let(:path) { '/sbin:/usr/sbin' }
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'sudo PATH=/sbin:/usr/sbin:$PATH source ~/.zshrc && sudo PATH=/sbin:/usr/sbin:$PATH command' }
+  end
+end
+
+describe 'path pre_command and set and user is non-root' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'root' } }
+      c.ssh = ssh
+    end
+  end
+
+  let(:path) { '/sbin:/usr/sbin' }
+  let(:pre_command) { 'source ~/.zshrc' }
+  context package('httpd') do
+    its(:command) { should eq 'PATH=/sbin:/usr/sbin:$PATH source ~/.zshrc && PATH=/sbin:/usr/sbin:$PATH command' }
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'serverspec'
 require 'pathname'
-
-include Serverspec::Helper::Exec
+require 'rspec/mocks/standalone'
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
@@ -29,6 +28,15 @@ module Serverspec
       end
     end
   end
+
+  module Type
+    class Base
+      def command
+        cmd = backend.build_command('command')
+        backend.add_pre_command(cmd)
+      end
+    end
+  end
 end
 
 RSpec.configure do |c|

data/spec/support/shared_group_examples.rb

@@ -1,3 +1,5 @@
+include Serverspec::Helper::Exec
+
 shared_examples_for 'support user exist matcher' do |name|
   describe 'user exist' do
     describe user(name) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -153,10 +153,12 @@ files:
 - lib/serverspec/commands/linux.rb
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/solaris.rb
+- lib/serverspec/configuration.rb
 - lib/serverspec/filter.rb
 - lib/serverspec/helper.rb
 - lib/serverspec/helper/attributes.rb
 - lib/serverspec/helper/base.rb
+- lib/serverspec/helper/configuration.rb
 - lib/serverspec/helper/darwin.rb
 - lib/serverspec/helper/debian.rb
 - lib/serverspec/helper/detect_os.rb
@@ -234,7 +236,8 @@ files:
 - lib/serverspec/type/zfs.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
-- spec/backend/exec_spec.rb
+- spec/backend/exec/configuration_spec.rb
+- spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb
@@ -351,12 +354,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 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/backend/exec/configuration_spec.rb
+- spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
 - spec/darwin/cron_spec.rb

data/spec/backend/exec_spec.rb

@@ -1,21 +0,0 @@
-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