morpheus-cli 5.5.2.1 → 5.5.3

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

@@ -178,7 +178,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 +190,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

data/test/api/containers_interface_test.rb

@@ -0,0 +1,68 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::ContainersInterface
+class MorpheusTest::ContainersInterfaceTest < MorpheusTest::TestCase
+
+  include MorpheusTest::TestDataHelper  
+
+  def setup()
+    super
+    #load_container_test_data()
+  end
+
+  def test_get
+    container_id = find_first_container_id()
+    response = client.containers.get(container_id)
+    assert response['container'].is_a?(Hash)
+    assert_equal response['container']['id'], container_id
+  end
+
+  # todo: need to wait and refresh status for this to work well
+  
+=begin  
+  def test_stop
+    response = client.containers.stop(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_start
+    response = client.containers.start(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_restart
+    response = client.containers.restart(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_suspend
+    response = client.containers.suspend(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_eject
+    response = client.containers.eject(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_available_actions
+    response = client.containers.available_actions(@id)
+    assert response['actions'].is_a?(Array)
+  end
+
+  def test_action
+    response = client.containers.action(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_import
+    response = client.containers.import(@id, {})
+    assert_equal response['success'], true
+  end
+
+  def test_clone_image
+    response = client.containers.clone_image(@id, {})
+    assert_equal response['success'], true
+  end
+=end
+end

data/test/api/doc_interface_test.rb

@@ -0,0 +1,35 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::DocInterface
+class MorpheusTest::DocInterfaceTest < MorpheusTest::TestCase
+  
+  def test_doc_list
+    @doc_interface = client.doc
+    response = @doc_interface.list()
+    assert_equal response['links'].class, Array
+  end
+
+  def test_doc_get
+    @doc_interface = client.doc
+    response = @doc_interface.openapi()
+    assert_equal response['openapi'], '3.0.3'
+    # todo: fix this, can be cached and fail
+    #assert_equal response['version'], Morpheus::Cli::Remote.load_remote(@config.remote_name)[:build_version]
+  end
+
+  def test_doc_get_yaml
+    @doc_interface = client.doc
+    response = @doc_interface.openapi({'format' => "yaml"})
+    assert response.body
+    assert YAML.load(response.body)
+  end
+
+  # def test_doc_download
+  #   @doc_interface = client.doc
+  #   response = @doc_interface.download_openapi('/path/to/openapi.json')
+  #   yaml_content = response.body
+  #   yaml_data = YAML.load(yaml_content)
+  #   assert_not_nil yaml_data
+  # end
+
+end

data/test/api/instances_interface_test.rb

@@ -0,0 +1,22 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::InstancesInterface
+class MorpheusTest::InstancesInterfaceTest < MorpheusTest::TestCase
+  
+  def test_instances_interface
+    @instances_interface = client.instances
+    response = @instances_interface.list()
+    instances = response['instances']
+    assert instances.is_a?(Array)
+    if !instances.empty?
+      response = @instances_interface.get(instances[0]['id'])
+      instance = response['instance']
+      assert instance.is_a?(Hash)
+      assert_equal instance['id'], instances[0]['id']
+    else
+      #puts "No instances found in this environment"
+    end
+    #todo: create and delete  
+  end
+
+end

data/test/api/whoami_interface_test.rb

@@ -0,0 +1,14 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::WhoamiInterface
+class MorpheusTest::WhoamiInterfaceTest < MorpheusTest::TestCase
+  
+  def test_whoami_interface
+    @whoami_interface = client.whoami
+    response = @whoami_interface.get()
+    assert_equal response['user']['username'], @config.username
+    # todo: fix this, can be cached and fail
+    #assert_equal response['appliance']['buildVersion'], Morpheus::Cli::Remote.load_remote(@config.remote_name)[:build_version]
+  end
+
+end

data/test/cli/access_token_test.rb

@@ -0,0 +1,36 @@
+require 'morpheus_test'
+
+# Tests for Morpheus::Cli::AccessTokenCommand
+class MorpheusTest::AccessTokenTest < MorpheusTest::TestCase
+  
+  def test_access_token
+    assert_execute("access-token")
+    assert_execute("access-token get")
+    assert_equal(is_logged_in(), true, "is_logged_in() should be true after access-token refresh")
+  end
+
+  def test_access_token_details
+    assert_execute("access-token details")
+  end
+
+  def test_access_token_refresh
+    previous_token = get_access_token()
+    without_authentication do 
+      login()
+      assert_execute("access-token refresh -y")
+      assert_equal(is_logged_in(), true, "is_logged_in() should be true after access-token refresh")
+      new_token = get_access_token()
+      assert_not_equal(previous_token, new_token, "Access token should have changed")
+      assert_error("login --test --token #{previous_token} ", "Old token should no longer be valid after refresh")
+      assert_execute("login --token #{new_token} ", "New token should be valid after refresh")
+    end
+  end
+
+  def test_access_token_unauthenticated
+    without_authentication do 
+      assert_error("access-token")
+      assert_error("access-token get")
+    end
+  end
+
+end

data/test/cli/auth_test.rb

@@ -0,0 +1,82 @@
+require 'morpheus_test'
+
+# Tests for login and logout
+class MorpheusTest::AuthTest < MorpheusTest::TestCase
+  
+  def requires_authentication
+    false
+  end
+
+  def test_login
+    assert_execute %(login "#{escape_arg @config.username}" "#{escape_arg @config.password_decrypted}")
+    assert is_logged_in()
+  end
+
+  def test_login_bad_credentials
+    assert_error %(login "#{escape_arg @config.username}" "invalid_password")
+    assert !is_logged_in()
+  end
+
+  def test_login_test_option
+    without_authentication do
+      assert_equal(is_logged_in(), false, "begin as logged out")
+      assert_execute(%(login --test "#{escape_arg @config.username}" "#{escape_arg @config.password_decrypted}"))
+      assert_equal(is_logged_in(), false, "should still be logged out")
+    end
+
+    with_authentication do
+      assert is_logged_in()
+      assert_error %(login --test "#{escape_arg @config.username}" "invalid_password")
+      assert is_logged_in(), "should still be logged in"
+    end
+  end
+
+  def test_logout
+    with_authentication do
+      assert_execute %(logout)
+      assert !is_logged_in()
+    end
+    without_authentication do
+      assert_execute %(logout)
+      assert !is_logged_in()
+    end
+  end
+
+  def test_login_prompt
+    with_input @config.username.to_s, @config.password_decrypted do
+      assert_execute %(login)
+    end
+    with_input @config.username.to_s, "invalid_password" do
+      assert_error %(login --test)
+    end
+    without_authentication do
+      with_input @config.username, @config.password_decrypted do
+        assert_execute %(instances list)
+      end
+    end
+  end
+
+  def test_login_adhoc
+    assert_execute %(login "#{escape_arg @config.username}" "#{escape_arg @config.password_decrypted}")
+    assert is_logged_in()
+    assert_execute %(login "#{escape_arg @config.username}" "#{escape_arg @config.password_decrypted}")
+    assert is_logged_in()
+    assert_execute("logout")
+    assert !is_logged_in()
+
+    # a bit meta, but let's test our helper methods here..
+    # login()
+    # assert_equal(is_logged_in(), true, "should be logged in")
+    # logout()
+    # assert_equal(is_logged_in(), false, "should be logged out")
+    # login_if_needed()
+    # assert_equal(is_logged_in(), true, "should be logged in")
+    # logout_if_needed()
+    # assert_equal(is_logged_in(), false, "should be logged out")
+    # logout()
+    # assert_equal(is_logged_in(), false, "should be logged out")
+    # login_if_needed()
+    # assert_equal(is_logged_in(), true, "should be logged in")
+  end
+
+end

data/test/cli/cli_test.rb

@@ -0,0 +1,48 @@
+require 'morpheus_test'
+
+# Tests for top level CLI functionality
+class MorpheusTest::CliTest < MorpheusTest::TestCase
+  
+  def requires_remote
+    false
+  end
+
+  def requires_authentication
+    false
+  end
+
+  def test_cli_no_arguments
+  	assert_error("")
+  end
+
+  def test_cli_unknown_command
+    assert_error("unknown_command")
+  end
+
+  def test_cli_unknown_subcommand
+    assert_error("instances unknown_subcommand")
+  end
+
+  def test_cli_version_option
+    assert_execute("-v")
+    assert_execute("--version")
+  end
+
+  def test_cli_nocolor
+    assert_execute("version -C")
+    assert_execute("echo -C \"disable coloring with the -C option\"")
+    # todo: fix bug here that makes this persist for all subsequent terminal commands
+    # this re-enavbles it for remainder of tests
+    # assert_execute("coloring on?")
+    assert_execute("coloring off?")
+    assert_execute("coloring")
+  end
+
+  # HelpTest handles this now..
+  # def test_help
+  #   assert_execute("help")
+  # 	assert_execute("-h")
+  # 	assert_execute("--help")
+  # end
+
+end

data/test/cli/containers_test.rb

@@ -0,0 +1,92 @@
+require 'morpheus_test'
+require 'test_data_helper'
+
+# Tests for Morpheus::Cli::Containers
+class MorpheusTest::ContainersTest < MorpheusTest::TestCase
+  
+  include MorpheusTest::TestDataHelper  
+
+  def setup()
+    super
+    #load_container_test_data()
+  end
+
+  def test_containers_get
+    id = find_first_container_id()
+    assert_execute %(containers get #{id})
+  end
+
+  # todo: need to wait and refresh status for this to work well
+  
+=begin
+  def test_containers_get_many
+    ids = find_many_container_ids().take(5)
+    assert_execute %(containers get #{ids.join(' ')})
+  end
+
+  def test_containers_stop
+    with_input ["n", "y"] do
+      assert_execute %(containers stop #{@id}), exit_code: 9
+      assert_execute %(containers stop #{@id})
+    end
+  end
+
+  def test_containers_start
+    with_input ["n", "y"] do
+      assert_execute %(containers start #{@id}), exit_code: 9
+      assert_execute %(containers start #{@id})
+    end
+  end
+
+  def test_containers_restart
+    with_input ["n", "y"] do
+      assert_execute %(containers restart #{@id}), exit_code: 9
+      assert_execute %(containers restart #{@id})
+    end
+  end
+
+  def test_containers_suspend
+    with_input ["n", "y"] do
+      assert_execute %(containers suspend #{@id}), exit_code: 9
+      assert_execute %(containers suspend #{@id})
+    end
+  end
+
+  def test_containers_eject
+    with_input ["n", "y"] do
+      assert_execute %(containers eject #{@id}), exit_code: 9
+      assert_execute %(containers eject #{@id})
+    end
+  end
+=end
+
+  def test_containers_actions
+    @id = find_first_container_id()
+    assert_execute %(containers actions #{@id})
+  end
+
+=begin
+  # do not run random actions for now
+  # def test_containers_action
+  #   #action_code = "docker-remove-node"
+  #   action = client.containers.available_actions(@id)['actions'].first
+  #   assert action.is_a?(Hash),  "Expected to find an action to run"
+  #   action_code = action['code']
+  #   assert_execute %(containers action #{@id} -a #{action_code} -y)
+  # end
+
+  def test_containers_import
+    with_input ["n", "y"] do
+      assert_execute %(containers import #{@id} -N), exit_code: 9
+      assert_execute %(containers import #{@id} -N)
+    end
+  end
+
+  def test_containers_clone_image
+    with_input ["n", "y"] do
+      assert_execute %(containers clone-image #{@id} -N), exit_code: 9
+      assert_execute %(containers clone-image #{@id} -N)
+    end
+  end
+=end
+end