commander-openflighthpc 2.0.1 → 2.2.0

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander-openflighthpc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Alces Flight Ltd
@@ -10,22 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.7.2
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +115,7 @@ description: The complete solution for Ruby command-line executables. Commander
   HighLine), while providing many new features, and an elegant API.
 email:
 - flight@openflighthpc.org
-executables:
-- commander
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -117,45 +130,18 @@ files:
 - Manifest
 - README.md
 - Rakefile
-- bin/commander
 - commander-openflighthpc.gemspec
 - lib/commander.rb
-- lib/commander/blank.rb
 - lib/commander/cli.rb
 - lib/commander/command.rb
-- lib/commander/core_ext.rb
-- lib/commander/core_ext/array.rb
-- lib/commander/core_ext/object.rb
+- lib/commander/error_handler.rb
 - lib/commander/help_formatters.rb
 - lib/commander/help_formatters/base.rb
 - lib/commander/help_formatters/terminal.rb
 - lib/commander/help_formatters/terminal/command_help.erb
 - lib/commander/help_formatters/terminal/help.erb
-- lib/commander/help_formatters/terminal/subcommand_help.erb
-- lib/commander/help_formatters/terminal_compact.rb
-- lib/commander/help_formatters/terminal_compact/command_help.erb
-- lib/commander/help_formatters/terminal_compact/help.erb
-- lib/commander/help_formatters/terminal_compact/subcommand_help.erb
-- lib/commander/import.rb
-- lib/commander/patches/decimal-integer.rb
-- lib/commander/patches/help_formatter_binding.rb
-- lib/commander/patches/implicit-short-tags.rb
-- lib/commander/patches/priority_sort.rb
-- lib/commander/patches/validate_inputs.rb
-- lib/commander/platform.rb
 - lib/commander/runner.rb
 - lib/commander/version.rb
-- spec/command_spec.rb
-- spec/configure_spec.rb
-- spec/core_ext/array_spec.rb
-- spec/core_ext/object_spec.rb
-- spec/help_formatters/terminal_compact_spec.rb
-- spec/help_formatters/terminal_spec.rb
-- spec/methods_spec.rb
-- spec/patches/validate_inputs_spec.rb
-- spec/runner_spec.rb
-- spec/spec_helper.rb
-- spec/ui_spec.rb
 homepage: https://github.com/openflighthpc/commander-openflighthpc
 licenses:
 - MIT
@@ -179,15 +165,4 @@ rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The complete solution for Ruby command-line executables
-test_files:
-- spec/command_spec.rb
-- spec/configure_spec.rb
-- spec/core_ext/array_spec.rb
-- spec/core_ext/object_spec.rb
-- spec/help_formatters/terminal_compact_spec.rb
-- spec/help_formatters/terminal_spec.rb
-- spec/methods_spec.rb
-- spec/patches/validate_inputs_spec.rb
-- spec/runner_spec.rb
-- spec/spec_helper.rb
-- spec/ui_spec.rb
+test_files: []

data/bin/commander

@@ -1,104 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'commander/import'
-
-program :name, 'commander'
-program :version, Commander::VERSION
-program :description, 'Commander utility program.'
-
-command :init do |c|
-  c.syntax = 'commander init [option] <file>'
-  c.summary = 'Initialize a commander template'
-  c.description = 'Initialize an empty <file> with a commander template,
-    allowing very quick creation of commander executables.'
-  c.example 'Create a new classic style template file.', 'commander init bin/my_executable'
-  c.example 'Create a new modular style template file.', 'commander init --modular bin/my_executable'
-  c.option '-m', '--modular', 'Initialize a modular style template'
-  c.action do |args, options|
-    file = args.shift || abort('file argument required.')
-    name = ask 'Machine name of program: '
-    description = ask 'Describe your program: '
-    commands = ask_for_array 'List the commands you wish to create: '
-    begin
-      if options.modular
-        File.open(file, 'w') do |f|
-          f.write <<-"...".gsub!(/^ {10}/, '')
-          #!/usr/bin/env ruby
-
-          require 'rubygems'
-          require 'commander'
-
-          class MyApplication
-            include Commander::Methods
-            # include whatever modules you need
-
-            def run
-              program :name, '#{name}'
-              program :version, '0.0.1'
-              program :description, '#{description}'
-
-          ...
-          commands.each do |command|
-            f.write <<-"...".gsub!(/^ {12}/, '')
-                command :#{command} do |c|
-                  c.syntax = '#{name} #{command} [options]'
-                  c.summary = ''
-                  c.description = ''
-                  c.example 'description', 'command example'
-                  c.option '--some-switch', 'Some switch that does something'
-                  c.action do |args, options|
-                    # Do something or c.when_called #{name.capitalize}::Commands::#{command.capitalize}
-                  end
-                end
-
-            ...
-          end
-          f.write <<-"...".gsub!(/^ {12}/, '')
-                run!
-              end
-            end
-
-            MyApplication.new.run if $0 == __FILE__
-          ...
-        end
-
-        File.chmod(0755, file)
-        say "Initialized modular template in #{file}"
-      else
-        File.open(file, 'w') do |f|
-          f.write <<-"...".gsub!(/^ {10}/, '')
-          #!/usr/bin/env ruby
-
-          require 'rubygems'
-          require 'commander/import'
-
-          program :name, '#{name}'
-          program :version, '0.0.1'
-          program :description, '#{description}'
-
-          ...
-          commands.each do |command|
-            f.write <<-"...".gsub!(/^ {12}/, '')
-            command :#{command} do |c|
-              c.syntax = '#{name} #{command} [options]'
-              c.summary = ''
-              c.description = ''
-              c.example 'description', 'command example'
-              c.option '--some-switch', 'Some switch that does something'
-              c.action do |args, options|
-                # Do something or c.when_called #{name.capitalize}::Commands::#{command.capitalize}
-              end
-            end
-
-            ...
-          end
-        end
-        File.chmod 0755, file
-        say "Initialized template in #{file}"
-      end
-    rescue => e
-      abort e
-    end
-  end
-end

data/lib/commander/blank.rb

@@ -1,7 +0,0 @@
-module Blank
-  def self.included(base)
-    base.class_eval do
-      instance_methods.each { |m| undef_method m unless m =~ /^__|object_id/ }
-    end
-  end
-end

data/lib/commander/core_ext.rb

@@ -1,2 +0,0 @@
-require 'commander/core_ext/array'
-require 'commander/core_ext/object'

data/lib/commander/core_ext/array.rb

@@ -1,24 +0,0 @@
-class Array
-  ##
-  # Split _string_ into an array. Used in
-  # conjunction with Highline's #ask, or #ask_for_array
-  # methods, which must respond to #parse.
-  #
-  # This method allows escaping of whitespace. For example
-  # the arguments foo bar\ baz will become ['foo', 'bar baz']
-  #
-  # === Example
-  #
-  #   # ask invokes Array#parse
-  #   list = ask 'Favorite cookies:', Array
-  #
-  #   # or use ask_for_CLASS
-  #   list = ask_for_array 'Favorite cookies: '
-  #
-
-  def self.parse(string)
-    # Using reverse + lookahead to work around Ruby 1.8's lack of lookbehind
-    # TODO: simplify now that we don't support Ruby 1.8
-    string.reverse.split(/\s(?!\\)/).reverse.map { |s| s.reverse.gsub('\\ ', ' ') }
-  end
-end

data/lib/commander/core_ext/object.rb

@@ -1,8 +0,0 @@
-class Object
-  ##
-  # Return the current binding.
-
-  def get_binding
-    binding
-  end
-end

data/lib/commander/help_formatters/terminal/subcommand_help.erb

@@ -1,23 +0,0 @@
-<% if !cmd.syntax %>
-  <%= $terminal.color "NAME", :bold %>:
-
-    <%= cmd.name %>
-<% else -%>
-  <%= $terminal.color "SYNOPSIS", :bold %>:
-
-    <%= cmd.syntax -%>
-
-<% end -%>
-
-  <%= $terminal.color "DESCRIPTION", :bold %>:
-
-    <%= Commander::HelpFormatter.indent 4, (cmd.description || cmd.summary || 'No description.') -%>
-
-
-  <%= $terminal.color "SUBCOMMANDS", :bold %>:
-<% @commands.values.sort.map { |c| [c.name, c] }.each do |name, command| -%>
-  <% unless alias? name %>
-    <%= "%-#{max_command_length}s %s" % [command.name, command.summary || command.description] -%>
-  <% end -%>
-<% end %>
-

data/lib/commander/help_formatters/terminal_compact.rb

@@ -1,11 +0,0 @@
-require 'erb'
-
-module Commander
-  module HelpFormatter
-    class TerminalCompact < Terminal
-      def template(name)
-        ERB.new(File.read(File.join(File.dirname(__FILE__), 'terminal_compact', "#{name}.erb")), nil, '-')
-      end
-    end
-  end
-end

data/lib/commander/help_formatters/terminal_compact/command_help.erb

@@ -1,26 +0,0 @@
-  <%= @name %>
-<% if @syntax -%>
-
-  Usage: <%= @syntax %>
-<% end -%>
-<% if @description || @summary -%>
-
-  <%= @description || @summary %>
-<% end -%>
-<% unless @examples.empty? -%>
-
-  Examples:
-	<% for description, command in @examples -%>
-
-    # <%= description %>
-    <%= command %>
-	<% end -%>
-<% end -%>
-<% unless @options.empty? -%>
-
-  Options:
-<% for option in @options -%>
-    <%= "%-20s %s" % [option[:switches].join(', '), option[:description]] %><% if option[:default] %> <%= option[:default] %><% end %>
-<% end -%>
-<% end -%>
-

data/lib/commander/help_formatters/terminal_compact/help.erb

@@ -1,29 +0,0 @@
-  <%= program :name %>
-
-  <%= program :description %>
-
-  Commands:
-<% for name, command in @help_commands.sort -%>
-<% unless alias? name -%>
-    <%= "%-#{max_command_length}s %s" % [command.name, command.summary || command.description] %>
-<% end -%>
-<% end -%>
-<% unless @aliases.empty? %>
-  Aliases:
-<% for alias_name, args in @aliases.sort -%>
-    <%= "%-#{max_aliases_length}s %s %s" % [alias_name, command(alias_name).name, args.join(' ')] %>
-<% end -%>
-<% end %>
-<% unless @help_options.empty? -%>
-  Global Options:
-<% for option in @help_options -%>
-    <%= "%-20s %s" % [option[:switches].join(', '), option[:description]] -%> 
-<% end -%>
-<% end -%>
-<% if program :help -%>
-  <% for title, body in program(:help) %>
-  <%= title %>:
-    <%= body %>
-  <% end %>
-<% end -%>
-

data/lib/commander/help_formatters/terminal_compact/subcommand_help.erb

@@ -1,15 +0,0 @@
-  <%= cmd.name %>
-<% if cmd.syntax -%>
-
-  Usage: <%= cmd.syntax %>
-<% end -%>
-<% if cmd.description || cmd.summary -%>
-
-  <%= cmd.description || cmd.summary %>
-<% end -%>
-
-<% @commands.values.sort.map { |c| [c.name, c] }.each do |name, command| -%>
-<% unless alias? name -%>
-    <%= "%-#{max_command_length}s %s" % [command.name, command.summary || command.description] %>
-<% end -%>
-<% end -%>

data/lib/commander/import.rb

@@ -1,5 +0,0 @@
-require 'commander'
-
-extend Commander::CLI
-
-at_exit { run!(ARGV) }

data/lib/commander/patches/decimal-integer.rb

@@ -1,17 +0,0 @@
-# Patches the underling OptionParser DecimalInteger type so that it doesn't
-# convert numbers starting with a '0' as if they are an Octal number
-module Commander
-  module Patches
-    module DecimalInteger
-      decimal = '\d+(?:_\d+)*'
-      DecimalInteger = /\A[-+]?#{decimal}\z/io
-      ::OptionParser::accept(DecimalInteger, DecimalInteger) {|s,|
-        begin
-          Integer(s, 10)
-        rescue ArgumentError
-          raise ::OptionParser::InvalidArgument, s
-        end if s
-      }
-    end
-  end
-end

data/lib/commander/patches/help_formatter_binding.rb

@@ -1,15 +0,0 @@
-module Commander
-  module Patches
-    module HelpFormatterBinding
-      def get_binding(additional = {})
-        bnd = @target.instance_eval { binding }.tap do |bind|
-          decorate_binding(bind)
-        end
-        additional.each do |k, v|
-          bnd.local_variable_set(k, v)
-        end
-        bnd
-      end
-    end
-  end
-end

data/lib/commander/patches/implicit-short-tags.rb

@@ -1,75 +0,0 @@
-# Patches the underling ruby OptionParser to prevent it from automatically
-# generating short tags for options
-module Commander
-  module Patches
-    module ImplicitShortTags
-      def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
-        opt, arg, val, rest = nil
-        nonopt ||= proc {|a| throw :terminate, a}
-        argv.unshift(arg) if arg = catch(:terminate) {
-          while arg = argv.shift
-            case arg
-            # long option
-            when /\A--([^=]*)(?:=(.*))?/m
-              opt, rest = $1, $2
-              opt.tr!('_', '-')
-              begin
-                sw, = complete(:long, opt, true)
-              rescue ::OptionParser::ParseError
-                raise $!.set_option(arg, true)
-              end
-              begin
-                opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-                val = cb.call(val) if cb
-                setter.call(sw.switch_name, val) if setter
-              rescue ::OptionParser::ParseError
-                raise $!.set_option(arg, rest)
-              end
-
-            # short option
-            when /\A-(.)((=).*|.+)?/m
-              eq, rest, opt = $3, $2, $1
-              has_arg, val = eq, rest
-              begin
-                sw, = search(:short, opt)
-                unless sw
-                  sw, = complete(:short, opt)
-                  # short option matched.
-                  val = arg.sub(/\A-/, '')
-                  has_arg = true
-                end
-              rescue ::OptionParser::ParseError
-                raise $!.set_option(arg, true)
-              end
-              begin
-                opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
-                raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-                argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
-                val = cb.call(val) if cb
-                setter.call(sw.switch_name, val) if setter
-              rescue ::OptionParser::ParseError
-                raise $!.set_option(arg, arg.length > 2)
-              end
-
-            # non-option argument
-            else
-              catch(:prune) do
-                visit(:each_option) do |sw0|
-                  sw = sw0
-                  sw.block.call(arg) if ::OptionParser::Switch === sw and sw.match_nonswitch?(arg)
-                end
-                nonopt.call(arg)
-              end
-            end
-          end
-
-          nil
-        }
-
-        visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
-
-        argv
-      end
-    end
-  end
-end