dtk-client 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46ddda1f2067a87c86d33e8ca4c9f5a296240a7
-  data.tar.gz: 52dc5c9d3fdcd9bfcd7eb61187b0af43033d7ae2
+  metadata.gz: 2817e488bead21b5b89b2a858c54a2ba8572dfa2
+  data.tar.gz: 9e06efff1beb26514abb4816bb38bc0b90f23ddd
 SHA512:
-  metadata.gz: 14b2a72db3ec12725521967a979e5645e5072212d73a84ad02159aef55d51c60591e5757ca8018ccbfc4e3113a414c4adb44fd24e7115b087545aec9d1389911
-  data.tar.gz: 9f0d95dbbb042c5059eb375bb001451d60863c17b7860e00ef72d31270cc9074ee98bd82dbbbda5af6c7d7257f3b713f357410910d884f2484390693e0b07a6e
+  metadata.gz: f0f6936dc5618b38729e7cfa3dc46666c45c71e9a4671b6fbf22d566a257659168304bbb4d468e3583797660a4e1ea4b3a41629c741a849ca33ca31c50ae8832
+  data.tar.gz: aeb6cf7b75d37b1daed90920c070e4a553b50bdb77388eca585a10263803272ea8ce39d4b5a2764475396dbd124b802be9ed19b7d7d2711a3e40679761a50eaf

data/lib/command_helpers/service_importer.rb

@@ -15,24 +15,54 @@ module DTK::Client
       "Module '#{name}' has errors:\n  #{errors.to_s}\nYou can fix errors in the DSL by invoking the 'edit' command.\n"
     end
 
+    ##
+    # Method will trigger pull from dtkn for each existing module
+    #
+
+    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?")
+        required_modules.each do |r_module|
+          module_name = full_module_name(r_module)
+          module_type = r_module['type']
+
+          print "Pulling latest #{module_type.gsub('_',' ')} code for '#{module_name}' ... "
+
+          new_context_params = DTK::Shell::ContextParams.new
+          new_context_params.add_context_to_params(module_type, module_type)
+          new_context_params.add_context_name_to_params(module_type, module_type, module_name)
+          new_context_params.forward_options( { :skip_recursive_pull => true })
+
+          response = ContextRouter.routeTask(module_type, "pull_dtkn", new_context_params, @conn)
+
+          raise DTK::Client::DtkError, response.error_message unless response.ok?
+
+          # in case there are diffs there was no ouput so we add 'Done'
+          puts 'Done.' unless response.data[:diffs].empty?
+        end
+      end
+    end
+
+
     ##
     # Method will trigger import for each missing module component
     #
-    def trigger_module_component_import(missing_component_list, required_components, opts={})
+    def trigger_module_auto_import(missing_modules, required_modules, opts={})
       puts "Auto-importing missing module(s)"
-      modules_to_import = missing_component_list
+      modules_to_import = missing_modules
 
-      required_components.each do |r_module|
-        module_name = "#{r_module['namespace']}/#{r_module['name']}"
-        module_name += "-#{r_module['version']}" if r_module['version']
+      # Print out installed modules
+      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"
       end
 
+      # Trigger import/install for missing modules
       modules_to_import.each do |m_module|
-        module_name = "#{m_module['namespace']}/#{m_module['name']}"
-        module_name += "-#{m_module['version']}" if m_module['version']
+        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'])
@@ -110,5 +140,11 @@ module DTK::Client
       (version ? "#{display_name}-#{version.strip}" : "#{display_name}")
     end
 
+  private
+
+    def full_module_name(module_hash)
+      ::DTK::Client::ModuleUtil.join_name(module_hash['name'], module_hash['namespace'])
+    end
+
   end
 end

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

@@ -63,7 +63,7 @@ module DTK::Client
         if service_module_name_x =~ /(^[^:]+):([^:]+$)/
           namespace,service_module_name = [$1,$2]
         end
-        post_body.merge!(:service_module_name => service_module_name) 
+        post_body.merge!(:service_module_name => service_module_name)
       end
 
       namespace ||= opts[:default_namespace]
@@ -503,7 +503,7 @@ module DTK::Client
 
     def info_aux(context_params)
       assembly_or_workspace_id, node_id, component_id, attribute_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :node_id, :component_id, :attribute_id],method_argument_names)
-      is_json_return = context_params.get_forwarded_option(:json_return) || false
+      is_json_return = context_params.get_forwarded_options[:json_return] || false
 
       post_body = {
         :assembly_id => assembly_or_workspace_id,
@@ -645,7 +645,7 @@ module DTK::Client
         return unless Console.confirmation_prompt("Are you sure you want to delete and destroy all nodes in the workspace"+'?')
       end
 
-      unsaved_modules = check_if_unsaved_changes(assembly_or_workspace_id)
+      unsaved_modules = check_if_unsaved_cmp_module_changes(assembly_or_workspace_id)
       unless unsaved_modules.empty?
         return unless Console.confirmation_prompt("Purging the workspace will cause unsaved changes in component module(s) '#{unsaved_modules.join(',')}' to be lost. Do you still want to proceed"+'?')
       end

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

@@ -354,7 +354,7 @@ module DTK::Client
         opts = {:do_not_raise=>true}
         module_opts = ignore_component_error ? opts.merge(:ignore_component_error => true) : opts.merge(:additional_message=>true)
 
-        continue = trigger_module_component_import(missing_components, required_components, module_opts)
+        continue = trigger_module_auto_import(missing_components, required_components, module_opts)
         return unless continue
 
         puts "Resuming DTK Network import for #{module_type} '#{remote_module_name}' ..."
@@ -426,6 +426,7 @@ module DTK::Client
       catalog      = 'dtkn'
       version      = options["version"]
       module_type  = get_module_type(context_params)
+      skip_recursive_pull = context_params.get_forwarded_options()[:skip_recursive_pull]
 
       raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}" unless catalog
 
@@ -433,15 +434,14 @@ module DTK::Client
 
       if catalog.to_s.eql?("dtkn")
         clone_aux(module_type.to_sym, module_id, version, true, true) unless File.directory?(module_location)
-        opts = {:version => version, :remote_namespace => options.namespace}
+        opts = {:version => version, :remote_namespace => options.namespace, :skip_recursive_pull => skip_recursive_pull}
 
         response = pull_from_remote_aux(module_type.to_sym, module_id, opts)
         return response unless response.ok?
 
         push_clone_changes_aux(module_type.to_sym, module_id, version, nil, true) if File.directory?(module_location)
-        Response::Ok.new()
-      #elsif catalog.to_s.eql?("origin")
-        #needs to be implemented
+        response.skip_render = true
+        response
       else
         raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}"
       end

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

@@ -23,9 +23,10 @@ module DTK::Client
       remote_params.merge!(:version => version) if version
 
       # check and import component module dependencies before importing service itself
-      if (module_type == :service_module)
-        import_module_component_dependencies(module_id,remote_namespace)
+      unless opts[:skip_recursive_pull]
+        import_module_component_dependencies(module_type, module_id,remote_namespace)
       end
+
       # check whether a local module exists to determine whether pull from local clone or try to pull from server
       if Helper(:git_repo).local_clone_dir_exists?(module_type,module_name,:full_module_name=>full_module_name,:version=>version)
         unless rsa_pub_key
@@ -44,40 +45,52 @@ module DTK::Client
     ##
     #
     # module_type: will be :component_module or :service_module
-    def import_module_component_dependencies(module_id,remote_namespace=nil)
-      post_body = PostBody.new(
-        :service_module_id => module_id,
-        :remote_namespace? => remote_namespace,
-        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
-      )
-      response = post(rest_url("service_module/resolve_pull_from_remote"),post_body)
+    def import_module_component_dependencies(module_type, module_id, remote_namespace=nil)
+      response = resolve_pull_from_remote_on_server(module_type, module_id, remote_namespace)
 
       print "Resolving dependencies please wait ... "
 
+      # install them all!
       if (response.ok? && !(missing_components = response.data(:missing_modules)).empty?)
         required_modules = response.data(:required_modules)
         puts " New dependencies found, Installing."
 
-        module_opts = {:module_type => 'component-module'}
-        trigger_module_component_import(missing_components, required_modules, module_opts)
+        trigger_module_auto_import(missing_components, required_modules, { :include_pull_action => true })
 
         puts "Resuming pull from remote ..."
       else
         puts 'Done.'
       end
 
+      # pull them all!
+      if (response.ok? && !(required_modules = response.data(:required_modules)).empty?)
+        trigger_module_auto_pull(required_modules)
+      end
+
       RemoteDependencyUtil.print_dependency_warnings(response)
       nil
     end
 
+  private
+
+    def resolve_pull_from_remote_on_server(module_type, module_id, remote_namespace=nil)
+      post_body = PostBody.new(
+        :module_id => module_id,
+        :remote_namespace? => remote_namespace,
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
+      )
+      post(rest_url("#{module_type}/resolve_pull_from_remote"),post_body)
+    end
+
     module PullFromRemote
       extend CommandBase
       def self.perform_locally(cmd_obj,module_type,module_id,module_name,remote_params)
         opts = remote_params
         response = cmd_obj.Helper(:git_repo).pull_changes(module_type,module_name,opts)
+
         # return response unless response.ok?
         if response.data[:diffs].empty?
-          raise DtkError, "No changes to pull from remote"
+          puts "No changes to pull from remote."
         end
 
         return response

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

@@ -23,7 +23,7 @@ module DTK::Client
       response
     end
 
-    def check_if_unsaved_changes(assembly_or_workspace_id, opts={})
+    def check_if_unsaved_cmp_module_changes(assembly_or_workspace_id, opts={})
       unsaved_modules = []
       post_body = {
         :assembly_id => assembly_or_workspace_id,
@@ -40,5 +40,42 @@ module DTK::Client
       unsaved_modules
     end
 
+    def check_if_unsaved_assembly_changes(assembly_or_workspace_id, assembly_name, opts={})
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :module_type => 'service_module',
+        :modification_type => 'workflow'
+      }
+      response = post rest_url("assembly/prepare_for_edit_module"), post_body
+      return unless response.ok?
+      assembly_name,service_module_id,service_module_name,version,repo_url,branch,branch_head_sha,edit_file = response.data(:assembly_name,:module_id,:full_module_name,:version,:repo_url,:workspace_branch,:branch_head_sha,:edit_file)
+
+      edit_opts = {
+        :automatically_clone => true,
+        :assembly_module => {
+          :assembly_name => assembly_name,
+          :version => version
+        },
+        :workspace_branch_info => {
+          :repo_url => repo_url,
+          :branch => branch,
+          :module_name => service_module_name
+        },
+        :commit_sha => branch_head_sha,
+        :pull_if_needed => true,
+        :modification_type => :workflow,
+        :edit_file => edit_file
+      }
+
+      version = nil #TODO: version associated with assembly is passed in edit_opts, which is a little confusing
+      module_location  = OsUtil.module_location(:service_module,service_module_name,version,edit_opts)
+      return unless File.directory?(module_location)
+
+      grit_adapter = Helper(:git_repo).create(module_location)
+      return unless grit_adapter.repo_exists?
+
+      grit_adapter.changed?
+    end
+
   end
 end

data/lib/commands/thor/account.rb

@@ -127,7 +127,11 @@ module DTK::Client
         DTK::Client::Configurator.add_current_user_to_direct_access() if response.ok?
       end
 
-      nil
+      if response.ok? && !response.data(:registered_with_repoman)
+        OsUtil.print("Warning: We were not able to register your key with remote catalog!", :yellow)
+      end
+
+      response.ok? ? nil : response
     end
 
     desc "delete-ssh-key KEYPAIR-NAME ","Deletes the named ssh key from your user account"

data/lib/commands/thor/service.rb

@@ -537,11 +537,16 @@ TODO: will put in dot release and will rename to 'extend'
         return unless Console.confirmation_prompt("Are you sure you want to delete and destroy service '#{assembly_name}' and its nodes"+'?')
       end
 
-      unsaved_modules = check_if_unsaved_changes(assembly_id)
+      unsaved_modules = check_if_unsaved_cmp_module_changes(assembly_id)
       unless unsaved_modules.empty?
         return unless Console.confirmation_prompt("Deleting this service will cause unsaved changes in component module(s) '#{unsaved_modules.join(',')}' to be lost. Do you still want to proceed"+'?')
       end
 
+      assembly_changed = check_if_unsaved_assembly_changes(assembly_id, assembly_name)
+      if assembly_changed == true
+        return unless Console.confirmation_prompt("You made some changes in assembly or it's workflow that will be lost if you delete this service. Do you still want to proceed"+'?')
+      end
+
       # purge local clone
       response = purge_clone_aux(:all,:assembly_module => {:assembly_name => assembly_name})
       return response unless response.ok?

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.6.4"
+  VERSION="0.6.6"
 end

data/lib/shell/domain.rb

@@ -9,11 +9,15 @@ module DTK
       def initialize(override_method_arguments = [])
         @current_context  = ActiveContext.new
         @method_arguments = override_method_arguments
-        @thor_options          = nil
+        @thor_options     = Hash.new
       end
 
       def add_context_to_params(context_name, entity_name, context_value = nil)
-        @current_context.push_new_context(context_name, entity_name, context_value)
+        @current_context.push_new_context(context_name, stand_name(entity_name), context_value)
+      end
+
+      def add_context_name_to_params(context_name, entity_name, context_value = nil)
+        @current_context.push_new_name_context(context_name, stand_name(entity_name), context_value)
       end
 
       def forward_options(options)
@@ -24,10 +28,6 @@ module DTK
         @thor_options
       end
 
-      def get_forwarded_option(key)
-        @thor_options ? @thor_options[key] : nil
-      end
-
       def get_forwarded_thor_option(option_key)
         return @thor_options ? @thor_options[option_key] : nil
       end
@@ -112,10 +112,10 @@ module DTK
                 break if element
                 if context_name
                   if alternative_key.to_s.include?(context_name.downcase)
-                    required = alternative_key.to_s.match(/.+!$/) 
+                    required = alternative_key.to_s.match(/.+!$/)
                     selected_key = alternative_key
                   end
-                end 
+                end
               end
             end
 
@@ -165,7 +165,7 @@ module DTK
         (matched ? matched[1].to_i - 1 : nil)
       end
 
-      # based on map key binding e.g. assembly_id, assembly_name we will extrace value 
+      # based on map key binding e.g. assembly_id, assembly_name we will extrace value
       # from our ActiveContext
       def check_context_for_element(key_mapping)
         split_info  =  split_info(key_mapping)
@@ -184,6 +184,15 @@ module DTK
         split_info[0].gsub(/_/,'-')  # makes sure we are using entity names with '_'
       end
 
+      #
+      # Standardize context name since we are in domain treating :component_module as :'component-module'
+      # and need to be careful about these changes
+      #
+
+      def stand_name(name)
+        name.to_s.gsub('_','-').to_sym
+      end
+
       def split_info(key_mapping)
         key_mapping.to_s.split(/_([a-z]+!?$)/)
       end
@@ -198,9 +207,13 @@ module DTK
 
       SHELL_SEPARATOR = '/'
 
-      def self.create_context(context_name, entity_name, context_value=nil)
+      def self.create_context(context_name, entity_name, context_value=nil, type_id=:id)
         if context_value
-          return ContextEntity.create_identifier(context_name, entity_name, context_value)
+          if :id.eql?(type_id)
+            return ContextEntity.create_identifier(context_name, entity_name, context_value)
+          else
+            return ContextEntity.create_name_identifier(context_name, entity_name, context_value)
+          end
         else
           return ContextEntity.create_command(context_name, entity_name)
         end
@@ -235,6 +248,14 @@ module DTK
         return instance
       end
 
+      def self.create_name_identifier(name, entity_name, value)
+        instance            = self.create_command(name,entity_name)
+        instance.name           = value
+        instance.identifier     = value
+        instance.alt_identifier = value
+        return instance
+      end
+
       def self.create_identifier(name, entity_name, value)
         instance                = self.create_command(name,entity_name)
         instance.identifier     = value
@@ -246,7 +267,7 @@ module DTK
 
     class ActiveContext
 
-      # special case when we are not able to provide valid identifier but we are 
+      # special case when we are not able to provide valid identifier but we are
       # using it as such
       NO_IDENTIFIER_PROVIDED = -1
 
@@ -266,6 +287,9 @@ module DTK
       def push_new_context(context_name, entity_name, context_value=nil)
         @context_list << ContextEntity.create_context(context_name, entity_name, context_value)
       end
+      def push_new_name_context(context_name, entity_name, context_value=nil)
+        @context_list << ContextEntity.create_context(context_name, entity_name, context_value, :name)
+      end
 
       def pop_context(n)
         return @context_list.pop(n)
@@ -301,7 +325,7 @@ module DTK
         return filtered_entities.collect { |e| e.entity.to_s }
       end
 
-      # returns id to be used to retrive task list form the cache based on 
+      # returns id to be used to retrive task list form the cache based on
       # current active context
       def get_task_cache_id()
         identifier = command_list().join('_')
@@ -447,7 +471,7 @@ module DTK
 
       # returns 2 arrays one for commands and next one for identifiers
       def get_all_tasks(child_name)
-        command_o_tasks, identifier_o_tasks = [], []           
+        command_o_tasks, identifier_o_tasks = [], []
         command_o_tasks    = (self[:all][child_name]||[]) + (self[:command_only][child_name]||[])
         identifier_o_tasks = (self[:all][child_name]||[]) + (self[:identifier_only][child_name]||[])
         return command_o_tasks, identifier_o_tasks
@@ -463,6 +487,6 @@ module DTK
         @completed_tasks << child_name
       end
     end
-    
+
   end
 end

data/lib/util/console.rb

@@ -14,7 +14,9 @@ module DTK::Client
       include CommandBase
       include CommandHelperMixin
 
+      #
       # Display confirmation prompt and repeat message until expected answer is given
+      #
       def confirmation_prompt(message, add_options=true)
         # used to disable skip with ctrl+c
         trap("INT", "SIG_IGN")
@@ -58,7 +60,7 @@ module DTK::Client
         # remove loading animation
         print "\b\b\b\b\b\b\bRefreshing..."
         STDOUT.flush
-        puts 
+        puts
       end
 
 
@@ -67,7 +69,7 @@ module DTK::Client
       # path to desire directory from where unix shell can execute normaly.
       #
       def unix_shell(path,module_id,module_type,version=nil)
-        
+
         dtk_shell_ac_proc = Readline.completion_proc
         dtk_shell_ac_append_char = Readline.completion_append_character
 
@@ -75,7 +77,7 @@ module DTK::Client
           puts "[NOTICE] Shell interaction is currenly not supported on Windows."
           return
         end
-        
+
         begin
           # we need to change path like this since system call 'cd' is not supported
           initial_dir = Dir.pwd
@@ -102,7 +104,7 @@ module DTK::Client
                 path = line.match(/^\//) ? line : "#{Dir.getwd()}/#{line}"
                 # If filepat* with '*' at the end, match first directory and go in it, else try to change original input
                 if path.match(/\*$/)
-                  dirs = Dir[path].select{|file| File.directory?(file)} 
+                  dirs = Dir[path].select{|file| File.directory?(file)}
                   unless dirs.empty?
                     Dir.chdir(dirs.first)
                     next

data/lib/util/remote_dependency_util.rb

@@ -16,7 +16,7 @@ module DTK
           warnings = response.data['dependency_warnings']
           if warnings && !warnings.empty?
             print_out "Following warnings have been detected for current module by Repo Manager:\n"
-            warnings.each { |w| print_out("  - #{w}") }
+            warnings.each { |w| print_out("  - #{w['message']}") }
             puts
             are_there_warnings = true
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler