atk_toolbox 0.0.103 → 0.0.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2460aed2031cdaff8ce3ad1462bb7ff132f1c2f9bba1a08aad2e01f62d436c4
-  data.tar.gz: 2ea9f6a60938c47469b09193b6ec8961181ce81bdbf24ba23f1fe15aa1c8b20f
+  metadata.gz: a0a6d59658071c79365f3123c13fea6f273b40e5bbed9c5f72043d6361a0a630
+  data.tar.gz: 64064bdc88621871c55c26cfc9471de3234703c9d7111303b3464e9f79065c6c
 SHA512:
-  metadata.gz: 7ad280dcdd1a99b0acda1a26d0c45e6e865b17ee4ee74b9eaf4ce38236181a41f89847a29f4f3c51b1d1cf859e3b0986c216c4af68228847f4a119366185343c
-  data.tar.gz: a7706b272bae670227ae640631c5088762f3f3f78140205af7791fed8671cd036ccecde31164f1fffe8f3d63f73274976459127fa699bdd74937d6d7417d2181
+  metadata.gz: 769fdbdc25e60ca4cb623ee49e54b8c9f54da4947fb4ca74c635661488c3b7a72a161f85737e9893eec46cb1012417aba1d3230747532a0532ac96489a75449d
+  data.tar.gz: e2acfbfeec69c4cfa3a38308b18908454486995f401526bb1605fdcf988226e685b3840411d8770f878f45d7bbe385bdf1bb3db1b7bc556f487a029679549de3

data/lib/atk/os.rb

@@ -43,6 +43,20 @@ os_heirarchy = {
     "android"    => {},
 }
 
+# this statment was extracted from the ptools gem, credit should go to them
+# https://github.com/djberg96/ptools/blob/master/lib/ptools.rb
+# The WIN32EXTS string is used as part of a Dir[] call in certain methods.
+if File::ALT_SEPARATOR
+    MSWINDOWS = true
+    if ENV['PATHEXT']
+        WIN32EXTS = ('.{' + ENV['PATHEXT'].tr(';', ',').tr('.','') + '}').downcase
+    else
+        WIN32EXTS = '.{exe,com,bat}'
+    end
+else
+    MSWINDOWS = false
+end
+
 # TODO: look into using https://github.com/piotrmurach/tty-platform
 
 # 
@@ -105,21 +119,52 @@ module OS
     end
     
     def self.path_for_executable(name_of_executable)
-        if OS.is?(:windows)
-            begin
-                # TODO: need to escape this value for both double quote and single quotes
-                output = `powershell -command "(Get-Command '#{name_of_executable}')"`.strip
-            # if the command doesn't exist it throws an error
-            rescue
-                output = ""
+        # this method was extracted from the ptools gem, credit should go to them
+        # https://github.com/djberg96/ptools/blob/master/lib/ptools.rb
+        # this complex method is in favor of just calling the command line because command line calls are slow
+        path=ENV['PATH']
+        if path.nil? || path.empty?
+            raise ArgumentError, "path cannot be empty"
+        end
+
+        # Bail out early if an absolute path is provided.
+        if program =~ /^\/|^[a-z]:[\\\/]/i
+            program += WIN32EXTS if MSWINDOWS && File.extname(program).empty?
+            found = Dir[program].first
+            if found && File.executable?(found) && !File.directory?(found)
+                return found
+            else
+                return nil
             end
-            return output
-        else
-            return `which '#{name_of_executable}'`.strip
         end
+
+        # Iterate over each path glob the dir + program.
+        path.split(File::PATH_SEPARATOR).each{ |dir|
+            dir = File.expand_path(dir)
+
+            next unless File.exist?(dir) # In case of bogus second argument
+            file = File.join(dir, program)
+
+            # Dir[] doesn't handle backslashes properly, so convert them. Also, if
+            # the program name doesn't have an extension, try them all.
+            if MSWINDOWS
+                file = file.tr("\\", "/")
+                file += WIN32EXTS if File.extname(program).empty?
+            end
+
+            found = Dir[file].first
+
+            # Convert all forward slashes to backslashes if supported
+            if found && File.executable?(found) && !File.directory?(found)
+                found.tr!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+                return found
+            end
+        }
+
+        return nil
     end
     
     def self.has_command(name_of_executable)
-        return OS.path_for_executable(name_of_executable) != ''
+        return OS.path_for_executable(name_of_executable) != nil
     end
 end

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.103'
+  VERSION = '0.0.104'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.103
+  version: 0.0.104
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: The Ruby gem for all the standard tools ATK uses internally