morpheus-cli 3.3.2.2 → 3.3.2.3

data/lib/morpheus/formatters.rb

@@ -104,9 +104,9 @@ def format_human_duration(seconds)
   #seconds = seconds.round
   days, hours, minutes = (seconds / (60*60*24)).floor, (seconds / (60*60)).floor, (seconds / (60)).floor
   if days > 365
-    out << "#{days.floor} days (more than a year!!)"
+    out << "#{days.floor} days (over a year)"
   elsif days > 61
-    out << "#{days.floor} days (months!)"
+    out << "#{days.floor} days (many months)"
   elsif days > 31
     out << "#{days.floor} days (over a month)"
   elsif days > 0

data/lib/morpheus/terminal.rb

@@ -90,16 +90,15 @@ module Morpheus
     end
 
     attr_accessor :prompt #, :angry_prompt
-    attr_reader :stdin, :stdout, :stderr, :homedir
+    attr_reader :stdin, :stdout, :stderr, :home_directory
 
 
+    # Create a new instance of Morpheus::Terminal
     # @param stdin  [IO] Default is STDIN
     # @param stdout [IO] Default is STDOUT
     # @param stderr [IO] Default is STDERR
     # @param [IO] stderr
     # @stderr = stderr
-    # @homedir = homedir
-    # instead, setup global stuff for now...
     def initialize(stdin=STDIN,stdout=STDOUT, stderr=STDERR, homedir=nil)
       # todo: establish config context for executing commands, 
     #       so you can run them in parallel within the same process
@@ -114,8 +113,8 @@ module Morpheus
       set_stderr(stderr)
       
       # establish home directory
-      @homedir = homedir || ENV['MORPHEUS_CLI_HOME'] || File.join(Dir.home, ".morpheus")
-      Morpheus::Cli.home_directory = @homedir
+      use_homedir = homedir || ENV['MORPHEUS_CLI_HOME'] || File.join(Dir.home, ".morpheus")
+      set_home_directory(use_homedir)
       
       # use colors by default
       set_coloring(STDOUT.isatty)
@@ -175,6 +174,20 @@ module Morpheus
       @stderr
     end
 
+    def set_home_directory(homedir)
+      full_homedir = File.expand_path(homedir)
+      # if !Dir.exists?(full_homedir)
+      #   print_red_alert "Directory not found: #{full_homedir}"
+      #   exit 1
+      # end
+      @home_directory = full_homedir
+      
+      # todo: deprecate this
+      Morpheus::Cli.home_directory = full_homedir
+
+      @home_directory
+    end
+
     # def coloring=(v)
     #   set_coloring(enabled)
     # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.3.2.2
+  version: 3.3.2.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,6 +226,8 @@ files:
 - lib/morpheus/cli/deploys.rb
 - lib/morpheus/cli/dot_file.rb
 - lib/morpheus/cli/echo_command.rb
+- lib/morpheus/cli/edit_profile_command.rb
+- lib/morpheus/cli/edit_rc_command.rb
 - lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb