fedux_org-stdlib 0.3.0 → 0.3.2

data/lib/fedux_org/stdlib/command/which.rb

@@ -1,5 +1,12 @@
 require 'pathname'
 
+begin
+  require 'active_support/core_ext/object/blank'
+rescue LoadError
+  $stderr.puts 'You need to install the "activesupport"-gem to make that rake task work.'
+  exit 1 
+end
+
 module FeduxOrg
   module Stdlib
     module Command
@@ -17,13 +24,28 @@ module FeduxOrg
         #   
         # @return [String] 
         #   path to command
-        def which(cmd, paths=ENV['PATH'].split(File::PATH_SEPARATOR), pathexts=ENV['PATHEXT'].to_s.split( /;/ ) )
-          cmd = Pathname.new( cmd.to_s )
+        def which(cmd, options={})
+          options = {
+            paths:                         ENV['PATH'].split(File::PATH_SEPARATOR),
+            pathexts:                      ENV['PATHEXT'].to_s.split( /;/ ),
+            raise_error_on_not_executable: false,
+            raise_error_on_not_found:      false,
+          }.merge options
+
+          cmd = Pathname.new(cmd)
+
+          paths                         = options[:paths]
+          pathexts                      = options[:pathexts]
+          raise_error_on_not_executable = options[:raise_error_on_not_executable]
+          raise_error_on_not_found      = options[:raise_error_on_not_found]
 
+          raise Exceptions::CommandNotFound if cmd.to_s.empty?
           return nil if cmd.to_s.empty?
 
           if cmd.absolute? 
             return cmd.to_s if cmd.executable?
+            raise Exceptions::CommandNotFound if raise_error_on_not_found and not cmd.exist?
+            raise Exceptions::CommandNotExecutable if raise_error_on_not_executable and not cmd.executable?
             return nil
           end
 
@@ -33,8 +55,10 @@ module FeduxOrg
             Array( pathexts ).each do |ext|
               file = Pathname.new( File.join(path, "#{cmd.to_s}#{ext.to_s}") )
               return file.to_s if file.executable?
+              raise Exceptions::CommandNotExecutable if raise_error_on_not_executable and not cmd.executable?
             end
           end                                                                                                                                                        
+          raise Exceptions::CommandNotFound if raise_error_on_not_found
           nil
         end
       end

data/lib/fedux_org/stdlib/filesystem.rb

@@ -44,6 +44,7 @@ module FeduxOrg
       def switch_to_working_directory(&block)
         Dir.chdir(working_directory, &block)
       end
+      alias_method :in_working_directory, :switch_to_working_directory
 
       # Create directory(ies)
       #
@@ -204,7 +205,7 @@ module FeduxOrg
         strings = []
         regex = %r[\.\.]
 
-        raise FileSystem::Exceptions::InvalidPath , "Sorry, but you cannot use paths matching \"#{strings.join(', ')}\"  or \"#{regex.to_s}\" here!" if path_matches?(strings, regex, flattend_paths)
+        raise FileSystem::Exceptions::InvalidPath , "Sorry, but you cannot use paths matching \"#{strings.join(', ')}\"  or \"#{regex.inspect}\" here!" if path_matches?(strings, regex, flattend_paths)
       end
 
       # Check if path is forbidden for delete operation

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

@@ -101,12 +101,12 @@ module FeduxOrg
           end
 
           #finds a single instance
-          def find( criteria={} )
-            find_all( criteria ).first
+          def find(criteria = {})
+            find_all(criteria).first
           end
 
           #finds all instances
-          def find_all( criteria={} )
+          def find_all(criteria = {})
             FeduxOrg::Stdlib.logger.debug(self) { "Criteria for search: #{ criteria }" }
             criteria = { name: criteria.to_sym } if criteria.kind_of? Symbol or criteria.kind_of? String
 

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

@@ -21,35 +21,42 @@ unless ENV.to_hash.has_key? 'CI'
   namespace :version do
     @logger = FeduxOrg::Stdlib::Logging::Logger.new
 
-    def bump_version( type )
+    def add_to_repo(file, version)
+      @logger.info('Adding new version file to repository.')
+      sh "git add #{file}"
+      sh "git commit -m 'version bump to #{version}'"
+    end
+
+    def bump_version(type)
       version_update do |file|
-        file.bump( type ) 
+        file.bump(type) 
       end
     end
 
-    def version_update( &block )
-      file = FeduxOrg::Stdlib::VersionManagement::RubygemVersionFile.read( version_file )
+    def version_update(&block)
+      file = FeduxOrg::Stdlib::VersionManagement::RubygemVersionFile.read(version_file)
       old_version = file.version
-      block.call( file )
+      block.call(file)
       new_version = file.version
 
-      file.write( version_file )
-      @logger.info( "Updated version. It was \"#{old_version}\". It is now \"#{new_version}\"." )
+      file.write(version_file)
+      @logger.info("Updated version. It was \"#{old_version}\". It is now \"#{new_version}\".")
+      add_to_repo(version_file, file.version)
     end
 
     desc "Bump x.1.1"
     task :bump_major do
-      bump_version( :major )
+      bump_version(:major)
     end
 
     desc "Bump 1.x.1"
     task :bump_minor do
-      bump_version( :minor )
+      bump_version(:minor)
     end
 
     desc "Bump 1.1.x"
     task :bump_tiny do
-      bump_version( :tiny )
+      bump_version(:tiny)
     end
 
     desc 'bump version of library to new version'
@@ -60,14 +67,11 @@ unless ENV.to_hash.has_key? 'CI'
       begin
         version_update do |file|
           file.version = new_version
-          file.write( version_file )
-
-          @logger.info( 'Adding new version file to repository.' )
-          sh "git add #{version_file}"
-          sh "git commit -m 'version bump to #{new_version}'"
+          file.write(version_file)
+          add_to_repo(version_file, new_version)
         end
       rescue
-        @logger.fatal( 'Nothing has changed since your last commit or has been added to the index. Therefor nothing needs to be commited.' )
+        @logger.fatal('Nothing has changed since your last commit or has been added to the index. Therefor nothing needs to be commited.')
       end
     end
   end

data/lib/fedux_org/stdlib/version.rb

@@ -1,6 +1,6 @@
 #main FeduxOrg
 module FeduxOrg
   module Stdlib
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/spec/command/which_spec.rb

@@ -10,35 +10,35 @@ describe Command::Which do
     end
 
     it 'returns full path for a valid command' do
-      expect( klass.new.which( 'which' ) ).to eq( '/usr/bin/which' )
+      expect(klass.new.which( 'which' )).to eq( '/usr/bin/which' )
     end
 
     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' )
+      expect(klass.new.which( '/usr/bin/which' )).to eq( '/usr/bin/which' )
     end
 
     it 'returns nil for a invalid command if a full path is given' do
-      expect( klass.new.which( '/usr/bin/which1' ) ).to eq( nil )
+      expect(klass.new.which( '/usr/bin/which1' )).to eq( nil )
     end
 
     it 'returns nil if no executable can be found in path' do
-      expect( klass.new.which( 'asdfasdf' ) ).to eq( nil )
+      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' )
+      expect(klass.new.which('which', paths: '/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' )
+      expect(klass.new.which('which', paths: ['/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' )
+      expect(klass.new.which('which', paths: ['/usr/bin'], pathexts: '')).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' )
+      expect(klass.new.which( 'which', paths: ['/usr/bin'], pathexts: [''])).to eq('/usr/bin/which')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler