dtk-client 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3953dc0df5e344c64f43464dd5e730198c4a484f
-  data.tar.gz: adbd2402ddbacff57acde0e95ec69cb9f33f76da
+  metadata.gz: a4fe37c7f760ab997a0789958481c16a3924f8fc
+  data.tar.gz: 4329e1f91b5b7542cccbe0d27105e831d7b7f498
 SHA512:
-  metadata.gz: 0759ad3202f4b49e699ba368d0a6378e15499498e50b3b2aeafd85f8e79ced559dcd0e366b3dd480729caad364e9d552e3da3c97ac411aa3eff5a7f949349fab
-  data.tar.gz: 6b6955127a3e4413ba4e50b2dbf64ee66aa333669d3ea7d6a34de1314533131be399f63f6cf507135f2a07c00a08b6c8ef327eb07ba574137b630758ccf4213a
+  metadata.gz: e7ee7ed59d2b153fa7e4815f006f6a7fc42a1ffcf67b67818a9278a4a44c44c9d08a65f9859f0d56f14e7066285f0a49f96677ea916d2f9c12907faae5208372
+  data.tar.gz: e09ab967d418e7445f6d584682f2059d8a07f06b5e1fde7a09a4541d4bb353c5e5b7b2410cb4efc9066238695b0c81c6528aedb5709673b526f08d5c553084bc

data/.gitignore

@@ -6,3 +6,6 @@ sftp-config*.json
 .tags1
 Gemfile.lock
 .vscode
+doc
+.yardoc
+.solargraph.yml

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

@@ -30,40 +30,100 @@ module DTK::Client
           sc.switch Token.update_deps
 
           sc.action do |_global_options, options, args|
-            directory_path = args[1] || options[:directory_path]
-            version        = options[:version]
-            update_deps    = options[:update_deps]
+            directory_path  = args[1] || options[:directory_path]
+            version         = options[:version]
+            update_deps     = options[:update_deps]
             has_remote_repo = false
-          
+            is_clone        = false
+
             if module_name = args[0]
               # reached if installing from dtkn
               # installs content from dtkn (later probably from other remote catalogs) onto client machine
               # 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_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
+              has_remote_repo    = true
+              module_ref         = module_ref_object_from_options_or_context?(:module_ref => module_name, :version => version)
+              remote_module_info = nil
 
-            raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
+              unless version
+                remote_module_info = get_remote_module_info(module_ref)
+                version            = remote_module_info.required(:version)
+                module_ref.version = version
+              end
 
-            if target_repo_dir
-              directory_path ||= target_repo_dir.data[:target_repo_dir]
+              if Operation::Module.module_version_exists?(module_ref, :type => :common_module)
+                clone_module(module_ref, directory_path, version)
+                is_clone = true
+              else
+                target_repo_dir = Operation::Module.install_from_catalog(:module_ref => module_ref, :version => version, :directory_path => directory_path, :remote_module_info => remote_module_info)
+              end
             end
 
-            install_opts = directory_path ? { :directory_path => directory_path, :version => (version || 'master') } : options
-            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, 
-              :has_directory_param => !options["d"].nil?,
-              :has_remote_repo     => has_remote_repo,
-              :update_deps         => update_deps
-            }
-            Operation::Module.install(operation_args)
+            unless is_clone
+              raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
+
+              if target_repo_dir
+                directory_path ||= target_repo_dir.data[:target_repo_dir]
+              end
+
+              install_opts = directory_path ? { :directory_path => directory_path, :version => (version || 'master') } : options
+              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,
+                :has_directory_param => !options["d"].nil?,
+                :has_remote_repo     => has_remote_repo,
+                :update_deps         => update_deps
+              }
+              Operation::Module.install(operation_args)
+            end
           end
         end
       end
+
+      def clone_module(module_ref, directory_path, version)
+        arg = {
+          :module_ref => module_ref,
+          :target_directory => Operation::ClientModuleDir.create_module_dir_from_path(directory_path || OsUtil.current_dir)
+        }
+        repo_dir_info = Operation::Module.clone_module(arg).data
+        repo_dir      = repo_dir_info[:target_repo_dir]
+
+        # DTK-3088 - need this to pull service info for dependency module on clone
+        if repo_dir_info[:pull_service_info]# && (version.nil? || version.eql?('master'))
+          repo_dir = repo_dir_info[:target_repo_dir]
+          module_ref = module_ref_object_from_options_or_context(:directory_path => repo_dir)
+
+          operation_args = {
+            :module_ref          => module_ref,
+            :base_dsl_file_obj   => @base_dsl_file_obj,
+            :has_directory_param => true,
+            :directory_path      => repo_dir,
+            :update_deps         => false,
+            :do_not_print        => true,
+            :force               => true,
+            :allow_version       => true
+          }
+
+          Operation::Module.pull_dtkn(operation_args)
+          Operation::Module.push(operation_args.merge(:method => "pulled"))
+        end
+
+        OsUtil.print_info("DTK module '#{module_ref.pretty_print}' has been successfully cloned from server into '#{repo_dir}'")
+      end
+
+      private
+
+      def get_remote_module_info(module_ref)
+        query_string_hash = QueryStringHash.new(
+          :module_name => module_ref.module_name,
+          :namespace   => module_ref.namespace,
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :version?    => nil
+        )
+
+        Operation::Module.rest_get("#{Operation::Module::BaseRoute}/remote_module_info", query_string_hash)
+      end
     end
   end
 end

data/lib/cli/command/module.rb

@@ -27,7 +27,7 @@ module DTK::Client
           'list-assemblies',
           'push',
           'uninstall',
-          'clone',
+          # 'clone',
           'list-remotes',
           'push-dtkn',
           'stage',

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

@@ -23,18 +23,20 @@ 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.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]
             directory_path = options[:d] || @base_dsl_file_obj.parent_dir
-            
+
             args = {
               :service_instance => service_instance,
               :action           => action,
               :action_params    => action_params,
+              :breakpoint       => options['breakpoint'],
               :directory_path   => directory_path,
               :command          => 'exec'
             }

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

@@ -23,6 +23,7 @@ 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.switch Token.breakpoint
           sc.action do |_global_options, options, args|
             service_instance = service_instance_in_options_or_context(options)
             
@@ -34,6 +35,7 @@ module DTK::Client
               :service_instance => service_instance,
               :action           => action,
               :action_params    => action_params,
+              :breakpoint       => options['breakpoint'],
               :directory_path   => directory_path,
               :command          => 'exec-sync'
             }

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

@@ -21,10 +21,10 @@ module DTK::Client; module CLI
       subcommand_def 'list-attributes' do |c|
         command_body c, 'attributes', 'List attributes associated with service instance.' 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.node, :desc => 'Filter attributes by node'
+#          sc.flag Token.node, :desc => 'Filter attributes by node'
           sc.flag Token.format
-          sc.flag Token.component, :desc => 'Filter attributes by component'
-          #sc.switch Token.all, :desc => 'Get all attributes'
+#          sc.flag Token.component, :desc => 'Filter attributes by component'
+          sc.switch Token.all, :desc => 'List component and node level attributes with top level ones'
           sc.switch Token.links, :desc => 'Display attribute links'
 
           sc.action do |_global_options, options, _args|
@@ -32,10 +32,10 @@ module DTK::Client; module CLI
 
             args = {
               :service_instance => service_instance,
-              :links            => options[:links]||nil,
-              :node             => options[:node],
-              :component        => options[:component],
-              #:all              => options[:all],
+              :links            => options[:links],
+              # :node             => options[:node],
+              # :component        => options[:component],
+              :all              => options[:all],
               :format           => options[:format]
             }
             Operation::Service.list_attributes(args)
@@ -44,4 +44,4 @@ module DTK::Client; module CLI
       end
     end
   end
-end; end
+end; end

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

@@ -24,13 +24,11 @@ module DTK::Client; module CLI
           sc.flag Token.uninstall_name
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
-          sc.switch Token.delete, :desc => 'Removes service instance with all nodes and modules'
           sc.switch Token.recursive, :desc => 'Delete dependent service instances'
           sc.switch Token.force, :desc => 'Ignore errors and delete service instance. This will not terminate aws instances, you will have to do that manually'
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
             purge          = options[:purge]
-            delete         = options[:delete]
             force          = options[:f]
             recursive      = options[:recursive]
             name           = options[:uninstall_name]
@@ -39,18 +37,17 @@ module DTK::Client; module CLI
               raise Error::Usage, "If use option '#{option_ref(:purge)}' then need to call from outside directory and use option '#{option_ref(:directory_path)}'"
             end
 
-            if name.nil? 
-              service_instance = service_instance_in_options_or_context(options, :ignore_parsing_errors => true) 
-            else  
+            if name.nil?
+              service_instance = service_instance_in_options_or_context(options, :ignore_parsing_errors => true)
+            else
               service_instance = name
             end
 
-            args = {  
+            args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
               :directory_path   => directory_path,
               :purge            => purge,
-              :delete           => delete,
               :recursive        => recursive,
               :force            => force
             }

data/lib/cli/command/token.rb

@@ -56,6 +56,7 @@ module DTK::Client
         # Switch constructor args order: key, desc, opts={}
         :all          => Switch.new(:all, 'All'),
         :base         => Switch.new(:base, 'Create base service instance'),
+        :breakpoint       => Switch.new([:b, :breakpoint], 'Add breakpoint'),
         :delete       => Switch.new(:delete, 'Delete'),
         :force        => Switch.new([:f, :force], 'Force'),
         :purge        => Switch.new(:purge, 'Purge'),

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.3"
+      VERSION="0.11.4"
     end
   end
 end

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

@@ -34,7 +34,7 @@ module DTK::Client
       end
 
       def clone_module
-        unless module_info = module_version_exists?(@module_ref, :type => :common_module, :remote_info => true, :rsa_pub_key => SSHUtil.rsa_pub_key_content)
+        unless module_info = module_version_exists?(@module_ref, :type => :common_module, :remote_info => false, :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
 
@@ -92,8 +92,14 @@ module DTK::Client
           :rsa_pub_key => SSHUtil.rsa_pub_key_content,
           :version     => version||'master'
         )
-        remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
-        if remote_module_info.data(:service_info)
+
+        begin
+          remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
+        rescue DTK::Client::Error::ServerNotOkResponse => e
+          # ignore if remote does not exist
+        end
+
+        if remote_module_info && remote_module_info.data(:service_info)
           !module_version_exists?(@module_ref, :type => :service_module)
         end
       end

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

@@ -130,7 +130,7 @@ module DTK::Client; class Operation::Module
         are_there_warnings = RemoteDependency.check_permission_warnings(module_dependencies_response)
         are_there_warnings ||= RemoteDependency.print_dependency_warnings(module_dependencies_response, nil, :ignore_permission_warnings => true)
         if are_there_warnings
-          raise TerminateInstall unless Console.prompt_yes_no("Do you still want to proceed with install?", :add_options => true)
+          raise Install::TerminateInstall unless Console.prompt_yes_no("Do you still want to proceed with install?", :add_options => true)
         end
       end
 

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

@@ -19,38 +19,42 @@ module DTK::Client
   class Operation::Module
     class InstallFromCatalog < self
       attr_reader :version, :module_ref, :target_repo_dir
-      def initialize(catalog, module_ref, directory_path, version)
-        @catalog          = catalog
-        @module_ref       = module_ref
-        @directory_path   = directory_path
-        @target_repo_dir  = ClientModuleDir.create_module_dir_from_path(directory_path || OsUtil.current_dir)
-        @version          = version # if nil wil be dynamically updated along with version attribute of @module_ref
+      def initialize(catalog, module_ref, directory_path, version, remote_module_info)
+        @catalog            = catalog
+        @module_ref         = module_ref
+        @directory_path     = directory_path
+        @target_repo_dir    = ClientModuleDir.create_module_dir_from_path(directory_path || OsUtil.current_dir)
+        @version            = version # if nil wil be dynamically updated along with version attribute of @module_ref
+        @remote_module_info = remote_module_info
       end
       private :initialize
 
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
-          module_ref     = args.required(:module_ref)
-          version        = args[:version]
-          directory_path = args[:directory_path]
+          module_ref         = args.required(:module_ref)
+          version            = args[:version]
+          directory_path     = args[:directory_path]
+          remote_module_info = args[:remote_module_info]
 
           # will create different classes for different catalog types when we add support for them
-          new('dtkn', module_ref, directory_path, version).install_from_catalog
+          new('dtkn', module_ref, directory_path, version, remote_module_info).install_from_catalog
         end
       end
       
       def install_from_catalog
-        query_string_hash = QueryStringHash.new(
-          :module_name => @module_ref.module_name,
-          :namespace   => @module_ref.namespace,
-          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
-          :version?    => @version
-        )
+        unless @remote_module_info
+          query_string_hash = QueryStringHash.new(
+            :module_name => @module_ref.module_name,
+            :namespace   => @module_ref.namespace,
+            :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+            :version?    => @version
+          )
 
-        remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
+          @remote_module_info = rest_get "#{BaseRoute}/remote_module_info", query_string_hash
+        end
 
         unless @version
-          @version = remote_module_info.required(:version)
+          @version = @remote_module_info.required(:version)
           @module_ref.version = @version
         end
 
@@ -60,7 +64,7 @@ module DTK::Client
 
         create_repo_opts = { :repo_dir => @target_repo_dir, :commit_msg => "DTK client initialize" }
         Operation::ClientModuleDir::GitRepo.create_repo_with_empty_commit(create_repo_opts)
-        LoadSource.fetch_transform_and_merge(remote_module_info, self)
+        LoadSource.fetch_transform_and_merge(@remote_module_info, self)
 
         {:target_repo_dir => @target_repo_dir}
       end

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

@@ -45,6 +45,7 @@ module DTK::Client
           force               = args[:force]
           update_deps         = args[:update_deps]
           do_not_print        = args[:do_not_print]
+          allow_version       = args[:allow_version]
 
           case update_deps
           when "prompt"
@@ -59,7 +60,8 @@ module DTK::Client
             file_obj = base_dsl_file_obj.raise_error_if_no_content
           end
 
-          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:update_deps => update_deps, :no_update_deps => no_update_deps, :force => force, :do_not_print => do_not_print)
+          new('dtkn', module_ref, directory_path, version, file_obj).pull_dtkn(:update_deps => update_deps,
+          :no_update_deps => no_update_deps, :force => force, :do_not_print => do_not_print, :allow_version => allow_version)
         end
       end
       
@@ -70,7 +72,8 @@ module DTK::Client
         end
 
         if ref_version = @version || module_ref.version
-          raise Error::Usage, "You are not allowed to pull module version '#{ref_version}'!" unless ref_version.eql?('master')
+          do_not_raise = opts[:allow_version] || ref_version.eql?('master')
+          raise Error::Usage, "You are not allowed to pull module version '#{ref_version}'!" unless do_not_raise
         end
 
         error_msg = "To allow pull-dtkn to go through, invoke 'dtk push' to push the changes to server before invoking pull-dtkn again"

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

@@ -20,8 +20,9 @@ module DTK::Client
     class Push < self
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
-          module_ref = args.required(:module_ref)
-          method     = args[:method] || "pushed"
+          module_ref    = args.required(:module_ref)
+          method        = args[:method] || "pushed"
+          allow_version = args[:allow_version]
 
           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"
@@ -31,6 +32,11 @@ module DTK::Client
             raise Error::Usage, "DTK module '#{module_ref.print_form}' does not exist."
           end
 
+          if ref_version = module_ref.version
+            do_not_raise = allow_version || ref_version.eql?('master')
+            raise Error::Usage, "You are not allowed to push module version '#{ref_version}'!" unless do_not_raise
+          end
+
           branch    = module_info.required(:branch, :name)
           repo_url  = module_info.required(:repo, :url)
           repo_name = module_info.required(:repo, :name)

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

@@ -26,7 +26,7 @@ module DTK::Client
         @module_ref        = module_ref
         @directory_path    = directory_path
         @target_repo_dir   = directory_path || base_dsl_file_obj.parent_dir
-        @version           = version || 'master'
+        @version           = version || module_ref.version || 'master'
         @base_dsl_file_obj = base_dsl_file_obj
 
         @module_ref.version ||= @version

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

@@ -24,6 +24,7 @@ module DTK::Client
           action           = args.required(:action)
           action_params    = args[:action_params]
           directory_path   = args[:directory_path]
+          breakpoint       = args[:breakpoint]
 
           # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
           task_params = parse_params?(action_params)||{}
@@ -32,7 +33,7 @@ module DTK::Client
           # will transform ec2::node[node_name]/action to node_name/action
           action_node, action_name = (action||"").split('/')
           if action_node && action_name
-            if action_node_match = action_node.match(/^ec2::node\[(.*)\]/)
+            if action_node_match = action_node.match(/^ec2::node\[(.*)\]/) || action_node.match(/^ec2::node_group\[(.*)\]/)
               matched_node = $1
               action = "#{matched_node}/#{action_name}"
             end
@@ -50,6 +51,7 @@ module DTK::Client
           post_body = PostBody.new(
             :task_params? => task_params
           )
+          post_body.merge!(:breakpoint => breakpoint) if breakpoint
           encoded_action =  URI.encode_www_form_component("#{action}")
           response = rest_post("#{BaseRoute}/#{service_instance}/#{encoded_action}", post_body)
 

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

@@ -22,17 +22,17 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           links            = args[:links]
-          node             = args[:node]
-          component        = args[:component]
+          # node             = args[:node]
+          # component        = args[:component]
           all              = args[:all]
           format           = args[:format] || 'table'
           format.downcase!
 
           query_string_hash = QueryStringHash.new(
             :links?            => links,
-            :node_id?          => node,
+            # :node_id?          => node,
             :all               => all,
-            :filter_component? => component,
+            # :filter_component? => component,
             :format            => format
           )
           

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

@@ -22,7 +22,6 @@ module DTK::Client
         wrap_operation(args) do |args|
           service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
-          delete           = args.required(:delete)
           force            = args.required(:force)
           path             = args[:directory_path]
           node             = []
@@ -39,20 +38,15 @@ module DTK::Client
           post_body = PostBody.new(
             :service_instance => service_instance,
             :recursive?  => recursive,
-            :delete      => delete,
+            :delete      => true,
             :force       => force
           )
           response = rest_post("#{BaseRoute}/uninstall", post_body)
 
           ClientModuleDir.rm_f(path) if args[:purge]
 
-          if delete
-            if message = response.data(:message)
-              OsUtil.print_info(message)
-            end
-          else
-            msg = "DTK service '#{service_instance}' has been uninstalled successfully."
-            OsUtil.print_info(msg)
+          if message = response.data(:message) || "DTK service '#{service_instance}' has been uninstalled successfully."
+            OsUtil.print_info(message)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core