ops_team 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9656333af7b4f103645f9f27af758b4cc11e749c0e9770474ec249af8db85983
-  data.tar.gz: d1a69bbc44b1626bbcd754fa8484547f2bfa3beede615d8ebcd951e00432008a
+  metadata.gz: 41782bcb93146b1b1fabc4f762bc0c9c1c2b4ae447aeb7e74a4f9b31f6a69629
+  data.tar.gz: 8e249d5e45fd10517215864bb5a71c2d906116750205b484e8644e9b4bdd1d52
 SHA512:
-  metadata.gz: 73e177e194c2f3e7415612bd23aea779502182929fbb5264c00a1516a52869056bb045e75ff5aaca4c546b92f03481f5346eb24958f4a6ccdd247d0d3cdc06dc
-  data.tar.gz: 53c224dd9162d269c0154c842ec36d4e748dd59b401efb1a959199332e3ee99489a1de4cf88d3e2d2bff7c04a37906c687d542ac2bc4852d7fa38a0f4e0ad9c6
+  metadata.gz: 979ff357afd440bfc2b52866e5f74c5a55932155b9666f5f7d88547a1d7837b1c4d75eb2559a696aac95cd42071167c68dc37dbf3f129ff944cab41b6ab591e0
+  data.tar.gz: '07809f3717a5cff0dfa118b492fc1fef5d3280e15e4a48b7cb510052ab1724ff4289ac4f86c4d3de86254409c6794d46d06b96edb354756e8dd29fe01af1dbba'

data/Gemfile

@@ -6,8 +6,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gem "bcrypt_pbkdf"
 gem "colorize"
+gem "e2mmap"
 gem "ed25519"
 gem "ejson"
+gem "etc"
+gem "io-console"
+gem "json", ">= 2.3.0"
 gem "net-ssh"
 gem "require_all"
 
@@ -17,6 +21,7 @@ group :test do
 end
 
 group :development do
+	gem "irb"
 	gem "pry"
 	gem "pry-byebug"
 	gem "rerun"

data/bin/ops

@@ -5,6 +5,4 @@ require_relative "../loader"
 
 require 'ops'
 
-require 'pry-byebug' if ENV['environment'] == 'dev' || ENV['environment'].nil?
-
 Ops.new(ARGV).run

data/lib/action_suggester.rb

@@ -9,6 +9,8 @@ class ActionSuggester
 		spellchecker.correct(word)
 	end
 
+	private
+
 	def spellchecker
 		@spellchecker ||= DidYouMean::SpellChecker.new(dictionary: @dictionary)
 	end

data/lib/dependencies/apk.rb

@@ -20,7 +20,7 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux" && system("which apk")
+			`uname`.chomp == "Linux" && system("which apk", out: File::NULL, err: File::NULL)
 		end
 	end
 end

data/lib/dependencies/apt.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require 'dependency'
+require 'dependencies/versioned_dependency'
 require 'dependencies/helpers/apt_cache_policy'
 
 module Dependencies
-	class Apt < Dependency
-		PACKAGE_NAME_SEPARATOR = "/"
-
+	class Apt < VersionedDependency
 		def met?
-			return apt_cache_policy.installed_version == package_version if package_version
+			return apt_cache_policy.installed_version == dep_version if dep_version
 
 			apt_cache_policy.installed?
 		end
@@ -23,25 +21,13 @@ module Dependencies
 		end
 
 		def should_meet?
-			`uname`.chomp == "Linux" && system("which apt-get")
+			`uname`.chomp == "Linux" && system("which apt-get", out: File::NULL, err: File::NULL)
 		end
 
 		private
 
-		def package_name
-			name_components[0]
-		end
-
-		def package_version
-			name_components[1]
-		end
-
-		def name_components
-			name.split(PACKAGE_NAME_SEPARATOR, 2)
-		end
-
 		def apt_cache_policy
-			@apt_cache_policy ||= Dependencies::Helpers::AptCachePolicy.new(package_name)
+			@apt_cache_policy ||= Dependencies::Helpers::AptCachePolicy.new(dep_name)
 		end
 
 		def sudo_string

data/lib/dependencies/gem.rb

@@ -4,18 +4,20 @@ require 'dependency'
 require 'options'
 
 module Dependencies
-	class Gem < Dependency
+	class Gem < VersionedDependency
 		def met?
-			execute("gem list -i '^#{name}$'")
+			if versioned?
+				execute("gem list -i '^#{dep_name}$' -v '#{dep_version}'") if versioned?
+			else
+				execute("gem list -i '^#{name}$'")
+			end
 		end
 
 		def meet
-			if Options.get("gem.use_sudo")
-				execute("sudo gem install #{name}")
-			elsif Options.get("gem.user_install")
-				execute("gem install --user-install #{name}")
+			if versioned?
+				execute("#{sudo_string}gem install #{user_install_string}'#{dep_name}' -v '#{dep_version}'")
 			else
-				execute("gem install #{name}")
+				execute("#{sudo_string}gem install #{user_install_string}'#{name}'")
 			end
 		end
 
@@ -23,5 +25,15 @@ module Dependencies
 			# do nothing; we don't want to uninstall packages and reinstall them every time
 			true
 		end
+
+		private
+
+		def sudo_string
+			Options.get("gem.use_sudo") ? "sudo " : ""
+		end
+
+		def user_install_string
+			Options.get("gem.user_install") ? "--user-install " : ""
+		end
 	end
 end

data/lib/dependencies/versioned_dependency.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Dependencies
+	class VersionedDependency < Dependency
+		VERSION_SEPARATOR = " "
+
+		def dep_name
+			name_components[0]
+		end
+
+		def dep_version
+			name_components[1]
+		end
+
+		def versioned?
+			!!dep_version
+		end
+
+		private
+
+		def name_components
+			name.split(VERSION_SEPARATOR, 2)
+		end
+	end
+end

data/lib/ops.rb

@@ -27,6 +27,8 @@ class Ops
 	ERROR_LOADING_APP_CONFIG_EXIT_CODE = 66
 	MIN_VERSION_NOT_MET_EXIT_CODE = 67
 
+	RECOMMEND_HELP_TEXT = "Run 'ops help' for a list of builtins and actions."
+
 	class << self
 		def project_name
 			File.basename(::Dir.pwd)
@@ -48,7 +50,7 @@ class Ops
 		run_action
 	rescue UnknownActionError => e
 		Output.error(e.to_s)
-		print_did_you_mean
+		Output.out(RECOMMEND_HELP_TEXT) unless print_did_you_mean
 		exit(UNKNOWN_ACTION_EXIT_CODE)
 	end
 
@@ -57,6 +59,7 @@ class Ops
 	def syntax_valid?
 		if @action_name.nil?
 			Output.error("Usage: ops <action>")
+			Output.out(RECOMMEND_HELP_TEXT)
 			false
 		else
 			true
@@ -67,6 +70,8 @@ class Ops
 		suggestions = did_you_mean.check(@action_name)
 
 		Output.out("Did you mean '#{suggestions.join(", ")}'?") if suggestions.any?
+
+		suggestions.any?
 	end
 
 	def did_you_mean

data/lib/output.rb

@@ -40,7 +40,7 @@ class Output
 			@err.puts(msg.yellow)
 		end
 
-		alias_method :notice, :warn
+		alias notice warn
 
 		def error(msg)
 			@err.puts(msg.red)

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.13.0'
+	s.version = '0.14.1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -170,6 +170,7 @@ files:
 - lib/dependencies/gem.rb
 - lib/dependencies/helpers/apt_cache_policy.rb
 - lib/dependencies/sshkey.rb
+- lib/dependencies/versioned_dependency.rb
 - lib/dependency.rb
 - lib/environment.rb
 - lib/executor.rb