check_names 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0cf11e9076de1fa47bd7958d036569900222f8ffbe9aefd86e4cee94fdaa2c
-  data.tar.gz: 0d3450cd0d9825a3d99d7169df84a321203ed85a516587ac974b7bc361d59fa2
+  metadata.gz: 4cb09b3fed90bd9fa021f047530c0caa584f03b077c73a048dfd60fe6e059a97
+  data.tar.gz: d90ea5f678f36bd1e6144fba95cfcb9a5136dcd7f63b3ef31a60fbe8e89ab74b
 SHA512:
-  metadata.gz: a57acda4efb147a008062b2660ff1473ae93b7a499d6cc425c386c9eae69177692193a52c3fa576ecb4d82c857c71b450436a7965debc3d30e5cc3398494b8a8
-  data.tar.gz: 830e2e02569026fd527180a71f786d975d9ca7c258655955f59cc74f513a4e50a153a0523a92d83a444197f1771186488f9896e5325faa567ae1eab7a40f7e96
+  metadata.gz: 8b4baf708e2ef476305f901103ec360809a4ca79c299a81ed6b4d241c19649d6e0600ee8eba41820f506a9329cf1d230ab1a11cd16845748f0615e74bdb25918
+  data.tar.gz: 730e74250b8f7c7ddb87fcc42fb683edc60e80fb1b25001e6c399b9705d95643c5798e20daa2170772b4cb3117b590b9a4e58f248c6ef400aeebf52b491a123e

data/exe/check_names

@@ -40,6 +40,8 @@ The following options are available:
 
 --help  -h  Print this help information
 --quiet -q  Suppress messages about the status of the name check
+--all   -a  Normally, check_names stops at the first use it finds.
+            With --all, it checks and reports every use
   HELP
 end
 
@@ -47,16 +49,34 @@ def main(args)
   args = args.map { |arg| arg.downcase }
   quiet = args.index { |arg| %w{-q --quiet}.include?(arg) }
   args.delete_at(quiet) if quiet
+  all = args.index { |arg| %w{-a --all}.include?(arg) }
+  args.delete_at(all) if all
   if args.size == 0 || %w{-h --help help}.include?(args.first)
     show_help
     exit
   end
+
+  if all
+    results = GemName.check_names_all(*args)
+  else
+    results = GemName.check_names(*args)
+  end
+  
   rc = 0
-  args.each do |arg|
-    status = GemName.check(arg)
-    puts "#{arg}: #{status[:message]}." unless quiet
-    rc = status[:rc] if status[:rc] > rc
+
+  types = []
+  results.each.with_index(1) do |result, count|
+    types << result[:description] if result[:result]
+    rc = result[:check] if result[:check] > rc
+    if count >= results.size || results[count][:name] != result[:name]
+      unless quiet
+        types << "Unused" if types.size == 0
+        puts "#{result[:name]}: #{types.join(', ')}"
+      end
+      types = []
+    end
   end
+  rc = 1 if rc > 0 && (all || args.size > 1)
   exit(rc)
 end
 

data/lib/check_names/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CheckNames
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
   def self.version
     VERSION

data/lib/check_names.rb

@@ -51,26 +51,64 @@ module GemName
     Module.const_defined?(class_name)
   end
 
-  def self.check(name)
-    name = name.downcase
-    if ruby_gem_exists?(name)
-      return {rc: 1, message: "A Gem on RubyGems"}
-    end
-    if github_repository_exists?(name)
-      return {rc: 2, message: "A personal Github repository"}
+  CHECK_METHODS = [
+    {method: nil, description: "Unused"}, # 0
+    {method: :ruby_gem_exists?, description: "RubyGem"}, # 1
+    {method: :github_repository_exists?, description: "Github repository"}, # 2
+    {method: :executable_exists?, description: "Executable"}, # 3
+    {method: :function_exists?, description: "Function"}, # 4
+    {method: :alias_exists?, description: "Alias"}, # 5
+    {method: :standard_class_exists?, description: "Class"} # 6
+  ]
+
+  def self.unused_result
+    {check: 0, description: CHECK_METHODS[0][:description], result: true}
+  end
+
+  def self.check_name_once(check, name)
+    method = CHECK_METHODS[check] && CHECK_METHODS[check][:method]
+    if method
+      result = {check: check, description: CHECK_METHODS[check][:description], result: send(method, name)}
+    else
+      result = unused_result.dup
     end
-    if executable_exists?(name)
-      return {rc: 3, message: "An executable"}
+    result[:name] = name
+    result
+  end
+
+  def self.check_name(name)
+    name = name.downcase
+    result = unused_result.dup
+    (1...(CHECK_METHODS.size)).each do |check|
+      res = check_name_once(check, name)
+      if res[:result]
+        result = res
+        break
+      end
     end
-    if function_exists?(name)
-      return {rc: 4, message: "A function"}
+    result[:name] = name
+    result
+  end
+
+  def self.check_name_all(name)
+    (1...(CHECK_METHODS.size)).map do |check|
+      check_name_once(check, name)
     end
-    if alias_exists?(name)
-      return {rc: 5, message: "An alias"}
+  end
+
+  def self.check_names(*names)
+    results = []
+    names.each do |name|
+      results << check_name(name)
     end
-    if standard_class_exists?(name)
-      return {rc: 6, message: "A Ruby class"}
+    results
+  end
+
+  def self.check_names_all(*names)
+    results = []
+    names.each do |name|
+      results += check_name_all(name)
     end
-    {rc: 0, message: "Available"}
+    results
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check_names
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Richard LeBer