dtk-client 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1abbc6f5062ad48d35ba88b53cfaf6486c0aa2
-  data.tar.gz: df24b3e1f53d12977293b7622b52a2ed4f5db48a
+  metadata.gz: 43813c96b0c40e8459d6668ca71bd0b8db38958f
+  data.tar.gz: ab8249e25eb9242e7b09f45b68b834e5c059764c
 SHA512:
-  metadata.gz: 28a5f3cf4bf0c1788abb74067e73335626d82df5077a2007bd0619b2195fc7145d6618c00702c68cdd6f9a1aa600219b94619a3add7357ddfcaa4a062b23103b
-  data.tar.gz: 1b4369cfcca59952127f284185c190ab71543647ac46a73d6b119cf960a705554fc866676a2a8d40da4664dddcebc129c5bbbb8573b97fa55b12cb650f4075d4
+  metadata.gz: 4dbb96de07e1c8ca3f6721b15151196e91f52444b002aef643fedd7aad32e494d2db00d499a807abc474909d7374d1256861fe90b03e2d1ad8a63e9d665651ba
+  data.tar.gz: abc0b3255033efc1ad9ee47e99eab523e25f4226732ae837de6c36cb1b9bbe99dd696d021ee18f46aa4518392f09997cb83aa809c283eb3040d6ee4f629fba85

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

@@ -25,10 +25,9 @@ module DTK::Client
           sc.flag Token.version
           sc.action do |_global_options, options, args|
             module_name = args[0]
-            module_ref  = module_ref_in_options_or_context(:module_ref => module_name, :version => options[:version])
+            module_ref  = module_ref_object_from_options_or_context(:module_ref => module_name, :version => options[:version])
             arg = {
               :module_ref       => module_ref,
-              :module_name      => module_name,
               :target_directory => args[1]
             }
             Operation::Module.clone_module(arg)

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

@@ -25,7 +25,7 @@ module DTK::Client
           sc.switch Token.skip_prompt
 
           sc.action do |_global_options, options, args|
-            module_ref = module_ref_in_options_or_context?(:module_ref => args[0], :version => options[:version])
+            module_ref = module_ref_object_from_options_or_context?(:module_ref => args[0], :version => options[:version])
             Operation::Module.delete_from_remote(:module_ref => module_ref, :skip_prompt => options[:skip_prompt])
           end
         end

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

@@ -37,7 +37,7 @@ module DTK::Client
               # in so doing installes depedent modules onto teh dtk server; this step though does not install main module onto
               # server (the later step Operation::Module.install does this)
               has_remote_repo = true
-              module_ref = module_ref_in_options_or_context?(:module_ref => module_name, :version => version)
+              module_ref = module_ref_object_from_options_or_context?(:module_ref => module_name, :version => version)
               target_repo_dir = Operation::Module.install_from_catalog(:module_ref => module_ref, :version => options[:version], :directory_path => directory_path)
             end
 
@@ -48,7 +48,7 @@ module DTK::Client
             end
 
             install_opts = directory_path ? { :directory_path => directory_path, :version => (version || 'master') } : options
-            module_ref   = module_ref_in_options_or_context?(install_opts)
+            module_ref   = module_ref_object_from_options_or_context?(install_opts)
             operation_args = {
               :module_ref          => module_ref, 
               :base_dsl_file_obj   => @base_dsl_file_obj, 

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

@@ -25,7 +25,7 @@ module DTK::Client
           sc.action do |_global_options, options, _args| 
             opts = {}
             unless options[:all]
-              if module_ref = module_ref_in_options_or_context?(options)
+              if module_ref = module_ref_object_from_options_or_context?(options)
                 opts.merge!(:module_ref => module_ref)
               end
             end

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

@@ -22,7 +22,7 @@ module DTK::Client
         command_body c, 'publish', 'Publish module installed on server to the repo manager' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to publish; not need if in the module directory'
           sc.action do |_global_options, options, _args|
-            module_ref = module_ref_in_options_or_context(options)
+            module_ref = module_ref_object_from_options_or_context(options)
             Operation::Module.publish(:module_ref => module_ref, :directory_path => options[:directory_path])
           end
         end

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

@@ -22,9 +22,9 @@ module DTK::Client
         command_body c, 'pull-dtkn', 'Pull content from repo manager to client module directory and push to server' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing content to update; not need if in the module directory'
           sc.action do |_global_options, options, _args|
-            module_ref = module_ref_in_options_or_context(options)
+            module_ref = module_ref_object_from_options_or_context(options)
             Operation::Module.pull_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj)
-            Operation::Module.push(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path])
+            Operation::Module.push(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path], :method => "pulled")
           end
         end
       end

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

@@ -22,7 +22,7 @@ module DTK::Client
         command_body c, :push, 'Push content from client module directory to server' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to push; not need if in the module directory'
           sc.action do |_global_options, options, _args|
-            module_ref = module_ref_in_options_or_context(options)
+            module_ref = module_ref_object_from_options_or_context(options)
             Operation::Module.push(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj)
           end
         end

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

@@ -22,7 +22,7 @@ module DTK::Client
         command_body c, 'push-dtkn', 'Push content from client module directory to repo manager' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to push; not need if in the module directory'
           sc.action do |_global_options, options, _args|
-            module_ref = module_ref_in_options_or_context(options)
+            module_ref = module_ref_object_from_options_or_context(options)
             Operation::Module.push_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path])
           end
         end

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

@@ -30,7 +30,7 @@ module DTK::Client
           # sc.switch Token.purge, :desc => 'Overwrite any content that presently exists in the service instance directory to be created'
           #  sc.flag Token.version
           sc.action do |_global_options, options, args|
-            module_ref     = module_ref_in_options_or_context(options)
+            module_ref     = module_ref_object_from_options_or_context(options)
             assembly_name  = args[0]
             version        = options[:version] || module_ref.version
             service_name   = options[:service_name]

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

@@ -32,9 +32,9 @@ module DTK::Client
             if options[:uninstall_name].nil?
               module_ref =
                 if module_name = args[0]
-                  module_ref_in_options_or_context?({:module_ref => module_name, :version => (version || 'master')}, module_refs_opts)
+                  module_ref_object_from_options_or_context?({:module_ref => module_name, :version => (version || 'master')}, module_refs_opts)
                 else
-                  module_ref_in_options_or_context(options, module_refs_opts)
+                  module_ref_object_from_options_or_context(options, module_refs_opts)
                 end
               else
                 module_name = options["name"]

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

@@ -30,7 +30,7 @@ module DTK::Client
           # sc.switch Token.purge, :desc => 'Overwrite any content that presently exists in the service instance directory to be created'
           #  sc.flag Token.version
           sc.action do |_global_options, options, args|
-            module_ref     = module_ref_in_options_or_context(options)
+            module_ref     = module_ref_object_from_options_or_context(options)
             assembly_name  = args[0]
             version        = options[:version] || module_ref.version
             service_name   = options[:service_name]

data/lib/cli/context.rb

@@ -161,11 +161,11 @@ module DTK::Client
          ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top
         ]
 
-      def module_ref_in_options_or_context(options, module_refs_opts = {})
-        module_ref_in_options_or_context?(options, module_refs_opts) || raise_error_when_missing_context(:module_ref, options)
+      def module_ref_object_from_options_or_context(options, module_refs_opts = {})
+        module_ref_object_from_options_or_context?(options, module_refs_opts) || raise_error_when_missing_context(:module_ref, options)
       end
 
-      def module_ref_in_options_or_context?(options, module_refs_opts = {})
+      def module_ref_object_from_options_or_context?(options, module_refs_opts = {})
         # using :ignore_parsing_errors to ret namespace, name and version from .yaml file even if there are parsing errors
         @options.merge!(:ignore_parsing_errors => module_refs_opts[:ignore_parsing_errors])
 

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.10.3"
+      VERSION="0.10.4"
     end
   end
 end

data/lib/client/module_ref.rb

@@ -42,9 +42,14 @@ module DTK::Client
       @client_dir_path = opts[:client_dir_path]
     end
 
+    def self.pretty_print(module_name, namespace, version = nil)
+      # TODO: update ::DTK::Common::PrettyPrintForm to insert 'master' when version is nil 
+      ::DTK::Common::PrettyPrintForm.module_ref(module_name, :namespace => namespace, :version => version || 'master')
+    end
     def pretty_print
-      ::DTK::Common::PrettyPrintForm.module_ref(@module_name, :namespace => @namespace, :version => @version)
+      self.class.pretty_print(@module_name, @namespace, @version)
     end
+
     # TODO: look at deprecating print_form
     def print_form
       NamespaceModuleName.print_form(@namespace, @module_name, :version => @version)

data/lib/client/operation/module.rb

@@ -41,35 +41,47 @@ module DTK::Client
         
       private
 
+      # opts can have keys
+      #   :remote_info - Boolean
+      #   :type
+      #   :rsa_pub_key
       def module_version_exists?(module_ref, opts = {})
         self.class.module_version_exists?(module_ref, opts)
       end
-
       def self.module_version_exists?(module_ref, opts = {})
         type = opts[:type] || :common_module
-        query_string_hash = QueryStringHash.new(module_ref_hash(module_ref).merge(:module_type => type))
+        query_string_hash = module_ref_query_string_hash(module_ref, module_type: type)
 
         if ret_remote_info = opts[:remote_info]
-          query_string_hash.merge!(:remote_info => ret_remote_info, :rsa_pub_key => opts[:rsa_pub_key])
+          query_string_hash = query_string_hash.merge(:remote_info => ret_remote_info, :rsa_pub_key => opts[:rsa_pub_key])
         end
 
         response = rest_get(BaseRoute, query_string_hash)
         response.data.empty? ? nil : response
       end
 
+      def self.module_ref_post_body(module_ref)
+        PostBody.new(module_ref_hash(module_ref))
+      end
+
+      # opts can have keys:
+      #    :module_type
+      def self.module_ref_query_string_hash(module_ref, opts = {})
+        QueryStringHash.new(module_ref_hash(module_ref, opts))
+      end
+
+      # opts can have keys:
+      #    :module_type
       # Can be used as input hash for QueryParams and PostBody
-      def self.module_ref_hash(module_ref)
+      def self.module_ref_hash(module_ref, opts = {})
         {
-          :namespace   => module_ref.namespace,
-          :module_name => module_ref.module_name,
-          :version?    => module_ref.version
+          :namespace    => module_ref.namespace,
+          :module_name  => module_ref.module_name,
+          :version?     => module_ref.version,
+          :module_type? => opts[:module_type]
         }
       end
 
-      def self.module_ref_query_string_hash(module_ref)
-        QueryStringHash.new(module_ref_hash(module_ref))
-      end
-
     end
   end
 end

data/lib/client/operation/module/clone_module.rb

@@ -18,32 +18,30 @@
 module DTK::Client
   class Operation::Module
     class CloneModule < self
-      attr_reader :module_ref, :target_repo_dir, :module_name, :version
-      def initialize(module_name, module_ref, target_directory)
-        @module_name     = module_name
+      attr_reader :target_repo_dir, :module_ref
+      def initialize(module_ref, target_directory)
         @module_ref      = module_ref
-        @target_repo_dir = target_directory || ClientModuleDir.ret_path_with_current_dir(module_name)
-        @version         = module_ref.version
+        @target_repo_dir = target_directory || ClientModuleDir.ret_path_with_current_dir(module_ref.module_name)
       end
       private :initialize
 
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           module_ref       = args.required(:module_ref)
-          module_name      = args.required(:module_name)
           target_directory = args[:target_directory]
-          new(module_name, module_ref, target_directory).clone_module
+          new(module_ref, target_directory).clone_module
         end
       end
 
       def clone_module
-        opts = {
-          :namespace => module_ref.namespace,
-          :version => version
-        }
+        unless module_info = module_version_exists?(@module_ref, :type => :common_module, :remote_info => true, :rsa_pub_key => SSHUtil.rsa_pub_key_content)
+          raise Error::Usage, "DTK module '#{@module_ref.pretty_print}' does not exist on the DTK Server."
+        end
 
-        unless module_info = module_version_exists?(module_ref, :type => :common_module, :remote_info => true, :rsa_pub_key => SSHUtil.rsa_pub_key_content)
-          raise Error::Usage, "DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' does not exist on server."
+        # This handles state where a depenent module is just created as a component module and consequently we tell server
+        # to create the common_module tied to it
+        unless module_info.data(:repo)
+          module_info = create_module_repo_from_component_info 
         end
 
         branch    = module_info.required(:branch, :name)
@@ -54,8 +52,8 @@ module DTK::Client
           :module_type => :common_module,
           :repo_url    => module_info.required(:repo, :url),
           :branch      => module_info.required(:branch, :name),
-          :module_name => module_name,
-          :repo_dir    => target_repo_dir
+          :module_name => @module_ref.module_name,
+          :repo_dir    => @target_repo_dir
         }
 
         ret = ClientModuleDir::GitRepo.clone_module_repo(clone_args)
@@ -64,8 +62,23 @@ module DTK::Client
           LoadSource.fetch_from_remote(module_info, self)
         end
 
-        OsUtil.print_info("DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+        OsUtil.print_info("DTK module '#{@module_ref.pretty_print}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+      end
+
+      def version
+        @module_ref.version
+      end
+
+      private
+
+      def create_module_repo_from_component_info
+        rest_post("#{BaseRoute}/create_repo_from_component_info", module_ref_post_body)
       end
+
+      def module_ref_post_body
+        self.class.module_ref_post_body(@module_ref)
+      end
+
     end
   end
 end

data/lib/client/operation/module/install/dependent_modules.rb

@@ -31,7 +31,7 @@ module DTK::Client
         @base_module_ref       = base_module_ref
         @component_module_refs = component_module_refs 
         @print_helper          = PrintHelper.new(:module_ref => @base_module_ref, :source => :remote)
-        @prompt_helper         = PromptHelper.new(:update_all => opts[:skip_prompt])
+        @prompt_helper         = PromptHelper.new(:update_all => opts[:skip_prompt], :update_none => opts[:update_none])
       end
       private :initialize
 

data/lib/client/operation/module/install/dependent_modules/component_module.rb

@@ -83,14 +83,7 @@ module DTK::Client; class Operation::Module
           :version?    => version
         }
 
-        response = rest_post "#{BaseRoute}/install_component_module", PostBody.new(post_body)
-
-        clone_args = {
-          :module_type => :component_module,
-          :repo_url    => response.required(:repo_url),
-          :branch      => response.required(:workspace_branch),
-          :module_name => response.required(:full_module_name)
-        }
+        response = rest_post "#{BaseRoute}/install_component_info", PostBody.new(post_body)
 
         @print_helper.print_done_message
         response

data/lib/client/operation/module/push.rb

@@ -21,6 +21,7 @@ module DTK::Client
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
           module_ref = args.required(:module_ref)
+          method     = args[:method] || "pushed"
 
           unless client_dir_path = module_ref.client_dir_path
             raise Error, "Not implemented yet; need to make sure module_ref.client_dir_path is set when client_dir_path given"
@@ -52,22 +53,46 @@ module DTK::Client
           )
 
           response = rest_post("#{BaseRoute}/update_from_repo", post_body)
+
+          if missing_dependencies = response.data(:missing_dependencies)
+            unless missing_dependencies.empty?
+              dependent_modules = missing_dependencies.map { |dependency| Install::ModuleRef.new(:namespace => dependency['namespace_name'], :module_name => dependency['display_name'], :version => dependency['version_info']) }
+              begin
+                Install::DependentModules.install(module_ref, dependent_modules, :update_none => true)
+              rescue TerminateInstall
+                @print_helper.print_terminated_installation
+                return nil
+              end
+            end
+            response = rest_post("#{BaseRoute}/update_from_repo", post_body.merge(:skip_missing_check => true))
+          end
           # TODO: DTK-2786; uncomment out to see what diffs is returning for different examples of what is deleted, added or modified before push
           # pp [:debug_diffs, response.data(:diffs)]
-          process_semantic_diffs(response.data(:diffs))
+          print = process_semantic_diffs(response.data(:diffs), method)
 
           # if diffs is nil then indicate no diffs, otherwise render diffs in yaml
-          OsUtil.print_info("No Diffs to be pushed.") if response.data(:diffs).nil?
+          OsUtil.print_info("No Diffs to be #{method}.") if response.data(:diffs).nil? || !print
           nil
         end
       end
       
-      def self.process_semantic_diffs(diffs)
+      def self.process_semantic_diffs(diffs, method)
         return if (diffs || {}).empty?
-        OsUtil.print_info("\nDiffs that were pushed:")
+        print = false
+        
+        diffs.each {|diff| print = true unless diff[1].nil?}
+
+        if print
+          OsUtil.print_info("\nDiffs that were #{method}:")
+
+          diffs.each { |v| diffs.delete(v[0]) if v[1].nil? }
+          OsUtil.print(hash_to_yaml(diffs).gsub("---\n", ""))
+        end
+        
+        print
+      end
 
-        diffs.each { |v| diffs.delete(v[0]) if v[1].nil? }
-        OsUtil.print(hash_to_yaml(diffs).gsub("---\n", ""))
+      class TerminateInstall < ::Exception
       end
     end
   end

data/lib/client/operation/module/uninstall.rb

@@ -23,6 +23,7 @@ module DTK::Client
           module_ref  = args.required(:module_ref)
           name        = args.required(:name)
           version     = args.required(:version)
+          versions    = nil
 
           unless name.nil?
             query_string_hash = QueryStringHash.new(
@@ -57,23 +58,15 @@ module DTK::Client
           
           raise Error::Usage, "Invalid module name." if module_ref.nil?
 
-          opts = {
-            :namespace => module_ref.namespace,
-            :version   => module_ref.version
-          }
-
           unless args[:skip_prompt]
-            return false unless Console.prompt_yes_no("Are you sure you want to uninstall module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' from the server?", :add_options => true)
+            return false unless Console.prompt_yes_no("Are you sure you want to uninstall module '#{module_ref.pretty_print}' from the DTK Server?", :add_options => true)
           end
 
-          post_body = PostBody.new(
-            :module_name => module_ref.module_name,
-            :namespace   => module_ref.namespace,
-            :version?    => module_ref.version
-          )
+          post_body = module_ref_post_body(module_ref)
+          post_body.merge!(:versions => versions) if versions
 
           rest_post("#{BaseRoute}/delete", post_body)
-          OsUtil.print_info("DTK module '#{DTK::Common::PrettyPrintForm.module_ref(module_ref.module_name, opts)}' has been deleted successfully.")
+          OsUtil.print_info("DTK module '#{module_ref.pretty_print}' has been uninstalled successfully.")
           nil
         end
       end

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

@@ -40,14 +40,15 @@ module DTK::Client
           post_body = PostBody.new(
             :task_params? => task_params
           )
-          response = rest_post("#{BaseRoute}/#{service_instance}/#{action}", post_body)
+          encoded_action =  URI.encode_www_form_component("#{action}")
+          response = rest_post("#{BaseRoute}/#{service_instance}/#{encoded_action}", post_body)
 
           if confirmation_message = response.data(:confirmation_message)
             unless Console.prompt_yes_no("Service instance has been stopped, do you want to start it?", :add_options => true)
               return Response::Ok.new(:empty_workflow => true) 
             end
 
-            response = rest_post("#{BaseRoute}/#{service_instance}/#{action}", post_body.merge!(:start_assembly => true, :skip_violations => true))
+            response = rest_post("#{BaseRoute}/#{service_instance}/#{encoded_action}", post_body.merge!(:start_assembly => true, :skip_violations => true))
           end
 
           if response.data(:empty_workflow)

data/lib/client/util/remote_dependency.rb

@@ -54,7 +54,7 @@ module DTK::Client
           end
         end
 
-        raise Error, errors unless errors.empty?
+        raise Error::Usage, errors unless errors.empty?
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -380,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.