cmd_executable 1.0.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebca555d7972dd6bd32d9baa1fb29055caa0d5aa4c4f1d77efecc8ef4cd0f9d6
-  data.tar.gz: daca2dd878419fa0e5fbc7c9be940ce66bc418038453cfc90165ae095a1e21e8
+  metadata.gz: 26297514863183eb48d67c92725eefd9b7a1d26c976828de479a4d20471f9fe8
+  data.tar.gz: 3d7ec77b656598a4370ae147eb866af2544549182e79ee11b87ae41a1a250dc0
 SHA512:
-  metadata.gz: 7e2771593c1c188bbd89c5681a09f14d171cb970ea7bfbd6b34d28e739d77e847e2fb2c577dd2b28aba96f11ee9fa5b33025e519e572fb993ed142db27582a56
-  data.tar.gz: 753b1d39d8522b79e7941e3a0796a3b3f36ebb0452ae7712b45d66d012cfeb06f8fb65fe8f62684399147bd6dcaa55924b18662e099ed1339cd5bc7338fd96c3
+  metadata.gz: a7835fa11324c7031f7a55453ff9c330395d6528561c86d121873033dccf22b1e8e6cd6f55c2be3a871502a3875b354b1f4c2a0650c2a01a2a2aa95aa559166d
+  data.tar.gz: f9998176a7d4ac932c3a3263e14464177a1e004464877003829ba42c610c58eb83ca9f85bb10b0c30f41ac20e1ac16343962f9965beb29fa3e28f9b08fcb845c

data/.github/workflows/gem-push.yml

@@ -16,19 +16,19 @@ jobs:
     - name: Set up Ruby 2.6
       uses: actions/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: 2.6.x
 
     - name: Publish to GPR
       run: |
         mkdir -p $HOME/.gem
         touch $HOME/.gem/credentials
         chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
         gem build *.gemspec
         gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
       env:
-        GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
-        OWNER: toshiki670
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GPR_AUTH_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
 
     - name: Publish to RubyGems
       run: |
@@ -39,4 +39,4 @@ jobs:
         gem build *.gemspec
         gem push *.gem
       env:
-        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/ruby_check.yml

@@ -35,8 +35,7 @@ jobs:
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
     - name: Install dependencies
@@ -53,8 +52,7 @@ jobs:
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
     - name: Install dependencies

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
     `$ gem install cmd_executable`
 
 ## Usage
-### as Module
+### as Module (include)
 ```
 require 'cmd_executable'
 
@@ -36,6 +36,14 @@ class Klass
   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.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"files.autoSave": "afterDelay",
+		"files.autoSaveDelay": 1000
+	}
+}

data/cmd_executable.gemspec

@@ -35,8 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.13.1'
   spec.add_development_dependency 'pry-doc', '~> 1.1'
   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 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.3'
+  spec.add_development_dependency 'stream_capture', '~> 1.0'
 
   spec.add_dependency 'thor', '~> 1.0'
 end

data/lib/cmd_executable.rb

@@ -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.1'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmd_executable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Toshiki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,28 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: '1.3'
+- !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
@@ -129,6 +143,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- cmd_executable.code-workspace
 - cmd_executable.gemspec
 - exe/cmd_executable
 - lib/cmd_executable.rb