Switch to require_all for code loading. (#182)

acquia · Nov 26, 2016 · 97eca02 · 97eca02
1 parent aa5d421
commit 97eca02
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 95 deletions.
diff --git a/lib/moonshot.rb b/lib/moonshot.rb
@@ -24,54 +24,6 @@ module Plugins
   end
 end
 
-[
-  # Helpers
-  'creds_helper',
-  'doctor_helper',
-  'resources',
-  'resources_helper',
-
-  # Core
-  'account_context',
-  'interactive_logger_proxy',
-  'command_line',
-  'command',
-  'ssh_command',
-  'commands/build',
-  'commands/console',
-  'commands/create',
-  'commands/delete',
-  'commands/deploy',
-  'commands/doctor',
-  'commands/list',
-  'commands/push',
-  'commands/ssh',
-  'commands/status',
-  'commands/update',
-  'commands/version',
-  'controller',
-  'controller_config',
-  'stack',
-  'stack_config',
-  'stack_lister',
-  'stack_events_poller',
-  'ask_user_source',
-  'always_use_default_source',
-
-  # Built-in mechanisms
-  'artifact_repository/s3_bucket',
-  'artifact_repository/s3_bucket_via_github_releases',
-  'build_mechanism/script',
-  'build_mechanism/github_release',
-  'build_mechanism/travis_deploy',
-  'build_mechanism/version_proxy',
-  'deployment_mechanism/code_deploy',
-
-  # Core Tools
-  'tools/asg_rollout'
-].each { |f| require_relative "moonshot/#{f}" }
-
-# Bundled plugins
-[
-  'backup'
-].each { |p| require_relative "plugins/#{p}" }
+require 'require_all'
+require_rel 'moonshot'
+require_rel 'plugins'
diff --git a/lib/moonshot/command_line.rb b/lib/moonshot/command_line.rb
@@ -1,6 +1,3 @@
-require 'thor'
-require_relative 'command_line_dispatcher'
-
 module Moonshot
   # This class implements the command-line `moonshot` tool.
   class CommandLine
@@ -132,7 +129,6 @@ def handle_early_commands
         ARGV.delete_at(0)
         ARGV.push('-h')
       elsif ARGV[0] == 'new'
-        require_relative 'commands/new'
         app_name = ARGV[1]
         ::Moonshot::Commands::New.run!(app_name)
         return true

diff --git a/lib/moonshot/commands/create.rb b/lib/moonshot/commands/create.rb
@@ -1,5 +1,3 @@
-require_relative 'parameter_arguments'
-
 module Moonshot
   module Commands
     class Create < Moonshot::Command

diff --git a/lib/moonshot/commands/list.rb b/lib/moonshot/commands/list.rb
@@ -1,6 +1,3 @@
-require_relative '../stack_lister'
-require_relative '../stack_list_printer'
-
 module Moonshot
   module Commands
     class List < Moonshot::Command

diff --git a/lib/moonshot/commands/update.rb b/lib/moonshot/commands/update.rb
@@ -1,5 +1,3 @@
-require_relative 'parameter_arguments'
-
 module Moonshot
   module Commands
     class Update < Moonshot::Command

diff --git a/lib/moonshot/controller.rb b/lib/moonshot/controller.rb
@@ -1,10 +1,3 @@
-require_relative 'ssh_target_selector'
-require_relative 'ssh_command_builder'
-
-require_relative 'stack_parameter'
-require_relative 'parameter_collection'
-require_relative 'parent_stack_parameter_loader'
-
 module Moonshot
   # The Controller coordinates and performs all Moonshot actions.
   class Controller # rubocop:disable ClassLength

diff --git a/lib/moonshot/controller_config.rb b/lib/moonshot/controller_config.rb
@@ -1,7 +1,3 @@
-require_relative 'ssh_config'
-require_relative 'task'
-require_relative 'ask_user_source'
-
 module Moonshot
   # Holds configuration for Moonshot::Controller
   class ControllerConfig

diff --git a/lib/moonshot/json_stack_template.rb b/lib/moonshot/json_stack_template.rb
@@ -1,5 +1,4 @@
 require 'json'
-require_relative 'stack_template'
 
 module Moonshot
   # Handles JSON formatted AWS template files.

diff --git a/lib/moonshot/stack.rb b/lib/moonshot/stack.rb
@@ -1,13 +1,3 @@
-require_relative 'creds_helper'
-require_relative 'doctor_helper'
-
-require_relative 'yaml_stack_template'
-require_relative 'json_stack_template'
-require_relative 'stack_parameter_printer'
-require_relative 'stack_output_printer'
-require_relative 'stack_asg_printer'
-require_relative 'unicode_table'
-require_relative 'change_set'
 require 'yaml'
 
 module Moonshot

diff --git a/lib/moonshot/stack_template.rb b/lib/moonshot/stack_template.rb
@@ -1,5 +1,3 @@
-require_relative 'stack_parameter'
-
 module Moonshot
   # A StackTemplate loads the template from disk and stores information
   # about it.

diff --git a/lib/moonshot/tools/asg_rollout.rb b/lib/moonshot/tools/asg_rollout.rb
@@ -1,7 +1,3 @@
-require_relative 'asg_rollout_config'
-require_relative 'asg_rollout/asg'
-require_relative 'asg_rollout/hook_exec_environment'
-
 module Moonshot
   module Tools
     class ASGRollout

diff --git a/lib/moonshot/tools/asg_rollout/asg.rb b/lib/moonshot/tools/asg_rollout/asg.rb
@@ -1,6 +1,3 @@
-require_relative 'asg_instance'
-require_relative 'instance_health'
-
 module Moonshot
   module Tools
     class ASGRollout

diff --git a/lib/moonshot/yaml_stack_template.rb b/lib/moonshot/yaml_stack_template.rb
@@ -1,5 +1,4 @@
 require 'yaml'
-require_relative 'stack_template'
 
 module Moonshot
   # Handles YAML formatted AWS template files.

diff --git a/lib/plugins/backup.rb b/lib/plugins/backup.rb
@@ -1,6 +1,5 @@
 require 'rubygems/package'
 require 'zlib'
-require_relative '../moonshot/creds_helper'
 
 module Moonshot
   module Plugins

diff --git a/moonshot.gemspec b/moonshot.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency('travis')
   s.add_dependency('vandamme')
   s.add_dependency('pry')
+  s.add_dependency('require_all')
 
   s.add_development_dependency('rspec')
   s.add_development_dependency('simplecov')