morpheus-cli 5.5.2.2 → 5.5.3.1

data/lib/morpheus/cli/option_types.rb

@@ -14,12 +14,25 @@ module Morpheus
         default_value = options[:default]
         value_found = false
         while value_found == false do
+          # if default_value.nil?
+          #   print "#{message} (yes/no): "
+          # else
+          #   print "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
+          # end
+          # input = $stdin.gets.chomp!
+
+          # should use Readline.readline to probably
+          Readline.completion_append_character = ""
+          Readline.basic_word_break_characters = ''
+          Readline.completion_proc = nil
           if default_value.nil?
-            print "#{message} (yes/no): "
+            confirm_prompt = "#{message} (yes/no): "
           else
-            print "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
+            confirm_prompt = "#{message} (yes/no) [#{!!default_value ? 'yes' : 'no'}]: "
           end
-          input = $stdin.gets.chomp!
+          input = Readline.readline(confirm_prompt, false).to_s
+          input = input.chomp.strip
+
           if input.empty? && !default_value.nil?
             return !!default_value
           end
@@ -86,6 +99,25 @@ module Morpheus
           context_map = results
           value = nil
           value_found = false
+
+          # allow for mapping of domain to relevant type: domain.zone => router.zone
+          option_type['fieldContext'] = (options[:context_map] || {})[option_type['fieldContext']] || option_type['fieldContext']
+          field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
+          help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
+          namespaces = field_key.split(".")
+          field_name = namespaces.pop
+
+
+          # support --no-options --skip-option x,y,z --only-option x,y,z
+          if options[:no_options]
+            next
+          elsif options[:skip_options] && options[:skip_options].find {|it| it.to_s.downcase == option_type['fieldName'].to_s.downcase || it.to_s.downcase == option_type['fieldLabel'].to_s.downcase }
+            next
+          elsif options[:only_options] && !options[:only_options].find {|it| it.to_s.downcase == option_type['fieldName'].to_s.downcase || it.to_s.downcase == option_type['fieldLabel'].to_s.downcase }
+            next
+          end            
+          
+
           field_group = (option_type['fieldGroup'] || 'default').to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
 
           if cur_field_group != field_group
@@ -105,12 +137,6 @@ module Morpheus
           #   end
           # end
 
-          # allow for mapping of domain to relevant type: domain.zone => router.zone
-          option_type['fieldContext'] = (options[:context_map] || {})[option_type['fieldContext']] || option_type['fieldContext']
-          field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
-          help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key
-          namespaces = field_key.split(".")
-          field_name = namespaces.pop
 
           # respect optionType.dependsOnCode
           # i guess this switched to visibleOnCode, respect one or the other
@@ -612,6 +638,7 @@ module Morpheus
         end
 
         while !value_found do
+          #Readline.input = $stdin
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
           Readline.completion_proc = proc {|s| 
@@ -703,6 +730,7 @@ module Morpheus
           elsif no_prompt
             input = default_value
           else
+            #Readline.input = $stdin
             Readline.completion_append_character = ""
             Readline.basic_word_break_characters = ''
             Readline.completion_proc = proc {|s| 
@@ -970,8 +998,26 @@ module Morpheus
       def self.password_prompt(option_type)
         value_found = false
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
-          input = $stdin.noecho(&:gets).chomp!
+          # readline is still echoing secret with 'NUL:'' so just use $stdin on windows for now
+          if Morpheus::Cli.windows?
+            print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
+            input = $stdin.noecho(&:gets).chomp!
+          else
+            Readline.completion_append_character = ""
+            Readline.basic_word_break_characters = ''
+            Readline.completion_proc = nil
+            # needs to work like $stdin.noecho
+            Readline.pre_input_hook = lambda {
+              Readline.output = File.open('/dev/null', 'w')
+              #Readline.output = File.open(Morpheus::Cli.windows? ? 'NUL:' : '/dev/null', 'w')
+              #$stdout = File.open(Morpheus::Cli.windows? ? 'NUL:' : '/dev/null', 'w')
+            }
+            password_prompt = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
+            input = Readline.readline(password_prompt, false).to_s.chomp
+            Readline.pre_input_hook = nil
+            Readline.output = Morpheus::Terminal.instance.stdout #my_terminal.stdout
+          end
+
           value = input
           print "\n"
           if input == '?'
@@ -991,6 +1037,7 @@ module Morpheus
         value = nil
         while !value_found do
           #print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          #Readline.input = $stdin
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
           Readline.completion_proc = proc {|s| Readline::FILENAME_COMPLETION_PROC.call(s) }
@@ -1005,7 +1052,7 @@ module Morpheus
             value_found = true
           elsif value
             filename = File.expand_path(value)
-            if !File.exists?(filename)
+            if !File.exist?(filename)
               # print_red_alert "File not found: #{filename}"
               # exit 1
               print Term::ANSIColor.red,"  File not found: #{filename}",Term::ANSIColor.reset, "\n"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.2.2"
+    VERSION = "5.5.3.1"
   end
 end

data/lib/morpheus/cli.rb

@@ -36,38 +36,48 @@ module Morpheus
       begin
         require 'rbconfig'
         @@is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-      rescue => ex
+      rescue
         # $stderr.puts "unable to determine if this is a Windows machine."
       end
       return @@is_windows
     end
 
-    # load all the well known commands and utilties they need
+    # load! does the initial loading of all the CLI utilities and commands
     def self.load!()
-      # load interfaces
-      require 'morpheus/api/api_client.rb'
-      require 'morpheus/api/rest_interface.rb'
-      require 'morpheus/api/read_interface.rb'
-      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| load file }
-
-      # load mixins
-      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| load file }
+      
+      # api interfaces
+      require 'morpheus/api'
+      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each { |file| require file }
 
-      # load utilites
+      # utilites
+      # Dir[File.dirname(__FILE__)  + "/cli/*.rb"].each { |file| require file }
       require 'morpheus/cli/cli_registry.rb'
       require 'morpheus/cli/expression_parser.rb'
       require 'morpheus/cli/dot_file.rb'
       require 'morpheus/cli/errors'
+      require 'morpheus/cli/cli_command.rb'
+      require 'morpheus/cli/option_types.rb'
+      require 'morpheus/cli/credentials.rb'
 
-      load 'morpheus/cli/cli_command.rb'
-      load 'morpheus/cli/option_types.rb'
-      load 'morpheus/cli/credentials.rb'
+      # mixins
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| require file }
       
-      # load all commands
-      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
+      # commands
+      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| require file }
 
     end
 
+    # reload! can be used for live reloading changes while developing
+    def self.reload!()
+      # api interfaces
+      Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each { |file| load file }
+      # mixins
+      Dir[File.dirname(__FILE__)  + "/cli/mixins/**/*.rb"].each {|file| load file }
+      # commands
+      Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
+    end
+
+    # require all CLI modules now (on require)
     load!
     
   end

data/lib/morpheus/ext/rest_client.rb

@@ -5,6 +5,7 @@ require 'rest-client'
 module RestClient  
   class Request
 
+    alias_method :original_log_request, :log_request
     def log_request
       begin
         return unless RestClient.log
@@ -14,10 +15,10 @@ module RestClient
         out << payload.short_inspect if payload
         out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
         RestClient.log << out.join(', ') + "\n"
-      rescue => ex
+      rescue
         # something went wrong, wrong gem version maybe...above is from rest-client 2.0.2
         # do it the old way
-        super
+        original_log_request()
       end
     end
 =begin

data/lib/morpheus/ext/string.rb

@@ -1,16 +1,17 @@
 class String
   
   def pluralize
+    # hacky version of this until we want to depend on ActiveSupport
     value = self.dup
     if value == ""
       value
     elsif value[-1].chr == "y"
       value[0..-2] + "ies"
     elsif value[-1].chr == "s"
-      if value[-2..-1] == "es"
-        value
-      else
+      if value[-2..-1] == "ss"
         value + "es"
+      else
+        value
       end
     else
       value + "s"
@@ -18,13 +19,14 @@ class String
   end
 
   def singularize
+    # hacky version of this until we want to depend on ActiveSupport
     value = self.dup
     if value == ""
       value
     elsif value.size > 3 && value[-3..-1] == "ies"
       value[0..-4] + "y"
     elsif value.size > 2 && value[-3..-1] == "ses"
-      value[0..-3]
+      value[0..-2]
     elsif value[-1] == "s"
       value[0..-2]
     else

data/lib/morpheus/formatters.rb

@@ -355,7 +355,7 @@ def format_bytes_short(bytes)
 end
 
 def no_colors(str)
-  str.to_s.gsub /\e\[\d+m/, ""
+  str.to_s.gsub(/\e\[\d+m/, "")
 end
 
 

data/lib/morpheus/logging.rb

@@ -85,18 +85,18 @@ module Morpheus::Logging
       msg = msg.clone
       # looks for RestClient format (hash.inspect) and request/curl output name: value
       msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/i, 'Authorization"=>"Bearer ************')
-      msg.gsub!(/Authorization\:\s?Bearer [^"'']+/i, 'Authorization: Bearer ************')
+      msg.gsub!(/Authorization\:\s?Bearer [^"']+/i, 'Authorization: Bearer ************')
       # msg.gsub!(/#{AUTHORIZATION_HEADER}\"\s?\=\>\s?\"Bearer [^"]+/, "#{AUTHORIZATION_HEADER}"=>"Bearer ************")
-      # msg.gsub!(/#{AUTHORIZATION_HEADER}\:\s?Bearer [^"'']+/, "#{AUTHORIZATION_HEADER}: Bearer ************")
+      # msg.gsub!(/#{AUTHORIZATION_HEADER}\:\s?Bearer [^"']+/, "#{AUTHORIZATION_HEADER}: Bearer ************")
       SECRET_TOKEN_HEADERS.each do |header|
         msg.gsub!(/#{header}\"\s?\=\>\s?\"[^"]+/, "#{header}\"=>\"************")
-        msg.gsub!(/#{header}\:\s?[^"'']+/, "#{header}: ************")
+        msg.gsub!(/#{header}\:\s?[^"']+/, "#{header}: ************")
       end
       msg.gsub!(/password\"\: "[^"]+/, 'password": "************') # json properties ending with password
       msg.gsub!(/Password\"\: "[^"]+/, 'Password": "************') # json properties ending with Password
       msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/i, 'password"=>"************')
       msg.gsub!(/password\=\"[^"]+/i, 'password="************')
-      msg.gsub!(/password\=[^"'&\Z]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/password\=[^"'&]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation="************')
       msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation=************')
     end

data/lib/morpheus/morpkg.rb

@@ -9,7 +9,7 @@ module Morpheus
     def self.parse_package_manifest(source_directory)
       source_directory = File.expand_path(source_directory)
       manifest_filename = File.join(source_directory, "package-manifest.json")
-      if !File.exists?(manifest_filename)
+      if !File.exist?(manifest_filename)
         raise "Package manifest file not found: #{manifest_filename}"
       end
       manifest = JSON.parse(File.read(manifest_filename))
@@ -46,10 +46,10 @@ module Morpheus
       elsif File.directory?(outfile)
         outfile = File.join(outfile, "#{code}-#{version}.morpkg")
       end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         raise "Invalid package target. #{outfile} is the name of an existing directory."
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # don't delete, just overwrite.
           # File.delete(outfile)
@@ -58,7 +58,7 @@ module Morpheus
         end
       end
       # build directories if needed
-      if !Dir.exists?(File.dirname(outfile))
+      if !Dir.exist?(File.dirname(outfile))
         Dir.mkdir(File.dirname(outfile))
       end
 

data/lib/morpheus/rest_client.rb

@@ -8,11 +8,11 @@ module Morpheus
     class << self
 
       def user_agent
-        if !@user_agent
+        if !defined?(@user_agent) || @user_agent.nil?
           begin
             @user_agent = "morpheus-cli #{Morpheus::Cli::VERSION}"
             @user_agent = "#{@user_agent} (#{::RestClient::Platform.architecture}) #{::RestClient::Platform.ruby_agent_version}"
-          rescue => e
+          rescue
           end
         end
         return @user_agent

data/lib/morpheus/routes.rb

@@ -123,8 +123,8 @@ module Morpheus::Routes
     admin: {
       accounts: {}, # Tenants
       :'service-plans' => [
-        "#prices",
-        "#pricesets"
+        "#!prices",
+        "#!pricesets"
       ],
       roles: {},
       users: {},
@@ -132,7 +132,19 @@ module Morpheus::Routes
       integrations: {},
       policies: {},
       health: ["logs"],
-      settings: {},
+      settings: [
+        "#!appliance",
+        "#!whitelabel",
+        "provisioning",
+        "monitoring",
+        "backups",
+        "logs",
+        "#!guidance",
+        "environments",
+        "software-licenses",
+        "#!license",
+        "#!utilities"
+      ],
     },
     :'user-settings' => {}, # User Settings (Profile)
   } unless defined?(SITE_MAP)
@@ -161,14 +173,34 @@ module Morpheus::Routes
       # find the one with smallest match index
 
       # map well known aliases
-      case(path.underscore.singularize)
-      when "server","host","vm","virtual-machine"
+      case(path.dasherize.pluralize)
+      when "servers","hosts","vms","virtual-machines"
         # actually should be "/infrastructure/inventory" unless id is passed, show route uses /servers though
         path = "/infrastructure/servers"
-      when "compute"
+      when "computes", "inventories"
         path = "/infrastructure/inventory"
-      when "tenant"
+      when "tenants"
         path = "/admin/accounts"
+      when "appliance-settings"
+        path = "/admin/settings/#!appliance"
+      when "whitelabel-settings"
+        path = "/admin/settings/#!whitelabel"
+      when "provisioning-settings"
+        path = "/admin/settings/#!provisioning"
+      when "monitoring-settings","monitor-settings"
+        path = "/admin/settings/monitoring"
+      when "backup-settings"
+        path = "/admin/settings/backups"
+      when "log-settings"
+        path = "/admin/settings/logs"
+      when "guidance-settings"
+        path = "/admin/settings/#!guidance"
+      when "environments"
+        path = "/admin/settings/environments"
+      when "software-licenses"
+        path = "/admin/settings/software-licenses"
+      when "license"
+        path = "/admin/settings/#!license"
       end
       # dasherize path and attempt to match the plural first
       plural_path = path.pluralize
@@ -178,7 +210,7 @@ module Morpheus::Routes
       end
 
       best_route = nil
-      best_index = nil
+      #best_index = nil
       best_prefix_words = nil
       paths.each do |p|
         if best_route.nil?
@@ -190,7 +222,7 @@ module Morpheus::Routes
               #if best_index.nil? || match_index < best_index
               if best_prefix_words.nil? || prefix_words.size < best_prefix_words.size
                 best_route = it
-                best_index = match_index
+                #best_index = match_index
                 best_prefix_words = prefix_words
               end
             end

data/lib/morpheus/terminal.rb

@@ -1,4 +1,4 @@
-require 'morpheus/cli'
+#require 'morpheus/cli' #todo: remove circular require...
 require 'morpheus/benchmarking'
 require 'morpheus/logging'
 require 'morpheus/rest_client'
@@ -7,6 +7,7 @@ require 'morpheus/cli/dot_file'
 require 'morpheus/cli/error_handler'
 require 'morpheus/cli/expression_parser'
 require 'morpheus/cli/option_parser'
+require 'morpheus/cli/version'
 require 'term/ansicolor'
 
 module Morpheus
@@ -41,7 +42,13 @@ module Morpheus
     include Morpheus::Benchmarking::HasBenchmarking
     # todo: this can be combined with Cli::Shell
 
-    class Blackhole # < IO
+    class Blackhole # < File
+
+      def initialize(*args)
+        # we shouldn't actually need a File tho.. but Readline wants one
+        # File.open(Morpheus::Cli.windows? ? 'NUL:' : '/dev/null', 'w')
+      end
+
       def accrete_data(*mgs)
         # Singularity.push(*msgs)
         return nil
@@ -61,7 +68,7 @@ module Morpheus
     end
 
     def self.prompt
-      if @prompt.nil?
+      if !defined?(@prompt) || @prompt.nil?
         if ENV['MORPHEUS_PS1']
           @prompt = ENV['MORPHEUS_PS1'].dup
         else
@@ -91,7 +98,7 @@ module Morpheus
     # the global Morpheus::Terminal instance
     # This should go away, but it needed for now...
     def self.instance
-      @morphterm # ||= self.new({})
+      @morphterm ||= self.new({})
     end
 
     # hack alert! This should go away, but is needed for now...
@@ -112,13 +119,13 @@ module Morpheus
     # @param stderr [IO] Default is STDERR
     # @param [IO] stderr
     # @stderr = stderr
-    def initialize(stdin=STDIN,stdout=STDOUT, stderr=STDERR, homedir=nil)
+    def initialize(stdin=$stdin,stdout=$stdout, stderr=$stderr, homedir=nil)
       attrs = {}
       if stdin.is_a?(Hash)
         attrs = stdin.clone()
-        stdin = attrs[:stdin] || STDIN
-        stdout = attrs[:stdout] || STDOUT
-        stderr = attrs[:stderr] || STDERR
+        stdin = attrs[:stdin] || $stdin
+        stdout = attrs[:stdout] || $stdout
+        stderr = attrs[:stderr] || $stderr
         homedir = attrs[:homedir] || attrs[:home] || attrs[:home_directory]
       end
       # establish IO
@@ -132,12 +139,12 @@ module Morpheus
       set_home_directory(use_homedir)
       
       # use colors by default
-      set_coloring(STDOUT.isatty)
+      set_coloring($stdout.isatty) #rescue nil
       # Term::ANSIColor::coloring = STDOUT.isatty
       # @coloring = Term::ANSIColor::coloring?
 
       # startup script
-      if File.exists? Morpheus::Cli::DotFile.morpheus_profile_filename
+      if File.exist? Morpheus::Cli::DotFile.morpheus_profile_filename
         @profile_dot_file = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
       else
         @profile_dot_file = nil
@@ -197,13 +204,52 @@ module Morpheus
       @stderr
     end
 
+    def with_pipes(opts, &block)
+      originals = {} #{stdout: stdout, stderr: stderr, stdin: stdin}
+      if opts[:stdout]
+        originals[:stdout] = stdout
+        set_stdout(opts[:stdout])
+      end
+      if opts[:stderr]
+        originals[:stderr] = stderr
+        set_stderr(opts[:stderr])
+      end
+      if opts[:stdin]
+        originals[:stdin] = stdin
+        set_stdin(opts[:stdin])
+      end
+      begin
+        yield
+      ensure
+        set_stdout(originals[:stdout]) if originals[:stdout]
+        set_stderr(originals[:stderr]) if originals[:stderr]
+        set_stdin(originals[:stdin]) if originals[:stdin]
+      end
+    end
+
+    def with_stdout(io, &block)
+      with_pipes(stdout:io, &block)
+    end
+
+    def with_stderr(io, &block)
+      with_pipes(stderr:io, &block)
+    end
+
+    def with_stdout_and_stderr(io, &block)
+      with_pipes(stdout:io, stderr:io, &block)
+    end
+
+    def with_stdin(io, &block)
+      with_pipes(stdin:io, &block)
+    end
+
     def home_directory=(homedir)
       set_home_directory(homedir)
     end
 
     def set_home_directory(homedir)
       full_homedir = File.expand_path(homedir)
-      # if !Dir.exists?(full_homedir)
+      # if !Dir.exist?(full_homedir)
       #   print_red_alert "Directory not found: #{full_homedir}"
       #   exit 1
       # end
@@ -293,7 +339,7 @@ module Morpheus
       # out << "Options:\n"
       out << optparse.to_s
       out << "\n"
-      out << "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+      out << "For more information, see https://clidocs.morpheusdata.com"
       out << "\n"
       out
     end
@@ -330,6 +376,10 @@ module Morpheus
     #   $stdin.gets(*args)
     # end
 
+    def readline(*args)
+      # todo: one prompt to rule them all
+    end
+
 # protected
 
     def execute(input)
@@ -397,7 +447,7 @@ module Morpheus
           set_home_directory(@use_home_directory)
           # re-initialize some variables
           # startup script
-          if File.exists? Morpheus::Cli::DotFile.morpheus_profile_filename
+          if File.exist? Morpheus::Cli::DotFile.morpheus_profile_filename
             @profile_dot_file = Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename)
           else
             @profile_dot_file = nil
@@ -414,7 +464,7 @@ module Morpheus
 
         
         if @profile_dot_file && !@profile_dot_file_has_run
-          if !noprofile && File.exists?(@profile_dot_file.filename)
+          if !noprofile && File.exist?(@profile_dot_file.filename)
             execute_profile_script()
           end
         end
@@ -466,14 +516,13 @@ module Morpheus
           #   return 127, nil
           # end
 
-          if @benchmarking || args.include?('-B') || args.include?('--benchmark')
+          if (defined?(@benchmarking) && @benchmarking) || args.include?('-B') || args.include?('--benchmark')
             benchmark_name = "morpheus #{formatted_cmd}"
             benchmark_name.sub!(' -B', '')
             benchmark_name.sub!(' --benchmark', '')
             #benchmark_name << " -B"
             start_benchmark(benchmark_name)
           end
-
           # shell is a Singleton command class
           if args[0] == "shell"
             require 'morpheus/cli/commands/shell'

data/lib/morpheus.rb

@@ -1,5 +1,5 @@
 # This provides the command: require 'morpheus'
-# This is really the same as just morpheus/api right now.
+# This is really the same as just morpheus/cli right now.
 # require 'morpheus/api'
 
 require 'morpheus/cli'

data/morpheus-cli.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "http"
   spec.add_dependency "rubyzip"
   spec.add_dependency "money"
+  spec.add_dependency "test-unit"
 end