ops_team 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756dc825ef1aa3ad8d89851637b530c22b9d60ab7432e401c0e9bb6516921ec2
-  data.tar.gz: 68b6345a698c3931efa9b447b25c8bf9bf7dc16b78d569761a92e54aeed7b473
+  metadata.gz: a54db2276ea07b84b3b6c8df6cb73dcca033c166b9ebf06585725a42892eb012
+  data.tar.gz: a3574a5efd0515911f089cc4df61693637b413cbea8316bef138a4c515785a01
 SHA512:
-  metadata.gz: 1d44786bc8a0abf6fecb0d08f0a45a695707887fdd4d8fecdfda166daf19371f3542c0c69b91b10617cbf1f41b21a36446760ad342ea1d4ab1ba8b4576f3682e
-  data.tar.gz: a02254d754ba41eb0eeafe8546722ba1728b9d3f04d46fda1dd96b922d7f2aa26c6810b2d288124ae8f304b234a8f45bd77690afeea2ed39e15178455023df2f
+  metadata.gz: 3f1a2b8726148706aba7ae2943c0bb9b9ad517f1e5ccd9b32d31b7e2dac403124647641fa6ae8256fda235d2d3e8f7cbb7f9e950762d7f9a5fe1c12aa0d05993
+  data.tar.gz: 5e25362c364f73db8c50f05af4a820795a3c284ec7fe724d82db9fefe5a60746eb208c54711ff36492dacd7908adb6f6ca02d4822799300eb74048549a9dff02

data/lib/builtins/help.rb

@@ -4,10 +4,11 @@ require 'colorize'
 
 require 'builtin'
 require 'forwards'
+require 'builtins/helpers/enumerator'
 
 module Builtins
 	class Help < Builtin
-		NAME_WIDTH = 35
+		NAME_WIDTH = 40
 
 		class << self
 			def description
@@ -35,34 +36,13 @@ module Builtins
 		end
 
 		def builtins
-			builtin_class_map.map do |klass, name|
-				format("%<name>-#{NAME_WIDTH}s %<desc>s", name: name.downcase.to_s.yellow, desc: klass.description)
-			end
-		end
-
-		def builtin_class_map
-			builtin_class_names.each_with_object({}) do |name, hash|
-				# get the class reference for this name
-				constant = const_for(name)
-				# check hash for an existing entry for the same class
-				existing_name = hash[constant]
+			builtin_enumerator.names_by_constant.map do |klass, names|
+				names_string = names.map(&:downcase).map(&:to_s).uniq.join(", ").yellow
 
-				# if there is an existing key for the same class, and it's longer than the one we just found,
-				# skip adding this one one to avoid duplicates, leaving the shortest name for each class
-				next if existing_name && existing_name.length <= name.length
-
-				hash[constant] = name
+				format("%<names>-#{NAME_WIDTH}s %<desc>s", names: names_string, desc: klass.description)
 			end
 		end
 
-		def builtin_class_names
-			@builtin_class_names ||= Builtins.constants.select { |c| const_for(c).is_a?(Class) }.sort
-		end
-
-		def const_for(name)
-			Builtins.const_get(name, false)
-		end
-
 		def actions
 			return [] unless @config["actions"]
 
@@ -79,5 +59,9 @@ module Builtins
 
 			""
 		end
+
+		def builtin_enumerator
+			@builtin_enumerator ||= ::Builtins::Helpers::Enumerator
+		end
 	end
 end

data/lib/builtins/helpers/enumerator.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Builtins
+	module Helpers
+		class Enumerator
+			class << self
+				def names_by_constant
+					constants_by_name.each_with_object({}) do |(name, const), hash|
+						if hash.include?(const)
+							hash[const] << name
+						else
+							hash[const] = [name]
+						end
+					end
+				end
+
+				private
+
+				def constants_by_name
+					@constants_by_name = Builtins.constants.each_with_object({}) do |const_name, hash|
+						const = Builtins.const_get(const_name, false)
+
+						next unless const.is_a?(Class)
+
+						hash[const_name] = const
+					end
+				end
+			end
+		end
+	end
+end

data/ops_team.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.5.0'
+	s.version = '1.5.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
 	s.date = '2021-05-05'
-	s.summary = 'ops_team handles basic operations tasks for your project, driven by self-documenting YAML config'
+	s.summary = 'ops_team handles basic automation for your project, driven by self-documenting YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[
 		'Gemfile',
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 		'ops_team.gemspec'
 	]
 	s.executables << 'ops'
-	s.required_ruby_version = '~> 2.5'
+	s.required_ruby_version = '> 2.5'
 	s.add_runtime_dependency 'bcrypt_pbkdf', '~> 1.0', '>= 1.0.1'
 	s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8.1'
 	s.add_runtime_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -179,6 +179,7 @@ files:
 - lib/builtins/exec.rb
 - lib/builtins/help.rb
 - lib/builtins/helpers/dependency_handler.rb
+- lib/builtins/helpers/enumerator.rb
 - lib/builtins/init.rb
 - lib/builtins/up.rb
 - lib/builtins/version.rb
@@ -217,7 +218,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">"
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -226,9 +227,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
-summary: ops_team handles basic operations tasks for your project, driven by self-documenting
+summary: ops_team handles basic automation for your project, driven by self-documenting
   YAML config
 test_files: []