dtk-client 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f5b684856babcaa9d925ad089f311461b8ea4c6
-  data.tar.gz: 952f5d25a660b8c17936cdc20ef80d1cd1c13ec7
+  metadata.gz: 9c2082aad673f9f8c447569657217f0649a15744
+  data.tar.gz: 5ccfc71b0d65e0e3e3d003ae6ab859ad1d770982
 SHA512:
-  metadata.gz: 12d06bf9def6875592c3bbf2daf4c31c175d426875672854d4c1c4d8ad25bb14b2f0db998e45cd4c906ef24ad96352b76d1daeb769bde35bcb637bd0acdf1840
-  data.tar.gz: 6dfd454ecc21eeba533d4ccb1ac130dfa9d7235055f133551bd320ff5d24366ad3f197da1b3a3eab572745bf11ba4352a36c63ae6f9e3653b5f645a4cea14467
+  metadata.gz: 4be06f509b412e40853aa433f1c8259ed5cda041fbf4386106d9ccdc27681a05b285fd93f14b03553ee794bc15d89b408e9e87f29680d28f216e33e635f160ae
+  data.tar.gz: fb600d5f4c54c9c01364c24175be7170a49804846330f0d2d4efaa2a210bd85ba07e6a0dc3bad590bf063ba3d8154b9fe34f333ea3d576e7d295f1ad93893f7f

data/lib/command_helpers/service_importer.rb

@@ -45,9 +45,8 @@ module DTK::Client
     ##
     # Method will trigger import for each missing module component
     #
-    def trigger_module_auto_import(missing_modules, required_modules, opts={})
+    def trigger_module_auto_import(modules_to_import, required_modules, opts={})
       puts "Auto-importing missing module(s)"
-      modules_to_import = missing_modules
 
       # Print out installed modules
       required_modules.each do |r_module|
@@ -62,12 +61,27 @@ module DTK::Client
         module_name = full_module_name(m_module)
         module_type = m_module['type']
 
-        print "Importing #{module_type.gsub('_',' ')} '#{module_name}' ... "
-        new_context_params = ::DTK::Shell::ContextParams.new([module_name])
-        new_context_params.override_method_argument!('option_2', m_module['version'])
-        new_context_params.forward_options( { :skip_cloning => false, :skip_auto_install => true, :module_type => module_type}).merge!(opts)
+        # we check if there is module_url if so we install from git
+        module_url  = m_module['module_url']
+
+        # descriptive message
+        import_msg  = "Importing #{module_type.gsub('_',' ')} '#{module_name}'"
+        import_msg += " from git source #{module_url}" if module_url
+        print "#{import_msg} ... "
+
+        unless module_url
+          # import from Repo Manager
+          new_context_params = ::DTK::Shell::ContextParams.new([module_name])
+          new_context_params.override_method_argument!('option_2', m_module['version'])
+          new_context_params.forward_options( { :skip_cloning => false, :skip_auto_install => true, :module_type => module_type}).merge!(opts)
+          response = ContextRouter.routeTask(module_type, "install", new_context_params, @conn)
+        else
+          # import from Git source
+          new_context_params = ::DTK::Shell::ContextParams.new([module_url, module_name])
+          new_context_params.forward_options( { :internal_trigger => true })
+          response = ContextRouter.routeTask(module_type, "import_git", new_context_params, @conn)
+        end
 
-        response = ContextRouter.routeTask(module_type, "install", new_context_params, @conn)
         puts(response.data(:does_not_exist) ? response.data(:does_not_exist) : "Done.")
         raise DTK::Client::DtkError, response.error_message unless response.ok?
       end

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

@@ -270,7 +270,7 @@ module DTK::Client
       if dsl_parsing_errors = response.data(:dsl_parsing_errors)
         error_message = "Module '#{component_module_name}' parsing errors found:\n#{dsl_parsing_errors}\nYou can fix errors using 'edit' command from module context and invoke promote-module-updates again.\n"
         OsUtil.print(error_message, :red)
-        return Response::Error.new()
+        return Response::NoOp.new()
       end
       module_name,namespace,branch,ff_change = response.data(:module_name,:module_namespace,:workspace_branch,:fast_forward_change)
       ff_change ||= true
@@ -323,7 +323,7 @@ module DTK::Client
       response = Helper(:git_repo).pull_changes?(:component_module, module_name, edit_opts.merge!(opts))
       return response unless response.ok?()
 
-      edit_opts.merge!(:force_parse => true, :update_from_includes => true, :print_dependencies => true)
+      edit_opts.merge!(:force_parse => true, :update_from_includes => true, :print_dependencies => true, :remote_branch => local_branch)
       response = push_clone_changes_aux(:component_module, module_id, nil, "Pull base module updates", true, edit_opts)
       
       unless response.ok?()
@@ -1201,6 +1201,7 @@ module DTK::Client
     def grep_aux(context_params)
       if context_params.is_there_identifier?(:node)
         mapping = [REQ_ASSEMBLY_OR_WS_ID,:option_1!,:node_id!,:option_2!]
+        is_node = true
       else
         mapping = [REQ_ASSEMBLY_OR_WS_ID,:option_1!,:option_2!,:option_3!]
       end
@@ -1263,7 +1264,7 @@ module DTK::Client
             console_width.times do
               print "="
             end
-            puts "NODE-ID: #{message_colorized}\n"
+            puts "NODE-ID: #{message_colorized}\n" unless is_node
             puts "Log output:\n"
             puts r[1]["output"].gsub(/`/,'\'')
           end

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

@@ -10,7 +10,9 @@ module DTK::Client
       include PushCloneChangesMixin
       include ReparseMixin
 
-      def from_git()
+      def from_git(internal_trigger = false)
+        OsUtil.print('Retrieving git module data, please wait ...') unless internal_trigger
+
         git_repo_url, module_name    = retrieve_arguments([:option_1!, :option_2!])
         namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
 
@@ -59,7 +61,9 @@ module DTK::Client
           print_external_dependencies(external_dependencies, 'in the git repo')
         end
 
-        OsUtil.print("Successfully installed #{ModuleUtil.module_name(module_type)} '#{ModuleUtil.join_name(@module_name, @module_namespace)}' from git.", :green)
+        unless internal_trigger
+          OsUtil.print("Successfully installed #{ModuleUtil.module_name(module_type)} '#{ModuleUtil.join_name(@module_name, @module_namespace)}' from git.", :green)
+        end
       end
 
       def from_file()

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

@@ -193,6 +193,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?)
 
       reparse_aux(module_location)
       push_clone_changes_aux(module_type.to_sym, module_id, version, options["message"]||DEFAULT_COMMIT_MSG, internal_trigger, opts)
@@ -222,8 +223,7 @@ module DTK::Client
     end
 
     def import_git_module_aux(context_params)
-      OsUtil.print('Retrieving git module data, please wait ...')
-      CommonModule::Import.new(self, context_params).from_git()
+      CommonModule::Import.new(self, context_params).from_git(context_params.get_forwarded_options()[:internal_trigger])
     end
 
     def import_module_aux(context_params)
@@ -310,17 +310,18 @@ module DTK::Client
       module_type        = get_module_type(context_params)
       remote_module_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
 
-      # for service_module we are doing this on server side
-      remote_namespace, remote_module_name = get_namespace_and_name(remote_module_name,'/') unless module_type.eql?('service_module')
+      # remote_module_name can be namespace:name or namespace/name
+      remote_namespace, remote_module_name = get_namespace_and_name(remote_module_name, ':')
 
-      unless options.force?
+      unless options.force? || options.confirmed?
         return unless Console.confirmation_prompt("Are you sure you want to delete remote #{module_type} '#{remote_namespace.nil? ? '' : remote_namespace+'/'}#{remote_module_name}' and all items contained in it"+'?')
       end
 
       post_body = {
         :rsa_pub_key             => SSHUtil.rsa_pub_key_content(),
         :remote_module_name      => remote_module_name,
-        :remote_module_namespace => remote_namespace
+        :remote_module_namespace => remote_namespace,
+        :force_delete            => options.force?
       }
 
       post rest_url("#{module_type}/delete_remote"), post_body

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

@@ -7,7 +7,7 @@ module DTK::Client
     ##
     #
     # module_type: will be :component_module or :service_module
-    def push_clone_changes_aux(module_type,module_id,version,commit_msg,internal_trigger=false,opts={})
+    def push_clone_changes_aux(module_type, module_id, version, commit_msg, internal_trigger=false, opts={})
       module_name, module_namespace, repo_url, branch, not_ok_response = workspace_branch_info(module_type, module_id, version, opts)
       return not_ok_response if not_ok_response
 
@@ -37,6 +37,7 @@ module DTK::Client
       post_body.merge!(:update_from_includes => true) if opts[:update_from_includes]
       post_body.merge!(:service_instance_module => true) if opts[:service_instance_module]
       post_body.merge!(:current_branch_sha => opts[:current_branch_sha]) if opts[:current_branch_sha]
+      post_body.merge!(:force => opts[:force]) if opts[:force]
 
       if opts[:set_parsed_false]
         post_body.merge!(:set_parsed_false => true)

data/lib/commands/thor/component_module.rb

@@ -138,7 +138,7 @@ module DTK::Client
     # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
     #
     method_option :branch, :aliases => '-b'
-    desc "import-git GIT-SSH-REPO-URL [-b BRANCH/TAG] [NAMESPACE:]COMPONENT-MODULE-NAME", "Create new local component module by importing from provided git repo URL"
+    desc "import-git GIT-SSH-REPO-URL [NAMESPACE:]COMPONENT-MODULE-NAME [-b BRANCH/TAG]", "Create new local component module by importing from provided git repo URL"
     def import_git(context_params)
       response = import_git_module_aux(context_params)
       @@invalidate_map << :component_module
@@ -236,8 +236,9 @@ module DTK::Client
     end
 =end
 
-    desc "delete-from-catalog NAMESPACE/REMOTE-COMPONENT-MODULE-NAME [-y]", "Delete the component module from the DTK Network catalog"
-    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    desc "delete-from-catalog NAMESPACE/REMOTE-COMPONENT-MODULE-NAME [-y] [--force]", "Delete the component module from the DTK Network catalog"
+    method_option :confirmed, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end
@@ -400,14 +401,14 @@ module DTK::Client
 
 #    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", "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-parse', :aliases => '-f', :type => :boolean, :default => false
+     method_option :force, :type => :boolean, :default => false, :aliases => '-f'
      def push(context_params, internal_trigger=false)
       push_module_aux(context_params, internal_trigger)
      end

data/lib/commands/thor/service.rb

@@ -159,7 +159,13 @@ module DTK::Client
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
-            ['tail',"tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","# Tail specified number of lines from log."]
+            ['tail',"tail NODE-NAME LOG-PATH [REGEX-PATTERN] [--more]","# Tail log from specified node."]
+          ],
+          :node_utils => [
+            ['get-netstats',"get-netstats","# Get netstats."],
+            ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
+            ['grep',"grep LOG-PATH GREP-PATTERN [--first]","# Grep log from node. --first option returns first match (latest log entry)."],
+            ['tail',"tail LOG-PATH [REGEX-PATTERN] [--more]","# Tail log from node."]
           ]
         },
         :identifier_only => {

data/lib/commands/thor/service_module.rb

@@ -299,7 +299,7 @@ module DTK::Client
       :banner => "NAMESPACE",
       :desc   => "Remote namespace"
     method_option :force,:aliases => '-f',
-      :type    => :boolean, 
+      :type    => :boolean,
       :desc   => "Force pull",
       :default => false
     def pull_dtkn(context_params)
@@ -524,13 +524,12 @@ 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", "Push changes from local copy to server."
+    desc "SERVICE-MODULE-NAME/ID push [--force]", "Push changes from local copy to server."
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
-    #hidden option for dev
-    method_option 'force-parse', :aliases => '-f', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def push(context_params, internal_trigger=false)
       push_module_aux(context_params, internal_trigger)
     end
@@ -569,8 +568,9 @@ module DTK::Client
       response
     end
 
-    desc "delete-from-catalog NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y]", "Delete the service module from the DTK Network catalog"
-    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    desc "delete-from-catalog NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [--force]", "Delete the service module from the DTK Network catalog"
+    method_option :confirmed, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end

data/lib/commands/thor/test_module.rb

@@ -138,8 +138,9 @@ module DTK::Client
       create_test_module_aux(context_params)
     end
 
-    desc "delete-from-catalog NAMESPACE/REMOTE-TEST-MODULE-NAME [-y]", "Delete the test module from the DTK Network catalog"
-    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    desc "delete-from-catalog NAMESPACE/REMOTE-TEST-MODULE-NAME [-y] [--force]", "Delete the test module from the DTK Network catalog"
+    method_option :confirmed, :aliases => '-y', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end

data/lib/core.rb

@@ -475,7 +475,7 @@ module DTK
         DefaultRestOpts = {:timeout => 2000, :open_timeout => 10, :error_response_class => Client::Response::Error}
         # DefaultRestOpts = {:timeout => 50, :open_timeout => 2, :error_response_class => Client::Response::Error}
       else
-        DefaultRestOpts = {:timeout => 100, :open_timeout => 10, :error_response_class => Client::Response::Error}
+        DefaultRestOpts = {:timeout => 150, :open_timeout => 10, :error_response_class => Client::Response::Error}
       end
 
       # enable SSL verification

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.3"
+  VERSION="0.7.4"
 end

data/lib/shell/help_monkey_patch.rb

@@ -174,6 +174,12 @@ class Thor
               if override_tasks_obj && is_n_level_context
                 last_entity_name = active_context.last_context_entity_name.to_sym
 
+                # special case for node_id/utils (we don't want to use utils from service context)
+                command_list = active_context.command_list
+                if (command_list.size > 2) && command_list.last.eql?('utils')
+                  last_entity_name = command_list.last(2).join('_').to_sym
+                end
+
                 # we get commands task, and identifier tasks for given entity (e.g. :assembly)
                 command_o_tasks, identifier_o_tasks = override_tasks_obj.get_all_tasks(last_entity_name)
 

data/lib/util/console.rb

@@ -39,7 +39,7 @@ module DTK::Client
       def confirmation_prompt_simple(message, add_options=true)
         # used to disable skip with ctrl+c
         trap("INT", "SIG_IGN")
-        message += " (y/n)" if add_options
+        message += " (Y/n)" if add_options
 
         while line = Readline.readline("#{message}: ", true)
           if (line.eql?("yes") || line.eql?("y") || line.empty?)

data/lib/util/module_util.rb

@@ -15,7 +15,7 @@ module DTK
       end
 
       def self.module_name(module_type)
-        module_type.gsub('_',' ')
+        module_type.to_s.gsub('_',' ')
       end
 
       # returns [namespace,name]; namespace can be null if cant determine it

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types