commander-openflighthpc 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40df29e6a019c3ff4bac1776e2752ceefd52ac7cf79f5e6d5d99ec32266c59b
-  data.tar.gz: 0fb111ee4776fd2fbcb359781e740f30572b7b0f6fb9474ddc014b11aa6c8da9
+  metadata.gz: f2bd1303f7a91cad5cadac934d35ee270a9b2441db7c37685a669b000f8782b5
+  data.tar.gz: '004078c3f1ee373463a37430dbc18207747907e12bc2d4b479903e1f08d1f200'
 SHA512:
-  metadata.gz: 27a69ae0244b52ddd67288b77a54cda2b0e54bc115c2212960fed7761d7aefe75fc86fb83114b328283c136aab097ae8cfa28f8be061d68891ed1900b87ff4d9
-  data.tar.gz: 87a25ff68ff7c522989e4c67002b6903433af6ace6a12779d23855f1be4e7d2b5257f33bd452ac708a439344f83c51ba911014b117dac90f01bfd144c8bd8714
+  metadata.gz: d2a0c2e988bcec7ce6d0a811777588684652b762c3886a4b7bbb25a79443fe924b8d726e6e576734769cbcf852f0bb1200717a5a509c3e25303846228ef28b7e
+  data.tar.gz: b62447900fdf781e69886d657c5470dc59ca935daeee043c08308689f5b7f24375535261f3f28f311754943a8ce8efbaf75d04ac4a0e53430f7dfa9cafeca424

data/lib/commander/command.rb

@@ -4,6 +4,7 @@ require 'commander/patches/decimal-integer'
 require 'commander/patches/validate_inputs'
 require 'commander/patches/option_defaults'
 require 'commander/patches/help_formatter_binding'
+require 'commander/patches/priority_sort'
 
 OptionParser.prepend Commander::Patches::ImplicitShortTags
 OptionParser.prepend Commander::Patches::DecimalInteger
@@ -13,6 +14,7 @@ module Commander
 
   class Command
     prepend Patches::ValidateInputs
+    prepend Patches::PrioritySort
 
     attr_accessor :name, :examples, :syntax, :description
     attr_accessor :summary, :proxy_options, :options, :hidden

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

@@ -15,7 +15,7 @@
 
 
   <%= $terminal.color "SUBCOMMANDS", :bold %>:
-<% for name, command in @commands.sort -%>
+<% @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 -%>

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

@@ -8,8 +8,8 @@
   <%= cmd.description || cmd.summary %>
 <% end -%>
 
-<% for name, command in @commands.sort -%>
+<% @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 -%>
+<% end -%>

data/lib/commander/patches/priority_sort.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Commander
+  module Patches
+    module PrioritySort
+      attr_accessor :priority
+
+      def <=>(other)
+        # Different classes can not be compared and thus are considered
+        # equal in priority
+        return 0 unless self.class == other.class
+
+        # Sort firstly based on the commands priority
+        comp = (self.priority || 0) <=> (other.priority || 0)
+
+        # Fall back on name comparison if priority is equal
+        comp == 0 ? self.name <=> other.name : comp
+      end
+    end
+  end
+end

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander-openflighthpc
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Alces Flight Ltd
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -143,6 +143,7 @@ files:
 - lib/commander/patches/help_formatter_binding.rb
 - lib/commander/patches/implicit-short-tags.rb
 - lib/commander/patches/option_defaults.rb
+- lib/commander/patches/priority_sort.rb
 - lib/commander/patches/validate_inputs.rb
 - lib/commander/platform.rb
 - lib/commander/runner.rb