dtk-client 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c80ce06a9a9d822a933c7613d0d2e608e68bf8ea
-  data.tar.gz: 516e42bae79455ea32c275236df7720ef683a4a2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2QzNTFhNjlhMWNlN2YwMmM5NGMwYzY5YTViMjQ4Y2ZkYmIwNmZjOA==
+  data.tar.gz: !binary |-
+    ZWIyZTI1NjYzYTY3MTU3NjU2MTZhY2I5YTU1N2I3NmI4OTE5OWI4ZA==
 SHA512:
-  metadata.gz: 4d4df462ad21ae5516dfcb89de0949d7c6537814365d93b44a666a099853f17521b5f20c31aa1b286293dff22bffcaabff76bdd8aba9f655fbd879b53a546bd7
-  data.tar.gz: 28cd24c15adab48e77f888ff9205954b479866d9a532d69785218c638e51d57ccc69d62517d16109e7c8eac8f8a25f090e10c2625c0c1405bd4ec26df76661e0
+  metadata.gz: !binary |-
+    ODRlMzA2ZmQxMWE3NjQxMjEwN2U5YzNjOTlhYTYxNzhhMzI3MzFlZDFhOWYz
+    NDg1ZDRjMzNlYWMwZDY0YWYyMGU5ZjBlN2Y0NjFlYWY1Y2JkYmM0M2JhZGVi
+    Y2E0MzlkM2VkYzMwOGVlMjM4YWY3NTYxZDdhOTVhZDE3MDllNzI=
+  data.tar.gz: !binary |-
+    M2E5YzEwMTFiMDI5ODdhYjQ0MTllNDg2YmJmMDM0MmMxM2JlYmI1NjA2MTc0
+    ZDRkN2M5ZGQzNzNlYzA2MjFlYTJiNGE3M2VkNGE0YmVjMGFhMDVjNTM5Y2Iw
+    MTYzNzcxNjdhOGNhYmVlZTAyYzRmYTViMmI2YmUwM2FiNDdlMDI=

data/bin/dtk-shell

@@ -11,4 +11,4 @@ config_exists = ::DTK::Client::Configurator.check_config_exists
 # check if .add_direct_access file exists, if not then add direct access and create .add_direct_access file
 resolve_direct_access(::DTK::Client::Configurator.check_direct_access, config_exists)
 
-run_shell_command()
+run_shell_command()

data/dtk-client.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "dtk-client"
   gem.require_paths = ["lib"]
-  gem.version       = "#{DtkClient::VERSION}.#{ARGV[3]}".chomp(".")
+  gem.version       = DtkClient::VERSION
 
   gem.add_dependency 'mime-types','~> 1.25'
   gem.add_dependency 'bundler','>= 1.2.4'

data/lib/command_helpers/git_repo/merge.rb

@@ -1,22 +1,24 @@
 module DTK; module Client; class CommandHelper
   class GitRepo
     class Merge
+
       def initialize(repo, remote_branch_ref, opts = {})
-        @repo = repo
+        @repo              = repo
         @remote_branch_ref = remote_branch_ref
-        @local_branch = repo.local_branch_name
+        @local_branch      = repo.local_branch_name
+        
         # options
         @opts_commit_sha = opts[:commit_sha]
         @opts_force = opts[:force]
-        @opts_merge_if_no_conflict = opts[:merge_if_no_conflict]
         @opts_ignore_dependency_merge_conflict = opts[:ignore_dependency_merge_conflict]
         @opts_full_module_name = opts[:full_module_name]
+        @opts_command = opts[:command]
       end
       
       def self.merge(repo, remote_branch_ref, opts = {})
         new(repo, remote_branch_ref, opts).merge
       end
-      
+
       def merge
         if @opts_force
           merge_force()
@@ -24,18 +26,18 @@ module DTK; module Client; class CommandHelper
           # check if merge needed
           merge_rel = merge_relationship()
           case merge_rel
-            when :equal 
-              response__no_diffs()
-            when :local_ahead, :branchpoint
-              merge_not_fast_forward(merge_rel)
-            when :local_behind
-              merge_simple()
-            else
-              raise Error.new("Unexpected merge_rel (#{merge_rel})")
+           when :equal 
+            response__no_diffs()
+           when :local_ahead, :branchpoint
+            merge_not_fast_forward(merge_rel)
+           when :local_behind
+            merge_simple()
+           else
+            raise Error.new("Unexpected merge_rel (#{merge_rel})")
           end
         end
       end
-      
+
       private
       
       def merge_force
@@ -46,31 +48,25 @@ module DTK; module Client; class CommandHelper
       end
       
       def merge_not_fast_forward(merge_rel)
-        if @opts_merge_if_no_conflict
-          if any_conflicts?
-            msg = 'Unable to do pull-dtkn merge without conflicts. Options are:'
-            msg << " a) command 'pull-dtkn --force', but all local changes will be lost or" 
-            msg << " b) use command 'edit' to get in linux shell and directly use git commands."
-            raise ErrorUsage.new(msg)
+        if any_conflicts?
+          # @opts_ignore_dependency_merge_conflict means called indirectly
+          if @opts_ignore_dependency_merge_conflict
+            # TODO: hard-wired that dependency is a component module in message: 'component-module/..
+            custom_message = "Unable to do fast-forward merge. You can go to 'component-module/#{@opts_full_module_name}' and pull with --force option but all local changes will be lost." 
+            response(compute_diffs, :custom_message => custom_message)
           else
-            if merge_rel == :local_ahead
-              response__no_diffs(:custom_message => 'No op because local module is ahead')
-            else
-              merge_simple()
-            end
+            err_msg = 'Unable to do fast-forward merge. You can use --force'
+            err_msg << " on #{@opts_command}" if @opts_command
+            err_msg <<  ', but all local changes will be lost on target that is being pushed to.'
+            raise ErrorUsage.new(err_msg)
           end
-        elsif @opts_force
-          merge_force()
-        elsif @opts_ignore_dependency_merge_conflict
-          custom_message = "Unable to do fast-forward merge. You can go to '#{@opts_full_module_name}' and pull with --force option but all changes will be lost." 
-          # TODO: should this instead by ErrorUsage.new like below
-          response(:custom_message => :custom_message)
+        elsif  merge_rel == :local_ahead
+          response__no_diffs(:custom_message => 'No op because local module is ahead')
         else
-          # this will only be reached if opts_merge_if_no_conflict is false 
-          raise ErrorUsage.new('Unable to do fast-forward merge. You can use --force on pull-dtkn, but all local changes will be lost.')
+          merge_simple()
         end
       end
-      
+
       def merge_simple
         # see if any diffs between fetched remote and local branch
         # this has be done after commit
@@ -134,6 +130,7 @@ module DTK; module Client; class CommandHelper
           nil
         end
       end
+
     end
   end
 end; end; end

data/lib/command_helpers/service_importer.rb

@@ -7,12 +7,16 @@ module DTK::Client
   #
   module ServiceImporter
     def create_missing_clone_dirs()
-      ::DTK::Client::Configurator.create_missing_clone_dirs
+      Configurator.create_missing_clone_dirs
     end
 
-    def self.error_message(name, errors)
-      #TODO: it is contingent whether solution is to fix errors using 'edit' command
-      "Module '#{name}' has errors:\n  #{errors.to_s}\nYou can fix errors in the DSL by invoking the 'edit' command.\n"
+    def self.error_message(name, errors, opts = {})
+      prefix = ''
+      unless opts[:module_type] == :service_module
+        prefix = "Module '#{name}' has errors:\n  "
+      end
+      command = opts[:command] || 'edit'
+      "#{prefix}#{errors.to_s}\nYou can fix errors by invoking the '#{command}' command.\n"
     end
 
     ##
@@ -42,7 +46,7 @@ module DTK::Client
             if opts[:do_not_raise]
               OsUtil.print("#{response.error_message}", :red)
             else
-              raise DTK::Client::DtkError, response.error_message
+              raise DtkError, response.error_message
             end
           end
         end
@@ -114,7 +118,7 @@ module DTK::Client
 
         ignore_component_error = (new_context_params.get_forwarded_options() || {})[:ignore_component_error] && module_type.eql?('component_module')
         puts(response.data(:does_not_exist) ? response.data(:does_not_exist) : 'Done.')
-        raise DTK::Client::DtkError, response.error_message if !response.ok? && !ignore_component_error
+        raise DtkError, response.error_message if !response.ok? && !ignore_component_error
       end
 
       Response::Ok.new()
@@ -161,7 +165,7 @@ module DTK::Client
 
             begin
               response = ContextRouter.routeTask("component_module", "clone", new_context_params, @conn)
-            rescue DTK::Client::DtkValidationError => e
+            rescue DtkValidationError => e
               # ignoring this
             end
             # puts "Done."
@@ -192,7 +196,7 @@ module DTK::Client
   private
 
     def full_module_name(module_hash)
-      ::DTK::Client::ModuleUtil.join_name(module_hash['name'], module_hash['namespace'])
+      ModuleUtil.join_name(module_hash['name'], module_hash['namespace'])
     end
 
   end

data/lib/commands/common/thor/assembly_workspace.rb

@@ -277,6 +277,7 @@ module DTK::Client
 
       assembly_name,service_module_id,service_module_name,version,repo_url,branch,branch_head_sha,edit_file = response.data(:assembly_name,:module_id,:full_module_name,:version,:repo_url,:workspace_branch,:branch_head_sha,:edit_file)
       edit_opts = {
+        :command => 'edit-workflow',
         :automatically_clone => true,
         :assembly_module => {
           :assembly_name => assembly_name,

data/lib/commands/common/thor/clone.rb

@@ -1,7 +1,7 @@
 dtk_require_common_commands('thor/common')
 module DTK::Client
   module CloneMixin
-    extend ::DTK::Client::Console
+    extend Console
     include CommonMixin
     ##
     #

data/lib/commands/common/thor/module.rb

@@ -167,6 +167,7 @@ module DTK::Client
       git_import = opts[:git_import]
       opts.merge!(:update_from_includes => true, :force_parse => true) unless git_import
       opts.merge!(:force => options.force?)
+      opts.merge!(:generate_docs => options.docs?)
 
       reparse_aux(module_location)
       push_clone_changes_aux(module_type.to_sym, module_id, version, options['message'] || DEFAULT_COMMIT_MSG, internal_trigger, opts)
@@ -350,7 +351,7 @@ module DTK::Client
         response = pull_from_remote_aux(module_type.to_sym, module_id, opts)
         return response unless response.ok?
 
-        push_clone_changes_aux(module_type.to_sym, module_id, version, nil, true) if File.directory?(module_location)
+        push_clone_changes_aux(module_type.to_sym, module_id, version, nil, true, {:update_from_includes => true}) if File.directory?(module_location)
         response.skip_render = true
         response
       else

data/lib/commands/common/thor/node.rb

@@ -0,0 +1,36 @@
+module DTK::Client
+  module NodeMixin
+    def get_node_info_for_ssh_login(node_id, context_params)
+      context_params.forward_options(:json_return => true)
+      response = info_aux(context_params)
+      return response unless response.ok?
+      # Should only have info about the specfic node_id
+      
+      unless node_info = response.data(:nodes).find{ |node| node_id == (node['node_properties'] || {})['node_id'] }
+        raise DtkError, "Cannot find info about node with id '#{node_id}'"
+      end
+
+      data = {}
+      node_properties = node_info['node_properties'] || {}
+      if public_dns = node_properties['ec2_public_address']
+        data.merge!('public_dns' => public_dns)
+      end
+      if default_login_user = NodeMixin.default_login_user?(node_properties)
+        data.merge!('default_login_user' => default_login_user)
+      end
+
+      Response::Ok.new(data)
+    end
+
+    def self.default_login_user?(node_properties)
+    if os_type = node_properties['os_type']
+        DefaultLoginByOSType[os_type]
+      end
+    end
+
+    DefaultLoginByOSType = {
+      'ubuntu'       => 'ubuntu',
+      'amazon-linux' => 'ec2-user'
+    }
+  end
+end

data/lib/commands/common/thor/pull_from_remote.rb

@@ -34,12 +34,9 @@ module DTK::Client
         unless rsa_pub_key
           raise DtkError,"No File found at (#{path_to_key}). Path is wrong or it is necessary to generate the public rsa key (e.g., run ssh-keygen -t rsa)"
         end
-        # making :merge_if_no_conflict the default (when force not set)
-        merge_if_no_conflict = (opts[:force] ? nil : true)
         opts_perform_locally = remote_params.merge(
           :full_module_name => full_module_name, 
           :force => opts[:force], 
-          :merge_if_no_conflict => merge_if_no_conflict,
           :do_not_raise => opts[:do_not_raise], 
           :ignore_dependency_merge_conflict => opts[:ignore_dependency_merge_conflict]
         )

data/lib/commands/common/thor/push_clone_changes.rb

@@ -40,6 +40,7 @@ module DTK::Client
       post_body.merge!(:current_branch_sha => opts[:current_branch_sha]) if opts[:current_branch_sha]
       post_body.merge!(:force => opts[:force]) if opts[:force]
       post_body.merge!(:task_action => opts[:task_action]) if opts[:task_action]
+      post_body.merge!(:generate_docs => true) if opts[:generate_docs]
 
       if opts[:set_parsed_false]
         post_body.merge!(:set_parsed_false => true)
@@ -49,21 +50,35 @@ module DTK::Client
       response = post(rest_url("#{module_type}/update_model_from_clone"), post_body)
       return response unless response.ok?
 
+      external_dependencies = response.data(:external_dependencies)
+      dsl_parse_error       = response.data(:dsl_parse_error)
+      dsl_updated_info      = response.data(:dsl_updated_info)
+      dsl_created_info      = response.data(:dsl_created_info)
+      component_module_refs = response.data(:component_module_refs)
+
       ret = Response::Ok.new()
-      external_dependencies = response.data('external_dependencies')
 
       # check if any errors
-      if dsl_parse_error = response.data(:dsl_parse_error)
+      if dsl_parse_error
         if parsed_external_dependencies = dsl_parse_error['external_dependencies']
           external_dependencies = parsed_external_dependencies
-        elsif err_message = ServiceImporter.error_message(module_name, dsl_parse_error)
-          DTK::Client::OsUtil.print(err_message, :red)
-          ret = Response::NoOp.new()
+        else
+          err_msg_opts = { :module_type => module_type }
+          err_msg_opts.merge!(:command => opts[:command]) if opts[:command]
+          if err_message = ServiceImporter.error_message(module_name, dsl_parse_error, err_msg_opts)
+            DTK::Client::OsUtil.print(err_message, :red)
+            ret = Response::NoOp.new()
+          end
         end
       end
 
+      has_code_been_pulled = false
+
       # check if server pushed anything that needs to be pulled
-      dsl_updated_info = response.data(:dsl_updated_info)
+
+      # we need to pull latest code in case docs where generated
+      OsUtil.print("Pulling generated documentation on your local repository ...", :yellow) if opts[:generate_docs]
+
       if dsl_updated_info and !dsl_updated_info.empty?
         if msg = dsl_updated_info["msg"]
           DTK::Client::OsUtil.print(msg,:yellow)
@@ -72,10 +87,18 @@ module DTK::Client
         unless new_commit_sha and new_commit_sha == commit_sha
           opts_pull = opts.merge(:local_branch => branch,:namespace => module_namespace)
           resp = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
+          has_code_been_pulled = true
           return resp unless resp.ok?
         end
       end
 
+      # unless DSL was updated we pull latest code due to changes on documentation
+      if opts[:generate_docs] && !has_code_been_pulled
+        opts_pull = opts.merge(:local_branch => branch,:namespace => module_namespace)
+        resp = Helper(:git_repo).pull_changes(module_type, module_name, opts_pull)
+        return resp unless resp.ok?
+      end
+
       if opts[:print_dependencies] || !internal_trigger
         if external_dependencies
           ambiguous        = external_dependencies["ambiguous"]||[]
@@ -89,7 +112,6 @@ module DTK::Client
       end
 
       # check if server sent any file that should be added
-      dsl_created_info = response.data(:dsl_created_info)
       if dsl_created_info and !dsl_created_info.empty?
         path = dsl_created_info["path"]
         content = dsl_created_info["content"]
@@ -100,22 +122,23 @@ module DTK::Client
         end
       end
 
-      service_component_refs = response.data['component_module_refs']
-      unless (service_component_refs||{}).empty?
-        print_using_dependencies(service_component_refs)
+      unless (component_module_refs||{}).empty?
+        print_using_dependencies(component_module_refs)
       end
 
       ret
     end
 
     private
+
     def print_using_dependencies(component_refs)
-      component_refs.each do |k, value|
-        namespace = value['namespace_info']
-        name      = value['module_name']
-        puts "Using component module '#{namespace}:#{name}'"
+      # TODO: This just prints out dircetly included modules
+      unless component_refs.empty?
+        puts 'Using component modules:'
+        component_refs.values.map { |r| "#{r['namespace_info']}:#{r['module_name']}" }.sort.each do |name|
+          puts "  #{name}"
+        end
       end
     end
-
   end
 end

data/lib/commands/thor/assembly.rb

@@ -184,15 +184,16 @@ module DTK::Client
       response
     end
 
-    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--settings SETTINGS-NAME1[,..]]", "Stage assembly in target."
+    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE]", "Stage assembly in target."
     method_option "in-target",:aliases => "-t" ,
       :type => :string,
       :banner => "TARGET-NAME/ID",
       :desc => "Target (id) to create assembly in"
     #hidden option
-    method_option "instance-bindings",
-      :type => :string
+    method_option "instance-bindings", :type => :string
     method_option :settings, :type => :string, :aliases => '-s'
+    method_option :node_size, :type => :string, :aliases => "--node-size"
+    method_option :os_type, :type => :string, :aliases => "--os-type"
     def stage(context_params)
       assembly_template_id, service_module_id, name = context_params.retrieve_arguments([:assembly_id!, :service_module_id, :option_1],method_argument_names)
       post_body = {
@@ -211,10 +212,12 @@ module DTK::Client
         assembly_template_name.gsub!(/(::)|(\/)/,'-')
       end
 
-      in_target = options["in-target"]
+      in_target         = options["in-target"]
       instance_bindings = options["instance-bindings"]
-      settings = parse_service_settings(options["settings"])
-      assembly_list = Assembly.assembly_list()
+      settings          = parse_service_settings(options["settings"])
+      node_size         = options.node_size
+      os_type           = options.os_type
+      assembly_list     = Assembly.assembly_list()
 
       if name
         raise DTK::Client::DtkValidationError, "Unable to stage service with name '#{name}'. Service with specified name exists already!" if assembly_list.include?(name)
@@ -226,6 +229,8 @@ module DTK::Client
       post_body.merge!(:name => name) if name
       post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
       post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
+      post_body.merge!(:node_size => node_size) if node_size
+      post_body.merge!(:os_type => os_type) if os_type
 
       response = post rest_url("assembly/stage"), post_body
       return response unless response.ok?

data/lib/commands/thor/component_module.rb

@@ -336,8 +336,6 @@ module DTK::Client
     # version_method_option
     desc "COMPONENT-MODULE-NAME/ID clone [-n]", "Locally clone component module and component files. Use -n to skip edit prompt"
     method_option :skip_edit, :aliases => '-n', :type => :boolean, :default => false
-    # DEBUG SNIPPET >>> REMOVE <<<
-    # REMOVE TRIGGER!!!!
     def clone(context_params, internal_trigger=true)
       clone_module_aux(context_params, internal_trigger)
     end
@@ -349,19 +347,18 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-#    desc "COMPONENT-MODULE-NAME/ID push [-v VERSION] [-m COMMIT-MSG]", "Push changes from local copy of component module to server"
-#    desc "COMPONENT-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy of component module to server"
-    desc "COMPONENT-MODULE-NAME/ID push [--force]", "Push changes from local copy of component module to server"
-     version_method_option
-     method_option "message",:aliases => "-m" ,
-       :type => :string,
-       :banner => "COMMIT-MSG",
-       :desc => "Commit message"
-     # hidden option for dev
-     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
-     def push(context_params, internal_trigger=false)
+    desc "COMPONENT-MODULE-NAME/ID push [--force] [--docs]", "Push changes from local copy of component module to server"
+    version_method_option
+    method_option "message",:aliases => "-m" ,
+      :type => :string,
+      :banner => "COMMIT-MSG",
+      :desc => "Commit message"
+    # hidden option for dev
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
+    method_option :docs, :type => :boolean, :default => false, :aliases => '-d'
+    def push(context_params, internal_trigger=false)
       push_module_aux(context_params, internal_trigger)
-     end
+    end
 
 #    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of component module to remote repository (dtkn)."
     desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [--force]", "Push changes from local copy of component module to remote repository (dtkn)."

data/lib/commands/thor/node.rb

@@ -1,4 +1,5 @@
 dtk_require_from_base('task_status')
+dtk_require_common_commands('thor/node')
 dtk_require_common_commands('thor/set_required_attributes')
 dtk_require_common_commands('thor/assembly_workspace')
 
@@ -6,6 +7,7 @@ module DTK::Client
   class Node < CommandBaseThor
 
     include AssemblyWorkspaceMixin
+    include NodeMixin
 
     no_tasks do
       include TaskStatusMixin
@@ -95,7 +97,7 @@ module DTK::Client
        post rest_url("node/info"), post_body
     end
 
-    desc "NODE-NAME/ID ssh REMOTE-USER [-i PATH-TO-PEM]","SSH into node, optional parameters are path to indentity file."
+    desc "NODE-NAME/ID ssh [LINUX-LOGIN-USER] [-i PATH-TO-PEM]","SSH into node."
     method_option "--identity-file",:aliases => '-i',:type => :string, :desc => "Identity-File used for connection, if not provided default is used", :banner => "IDENTITY-FILE"
     def ssh(context_params)
       if OsUtil.is_windows?
@@ -103,11 +105,11 @@ module DTK::Client
         return
       end
 
-      node_id, remote_user = context_params.retrieve_arguments([:node_id!,:option_1!],method_argument_names)
+      node_id, login_user = context_params.retrieve_arguments([:node_id!,:option_1],method_argument_names)
 
       if identity_file_location = options['identity-file']
         unless File.exists?(identity_file_location)
-          raise ::DTK::Client::DtkError, "Not able to find identity file, '#{identity_file_location}'"
+          raise DtkError, "Not able to find identity file, '#{identity_file_location}'"
         end
       elsif default_identity_file = OsUtil.dtk_identity_file_location()
         if File.exists?(default_identity_file)
@@ -115,42 +117,35 @@ module DTK::Client
         end
       end
 
-      context_params.forward_options({ :json_return => true })
-      # TODO: should call something taht just returns info about nodes, rather than info_aux
-      #       also info that comes back should indicate whether a node group and if so error message is that
-      #       ssh cannot be called on node group
-      response = info_aux(context_params)
-      if response.ok?
-        node_info = {}
-        response.data['nodes'].each do |node|
-          properties = node['node_properties']
-          node_info = properties if node_id == properties['node_id']
-        end
-        public_dns = node_info ? node_info['ec2_public_address'] : nil
-
-        raise ::DTK::Client::DtkError, "Not able to resolve instance address, has instance been stopped?" unless public_dns
-
-        connection_string = "#{remote_user}@#{public_dns}"
+      response = get_node_info_for_ssh_login(node_id, context_params)
+      return response unless response.ok?
 
+      unless public_dns = response.data(:public_dns)
+        raise DtkError, "Not able to resolve instance address, has instance been stopped?"
+      end
+      
+      unless login_user ||= response.data(:default_login_user)
+        raise DtkError, "Retry command with a specfic login user (a default login user could not be computed)"
+      end
 
-        ssh_command = nil
+      connection_string = "#{login_user}@#{public_dns}"
 
+      ssh_command = 
         if identity_file_location
           # provided PEM key
-          ssh_command = "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -i #{identity_file_location} #{connection_string}"
-        elsif SSHUtil.ssh_reachable?(remote_user, public_dns)
+          "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" -i #{identity_file_location} #{connection_string}"
+        elsif SSHUtil.ssh_reachable?(login_user, public_dns)
           # it has PUB key access
-          ssh_command = "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" #{connection_string}"
+          "ssh -o \"StrictHostKeyChecking no\" -o \"UserKnownHostsFile /dev/null\" #{connection_string}"
         end
 
-        raise ::DTK::Client::DtkError, "No public key access or PEM provided, please grant access or provide valid PEM key" if ssh_command.nil?
-
-        OsUtil.print("You are entering SSH terminal (#{connection_string}) ...", :yellow)
-        Kernel.system(ssh_command)
-        OsUtil.print("You are leaving SSH terminal, and returning to DTK Shell ...", :yellow)
-      else
-        response
+      unless ssh_command
+        raise DtkError, "No public key access or PEM provided, please grant access or provide valid PEM key" 
       end
+      
+      OsUtil.print("You are entering SSH terminal (#{connection_string}) ...", :yellow)
+      Kernel.system(ssh_command)
+      OsUtil.print("You are leaving SSH terminal, and returning to DTK Shell ...", :yellow)
     end
 
     desc "NODE-NAME/ID list-components","List components that are on the node instance."
@@ -267,7 +262,7 @@ module DTK::Client
       if response.data and response.data.size > 0
         #TODO: may not directly print here; isntead use a lower level fn
         error_message = "The following violations were found; they must be corrected before the node can be converged"
-        DTK::Client::OsUtil.print(error_message, :red)
+        OsUtil.print(error_message, :red)
         return response.render_table(:violation)
       end
 
@@ -310,7 +305,7 @@ module DTK::Client
       }
       unless options.force?
         # Ask user if really want to delete and destroy, if not then return to dtk-shell without deleting
-        return unless Console.confirmation_prompt("Are you sure you want to destroy and delete node '#{node_id}'?")
+        return unless Console.confirmation_prompt("Are you sure you want to destroy and delete node '#{node_id}'"+"?")
       end
 
       response = post rest_url("node/destroy_and_delete"), post_body
@@ -460,7 +455,7 @@ module DTK::Client
         end
 
         if response.data(:result).nil?
-          raise DTK::Client::DtkError, "Server seems to be taking too long to start node(s)."
+          raise DtkError, "Server seems to be taking too long to start node(s)."
         end
 
         task_id = response.data(:result)['task_id']
@@ -478,7 +473,7 @@ module DTK::Client
       def get_assembly_and_node_id(context_params)
         response = info(context_params)
         unless response.ok?
-          raise DTK::Client::DtkError, "Unable to retrive node information, please try again."
+          raise DtkError, "Unable to retrive node information, please try again."
         end
 
         return response.data(:assembly_id), response.data(:id)

data/lib/commands/thor/service_module.rb

@@ -76,7 +76,7 @@ module DTK::Client
           ],
           :assembly => [
             ["info","info","# Info for given assembly in current service module."],
-            ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID]", "# Stage assembly in target."],
+            ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE]", "# Stage assembly in target."],
             # ["deploy","deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             # ["deploy","deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             ["deploy","deploy [INSTANCE-NAME] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
@@ -478,12 +478,13 @@ module DTK::Client
 =end
 
 #    desc "SERVICE-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy to server (origin)."
-    desc "SERVICE-MODULE-NAME/ID push [--force]", "Push changes from local copy to server."
+    desc "SERVICE-MODULE-NAME/ID push [--force] [--docs]", "Push changes from local copy to server."
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
+    method_option :docs, :type => :boolean, :default => false, :aliases => '-d'
     def push(context_params, internal_trigger=false)
       push_module_aux(context_params, internal_trigger)
     end

data/lib/commands/thor/test_module.rb

@@ -214,7 +214,7 @@ module DTK::Client
       edit_module_aux(context_params)
     end
 
-    desc "TEST-MODULE-NAME/ID push", "Push changes from local copy of test module to server"
+    desc "TEST-MODULE-NAME/ID push [--force] [--docs]", "Push changes from local copy of test module to server"
     version_method_option
     method_option "message",:aliases => "-m" ,
       :type => :string,
@@ -222,6 +222,8 @@ module DTK::Client
       :desc => "Commit message"
     # hidden option for dev
     method_option 'force-parse', :aliases => '-f', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false
+    method_option :docs, :type => :boolean, :default => false, :aliases => '-d'
     def push(context_params, internal_trigger=false)
       push_module_aux(context_params, internal_trigger)
     end

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.6"
+  VERSION="0.7.7"
 end

data/lib/view_processor/table_print.rb

@@ -112,7 +112,7 @@ module DTK
 
                   val = value_of(structured_element,'dtk_type')||''
                   # extract e.g. 3.1.1.1 from '3.1.1.1 action' etc.
-                  error_index = "[ #{val.scan( /\d+[,.]\d?[,.]?\d?[,.]?\d?[,.]?\d?/ ).first} ]"
+                  error_index = "[ #{val.scan( /\d+[,.]?\d?[,.]?\d?[,.]?\d?[,.]?\d?/ ).first} ]"
 
                   # original table takes that index
                   evaluated_element.send("#{k}=", error_index)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -70,42 +70,42 @@ dependencies:
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
@@ -140,14 +140,14 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
@@ -225,6 +225,7 @@ files:
 - lib/commands/common/thor/list_diffs.rb
 - lib/commands/common/thor/module.rb
 - lib/commands/common/thor/module/import.rb
+- lib/commands/common/thor/node.rb
 - lib/commands/common/thor/poller.rb
 - lib/commands/common/thor/pull_clone_changes.rb
 - lib/commands/common/thor/pull_from_remote.rb
@@ -381,17 +382,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.