Rename hooks to events

Author: Naatan

.gometalinter.json

@@ -0,0 +1,16 @@
+{
+    "Enable": [
+        "vet",
+        "deadcode",
+        "unconvert",
+        "golint",
+        "varcheck",
+        "goconst",
+        "gocyclo",
+        "gotype"
+    ],
+    "Exclude": [
+        "exported const",
+        "suspect or"
+    ]
+}

activestate.yaml

@@ -62,7 +62,7 @@ scripts: &scripts
       $scripts.build
       build/state --help
 commands: *scripts  # temporary alias for backwards compatibility
-hooks:
+events: &events
   - name: ACTIVATE
     value: |
       $variables.ENV
@@ -75,4 +75,5 @@ hooks:
       if ! type "swagger" &> /dev/null; then
         echo "swagger was not found on your PATH, installing .."
         go get -u github.com/go-swagger/go-swagger/cmd/swagger
-      fi
+      fi
+hooks: *events # temporary alias for backwards compatibility

internal/locale/a_locale-packr.go

@@ -71,7 +71,7 @@ type SubShell interface {
 func Activate(wg *sync.WaitGroup) (SubShell, error) {
 	logging.Debug("Activating Subshell")
 
-	// Why another check here? Because some things like hooks / run script don't take the virtualenv route,
+	// Why another check here? Because some things like events / run script don't take the virtualenv route,
 	// realistically this shouldn't really happen, but it's a useful failsafe for us
 	activeProject := os.Getenv(constants.ActivatedStateEnvVarName)
 	if activeProject != "" {
@@ -99,9 +99,9 @@ func getRcFile(v SubShell) (*os.File, error) {
 	prj := project.Get()
 
 	userScripts := ""
-	for _, hook := range prj.Hooks() {
-		if hook.Name() == "ACTIVATE" {
-			userScripts = userScripts + "\n" + hook.Value()
+	for _, event := range prj.Events() {
+		if event.Name() == "ACTIVATE" {
+			userScripts = userScripts + "\n" + event.Value()
 		}
 	}
 

internal/subshell/subshell.go

@@ -93,7 +93,7 @@ type ExpanderFunc func(name string, project *projectfile.Project) (string, *fail
 var expanderRegistry = map[string]ExpanderFunc{
 	"platform":  PlatformExpander,
 	"variables": VariableExpander,
-	"hooks":     HookExpander,
+	"events":    EventExpander,
 	"scripts":   ScriptExpander,
 }
 
@@ -154,12 +154,12 @@ func VariableExpander(name string, project *projectfile.Project) (string, *failu
 	return value, nil
 }
 
-// HookExpander expands hooks defined in the project-file.
-func HookExpander(name string, project *projectfile.Project) (string, *failures.Failure) {
+// EventExpander expands events defined in the project-file.
+func EventExpander(name string, project *projectfile.Project) (string, *failures.Failure) {
 	var value string
-	for _, hook := range project.Hooks {
-		if hook.Name == name && !constraints.IsConstrained(hook.Constraints) {
-			value = hook.Value
+	for _, event := range project.Events {
+		if event.Name == name && !constraints.IsConstrained(event.Constraints) {
+			value = event.Value
 			break
 		}
 	}

internal/variables/variables.go

@@ -37,7 +37,7 @@ variables:
     platform: Windows
   - name: UPPERCASE
     value: foo
-hooks:
+events:
   - name: pre
     value: echo 'Hello $variables.foo!'
   - name: post
@@ -69,23 +69,23 @@ func TestExpandProjectPlatformOs(t *testing.T) {
 	}
 }
 
-func TestExpandProjectHook(t *testing.T) {
+func TestExpandProjectEvent(t *testing.T) {
 	project := loadProject(t)
 
-	expanded := ExpandFromProject("$hooks.pre", project)
+	expanded := ExpandFromProject("$events.pre", project)
 	assert.NoError(t, Failure().ToError(), "Ran without failure")
 	assert.Equal(t, "echo 'Hello bar!'", expanded, "Expanded simple variable")
 }
 
-func TestExpandProjectHookWithConstraints(t *testing.T) {
+func TestExpandProjectEventWithConstraints(t *testing.T) {
 	project := loadProject(t)
 
 	if runtime.GOOS == "linux" {
-		expanded := ExpandFromProject("$hooks.post", project)
+		expanded := ExpandFromProject("$events.post", project)
 		assert.NoError(t, Failure().ToError(), "Ran without failure")
 		assert.Equal(t, "echo 'Hello baz!'", expanded, "Expanded platform-specific variable")
 	} else if runtime.GOOS == "windows" {
-		expanded := ExpandFromProject("$hooks.post", project)
+		expanded := ExpandFromProject("$events.post", project)
 		assert.NoError(t, Failure().ToError(), "Ran without failure")
 		assert.Equal(t, "echo 'Hello quux!'", expanded, "Expanded platform-specific variable")
 	}

internal/variables/variables_test.go

@@ -4,24 +4,16 @@ state_description:
   other: The ActiveState CLI allows you to easily switch between your ActiveState environments
 activate_project:
   other: activate a project
-hook_description:
-  other: Manage Project Hooks
-hook_add_description:
-  other: 
-    >
-    add script to run on hook trigger
-hook_remove_description:
-  other: 
-    >
-    remove script for hook trigger
-hook_header_id:
+events_description:
+  other: Manage Project Events
+events_header_id:
   other: ID
-hook_header_hook:
-  other: HOOK
-hook_header_command:
-  other: COMMAND
-hook_listing_hooks:
-  other: Listing configured hooks
+events_header_event:
+  other: Event
+events_header_value:
+  other: Value
+event_listing:
+  other: Listing configured events
 usage_tpl:
   other: "
 Usage:
@@ -119,52 +111,16 @@ error_could_not_activate_venv:
   other: Could not activate the virtual environment
 warning_language_not_yet_supported:
   other: "Warning: Your project configuration includes {{.Language}}, but this language is not yet supported"
-error_could_not_run_hooks:
-  other: Could not run hooks
-info_running_hook:
-  other: "Running hook: {{.Name}}"
-hook_add_cannot_add_hook:
-  other: "Cannot add hook '{{.Hook}} {{.Script}}'"
-hook_add_cannot_add_existing_hook:
-  other: "Identical hook already configured"
-hook_remove_multiple_hooks:
-  other: "More than one configured hook for name given.  Use ID instead."
-hook_remove_cannot_remove:
-  other: "Cannot remove hook"
 error_missing_arg:
   other: "Argument missing: {{.Name}}"
-arg_hook_add_hook:
-  other: HOOK
-arg_hook_add_hook_description:
-  other: The hook that will be listened to
-error_hook_add_invalid_hook:
-  other: "Invalid hook given: {{.V0}}"
-arg_hook_add_script:
-  other: SCRIPT
-arg_hook_add_script_description:
-  other: The script that will be run
-arg_hook_remove_identifier:
-  other: IDENTIFIER
-arg_hook_remove_identifier_description:
-  other: Identifies what hook to remove, can be a hash or a hook name
-prompt_choose_hook:
-  other: Which hook do you wish to remove?
 err_no_projectfile:
   other: No activestate.yaml file exists in the current working directory
 err_parse_project:
   other: "Could not parse project file. For more info refer to the error log"
-err_hook_cannot_list:
-  other: Cannot list hooks
-err_hook_cannot_find:
-  other: Cannot find hooks matching your query
-prompt_hook_choose_remove:
-  other: Which hook would you like to remove?
-prompt_hook_option:
-  other: "{{.Hook.Name}}: `{{.Script}}` ({{.Constraints}}{{.Hash}})"
 err_invalid_input:
   other: Invalid input received
-hook_removed:
-  other: "Hook removed: {{.Hook.Name}} ({{.Hash}})"
+events_empty:
+  other: No events found for the current environment
 err_no_update_info:
   other: Cannot retrieve update information
 no_update_available:
@@ -455,8 +411,8 @@ print_state_show_url:
   other: URL
 print_state_show_platforms:
   other: Platforms
-print_state_show_hooks:
-  other: Hooks that will run
+print_state_show_events:
+  other: Events that will run
 print_state_show_scripts:
   other: Scripts
 print_state_show_languages: