cmd_executable 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb46221d3ed8c07d273bc3d2590dc588d9b647821aa30878570aab30e95f583
-  data.tar.gz: 85e9a6bf88a681af1a74edc1974f6eb10d786f8973a54197d9824b74179de5da
+  metadata.gz: 2be28fc8b7b25d870c1ecd8043f8e170e7778671ab748db457a5e11d416711b7
+  data.tar.gz: 8e5fd645751d0beec7b4b29873de947252c87ae20ceef72704af7892f20b8dc6
 SHA512:
-  metadata.gz: b07679a1c1e9f161962c932347d855363416274276a993d55d03eec1242b98e92a3c9f98f1cf3583a2dcb401fc9de68930d8e6e9181d4932ca64662b7c8d44b0
-  data.tar.gz: '087e5ddeb2a3a923097c5b9c28cf86a5355df624c7a5b48dce0b970d6e712a3a447f4bf9d77b600b67c5ce0f276d0cdf87ab9eee8624ae0c64b590cf082d8a88'
+  metadata.gz: 0745f442bea47b45b4b3024599be749d1cdc21e7ec52d8ab3de6cba1d679ea2d1e5ded411cc194896165fcad528d0d92d6305f318b2edb5f5ab501c0d83a814e
+  data.tar.gz: 2827fbf6270af7564eb8fec73ab55985c7a366f2521bc4b16f600e43f463dfce38f8fe439432369b96230812f1e96189a67d4c7c1f4ef9794d1a84756cbb77ca

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

@@ -50,7 +50,7 @@ module CmdExecutable
     parsed = CmdExecutable::Parser.new(command)
     raise ArgumentError 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

@@ -37,7 +37,8 @@ module CmdExecutable
     def validate?
       !@raw.nil? &&
         command_class_validate? &&
-        !@raw.empty?
+        !@raw.empty? &&
+        !include_invalid_char?
     end
 
     def command
@@ -52,10 +53,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?
 
-      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 +76,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 +88,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 +106,9 @@ module CmdExecutable
 
       File.basename(path).split.first
     end
+
+    def escape_char(path)
+      path.gsub(/"/, '\"')
+    end
   end
 end

data/lib/cmd_executable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmd_executable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Toshiki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-13 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