ops_team 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3bc79f136cc22e2710bba983cb23d14ed332d7f9a4e14e1bf94b53f17e5a1b
-  data.tar.gz: 404cc0d081d9d1bbe4082fd4e24532322f5a1324d8063a6e6eaaea615a7a0321
+  metadata.gz: 158077a8d8c025f32b231991165c500b93000422bfc411ff88124a86dad7af05
+  data.tar.gz: db0c44533b58f0a65b9d25921b77a5eb41f1a058f8ecae444c175a635d9f455d
 SHA512:
-  metadata.gz: 1df25521312cd853043220089fed8b33b0bd3bbaa192ac3720e17528a14615ecd74ac3a17d69d3c87209f571149ef8d6d9adc4ce877cad9ef8fd0bf0b36fe0ef
-  data.tar.gz: 261a40eac02451b42d6c331bb2281647f687c04e2aafba7523d42a70bcc37e486904cf58993869452641f50d1ce07c2ea417054013c726b28cc75c6b6f6ee7f6
+  metadata.gz: a5a7026cbb1b3eee2e16128d5f1f3d36f54197327bbe5562eb28ac2c7eb74a29feb5cc743cae4f4afaef40a9e5dabc5cf4cdc17eab5dd373ed826b87e1b6744f
+  data.tar.gz: 540a77c3f21b3c015bd45300bd50c0a42b6d467607b77869b141f3a03a15399e0f3d74a59aeef8a6b6781b6538783ce874dc00d6f0811c442bc36a88923d3602

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
@@ -28,20 +26,8 @@ module Dependencies
 
 		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/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.3'
+	s.version = '0.14.0'
 	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.3
+  version: 0.14.0
 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