Moved the CLI options to their own module and pass them into execute …

…instead of setting an instance variable

lib/kaiser.rb

@@ -2,6 +2,7 @@
 
 require 'kaiser/version'
 require 'kaiser/kaiserfile'
+require 'kaiser/cli_options'
 require 'kaiser/cli'
 require 'kaiser/after_dotter'
 require 'kaiser/dotter'

lib/kaiser/cli.rb

@@ -5,20 +5,7 @@
 module Kaiser
   # The commandline
   class Cli
-    @options = []
-
-    class << self
-      def option(*option)
-        @options ||= []
-        @options << option
-      end
-
-      def options
-        @options || []
-      end
-    end
-
-    attr_reader :opts
+    extend Kaiser::CliOptions
 
     def set_config
       # This is here for backwards compatibility since it can be used in Kaiserfiles.
@@ -44,7 +31,7 @@ def define_options(global_opts = [])
       # the scope to Optimist::Parser. We can still reference variables but we can't
       # call instance methods of a Kaiser::Cli class.
       u = usage
-      @opts = Optimist.options do
+      Optimist.options do
         banner u
 
         global_opts.each { |o| opt *o }
@@ -86,7 +73,7 @@ def self.run_command(name, global_opts)
       )
       cmd.set_config
 
-      cmd.execute
+      cmd.execute(opts)
     end
 
     def self.all_subcommands_usage

lib/kaiser/cli_options.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Kaiser
+  module CliOptions
+    def option(*option)
+      @options ||= []
+      @options << option
+    end
+
+    def options
+      @options || []
+    end
+  end
+end

lib/kaiser/cmds/attach.rb

@@ -13,7 +13,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         attach_app
         start_app

lib/kaiser/cmds/db_load.rb

@@ -19,7 +19,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         name = ARGV.shift || '.default'
         load_db(name)

lib/kaiser/cmds/db_reset.rb

@@ -13,7 +13,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         load_db('.default')
       end

lib/kaiser/cmds/db_reset_hard.rb

@@ -11,7 +11,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         FileUtils.rm db_image_path('.default') if File.exist?(db_image_path('.default'))
         setup_db

lib/kaiser/cmds/db_save.rb

@@ -16,7 +16,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         name = ARGV.shift || '.default'
         save_db(name)

lib/kaiser/cmds/deinit.rb

@@ -11,7 +11,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         down
         Config.config[:envs].delete(envname)
         Config.config[:envnames].delete(Config.work_dir)

lib/kaiser/cmds/down.rb

@@ -11,7 +11,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         down
       end
     end

lib/kaiser/cmds/init.rb

@@ -12,7 +12,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         return Optimist.die "Already initialized as #{envname}" if envname
 
         name = ARGV.shift

lib/kaiser/cmds/login.rb

@@ -11,7 +11,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         cmd = (ARGV || []).join(' ')
         exec "docker exec -ti #{app_container_name} #{cmd}"

lib/kaiser/cmds/logs.rb

@@ -11,7 +11,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         exec "docker logs -f #{app_container_name}"
       end
     end

lib/kaiser/cmds/set.rb

@@ -21,7 +21,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         cmd = ARGV.shift
         if cmd == 'cert-url'
           Config.config[:cert_source] = {

lib/kaiser/cmds/show.rb

@@ -13,7 +13,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         cmd = ARGV.shift
         valid_cmds = 'ports cert-source http-suffix'

lib/kaiser/cmds/shutdown.rb

@@ -13,7 +13,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         Config.config[:shared_names].each do |_, container_name|
           killrm container_name
         end

lib/kaiser/cmds/up.rb

@@ -15,7 +15,7 @@ def usage
         EOS
       end
 
-      def execute
+      def execute(opts)
         ensure_setup
         setup_app
         setup_db