fedux_org-stdlib 0.1.1 → 0.1.2

data/lib/fedux_org/stdlib/command.rb

@@ -1,6 +1,12 @@
+begin
+  require 'active_support/core_ext/string/inflections'
+  require 'active_support/core_ext/object/blank'
+rescue LoadError
+  $stderr.puts 'You need to install the "activesupport"-gem to make that library work.'
+  exit 1 
+end
+
 require 'open3'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/object/blank'
 
 require 'fedux_org/stdlib/environment'
 require 'fedux_org/stdlib/command/command_result'
@@ -54,18 +60,24 @@ module FeduxOrg
       # Search for command
       # @param [String] cmd
       #    name of command or path to command (will be reduced to basename and then searched in PATH)
+      #
+      # @param [Array,String] paths
+      #   a string containing paths separated by "File::PATH_SEPARATOR" or an array of paths
+      #
+      # @param [Array,String] pathexts
+      #   a string containing pathexts separated by ";" or an array of pathexts
       #   
       # @return [String] 
       #   path to command
-      def which(cmd)
+      def which(cmd, paths=ENV['PATH'].split(File::PATH_SEPARATOR), pathexts=ENV['PATHEXT'].to_s.split( /;/ ) )
         return nil if cmd.blank?
 
         cmd = File.basename( cmd )
+        pathexts = [''] if pathexts.blank?
 
-        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exts.each do |ext|
-            exe = File.join(path, "#{cmd}#{ext}")
+        Array( paths ).each do |path|
+          Array( pathexts ).each do |ext|
+            exe = File.join(path, "#{cmd}#{ext.to_s}")
             return exe if File.executable? exe
           end
         end                                                                                                                                                        

data/lib/fedux_org/stdlib/models/class_based_model.rb

@@ -1,5 +1,11 @@
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/object/blank'
+begin
+  require 'active_support/core_ext/string/inflections'
+  require 'active_support/core_ext/object/blank'
+rescue LoadError
+  $stderr.puts 'You need to install the "activesupport"-gem to make that library work.'
+  exit 1 
+end
+
 require 'fedux_org/stdlib/models/filesystem_based_model'
 require 'find'
 

data/lib/fedux_org/stdlib/rake/documentation/yard.rb

@@ -1,4 +1,9 @@
-require 'yard'
+begin
+  require 'yard'
+rescue LoadError
+  $stderr.puts 'You need to install the "yard"-gem to make that rake task work.'
+  exit 1 
+end
 
 YARD::Rake::YardocTask.new() do |y|
 # y.options << '--verbose'

data/lib/fedux_org/stdlib/rake/gems/bundler.rb

@@ -1,3 +1,8 @@
 namespace :gem do
-  require 'bundler/gem_tasks'
+  begin
+    require 'bundler/gem_tasks'
+  rescue LoadError
+    $stderr.puts 'You need to install the "bundler"-gem to make that rake task work.'
+    exit 1 
+  end
 end

data/lib/fedux_org/stdlib/rake/version/bump.rb

@@ -1,7 +1,18 @@
 require_relative 'base'
 
-require 'active_support/core_ext/string/strip'
-require 'erubis'
+begin
+  require 'active_support/core_ext/string/strip'
+rescue LoadError
+  $stderr.puts 'You need to install the "activesupport"-gem to make that rake task work.'
+  exit 1 
+end
+
+begin
+  require 'erubis'
+rescue LoadError
+  $stderr.puts 'You need to install the "erubis"-gem to make that rake task work.'
+  exit 1 
+end
 
 namespace :version do
   desc 'bump version of library to new version'

data/lib/fedux_org/stdlib/version.rb

@@ -1,6 +1,6 @@
 #main FeduxOrg
 module FeduxOrg
 module Stdlib
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
 end

data/spec/command_spec.rb

@@ -25,7 +25,7 @@ describe Command do
     end
   end
 
-  context '#which' do
+  context '#which', :focus do
     klass = Class.new do
       include Command
     end
@@ -37,5 +37,25 @@ describe Command do
     it 'returns full path for a valid command although a full path is given' do
       expect( klass.new.which( '/usr/bin/which' ) ).to eq( '/usr/bin/which' )
     end
+
+    it 'returns nil if no executable can be found in path' do
+      expect( klass.new.which( 'asdfasdf' ) ).to eq( nil )
+    end
+
+    it 'uses paths string to search for command' do
+      expect( klass.new.which( 'which', '/usr/bin' ) ).to eq( '/usr/bin/which' )
+    end
+
+    it 'uses paths array to search for command' do
+      expect( klass.new.which( 'which', [ '/usr/bin' ] ) ).to eq( '/usr/bin/which' )
+    end
+
+    it 'uses pathexts to search for command' do
+      expect( klass.new.which( 'which', [ '/usr/bin' ], '' ) ).to eq( '/usr/bin/which' )
+    end
+
+    it 'uses pathexts array to search for command' do
+      expect( klass.new.which( 'which', [ '/usr/bin' ], [ '' ]) ).to eq( '/usr/bin/which' )
+    end
   end
 end

data/spec/logger/logger_spec.rb

@@ -33,7 +33,7 @@ describe FeduxOrg::Stdlib::Logging::Logger do
       expect( bucket.string ).not_to include( 'Not visible' )
     end
 
-    it 'changes the mode (log level) of the logger', :focus do
+    it 'changes the mode (log level) of the logger' do
       bucket = StringIO.new
 
       logger = FeduxOrg::Stdlib::Logging::Logger.new( Logger.new( bucket) )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler