(maint) Clean up cli requires

Hexoplon · Sep 30, 2019 · 5563502 · 5563502
1 parent 2d038fa
commit 5563502
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/lib/pdk/cli/build.rb b/lib/pdk/cli/build.rb
@@ -1,5 +1,3 @@
-require 'pdk/cli/util'
-
 module PDK::CLI
   @build_cmd = @base_cmd.define_command do
     name 'build'
@@ -15,6 +13,7 @@ module PDK::CLI
     run do |opts, _args, _cmd|
       require 'pdk/module/build'
       require 'pdk/module/metadata'
+      require 'pdk/cli/util'
 
       # Make sure build is being run in a valid module directory with a metadata.json
       PDK::CLI::Util.ensure_in_module!(

diff --git a/lib/pdk/cli/convert.rb b/lib/pdk/cli/convert.rb
@@ -1,5 +1,3 @@
-require 'pdk/cli/util'
-
 module PDK::CLI
   @convert_cmd = @base_cmd.define_command do
     name 'convert'
@@ -16,6 +14,7 @@ module PDK::CLI
 
     run do |opts, _args, _cmd|
       require 'pdk/module/convert'
+      require 'pdk/cli/util'
 
       PDK::CLI::Util.ensure_in_module!(
         check_module_layout: true,

diff --git a/lib/pdk/cli/update.rb b/lib/pdk/cli/update.rb
@@ -1,6 +1,3 @@
-require 'pdk/cli/util'
-require 'pdk/util'
-
 module PDK::CLI
   @update_cmd = @base_cmd.define_command do
     name 'update'
@@ -13,6 +10,8 @@ module PDK::CLI
     PDK::CLI.template_ref_option(self)
 
     run do |opts, _args, _cmd|
+      require 'pdk/cli/util'
+      require 'pdk/util'
       require 'pdk/module/update'
 
       PDK::CLI::Util.ensure_in_module!(