dtk-client 0.7.4 → 0.7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2082aad673f9f8c447569657217f0649a15744
-  data.tar.gz: 5ccfc71b0d65e0e3e3d003ae6ab859ad1d770982
+  metadata.gz: 6a7875186712bb106f9fbbf11458c702e66041ae
+  data.tar.gz: 23996874f5fb73b451fab137e6157252addb9224
 SHA512:
-  metadata.gz: 4be06f509b412e40853aa433f1c8259ed5cda041fbf4386106d9ccdc27681a05b285fd93f14b03553ee794bc15d89b408e9e87f29680d28f216e33e635f160ae
-  data.tar.gz: fb600d5f4c54c9c01364c24175be7170a49804846330f0d2d4efaa2a210bd85ba07e6a0dc3bad590bf063ba3d8154b9fe34f333ea3d576e7d295f1ad93893f7f
+  metadata.gz: 6b938efca3539c8ba284580cfc4f747c179e45939abe5025f479c696fa227618c4c98731e8b493f77834ed396c31b63f81230b3e324b8618be907da363efd3ea
+  data.tar.gz: f428e0857dbea981c780d12bc8e4fb7cf31d2a249282302d29d358917364a52230426c9dcf6802e85289b9859c7cf15f223b194a7a7a6dbb2a21b2aacf0292f8

data/lib/command_helpers/service_importer.rb

@@ -18,9 +18,10 @@ module DTK::Client
     ##
     # Method will trigger pull from dtkn for each existing module
     #
+    def trigger_module_auto_pull(required_modules, force = false)
+      return if required_modules.empty?
 
-    def trigger_module_auto_pull(required_modules)
-      if !required_modules.empty? && Console.confirmation_prompt("Do you want to update in addition to this module its dependent modules from the catalog?")
+      if force || Console.confirmation_prompt("Do you want to update in addition to this module its dependent modules from the catalog?")
         required_modules.each do |r_module|
           module_name = full_module_name(r_module)
           module_type = r_module['type']
@@ -37,7 +38,7 @@ module DTK::Client
           raise DTK::Client::DtkError, response.error_message unless response.ok?
         end
 
-        print "Resuming pull ... "
+        print "Resuming pull ... " unless force
       end
     end
 
@@ -47,13 +48,31 @@ module DTK::Client
     #
     def trigger_module_auto_import(modules_to_import, required_modules, opts={})
       puts "Auto-importing missing module(s)"
+      update_all, update_none = false, false
 
-      # Print out installed modules
+      # Print out or update installed modules from catalog
       required_modules.each do |r_module|
         module_name = full_module_name(r_module)
         module_type = r_module['type']
 
         print "Using #{module_type.gsub('_',' ')} '#{module_name}'\n"
+        next if update_none || opts[:update_none]
+
+        if update_all
+          trigger_module_auto_pull([r_module], true)
+        else
+          update = Console.confirmation_prompt_additional_options("Do you want to update dependent #{module_type.gsub('_',' ')} '#{module_name}' from the catalog?", ['all', 'none'])
+          next unless update
+
+          if update.to_s.eql?('all')
+            update_all = true
+            trigger_module_auto_pull([r_module], true)
+          elsif update.to_s.eql?('none')
+            update_none = true
+          else
+            trigger_module_auto_pull([r_module], true)
+          end
+        end
       end
 
       # Trigger import/install for missing modules

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

@@ -275,6 +275,7 @@ module DTK::Client
         required_components = response.data(:required_modules)
         opts = {:do_not_raise=>true}
         module_opts = ignore_component_error ? opts.merge(:ignore_component_error => true) : opts.merge(:additional_message=>true)
+        module_opts.merge!(:update_none => true) if options.update_none?
 
         continue = trigger_module_auto_import(missing_components, required_components, module_opts)
         return unless continue

data/lib/commands/thor/service_module.rb

@@ -184,6 +184,7 @@ module DTK::Client
     desc "install NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y] [-i]", "Install remote service module into local environment. -y will automatically clone component modules. -i will ignore component import error."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     method_option :ignore, :aliases => '-i', :type => :boolean, :default => false
+    method_option :update_none, :type => :boolean, :default => false
     def install(context_params)
       response = install_module_aux(context_params)
       @@invalidate_map << :service_module if response && response.ok?

data/lib/dtk-client/version.rb

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

data/lib/util/console.rb

@@ -52,6 +52,30 @@ module DTK::Client
         end
       end
 
+      #
+      # Display confirmation prompt and repeat message until expected answer is given
+      # options should be sent as array ['all', 'none']
+      def confirmation_prompt_additional_options(message, options = [])
+        raise DTK::Client::DtkValidationError, "Options should be sent as array: ['all', 'none']" unless options.is_a?(Array)
+
+        # used to disable skip with ctrl+c
+        trap("INT", "SIG_IGN")
+        message += " (yes/no#{options.empty? ? '' : ('/' + options.join('/'))})"
+
+        while line = Readline.readline("#{message}: ", true)
+          if line.eql?("yes") || line.eql?("y")
+            trap("INT",false)
+            return true
+          elsif line.eql?("no") || line.eql?("n")
+            trap("INT",false)
+            return false
+          elsif options.include?(line)
+            trap("INT",false)
+            return line
+          end
+        end
+      end
+
       # Loading output used to display waiting status
       def wait_animation(message, time_seconds)
         print message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.4.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.