ops_team 0.11.0.pre2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5f98b47649c277f4c0b29228d9d9ced79c985301bde206ec9a9a1cdad1990c
-  data.tar.gz: 6a5f36ef9a54b6a31dc745922888996f2420959a1a414f95318e6374fa162cc0
+  metadata.gz: 9656333af7b4f103645f9f27af758b4cc11e749c0e9770474ec249af8db85983
+  data.tar.gz: d1a69bbc44b1626bbcd754fa8484547f2bfa3beede615d8ebcd951e00432008a
 SHA512:
-  metadata.gz: a0869b884b7c8bda06c1ae664c3a056610776326ca7a0f87adfa64c9f45f4d4deb53d5e64000ffcdd0528865153da7b0a4155a92d20c4939cd38a8224ac3aa7f
-  data.tar.gz: 444234f4870cc90c6d56233763a69973de5f6f78c92eada37324bb5da354d09ae4493a49b04f15bf09f5d471f4669595f558e9de52e7f75ee287f9b1a05964fd
+  metadata.gz: 73e177e194c2f3e7415612bd23aea779502182929fbb5264c00a1516a52869056bb045e75ff5aaca4c546b92f03481f5346eb24958f4a6ccdd247d0d3cdc06dc
+  data.tar.gz: 53c224dd9162d269c0154c842ec36d4e748dd59b401efb1a959199332e3ee99489a1de4cf88d3e2d2bff7c04a37906c687d542ac2bc4852d7fa38a0f4e0ad9c6

data/bin/ops

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

data/lib/action.rb

@@ -32,6 +32,10 @@ class Action
 		@config["description"]
 	end
 
+	def skip_hooks?(name)
+		@config["skip_#{name}_hooks"]
+	end
+
 	private
 
 	def load_secrets?

data/lib/action_list.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class ActionList
+	class UnknownActionError < StandardError; end
+
+	def initialize(actions_list, args)
+		@actions_list = actions_list
+		@args = args
+
+		process_action_list
+	end
+
+	def get(name)
+		@actions[name]
+	end
+
+	def get_by_alias(name)
+		@aliases[name]
+	end
+
+	def names
+		@actions.keys
+	end
+
+	def aliases
+		@aliases.keys
+	end
+
+	private
+
+	def process_action_list
+		@actions = {}
+		@aliases = {}
+
+		@actions_list.each do |name, config|
+			action = Action.new(config, @args)
+
+			@actions[name] = action
+			@aliases[action.alias] = action
+		end
+	end
+end

data/lib/action_suggester.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActionSuggester
+	def initialize(dictionary)
+		@dictionary = dictionary
+	end
+
+	def check(word)
+		spellchecker.correct(word)
+	end
+
+	def spellchecker
+		@spellchecker ||= DidYouMean::SpellChecker.new(dictionary: @dictionary)
+	end
+end

data/lib/builtins/version.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require "rubygems"
-
 require "output"
+require "version"
 
 module Builtins
 	class Version < Builtin
-		GEMSPEC_FILE = "#{__dir__}/../../ops_team.gemspec"
-
 		class << self
 			def description
 				"prints the version of ops that is running"
@@ -15,18 +12,7 @@ module Builtins
 		end
 
 		def run
-			unless gemspec
-				Output.error("Unable to load gemspec at '#{GEMSPEC_FILE}")
-				return false
-			end
-
-			Output.out(gemspec.version)
-		end
-
-		private
-
-		def gemspec
-			@gemspec ||= Gem::Specification.load(GEMSPEC_FILE)
+			Output.out(::Version.version)
 		end
 	end
 end

data/lib/environment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'version'
+
 class Environment
 	def initialize(env_hash)
 		@env_hash = env_hash
@@ -21,6 +23,7 @@ class Environment
 
 	def set_ops_variables
 		ENV["OPS_YML_DIR"] = Dir.pwd
+		ENV["OPS_VERSION"] = Version.version.to_s
 	end
 
 	def set_environment_aliases

data/lib/hook_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'output'
+
 class HookHandler
 	class HookConfigError < StandardError; end
 	class HookExecError < StandardError; end
@@ -22,6 +24,7 @@ class HookHandler
 
 	def execute_hooks(name)
 		hooks(name).each do |hook|
+			Output.notice("Running #{name} hook: #{hook}")
 			output, exit_code = Executor.execute(hook)
 
 			next if exit_code.zero?

data/lib/ops.rb

@@ -3,12 +3,17 @@
 
 require 'yaml'
 require 'require_all'
+require "rubygems"
 
 require 'hook_handler'
 require 'action'
 require 'output'
 require 'options'
 require 'environment'
+require 'version'
+require 'action_list'
+require 'action_suggester'
+
 require_rel "builtins"
 
 # executes commands based on local `ops.yml`
@@ -20,6 +25,7 @@ class Ops
 	INVALID_SYNTAX_EXIT_CODE = 64
 	UNKNOWN_ACTION_EXIT_CODE = 65
 	ERROR_LOADING_APP_CONFIG_EXIT_CODE = 66
+	MIN_VERSION_NOT_MET_EXIT_CODE = 67
 
 	class << self
 		def project_name
@@ -35,11 +41,14 @@ class Ops
 	end
 
 	def run
+		# "return" is here to allow specs to stub "exit" without executing everything after it
 		return exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
+		return exit(MIN_VERSION_NOT_MET_EXIT_CODE) unless min_version_met?
 
 		run_action
 	rescue UnknownActionError => e
-		Output.error("Error: #{e}")
+		Output.error(e.to_s)
+		print_did_you_mean
 		exit(UNKNOWN_ACTION_EXIT_CODE)
 	end
 
@@ -54,11 +63,37 @@ class Ops
 		end
 	end
 
+	def print_did_you_mean
+		suggestions = did_you_mean.check(@action_name)
+
+		Output.out("Did you mean '#{suggestions.join(", ")}'?") if suggestions.any?
+	end
+
+	def did_you_mean
+		ActionSuggester.new(action_list.names + action_list.aliases + builtin_names)
+	end
+
+	def min_version_met?
+		return true unless min_version
+
+		if Version.min_version_met?(min_version)
+			true
+		else
+			Output.error("ops.yml specifies minimum version of #{min_version}, but ops version is #{Version.version}")
+			false
+		end
+	end
+
+	def min_version
+		config["min_version"]
+	end
+
 	def run_action
-		do_before_run_action
+		do_before_all
 
 		return builtin.run if builtin
 
+		do_before_action
 		Output.notice("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
 	rescue AppConfig::ParsingError => e
@@ -66,10 +101,16 @@ class Ops
 		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
 	end
 
-	def do_before_run_action
+	def do_before_all
 		environment.set_variables
 		AppConfig.load
-		hook_handler.do_hooks("before")
+	end
+
+	def do_before_action
+		hook_handler.do_hooks("before") unless ENV["OPS_RUNNING"] || action.skip_hooks?("before")
+
+		# this prevents before hooks from running in ops executed by ops
+		ENV["OPS_RUNNING"] = "1"
 	end
 
 	def hook_handler
@@ -83,24 +124,22 @@ class Ops
 		nil
 	end
 
+	def builtin_names
+		Builtins.constants.select { |c| Builtins.const_get(c).is_a? Class }.map(&:downcase)
+	end
+
 	def action
-		return actions[@action_name] if actions[@action_name]
-		return aliases[@action_name] if aliases[@action_name]
+		return action_list.get(@action_name) if action_list.get(@action_name)
+		return action_list.get_by_alias(@action_name) if action_list.get_by_alias(@action_name)
 
 		raise UnknownActionError, "Unknown action: #{@action_name}"
 	end
 
-	def actions
-		@actions ||= begin
-			if config["actions"]
-				config["actions"]&.transform_values do |config|
-					Action.new(config, @args)
-				end
-			else
-				# only print this error if ops.yml had something in it
-				Output.warn("'ops.yml' has no 'actions' defined.") if config.any?
-				{}
-			end
+	def action_list
+		@action_list ||= begin
+			Output.warn("'ops.yml' has no 'actions' defined.") if config.any? && config["actions"].nil?
+
+			ActionList.new(config["actions"], @args)
 		end
 	end
 
@@ -114,14 +153,6 @@ class Ops
 		end
 	end
 
-	def aliases
-		@aliases ||= begin
-			actions.each_with_object({}) do |(_name, action), alias_hash|
-				alias_hash[action.alias] = action if action.alias
-			end
-		end
-	end
-
 	def env_vars
 		@config.dig("options", "environment") || {}
 	end
@@ -129,10 +160,6 @@ class Ops
 	def environment
 		@environment ||= Environment.new(env_vars)
 	end
-
-	def app_config
-		@app_config ||= AppConfig.new
-	end
 end
 
 Ops.new(ARGV).run if $PROGRAM_NAME == __FILE__

data/lib/version.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "rubygems"
+
+class Version
+	GEMSPEC_FILE = "#{__dir__}/../ops_team.gemspec"
+
+	class << self
+		# these class methods exist because I don't want to have to call `Version.new.version` elsewhere
+		def version
+			new.send(:version)
+		end
+
+		def min_version_met?(min_version)
+			new.send(:min_version_met?, min_version)
+		end
+	end
+
+	private
+
+	# these instance methods exist so that I don't have to clear class variables between tests
+	def version
+		unless gemspec
+			Output.error("Unable to load gemspec at '#{GEMSPEC_FILE}")
+			return nil
+		end
+
+		gemspec.version
+	end
+
+	def min_version_met?(min_version)
+		Gem::Version.new(version) >= Gem::Version.new(min_version)
+	end
+
+	def gemspec
+		@gemspec ||= Gem::Specification.load(GEMSPEC_FILE)
+	end
+end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.11.0.pre2'
+	s.version = '0.13.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.11.0.pre2
+  version: 0.13.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -146,6 +146,8 @@ files:
 - etc/ruby.template.yml
 - etc/terraform.template.yml
 - lib/action.rb
+- lib/action_list.rb
+- lib/action_suggester.rb
 - lib/app_config.rb
 - lib/builtin.rb
 - lib/builtins/background.rb
@@ -176,6 +178,7 @@ files:
 - lib/options.rb
 - lib/output.rb
 - lib/secrets.rb
+- lib/version.rb
 - loader.rb
 - ops_team.gemspec
 homepage: https://github.com/nickthecook/ops
@@ -193,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: