ops_team 1.4.2 → 1.6.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf95d0b212fcf2fc2b6f6beb2d9acf60002725f6b0e51a85ae7b49cb337772c
-  data.tar.gz: 9ad06b3344df5c710420d31580ce7b316b9e22d172143397081d37c9e6b0b55f
+  metadata.gz: be60abf42c17c9dd49eb8138efa2baa9158fe6b915d3f57618622436535ee0c5
+  data.tar.gz: 212a99e857496b114bc6869a2bc8cc55f71e2c40d5ad9d7b93f20a462a1d75cd
 SHA512:
-  metadata.gz: 69e8a3408d8111ac85c032ae51d9d8bd83c4b2d4455b459f11e4a202868335652c1b93df6bf56de97c98bf8cd3fa34a4855b2a6b0917ed95d0cb345c4c20923f
-  data.tar.gz: 47a7174fffd8a391359a8ff3253be91d3b1a03ea7607cfc628e3cce0cb36f17e227928592f35d6ab344494d0cb4687747cc67a8e8205d40cda839056aa0b518f
+  metadata.gz: 230bca7765df3c169c531dc2730a8e9adf2e1356281c45a622e3debfdc33c127960b3a4da100757f1266765a4e2fab09f36bc424ef0369f4f61a7eb1870a4244
+  data.tar.gz: cc9231a47b708cccdc75dba79fe8ba85e4dcb3d726d362772fbfb9e597031f204f559ae692bb39fe56ebfc5cc29ec40b1a8a1da42f9c54f057179a56be59eee3

data/Gemfile

@@ -10,7 +10,6 @@ gem 'concurrent-ruby', require: 'concurrent'
 gem "e2mmap"
 gem "ed25519"
 gem "ejson"
-gem "etc"
 gem "io-console"
 gem "json", ">= 2.3.0"
 gem "net-ssh"

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/lib/builtins/up.rb

@@ -23,7 +23,7 @@ module Builtins
 		private
 
 		def dependency_handler
-			Helpers::DependencyHandler.new(@config["dependencies"])
+			Helpers::DependencyHandler.new(deps_to_meet)
 		end
 
 		def meet_dependencies
@@ -49,5 +49,11 @@ module Builtins
 				Output.out(dependency.output)
 			end
 		end
+
+		def deps_to_meet
+			return @config["dependencies"] if @args.empty?
+
+			return @config["dependencies"].select { |dep, names| @args.include?(dep) }
+		end
 	end
 end

data/ops_team.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.4.2'
+	s.version = '1.6.0-pre'
 	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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.6.0.pre.pre
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-05-05 00:00:00.000000000 Z
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description: 
-email: 
+description:
+email:
 executables:
 - ops
 extensions: []
@@ -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
@@ -211,24 +212,24 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+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: []