sprinkle 0.6.1 → 0.6.1.1

data/lib/sprinkle/verifiers/executable.rb

@@ -18,18 +18,9 @@ module Sprinkle
     module Executable
       Sprinkle::Verify.register(Sprinkle::Verifiers::Executable)
       
-      # Checks if <tt>path</tt> is an executable script. This verifier is "smart" because
-      # if the path contains a forward slash '/' then it assumes you're checking an 
-      # absolute path to an executable. If no '/' is in the path, it assumes you're
-      # checking for a global executable that would be available anywhere on the command line.
+      # Checks if <tt>path</tt> is an executable script using which
+      # - accepts both absolute paths and binary names with no path
       def has_executable(path)
-        # Be smart: If the path includes a forward slash, we're checking
-        # an absolute path. Otherwise, we're checking a global executable
-        if path.include?('/')
-          test "-x #{path}"
-        else
-          @commands << "[ -n \"`echo \\`which #{path}\\``\" ]"
-        end
         @commands << "which #{path}"
       end
 

data/lib/sprinkle/verify.rb

@@ -62,6 +62,9 @@ module Sprinkle
     include Sprinkle::Attributes
     attr_accessor :package, :description, :commands #:nodoc:
     
+    delegate :opts, :to => :package
+    delegate :args, :to => :package
+
     class <<self
       # Register a verification module
       def register(new_module)

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.6.1"
+  Version = "0.6.1.1"
 end

data/spec/sprinkle/verify_spec.rb

@@ -116,11 +116,11 @@ describe Sprinkle::Verify do
     end
 
     it 'should do a "test -x" to check for an executable' do
-      @verification.commands.should include("test -x /usr/bin/ruby")
+      @verification.commands.should include("which /usr/bin/ruby")
     end
 
     it 'should test the "which" command to look for a global executable' do
-      @verification.commands.should include('[ -n "`echo \`which rails\``" ]')
+      @verification.commands.should include('which rails')
     end
 
     it 'should test the process list to find a process' do
@@ -138,6 +138,16 @@ describe Sprinkle::Verify do
     it 'should check that an RPM is installed' do
       @verification.commands.should include("rpm -qa | grep ntp")
     end
+
+    it 'should delegate opts' do
+      @package.opts = {:tester_opt => "test-opt"}
+      @verification.opts[:tester_opt].should == "test-opt"
+    end
+
+    it 'should delegate args' do
+      @package.args = ["test-arg"]
+      @verification.args[0].should == "test-arg"
+    end
   end
 
   describe 'with process' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec