ops_team 0.13.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2290c83f4f7765f62b2efe59ed8e662970039057b7d3d948b68e4f0f0eb46a7c
-  data.tar.gz: 9b9948ff23bf8799ca294c9a637638980e9b679bb862657085712a97bde35fc1
+  metadata.gz: 9b9ea41a7031a3b0433fa1dce7a5d6e3acff2a0845df7e614d7348c42decfb17
+  data.tar.gz: b1914623e6e5990aa695112abdcf094b130fc10235fa4aaa1c03ac8d2ca70d14
 SHA512:
-  metadata.gz: 7fa27cf9f164af9e91a2d27820e811779a0781cb6b2f8849ef37e6ddd6042d4188422560343559ee072701351dc60f51cc48ce74c82bc1aa9201d233e37ef09d
-  data.tar.gz: 6af6633e1552b93fa07c3f6443bd292e0695fe9595dfda661e588fd9cc84df8176b2f5b1dbc7613d47bde7b5e1ed30a1b9551bbfd9963c7cc5b70bcb4b54c460
+  metadata.gz: bfb2ac0c3c7da9ea5cfb8113b9557e015739eb7ef7972ecf19c59924171274f28babacd9bba222a852dd0e141ac8b8a8d0bb83bb685c82bb644753b2f7c5c2fa
+  data.tar.gz: c885476119307be822abbb6a2762ab610094a4373ba701cc07359d17f6209d964fc8a83828b4c5a7a066ca4a6115072d9f94f267a50f0a4e5020d648afcaeac2

data/Gemfile

@@ -11,7 +11,7 @@ gem "ed25519"
 gem "ejson"
 gem "etc"
 gem "io-console"
-gem "json"
+gem "json", ">= 2.3.0"
 gem "net-ssh"
 gem "require_all"
 

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,20 +1,24 @@
 # 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
-
-			apt_cache_policy.installed?
+			if versioned?
+				apt_cache_policy.installed_version == dep_version
+			else
+				apt_cache_policy.installed?
+			end
 		end
 
 		def meet
-			execute("#{sudo_string}apt-get install -y #{name}")
+			if versioned?
+				execute("#{sudo_string}apt-get install -y #{dep_name}=#{dep_version}")
+			else
+				execute("#{sudo_string}apt-get install -y #{name}")
+			end
 		end
 
 		def unmeet
@@ -23,25 +27,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.1'
+	s.version = '0.14.2'
 	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.1
+  version: 0.14.2
 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