belafonte 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b79a1d44e0ead9355e7daf0091c3b93aac55fe
-  data.tar.gz: 7aa26f871377c9b8a0a110859500cb65f90f3c30
+  metadata.gz: 2f5509c92ec5d0ddd52432d56f34702b797d9240
+  data.tar.gz: 2b6399b51a131dda9ad8b6458da6581c4e556c01
 SHA512:
-  metadata.gz: 7c5245a9afd12af2cb31ff4d5633afb8233db43ae1f02f9b0612f479b7869de05b144ba2321ce60faa35f12224a0bc88d3db15c52fdc77bb836fb99b918f85ee
-  data.tar.gz: 992f421cf4b967f43f0a7b6668f90cd333f55f0f948eb1acbbc9f2c200376c1cfe76936d588d6d0cba90455d6d9debefcb2e103f006f90b585a9bef9152c72ef
+  metadata.gz: 598b0bd646258d587cc43a5a8d70bcb67d55795b23243080138bf3ebe1a4a7fcfbcd190659421185e43497609eb6678c99a1136a64e413ab6c8a6808c8d20c3c
+  data.tar.gz: 1c7c03b1c6da23bd3bb44a3dbd2686660445e60daae8d56078cf6f2bf22fe7b4c3e005f550e7c17a2d56937c859d8afc169d98f17fff0f119f248aa0f8ebdd71

data/lib/belafonte/help/app_extensions.rb

@@ -32,34 +32,56 @@ module Belafonte
         "#{parent.full_path} #{signature}"
       end
 
-      def signature
-        cmd = display_title
-
-        cmd += " [#{cmd} options]" if has_flags?
+      def command_arg
+        if Belafonte::Help::Generator.target == self && has_subcommands?
+          ' command'
+        else
+          ''
+        end
+      end
 
-        if has_args?
-          cmd += " #{configured_args.map(&:name).map(&:to_s).join(' ')}"
+      def display_flags(cmd)
+        if has_flags?
+          " [#{cmd} options]"
+        else
+          ''
         end
+      end
 
-        if has_subcommands? && @command.nil?
-          cmd += " command"
+      def display_args
+        if has_args?
+          " #{non_command_args.map(&:name).map(&:to_s).join(' ')}"
+        else
+          ''
         end
+      end
 
-        cmd
+      def signature
+        display_title.tap {|cmd|
+          return cmd + display_flags(cmd) + display_args + command_arg
+        }
       end
 
       def has_flags?
         configured_switches.any? || configured_options.any?
       end
 
+      def non_command_args
+        configured_args.reject {|arg| arg.name.to_sym == :command}
+      end
+
       def has_args?
-        configured_args.reject {|arg| arg.name.to_sym == :command}.any?
+        non_command_args.any?
       end
 
       def has_subcommands?
         configured_subcommands.any?
       end
 
+      def help_flag
+        @help_flag ||= Belafonte::Switch.new(name: :help, short: 'h', long: 'help', description: 'Shows this message')
+      end
+
       def sorted_flags
         (configured_switches + configured_options).sort {|a,b| a.name <=> b.name}
       end

data/lib/belafonte/help/generator.rb

@@ -6,8 +6,16 @@ require 'belafonte/help/command_extensions'
 module Belafonte
   module Help
     class Generator
+      def self.set_target(app)
+        @target = app
+      end
+
+      def self.target
+        @target
+      end
+
       def initialize(app)
-        @app = app
+        self.class.set_target(@app = app)
         app.extend(AppExtensions)
         @content = name_section + synopsis + options + commands
       end

data/lib/belafonte/version.rb

@@ -1,3 +1,3 @@
 module Belafonte
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belafonte
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dennis Walters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler