Rename Krane::CLI::Krane to Krane::CLI::Commands to avoid name conflicts

Shopify · Oct 8, 2019 · d661cfc · d661cfc
1 parent cf1cb9b
commit d661cfc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/exe/krane b/exe/krane
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'krane/cli/krane'
-Krane::CLI::Krane.start(ARGV)
+require 'krane/cli/commands'
+Krane::CLI::Commands.start(ARGV)
diff --git a/lib/krane/cli/krane.rb → lib/krane/cli/commands.rb b/lib/krane/cli/krane.rb → lib/krane/cli/commands.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'krane'
 require 'thor'
 require 'krane/cli/version_command'
 require 'krane/cli/restart_command'
@@ -10,11 +9,11 @@
 
 module Krane
   module CLI
-    class Krane < Thor
+    class Commands < Thor
       TIMEOUT_EXIT_CODE = 70
       FAILURE_EXIT_CODE = 1
 
-      package_name "Krane"
+      package_name "Commands"
 
       def self.expand_options(task_options)
         task_options.each { |option_name, config| method_option(option_name, config) }

diff --git a/test/exe/deploy_test.rb b/test/exe/deploy_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 require 'krane/bindings_parser'
 
 class DeployTest < Krane::TestCase
@@ -70,7 +70,7 @@ def test_deploy_passes_filename
   end
 
   def test_deploy_fails_without_filename
-    krane = Krane::CLI::Krane.new(
+    krane = Krane::CLI::Commands.new(
       [deploy_task_config.namespace, deploy_task_config.context],
       []
     )
@@ -91,7 +91,7 @@ def set_krane_deploy_expectations(new_args: {}, run_args: {})
 
   def krane_deploy!(flags: '')
     flags += ' -f /tmp' unless flags.include?('-f')
-    krane = Krane::CLI::Krane.new(
+    krane = Krane::CLI::Commands.new(
       [deploy_task_config.namespace, deploy_task_config.context],
       flags.split
     )

diff --git a/test/exe/krane_test.rb b/test/exe/krane_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 
 class KraneTest < Krane::TestCase
   def test_help_success_as_black_box

diff --git a/test/exe/render_test.rb b/test/exe/render_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 
 class RendertTest < Krane::TestCase
   include EnvTestHelper
@@ -41,7 +41,7 @@ def install_krane_render_expectations(new_args = {})
   end
 
   def krane_render!(flags = '-f /dev/null')
-    krane = Krane::CLI::Krane.new(
+    krane = Krane::CLI::Commands.new(
       [],
       flags.split
     )

diff --git a/test/exe/restart_test.rb b/test/exe/restart_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 
 class RestartTest < Krane::TestCase
   def test_restart_with_default_options
@@ -56,7 +56,7 @@ def set_krane_restart_expectations(new_args: {}, deployments: nil, run_args: {})
   end
 
   def krane_restart!(flags: '')
-    krane = Krane::CLI::Krane.new(
+    krane = Krane::CLI::Commands.new(
       [restart_task_config.namespace, restart_task_config.context],
       flags.split
     )

diff --git a/test/exe/run_test.rb b/test/exe/run_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 
 class RunTest < Krane::TestCase
   def test_run_with_default_options
@@ -73,7 +73,7 @@ def set_krane_run_expectations(new_args: {}, run_args: {})
   end
 
   def krane_run!(flags: '')
-    krane = Krane::CLI::Krane.new(
+    krane = Krane::CLI::Commands.new(
       [run_task_config.namespace, run_task_config.context],
       flags.split
     )

diff --git a/test/exe/version_test.rb b/test/exe/version_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'test_helper'
-require 'krane/cli/krane'
+require 'krane/cli/commands'
 
 class VersionTest < Krane::TestCase
   def test_version_prints_current_version
@@ -24,6 +24,6 @@ def test_version_failure_as_black_box
   private
 
   def krane
-    Krane::CLI::Krane.new
+    Krane::CLI::Commands.new
   end
 end