convoy 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e64e31cb32b012e592465bee8d1447f7a996b4
-  data.tar.gz: 0787f79d59ffa58a26d8a6f51cfb5aa84e67146f
+  metadata.gz: dce20ef0475a98ad8e3db17accdd52cf40df9402
+  data.tar.gz: f2cc919519e7b9ced080175d7630713536c5feac
 SHA512:
-  metadata.gz: 8ee90b28c6f9775eb877047900a510cc74da752b7ad014f617e7bb8057eb5cf94a2f8ce0e16a2cf0c599b09d4c846eecf918197c0749a6f7751f30e9b089edac
-  data.tar.gz: a58865ac6fe810286734579e6b179cb1c3132f34856c8cf678f947a905508bd7389529eabc6f551687f5f894db76b18b71c89d6b0e59ea15d357f5656794f4b5
+  metadata.gz: daa739a479de1c0685623e4686d6f4422a23ee1981de993d29bf5880f222ab70211d22bf80dba6ef1b5c865bf479eb577d06573433cd225b92facd9c7bb5dcc9
+  data.tar.gz: dcac8c553f276f5f623b3f68fc943c78a5a92b9a8118a29d78e2e8bdf28d748f739210a69216da78107acb826c0820961a0687726a5833a557c9dd7a653811ba

data/convoy.gemspec

@@ -4,7 +4,7 @@ require 'date'
 
 Gem::Specification.new do |s|
     s.name = 'convoy'
-    s.version = '1.0.0'
+    s.version = '1.1.0'
     s.date = Date.today.to_s
     s.summary = %q{A library that makes building command line apps in ruby so easy, you'll feel like an expert is guiding you through it}
     s.description = %q{Writing even complex command-line apps should be quick, easy and fun. Convoy takes the excellent Trollop option parser and adds a whole bunch of awesome features to produce a library you will always want to turn to when a 'quick script' is in order.}

data/lib/convoy/app.rb

@@ -121,7 +121,7 @@ module Convoy
 
         def print_convoy_error_message(e)
             print_stacktrace(e)
-            error_logger.warn {"\n  \x1B[48;5;196m ERROR \x1B[0m An internal Convoy error occurred.\n\n    You should probably report it to \x1B[38;5;222mAlbert Rannetsperger\x1B[0m or create an issue on his \x1B[38;5;222mGitHub\x1B[0m page (https://github.com/alb3rtuk).\n    Make sure to include the stacktrace above (although it probably won't be very helpful).bp\n\n"}
+            error_logger.warn {"\n  \x1B[48;5;196m ERROR \x1B[0m An internal Convoy error occurred.\n\n    You should probably report it to \x1B[38;5;222mAlbert Rannetsperger\x1B[0m or create an issue on his \x1B[38;5;222mGitHub\x1B[0m page (https://github.com/alb3rtuk).\n    Make sure to include the stacktrace above (although the way Ruby works, it probably won't be very helpful).\n"}
         end
     end
 end

data/lib/convoy/formatter/default_help_formatter.rb

@@ -12,18 +12,21 @@ module Convoy
                 options = Options.new(parser, setup, context)
                 commands = Commands.new(setup, context)
                 current_command = Commands.command_for(setup, context)
-                system('clear')
+                # Uncomment the following line if you want the screen
+                # to be cleared before the --help messages show.
+                #
+                # system('clear')
                 puts
                 StreamOutputFormatter.new($stdout, :max_output_width => Terminal.width) do |f|
                     if setup.summary_for != '' && !setup.summary_for.nil?
                         f.puts setup.summary_for, :newlines => 2
                     end
-                    if (setup.description_for != '' && !setup.description_for.nil?) && current_command.summary == setup.summary_for
-                        f.indent(4) do |f_inner|
-                            f_inner.puts setup.description_for, :newlines => 2
-                        end
-                    end
-                    # name_help(current_command, f)
+                    # if (setup.description_for != '' && !setup.description_for.nil?) && current_command.summary == setup.summary_for
+                    #     f.indent(4) do |f_inner|
+                    #         f_inner.puts setup.description_for, :newlines => 2
+                    #     end
+                    # end
+                    name_help(current_command, f)
                     usage_help(current_command, f)
                     version_help(current_command, f)
                     commands_help(commands, f)
@@ -34,13 +37,15 @@ module Convoy
             private
 
             def name_help(current_command, f)
-                f.puts "\x1B[38;5;84mNAME\x1B[0m"
-                f.indent(4) do |f|
-                    f.grid(:columns => 3) do |t|
-                        t.row current_command.script_name, '-', setup.summary_for(context)
+                # f.puts "\x1B[38;5;84mNAME\x1B[0m"
+                if setup.description_for(context) != ''
+                    f.indent(4) do |f|
+                        # f.grid(:columns => 3) do |t|
+                        #     t.row current_command.script_name, '-', setup.summary_for(context)
+                        # end
+                        # f.newline
+                        f.puts(setup.description_for(context), :newlines => 2)
                     end
-                    f.newline
-                    f.puts(setup.description_for(context), :newlines => 2) if setup.description_for(context)
                 end
             end
 

data/lib/convoy/trollop.rb

@@ -358,7 +358,7 @@ module Trollop
                               @long[$1] || @long["no-#{$1}"]
                           else
                               #  raise CommandlineError, "invalid argument syntax: '#{arg}'"
-                              puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Invalid argument syntax: \x1B[38;5;123m#{arg}\x1B[0m\n\n"
+                              puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Invalid argument syntax: #{arg}\n\n"
                               exit
                       end
 
@@ -366,13 +366,13 @@ module Trollop
 
                 # raise CommandlineError, "unknown argument '#{arg}'" unless sym
                 unless sym
-                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Unknown flag: \x1B[38;5;123m#{arg}\x1B[0m\n\n"
+                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Unknown flag: #{arg}\n\n"
                     exit
                 end
 
                 if given_args.include?(sym) && !@specs[sym][:multi]
                     # raise CommandlineError, "option '#{arg}' specified multiple times"
-                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Flag specified multiple times: \x1B[38;5;123m#{arg}\x1B[0m\n\n"
+                    puts "\n  \x1B[48;5;196m ERROR \x1B[0m \xe2\x80\x94 Flag specified multiple times: #{arg}\n\n"
                     exit
                 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convoy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nesty