dtk-client 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09840901f95d94e261d6eb27edb5ca81fa652426'
-  data.tar.gz: a45f1a592a98e7eda1c43394d87f5b150b3c660e
+  metadata.gz: 41bddc4ef8eb1c096ffee27ace98b4c5e1d17f4e
+  data.tar.gz: ac98dfb1857f1b916ed182072bff7278d7669901
 SHA512:
-  metadata.gz: bfdaf7faafa9ea7bf10f58c82234387b2dcf941f1a0da8595cae33b533914b8d35f1064ef1fe3706bce7c45c9466444ff528cae7cbf552f630826cae837a5c0e
-  data.tar.gz: a1ecb45fe85ae011ffa98c7fd4b3450503a02a4845bb6a1690ebf78d1af4d6e85c2f244efbd2b68c59b49bf896cba31e9e766b48e63d67ed78ed9568bf4612f7
+  metadata.gz: 3b379952dd59a5bb7d87ed06e5be921b23d7e0ae2e706eb5c559d4ea440ab425739524d025a49f55b83279886d2ac695829afe57aae2db169cb34cf7074d6caa
+  data.tar.gz: a0ce708ca651d169175fabf00be1d4de5a1d31b81aeed5b45f4309797fff3852b47f09420eebe94f9b1749ae40a62d188b07446d0162ffe6c149dbace15cb03b

data/.gitignore

@@ -8,4 +8,5 @@ Gemfile.lock
 .vscode
 doc
 .yardoc
-.solargraph.yml
+.solargraph.yml
+dtk-dsl

data/lib/cli/command/module/install.rb

@@ -46,9 +46,10 @@ module DTK::Client
               remote_module_info = nil
 
               unless version
-                remote_module_info = get_remote_module_info(module_ref)
-                version            = remote_module_info.required(:version)
-                module_ref.version = version
+                if remote_module_info = get_remote_module_info(module_ref)
+                  version            = remote_module_info.required(:version)
+                  module_ref.version = version
+                end
               end
 
               if Operation::Module.module_version_exists?(module_ref, :type => :common_module)
@@ -86,6 +87,14 @@ module DTK::Client
           :module_ref => module_ref,
           :target_directory => Operation::ClientModuleDir.create_module_dir_from_path(directory_path || OsUtil.current_dir)
         }
+
+        unless version
+          if server_version = get_last_version_from_server(module_ref)
+            version = server_version
+            module_ref.version = version
+          end
+        end
+
         repo_dir_info = Operation::Module.clone_module(arg).data
         repo_dir      = repo_dir_info[:target_repo_dir]
 
@@ -121,8 +130,28 @@ module DTK::Client
           :rsa_pub_key => SSHUtil.rsa_pub_key_content,
           :version?    => nil
         )
+        begin
+          Operation::Module.rest_get("#{Operation::Module::BaseRoute}/remote_module_info", query_string_hash)
+        rescue Error::ServerNotOkResponse => e
+          # do not raise if version not specified and module does not exist on repoman but exist on server; clone module from server instead
+          return
+        end
+      end
 
-        Operation::Module.rest_get("#{Operation::Module::BaseRoute}/remote_module_info", query_string_hash)
+      def get_last_version_from_server(module_ref)
+        query_string_hash = QueryStringHash.new(
+          :module_name => module_ref.module_name,
+          :namespace   => module_ref.namespace
+        )
+        response = Operation::Module.rest_get("#{Operation::Module::BaseRoute}/versions", query_string_hash)
+        versions = response.required(:versions)
+
+        if versions.size > 1
+          versions.delete('master')
+          versions.sort.last.strip
+        else
+          versions.first.strip
+        end
       end
     end
   end

data/lib/cli/command/service/exec.rb

@@ -23,14 +23,18 @@ module DTK::Client
         c.arg Token::Arg.action_params, :optional => true
         command_body c, :exec, 'Execute action asynchronously' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
+          sc.flag Token.attempts,  :desc => "Number of attempts"
+          sc.flag Token.sleep, :desc => "Number of sleep in seconds"
+
           sc.switch Token.breakpoint
           sc.action do |_global_options, options, args|
           
-            service_instance = service_instance_in_options_or_context(options)
-
-            action        = args[0]
-            action_params = args[1]
+            service_instance = service_instance_in_options_or_context(options)            
+            action         = args[0]
+            action_params  = args[1]
             directory_path = options[:d] || @base_dsl_file_obj.parent_dir
+            attempts       = options['attempts']
+            sleep          = options['sleep']
 
             args = {
               :service_instance => service_instance,
@@ -38,7 +42,9 @@ module DTK::Client
               :action_params    => action_params,
               :breakpoint       => options['breakpoint'],
               :directory_path   => directory_path,
-              :command          => 'exec'
+              :command          => 'exec',
+              :attempts            => attempts,
+              :sleep            => sleep
             }
             
             response = Operation::Service.exec(args)

data/lib/cli/command/service/exec_sync.rb

@@ -23,6 +23,8 @@ module DTK::Client
         c.arg Token::Arg.action_params, :optional => true
         command_body c, 'exec-sync', 'Execute action synchronously' do |sc|
          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
+         sc.flag Token.attempts, :desc => "Number of attempts"
+         sc.flag Token.sleep, :desc => "Number of sleep in seconds"
          sc.switch Token.breakpoint
           sc.action do |_global_options, options, args|
             service_instance = service_instance_in_options_or_context(options)
@@ -30,6 +32,8 @@ module DTK::Client
             action        = args[0]
             action_params = args[1]
             directory_path = options[:d] || @base_dsl_file_obj.parent_dir
+            attempts       = options['attempts']
+            sleep          = options['sleep']
 
             args = {
               :service_instance => service_instance,
@@ -37,7 +41,9 @@ module DTK::Client
               :action_params    => action_params,
               :breakpoint       => options['breakpoint'],
               :directory_path   => directory_path,
-              :command          => 'exec-sync'
+              :command          => 'exec-sync',
+              :attempts            => attempts,
+              :sleep            => sleep
             }
             response = Operation::Service.exec(args)
 

data/lib/cli/command/token.rb

@@ -50,6 +50,8 @@ module DTK::Client
         :uninstall_name            => Flag.new(:name, 'NAME', 'Module name to uninstall'),
         :link_name                 => Flag.new([:l, :link_name], 'link-name', 'Specify link name'),
         :format                    => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
+        :sleep                     => Flag.new(:sleep, '', ''),
+        :attempts                  => Flag.new(:attempts, '', ''),
 
         # switches
         # Switch constructor args order: key, desc, opts={}

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.6"
+      VERSION="0.11.7"
     end
   end
 end

data/lib/client/operation/service/exec.rb

@@ -25,7 +25,8 @@ module DTK::Client
           action_params    = args[:action_params]
           directory_path   = args[:directory_path]
           breakpoint       = args[:breakpoint]
-
+          attempts         = args[:attempts] || ""
+          sleep            = args[:sleep] || ""
           # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
           task_params = parse_params?(action_params)||{}
 
@@ -52,6 +53,7 @@ module DTK::Client
             :task_params? => task_params
           )
           post_body.merge!(:breakpoint => breakpoint) if breakpoint
+          post_body.merge!(:attempts => attempts, :sleep => sleep) if attempts || sleep
           encoded_action =  URI.encode_www_form_component("#{action}")
           response = rest_post("#{BaseRoute}/#{service_instance}/#{encoded_action}", post_body)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.