refactor commands_help_data

Author: DannyBen

lib/bashly/concerns/command_scopes.rb

@@ -70,33 +70,21 @@ def required_flags
       flags.select &:required
     end
 
+    def public_commands
+      commands.reject &:private
+    end
+
     # Returns a data structure for displaying subcommands help
     def commands_help_data
-      group_string = strings[:commands]
       result = {}
 
-      commands.reject(&:private).each do |command|
-        summary = if command.default
-          strings[:default_command_summary] % { summary: command.summary } 
-        else
-          command.summary
-        end
-        
-        group_string = strings[:group] % { group: command.group } if command.group
-
-        result[group_string] ||= {}
-        result[group_string][command.name] = summary
-
-        if command.deep_help
-          command.commands.reject(&:private).each do |subcommand|
-            sub_summary = if subcommand.default
-              strings[:default_command_summary] % { summary: subcommand.summary } 
-            else
-              subcommand.summary
-            end
-            
-            result[group_string]["#{command.name} #{subcommand.name}"] = sub_summary
-          end
+      public_commands.each do |command|
+        result[command.group_string] ||= {}
+        result[command.group_string][command.name] = command.summary_string
+        next unless command.deep_help
+
+        command.public_commands.each do |subcommand|
+          result[command.group_string]["#{command.name} #{subcommand.name}"] = subcommand.summary_string
         end
       end
 

lib/bashly/script/command.rb

@@ -100,6 +100,15 @@ def full_name
         parents.any? ? (parents + [name]).join(' ') : name
       end
 
+      # Returns the string for the group caption
+      def group_string
+        if group
+          strings[:group] % { group: group } 
+        else
+          strings[:commands]
+        end
+      end
+
       # Reads a file from the userspace (Settings.source_dir) and returns
       # its contents. 
       # If the file is not found, returns a string with a hint.
@@ -143,6 +152,15 @@ def short_flag_exist?(flag)
         flags.select { |f| f.short == flag }.any?
       end
 
+      # Returns the summary string
+      def summary_string
+        if default
+          strings[:default_command_summary] % { summary: summary }
+        else
+          summary
+        end
+      end
+
       # Returns a constructed string suitable for Usage pattern
       def usage_string
         result = [full_name]