cmd_executable 1.0.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946605fbae86fd31435538a3a032333fd66673b5667e11f20d8c5c5001a5f7f7
-  data.tar.gz: 85ddeaf7c6f07a9d95dbf6d634967c5ad863660c4fa545fe64181d1d27712de8
+  metadata.gz: 66d9c1f30fd634e52392e967c92564f48b5f3d5dad32b48525328772615df8e8
+  data.tar.gz: 162f824d3f8c8007416451e56bc21a4baf49b6d7f4ec6c8ac7bd122e2aa9b3f3
 SHA512:
-  metadata.gz: 788cf46157ad006a44a6df48d5981393660be6c4b12c62b34afbb58e3864c8ac5e6085b31c942cb49f33d60fc7a6efdab9862e571c41a94d671e6842c3ba284d
-  data.tar.gz: 45a773c916e5a7b5b6d2db49f4806307d0920be70303f837c5c6269c72132723e734b9ca9e4b88b291d464c3023f666e2cfda7de63d783ec596b67f9ca5c62ac
+  metadata.gz: 7f3fd927f9e7f20bd2bade3e088dd237a94c15cea0ca54cdb63d95a42fc32098b9d73bcf60970b3206b5949f967ea73ccccbd3de310997968e3699f2789935d1
+  data.tar.gz: c123587be2664391d5e6598ba470f6669abac78fc87cceef24b8d124258b7314528adba13465ed53b76528d4f30160a494af44b2d3dcdabe9b17bd1353f20999

data/README.md

@@ -21,18 +21,29 @@ Or install it yourself as:
     `$ gem install cmd_executable`
 
 ## Usage
-### as Module
+### as Module (include)
 ```
 require 'cmd_executable'
 
 class Klass
- include 'CmdExecutable'
-
- def instance_method
-   executable?('ls')
- end
+  include CmdExecutable
+
+  def instance_method
+    executable?('/bin/ls')
+    executable?('ls')
+    executable?(:ls)
+    executable?('./bin/setup')
+  end
 end
 ```
+### as Module method
+```
+CmdExecutable.executable?('/bin/ls')
+CmdExecutable.executable?('ls')
+CmdExecutable.executable?(:ls)
+CmdExecutable.executable?('./bin/setup')
+```
+
 ### as CLI
 Check executable? :
 

data/cmd_executable.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'rubocop', '~> 0.85.0'
+  spec.add_development_dependency 'stream_capture', '~> 1.0'
 
   spec.add_dependency 'thor', '~> 1.0'
 end

data/lib/cmd_executable.rb

@@ -33,7 +33,7 @@ require 'cmd_executable/version'
 #   require 'cmd_executable'
 #
 #   class Klass
-#     include 'CmdExecutable'
+#     include CmdExecutable
 #
 #     def instance_method
 #       executable?('ls')
@@ -43,10 +43,14 @@ module CmdExecutable
   class CmdExecutableError < StandardError; end
 
   def executable?(command)
+    CmdExecutable.executable?(command)
+  end
+
+  def self.executable?(command)
     parsed = CmdExecutable::Parser.new(command)
-    raise ArgumentError unless parsed.validate?
+    raise CmdExecutable::ParserError, parsed.raw unless parsed.validate?
 
-    `type '#{parsed.command}' > /dev/null 2>&1`.yield_self do
+    `type "#{parsed.command}" > /dev/null 2>&1`.yield_self do
       $CHILD_STATUS.success?
     end
   end

data/lib/cmd_executable/parser.rb

@@ -29,6 +29,8 @@ module CmdExecutable
 
   # Parser for CmdExecutable
   class Parser
+    attr_reader :raw
+
     def initialize(raw)
       @raw = raw
       @raw.freeze
@@ -37,7 +39,8 @@ module CmdExecutable
     def validate?
       !@raw.nil? &&
         command_class_validate? &&
-        !@raw.empty?
+        !@raw.empty? &&
+        !include_invalid_char?
     end
 
     def command
@@ -52,10 +55,15 @@ module CmdExecutable
         @raw.is_a?(Symbol)
     end
 
+    def include_invalid_char?
+      @raw.match?(/\r\n|\r|\n/) ||
+        @raw.match?(/\$\(.*\)/)
+    end
+
     def parse
-      raise CmdExecutable::ParserError unless validate?
+      raise CmdExecutable::ParserError, @raw unless validate?
 
-      path = @raw.to_s.chomp
+      path = escape_char(@raw.to_s.chomp)
       @dirname = parse_dirname(path)
       @basename = parse_basename(path)
       @command = @dirname + @basename
@@ -70,6 +78,10 @@ module CmdExecutable
       /\A\.\Z/
     end
 
+    def current_path_at_the_left_regex
+      /\A\.#{File::SEPARATOR}/
+    end
+
     def basename_exist?(path)
       path.match?(no_separator_at_the_right_end_regex)
     end
@@ -78,11 +90,15 @@ module CmdExecutable
       dir.match?(no_separator_at_the_right_end_regex)
     end
 
+    def current_path?(path)
+      path.match?(current_path_at_the_left_regex)
+    end
+
     def parse_dirname(path)
       return path unless basename_exist?(path)
 
       dir = File.dirname(path)
-      return '' if dir.match?(a_dot_only_regex)
+      return '' if dir.match?(a_dot_only_regex) && !current_path?(path)
 
       no_right_separator_exists?(dir) ? (dir + File::SEPARATOR) : dir
     end
@@ -92,5 +108,9 @@ module CmdExecutable
 
       File.basename(path).split.first
     end
+
+    def escape_char(path)
+      path.gsub(/"/, '\"')
+    end
   end
 end

data/lib/cmd_executable/runner.rb

@@ -34,6 +34,10 @@ module CmdExecutable
   class Runner < Thor
     include CmdExecutable
 
+    def self.exit_on_failure?
+      true
+    end
+
     map '-c' => :check
 
     desc '-c [/path/to/command]', "It's return true if given command usable on Linux."
@@ -45,12 +49,15 @@ module CmdExecutable
         puts 'NOT FOUND'
         exit 1
       end
+    rescue CmdExecutable::ParserError => e
+      warn "Invalid command: `#{e.message}'"
+      exit 16
     end
 
     map %w[-v --version] => :version
     desc '-v --version', 'Show version.'
     def version
-      STDOUT.puts CmdExecutable::VERSION
+      puts CmdExecutable::VERSION
     end
   end
 end

data/lib/cmd_executable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CmdExecutable
-  VERSION = '1.0.0'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmd_executable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Toshiki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.85.0
+- !ruby/object:Gem::Dependency
+  name: stream_capture
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement