toys-core 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0202fa141dcee7d96aacdec2092ace8041f5498e367596d8e2a5aa893fa64d36
-  data.tar.gz: 20ea445f7ad7a5ab964ad23434e57f4acb6ee567e6dc38837751246d32940ca5
+  metadata.gz: ac33c1214b7ae27c8ecea97837cd1ba186dfc3715db69ef52ef9dc24e56f8064
+  data.tar.gz: 9e8cc340e38cd320893cf9ee47c31c138ea42f9850c8efebb315a9e60182d791
 SHA512:
-  metadata.gz: 704d70fc544435c23cf3d0e88550fa3a3951bbb9b3611eabdc89c3c9871d3ad67098cce21fa54ffb130aa4da6d0901729471b9e698ae78a394f8ff750392205f
-  data.tar.gz: 57d9cacc5646fd39e0399bb2729d0a936d70f5d67a1f7a7e3d4b19a5d38ab699dc6b0e5044ae455fea3cdb0d46e44406bfc898074e71e2d9b3cc7882981886d7
+  metadata.gz: e77ed0de1cc6ee14300c4787c334f3ecd97e338d16df4e9004b303a618163b6cd07709cf1d956e9278b9e52624105cdfd87010c55d111580a164a9a6cddf9b4f
+  data.tar.gz: 02521cfe60b37bb36c7a5550a2c33a42e4de6f74350fa3b852c333642fc7aa0e7e7b4523a94219236f1523ad7a9c3f5297a2467b2a03b5337234fb059eac730c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+### 0.6.1 / 2019-01-07
+
+* FIXED: The presence of aliases caused subtool listing to crash.
+
 ### 0.6.0 / 2018-10-22
 
 * CHANGED: Replaced Toys::Definition::DataFinder with Toys::Definition::SourceInfo.

data/lib/toys/core_version.rb

@@ -34,5 +34,5 @@ module Toys
   # Current version of Toys core
   # @return [String]
   #
-  CORE_VERSION = "0.6.0"
+  CORE_VERSION = "0.6.1"
 end

data/lib/toys/loader.rb

@@ -341,7 +341,7 @@ module Toys
 
     private
 
-    ALLOWED_DELIMITERS = %r{^[\./:]*$}
+    ALLOWED_DELIMITERS = %r{^[\./:]*$}.freeze
 
     def process_extra_delimiters(input)
       unless ALLOWED_DELIMITERS =~ input
@@ -374,19 +374,12 @@ module Toys
     # priority tool that has been defined. If no tool has been defined with
     # the given name, returns `nil`.
     #
-    # @private
-    #
     def get_active_tool(words, looked_up = [])
       tool_data = get_tool_data(words)
       result = tool_data.active_definition
       case result
       when Definition::Alias
-        words = result.target_name
-        if looked_up.include?(words)
-          raise ToolDefinitionError, "Circular alias references: #{looked_up.inspect}"
-        end
-        looked_up << words
-        get_active_tool(words, looked_up)
+        resolve_alias(result, looked_up)
       when Definition::Tool
         result
       else
@@ -394,6 +387,18 @@ module Toys
       end
     end
 
+    ##
+    # Resolves the given alias
+    #
+    def resolve_alias(alias_tool, looked_up = [])
+      words = alias_tool.target_name
+      if looked_up.include?(words)
+        raise ToolDefinitionError, "Circular alias references: #{looked_up.inspect}"
+      end
+      looked_up << words
+      get_active_tool(words, looked_up)
+    end
+
     def resolve_middleware(input)
       input = Array(input)
       cls = input.first
@@ -526,16 +531,17 @@ module Toys
     def filter_hidden_subtools(tools)
       result = []
       tools.each_with_index do |tool, index|
-        next if tool.full_name.any? { |n| n.start_with?("_") }
-        unless tool.runnable?
-          next_tool = tools[index + 1]
-          next if next_tool && next_tool.full_name.slice(0..-2) == tool.full_name
-        end
-        result << tool
+        result << tool unless tool_hidden?(tool, tools[index + 1])
       end
       result
     end
 
+    def tool_hidden?(tool, next_tool)
+      return true if tool.full_name.any? { |n| n.start_with?("_") }
+      return tool_hidden?(resolve_alias(tool), nil) if tool.is_a? Definition::Alias
+      !tool.runnable? && next_tool && next_tool.full_name.slice(0..-2) == tool.full_name
+    end
+
     def calc_remaining_words(words1, words2)
       index = 0
       lengths = [words1.length, words2.length]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -180,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Framework for creating command line binaries