dracula 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8e7505de18b6cf573e524c2135a729927aeca6
-  data.tar.gz: 4bed76ffe1d0ec614ac598e26e511c165879fc78
+  metadata.gz: 1c5993ea9d0d226f890560dade6d177de9d092b9
+  data.tar.gz: 556662ade80ed31ddbc494897844935c3bdde05f
 SHA512:
-  metadata.gz: 5cfbb4bf8ff1c79f15455be0d7da775a94a18a90a49a6db6c1a27dca2bb923ee28f559679c0e60989ec31ac90fe12a01e7486d71c0095062437897361c89896e
-  data.tar.gz: b8cbcc6ab512c39edcce0a0d0869bca6aece9c89cc60e446eb49655d6fe21dc9e5f22be34aa1be798d89bdaea9ff096abab708320f4e052d8186fc36d1bf0250
+  metadata.gz: 32cffd934ccb445cc3e2c9580b6e920ad4471c6ee59fc23bbf87b1fdb1683427d64af4683f5f5ee451e4b3ab193755ba556b889c0f68917b77864c0ed97dceb0
+  data.tar.gz: 4c139824b3e88d2ec83885f045ac7b87051924c2942ffd00f6719040f4c6b9945bd70732c8b16d19ee08ced69e06284cbd6284ddfa33f42bf317426f9cfda483

data/lib/dracula.rb

@@ -2,10 +2,12 @@ require "dracula/version"
 require "optparse"
 
 class Dracula
-  require "dracula/command"
+  require "dracula/ui"
   require "dracula/flag"
+  require "dracula/command"
+  require "dracula/command_help"
   require "dracula/namespace"
-  require "dracula/ui"
+  require "dracula/namespace_help"
 
   class << self
     def program_name(name = nil)
@@ -59,6 +61,7 @@ class Dracula
     def register(name, description, klass)
       klass.namespace.name = name
       klass.namespace.description = description
+      klass.namespace.parent = namespace
 
       namespace.add_subcommand(klass.namespace)
     end

data/lib/dracula/command.rb

@@ -18,6 +18,14 @@ class Dracula
       @options = options || []
     end
 
+    def prefix
+      @klass.namespace.prefix
+    end
+
+    def full_name
+      "#{prefix}#{name}"
+    end
+
     def name
       desc.name
     end
@@ -26,41 +34,22 @@ class Dracula
       @klass.instance_method(@method_name).parameters.select { |p| p[0] == :req }.map { |p| p[1].to_s.upcase }
     end
 
-    def banner
-      namespace = @klass.namespace.name ? "#{@klass.namespace.name}:" : ""
-      args = arguments.count > 0 ? " #{arguments.join(" ")}" : ""
-
-      "#{namespace}#{desc.name}#{args}"
-    end
-
     def help
-      msg = [
-        "Usage: #{Dracula.program_name} #{banner}",
-        "",
-        "#{desc.description}",
-        ""
-      ]
-
-      if options.size > 0
-        msg << "Flags:"
-
-        options.each { |option| msg << "  #{option.banner}" }
-
-        msg << ""
-      end
-
-      unless long_desc.nil?
-        msg << long_desc
-      end
-
-      puts msg.join("\n")
+      CommandHelp.new(self).show
     end
 
     def run(params)
       args = params.take_while { |p| p[0] != "-" }
 
-      if args.count != arguments.count
-        puts "Missing arguments"
+      if args.count < arguments.count
+        puts Dracula::UI.error("Missing arguments")
+        puts ""
+        help
+        exit(1)
+      end
+
+      if args.count > arguments.count
+        puts Dracula::UI.error("Too many arguments")
         puts ""
         help
         exit(1)
@@ -71,7 +60,7 @@ class Dracula
       missing_flags = missing_required_flags(parsed_flags)
 
       unless missing_flags.empty?
-        puts "Required Parameter: #{missing_flags.first.banner}"
+        puts Dracula::UI.error("Missing required Parameter: #{missing_flags.first.banner}")
         puts ""
         help
         exit(1)
@@ -81,7 +70,7 @@ class Dracula
     rescue OptionParser::MissingArgument => ex
       flag = flags.find { |f| "--#{f.name}" == ex.args.first }
 
-      puts "Parameter has no value: #{flag.banner}"
+      puts Dracula::UI.error("Missing flag parameter: #{flag.banner}")
       puts ""
       help
       exit(1)

data/lib/dracula/command_help.rb

@@ -0,0 +1,56 @@
+class Dracula
+  class CommandHelp
+
+    def initialize(command)
+      @command = command
+    end
+
+    def show
+      show_usage
+      show_desc
+      show_flags     if @command.flags.any?
+      show_long_desc if @command.long_desc
+    end
+
+    private
+
+    def banner
+      args = if @command.arguments.count > 0
+               " #{@command.arguments.map { |a| Dracula::UI.bold("[#{a}]") }.join(" ")}"
+             else
+               ""
+             end
+
+      flags_banner = if @command.flags.count > 0
+                       " " + Dracula::UI.bold("[FLAGS]")
+                     else
+                       ""
+                     end
+
+      "#{@command.full_name}#{args}#{flags_banner}"
+    end
+
+    def show_usage
+      puts "Usage: #{Dracula.program_name} #{banner}"
+      puts ""
+    end
+
+    def show_desc
+      puts @command.desc.description.capitalize
+      puts ""
+    end
+
+    def show_flags
+      puts Dracula::UI.bold("Flags:")
+
+      @command.flags.each { |flag| puts "  #{flag.banner}" }
+
+      puts ""
+    end
+
+    def show_long_desc
+      puts @command.long_desc
+    end
+
+  end
+end

data/lib/dracula/namespace.rb

@@ -5,11 +5,13 @@ class Dracula
     attr_accessor :description
     attr_accessor :commands
     attr_accessor :subcommands
+    attr_accessor :parent
 
     def initialize(klass)
       @klass = klass
       @commands = []
       @subcommands = []
+      @parent = []
     end
 
     def dispatch(route, params, action = :run)
@@ -22,7 +24,10 @@ class Dracula
         if handler
           action == :run ? handler.run(params) : handler.help
         else
+          puts Dracula::UI.error("Command not found")
+          puts ""
           help
+          exit(1)
         end
       else
         handler = subcommands.find { |c| c.name == route[0] }
@@ -30,7 +35,10 @@ class Dracula
         if handler
           handler.dispatch(route[1..-1], params, action)
         else
+          puts Dracula::UI.error("Command not found #{prefix}#{Dracula::UI.danger(route.join(":"))}")
+          puts ""
           help
+          exit(1)
         end
       end
     end
@@ -39,25 +47,16 @@ class Dracula
       help
     end
 
-    def help
-      prefix = name ? "#{name}:" : ""
-
-      puts "Usage: #{Dracula.program_name} #{prefix}<command>"
-      puts ""
-      puts (description || "Help topics, type #{Dracula.program_name} help TOPIC for more details:")
-      puts ""
-
-      command_list = []
-
-      commands.each do |cmd|
-        command_list << ["#{prefix}#{cmd.desc.name}", cmd.desc.description]
-      end
+    def prefix
+      name ? "#{parent.prefix}#{name}:" : ""
+    end
 
-      subcommands.each do |sub_cmd|
-        command_list << ["#{prefix}#{sub_cmd.name}", sub_cmd.description]
-      end
+    def top_level?
+      prefix == ""
+    end
 
-      Dracula::UI.print_table(command_list, :indent => 2)
+    def help
+      NamespaceHelp.new(self).show
     end
 
     def add_command(command)

data/lib/dracula/namespace_help.rb

@@ -0,0 +1,63 @@
+class Dracula
+  class NamespaceHelp
+
+    attr_reader :namespace
+
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def show
+      show_usage
+      show_desc if namespace.description
+      show_commands
+    end
+
+    private
+
+    def show_usage
+      puts "Usage: #{Dracula.program_name} #{Dracula::UI.bold "#{namespace.prefix}[command]"}\n"
+      puts ""
+    end
+
+    def show_desc
+      puts namespace.description.capitalize
+      puts ""
+    end
+
+    def show_commands
+      puts "Command list, type #{Dracula::UI.bold(Dracula.program_name.to_s + " help #{namespace.prefix}[command]")} for more details:"
+      puts ""
+
+      banners = []
+
+      banners += command_banners(namespace)
+      banners << ["", ""] # empty line
+
+      if namespace.top_level?
+        banners += short_subcommand_banners(namespace)
+        banners << ["", ""] # empty line
+      else
+        namespace.subcommands.each do |sub_cmd|
+          banners += command_banners(sub_cmd)
+          banners << ["", ""] # empty line
+        end
+      end
+
+      Dracula::UI.print_table(banners, :indent => 2)
+    end
+
+    def short_subcommand_banners(namespace)
+      namespace.subcommands.map do |sub_cmd|
+        [Dracula::UI.bold("#{namespace.prefix}#{sub_cmd.name}"), sub_cmd.description.capitalize]
+      end
+    end
+
+    def command_banners(namespace)
+      namespace.commands.map do |cmd|
+        [Dracula::UI.bold("#{namespace.prefix}#{cmd.desc.name}"), cmd.desc.description.capitalize]
+      end
+    end
+
+  end
+end

data/lib/dracula/ui.rb

@@ -1,6 +1,26 @@
 class Dracula
   class UI
 
+    def self.bold(str)
+      if $stdout.tty? # colorize only if output is terminal
+        "\e[34m#{str}\e[0m"
+      else
+        str
+      end
+    end
+
+    def self.danger(str)
+      if $stdout.tty? # colorize only if output is terminal
+        "\e[31m#{str}\e[0m"
+      else
+        str
+      end
+    end
+
+    def self.error(str)
+      danger("[ERROR] ") + str.to_s
+    end
+
     # Prints a table. Shamelesly copied from thor.
     #
     # ==== Parameters

data/lib/dracula/version.rb

@@ -1,3 +1,3 @@
 class Dracula
-  VERSION = "0.2.2".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dracula
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Šarčević
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,10 @@ files:
 - dracula.gemspec
 - lib/dracula.rb
 - lib/dracula/command.rb
+- lib/dracula/command_help.rb
 - lib/dracula/flag.rb
 - lib/dracula/namespace.rb
+- lib/dracula/namespace_help.rb
 - lib/dracula/ui.rb
 - lib/dracula/version.rb
 homepage: https://github.com/renderedtext/dracula