dtk-client 0.5.17 → 0.5.18

data/lib/commands/thor/service_module.rb

@@ -43,11 +43,15 @@ module DTK::Client
       get_cached_response(:service_module, "service_module/list", {})
     end
 
+    def self.whoami()
+      return :service_module, "service_module/list", nil
+    end
+
     def self.override_allowed_methods()
       return DTK::Shell::OverrideTasks.new({
         :command_only => {
           :self => [
-            ["list"," list [--remote] [--diff]","# List service modules (local/remote). Use --diff to compare loaded and remote modules."]
+            ["list"," list [--remote] [--diff] [-n NAMESPACE]","# List service modules (local/remote). Use --diff to compare loaded and remote modules."]
           ],
           :"assembly" => [
             ["list","list","# List assemblies for given service module."]
@@ -63,8 +67,10 @@ module DTK::Client
             ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID]", "# Stage assembly in target."],
             # ["deploy","deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             # ["deploy","deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
+            ["deploy","deploy [INSTANCE-NAME] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             ["list-nodes","list-nodes", "# List all nodes for given assembly."],
-            ["list-components","list-components", "# List all components for given assembly."]
+            ["list-components","list-components", "# List all components for given assembly."],
+            ["list-settings","list-settings", "# List all settings for given assembly."]
           ]
         }
 
@@ -91,9 +97,13 @@ module DTK::Client
       list(context_params)
     end
 
-    desc "list [--remote] [--diff]","List service modules (local/remote). Use --diff to compare loaded and remote modules."
+    desc "list [--remote] [--diff] [-n NAMESPACE]","List service modules (local/remote). Use --diff to compare loaded and remote modules."
     method_option :remote, :type => :boolean, :default => false
     method_option :diff, :type => :boolean, :default => false
+    method_option :namespace, :aliases => "-n" ,
+      :type => :string,
+      :banner => "NAMESPACE",
+      :desc => "List modules only in specific namespace."
     def list(context_params)
       service_module_id, about, service_module_name = context_params.retrieve_arguments([:service_module_id, :option_1, :option_2],method_argument_names)
       datatype = nil
@@ -111,6 +121,7 @@ module DTK::Client
         action    = options.remote? ? "list_remote" : "list"
         post_body = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
         post_body[:diff] = options.diff? ? options.diff : {}
+        post_body.merge!(:module_namespace => options.namespace)
 
         response = post rest_url("service_module/#{action}"), post_body
       # If user is on service identifier level, list task can't have '--remote' option.
@@ -125,8 +136,7 @@ module DTK::Client
             data_type        = :assembly_template
             action           = "list_assemblies"
           when "modules"
-            #data_type is set by server
-            data_type        = options.remote? ? :component_remote : :component
+            data_type        = options.remote? ? :component_remote : :component_module
             action           = "list_component_modules"
           else
             raise_validation_error_method_usage('list')
@@ -159,7 +169,7 @@ module DTK::Client
     # end
 
     # version_method_option
-    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."
+    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
     def install(context_params)
@@ -388,12 +398,13 @@ module DTK::Client
     # end
 
     # TODO: put in two versions, one that creates empty and anotehr taht creates from local dir; use --empty flag
-    desc "import SERVICE-MODULE-NAME", "Create new service module from local clone"
+    desc "import [NAMESPACE:]SERVICE-MODULE-NAME", "Create new service module from local clone"
     def import(context_params)
       module_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      namespace, local_module_name = get_namespace_and_name(module_name, ':')
 
       # first check that there is a directory there and it is not already a git repo, and it ha appropriate content
-      response = Helper(:git_repo).check_local_dir_exists_with_content(:service_module,module_name)
+      response = Helper(:git_repo).check_local_dir_exists_with_content(:service_module, local_module_name, nil, namespace)
       return response unless response.ok?
       service_directory = response.data(:module_directory)
 
@@ -401,23 +412,20 @@ module DTK::Client
       reparse_aux(service_directory)
 
       # first call to create empty module
-      response = post rest_url("service_module/create"), { :module_name => module_name }
+      response = post rest_url("service_module/create"), { :module_name => local_module_name, :module_namespace => namespace }
       return response unless response.ok?
       @@invalidate_map << :service_module
 
-      if error = response.data(:dsl_parsed_info)
-        dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
-      end
-
       # initial commit for given service module
-      service_module_id, repo_info, module_id = response.data(:service_module_id, :repo_info)
-      repo_url,repo_id,module_id,branch = [:repo_url,:repo_id,:module_id,:workspace_branch].map { |k| repo_info[k.to_s] }
-      response = Helper(:git_repo).initialize_client_clone_and_push(:service_module, module_name,branch,repo_url,service_directory)
+      service_module_id, repo_info = response.data(:service_module_id, :repo_info)
+      repo_url,repo_id,module_id,branch,new_module_name = [:repo_url,:repo_id,:module_id,:workspace_branch,:full_module_name].map { |k| repo_info[k.to_s] }
+
+      response = Helper(:git_repo).rename_and_initialize_clone_and_push(:service_module, local_module_name, new_module_name,branch,repo_url,service_directory)
       return response unless response.ok?
+
       repo_obj,commit_sha =  response.data(:repo_obj,:commit_sha)
 
-      context_params.add_context_to_params(module_name, :"service-module", module_id)
+      context_params.add_context_to_params(local_module_name, :"service-module", module_id)
       push(context_params,true)
     end
 
@@ -517,13 +525,13 @@ module DTK::Client
       response
     end
 
-    desc "delete-from-catalog [NAMESPACE/]REMOTE-SERVICE-MODULE-NAME [-y]", "Delete the service module from the DTK Network catalog"
+    desc "delete-from-catalog NAMESPACE/REMOTE-SERVICE-MODULE-NAME [-y]", "Delete the service module from the DTK Network catalog"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
     end
 
-    desc "SERVICE-MODULE-NAME/ID delete-assembly ASSEMBLY-ID [-y]", "Delete assembly from service module."
+    desc "SERVICE-MODULE-NAME/ID delete-assembly ASSEMBLY-NAME [-y]", "Delete assembly from service module."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_assembly(context_params)
       response = delete_assembly_aux(context_params)
@@ -531,6 +539,23 @@ module DTK::Client
 
       response
     end
+
+    #
+    # DEVELOPMENT MODE METHODS
+    #
+    if DTK::Configuration.get(:development_mode)
+
+      desc "delete-all","Delete all service modules"
+      def delete_all(context_params)
+        return unless Console.confirmation_prompt("This will DELETE ALL service modules, are you sure"+'?')
+        response = list(context_params)
+
+        response.data().each do |e|
+          run_shell_command("delete #{e['display_name']} -y -p")
+        end
+      end
+
+    end
 =begin
     desc "SERVICE-NAME/ID assembly-templates list", "List assembly templates optionally filtered by service ID/NAME."
     def assembly_template(context_params)

data/lib/commands/thor/test_module.rb

@@ -47,25 +47,24 @@ module DTK::Client
       set_attribute_module_aux(context_params)
     end
 
-    desc "list [--remote] [--diff]", "List loaded or remote test modules. Use --diff to compare loaded and remote test modules."
+    desc "list [--remote] [--diff] [-n NAMESPACE]", "List loaded or remote test modules. Use --diff to compare loaded and remote test modules."
     method_option :remote, :type => :boolean, :default => false
     method_option :diff, :type => :boolean, :default => false
+    method_option :namespace, :aliases => "-n" ,
+      :type => :string,
+      :banner => "NAMESPACE",
+      :desc => "List modules only in specific namespace."
     def list(context_params)
-      # Amar: attribute context commented out per Rich suggeston
-      #if context_params.is_there_command?(:attribute)
-      #  return module_info_about(context_params, :attributes, :attribute)
-      #elsif context_params.is_there_command?(:"component-template")
-      # if context_params.is_there_command?(:"component-template")
-      if context_params.is_there_command?(:"component")
-        return module_info_about(context_params, :components, :component)
-      end
+      return module_info_about(context_params, :components, :component) if context_params.is_there_command?(:"component")
 
       forwarded_remote = context_params.get_forwarded_options()["remote"] if context_params.get_forwarded_options()
       remote           = options.remote? || forwarded_remote
       action           = (remote ? "list_remote" : "list")
-#     post_body        = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes","versions"]})
+
       post_body        = (remote ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
       post_body[:diff] = options.diff? ? options.diff : {}
+      post_body.merge!(:module_namespace => options.namespace)
+
       response         = post rest_url("test_module/#{action}"),post_body
 
       return response unless response.ok?
@@ -87,7 +86,7 @@ module DTK::Client
       module_info_about(context_params, :instances, :component)
     end
 
-    desc "import TEST-MODULE-NAME", "Create new test module from local clone"
+    desc "import [NAMESPACE:]TEST-MODULE-NAME", "Create new test module from local clone"
     def import(context_params)
       response = import_module_aux(context_params)
       @@invalidate_map << :test_module if response && response.ok?
@@ -95,7 +94,15 @@ module DTK::Client
       response
     end
 
-    desc "install [NAMESPACE/]REMOTE-TEST-MODULE-NAME","Install remote test module into local environment"
+    #
+    # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
+    #
+    desc "import-git GIT-SSH-REPO-URL [NAMESPACE:]TEST-MODULE-NAME", "Create new local test module by importing from provided git repo URL"
+    def import_git(context_params)
+      import_git_module_aux(context_params)
+    end
+
+    desc "install NAMESPACE/REMOTE-TEST-MODULE-NAME","Install remote test module into local environment"
     method_option "repo-manager",:aliases => "-r" ,
       :type => :string,
       :banner => "REPO-MANAGER",
@@ -107,20 +114,12 @@ module DTK::Client
       response
     end
 
-    #
-    # Creates component module from input git repo, removing .git dir to rid of pointing to user github, and creates component module
-    #
-    desc "import-git GIT-SSH-REPO-URL TEST-MODULE-NAME", "Create new local test module by importing from provided git repo URL"
-    def import_git(context_params)
-      import_git_module_aux(context_params)
-    end
-
-    desc "create TEST-MODULE-NAME", "Create template test module and generate all needed test module helper files"
+    desc "create [NAMESPACE:]TEST-MODULE-NAME", "Create template test module and generate all needed test module helper files"
     def create(context_params)
       create_test_module_aux(context_params)
     end
 
-    desc "delete-from-catalog [NAMESPACE/]REMOTE-TEST-MODULE-NAME [-y]", "Delete the test module from the DTK Network catalog"
+    desc "delete-from-catalog NAMESPACE/REMOTE-TEST-MODULE-NAME [-y]", "Delete the test module from the DTK Network catalog"
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       delete_from_catalog_aux(context_params)
@@ -225,5 +224,20 @@ module DTK::Client
       list_diffs_module_aux(context_params)
     end
 
+
+    #
+    # DEVELOPMENT MODE METHODS
+    #
+    if DTK::Configuration.get(:development_mode)
+      desc "delete-all","Delete all service modules"
+      def delete_all(context_params)
+        return unless Console.confirmation_prompt("This will DELETE ALL test modules, are you sure"+'?')
+        response = list(context_params)
+
+        response.data().each do |e|
+          run_shell_command("delete #{e['display_name']} -y -p")
+        end
+      end
+    end
   end
 end

data/lib/commands/thor/workspace.rb

@@ -179,7 +179,7 @@ module DTK::Client
       push_module_updates_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID push-assembly-updates SERVICE-MODULE-NAME/ASSEMBLY-NAME", "Push changes made to this workspace to the designated assembly."
+    desc "WORKSPACE-NAME/ID push-assembly-updates [NAMESPACE:]SERVICE-MODULE-NAME/ASSEMBLY-NAME", "Push changes made to this workspace to the designated assembly."
     def push_assembly_updates(context_params)
       workspace_id, qualified_assembly_name = context_params.retrieve_arguments([:workspace_id!,:option_1!],method_argument_names) 
       if qualified_assembly_name =~ /(^[^\/]*)\/([^\/]*$)/
@@ -193,12 +193,12 @@ module DTK::Client
       Response::Ok.new()
     end
 
-    desc "WORKSPACE-NAME/ID create-assembly SERVICE-MODULE-NAME ASSEMBLY-NAME [-p]", "Create a new assembly from the workspace instance in the designated service module."
+    desc "WORKSPACE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME [-p]", "Create a new assembly from the workspace instance in the designated service module."
    # The option -p will purge the workspace after assembly creation." 
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
     def create_assembly(context_params)
-      workspace_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:workspace_id!,:option_1!,:option_2!],method_argument_names)
-      response = promote_assembly_aux(:create,workspace_id,service_module_name,assembly_template_name)
+      workspace_id, service_module_full_name, assembly_template_name = context_params.retrieve_arguments([:workspace_id!,:option_1!,:option_2!],method_argument_names)
+      response = promote_assembly_aux(:create,workspace_id,service_module_full_name,assembly_template_name)
       return response unless response.ok?
       if options.purge?
         response = purge_aux(context_params)
@@ -303,12 +303,12 @@ module DTK::Client
     def edit_workflow(context_params)
       edit_workflow_aux(context_params)
     end
-=begin
+
     desc "WORKSPACE-NAME/ID edit-attributes", "Edit workspace's attributes."
     def edit_attributes(context_params)
       edit_attributes_aux(context_params)
     end
-=end
+
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
     desc "HIDE_FROM_BASE get-netstats", "Get netstats"
     def get_netstats(context_params)

data/lib/core.rb

@@ -15,6 +15,7 @@ dtk_require_from_base('util/ssh_util')
 dtk_require_from_base('util/common_util')
 dtk_require_from_base('util/permission_util')
 dtk_require_from_base('util/remote_dependency_util')
+dtk_require_from_base('util/module_util')
 
 dtk_require("config/configuration")
 
@@ -43,7 +44,7 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
 
     # if connection parameters are not set up properly then don't execute any command
     return if validate_connection(conn)
-    
+
     # call proper thor class and task
     entity_class = DTK::Client.const_get "#{cap_form(entity_name)}"
 
@@ -53,12 +54,12 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
     end
 
     response_ruby_obj = entity_class.execute_from_cli(conn,method_name,context_params,options_args,shell_execute)
-    
+
     # this will raise error if found
     DTK::Client::ResponseErrorHandler.check(response_ruby_obj)
 
     # this will find appropriate render adapter and give output, returns boolean
-    if print = response_ruby_obj.render_data() 
+    if print = response_ruby_obj.render_data()
       print = [print] unless print.kind_of?(Array)
       print.each do |el|
 
@@ -76,7 +77,7 @@ def top_level_execute_core(entity_name, method_name, context_params=nil, options
     DTK::Client::OsUtil.print(e.message, :red)
   rescue DTK::Client::DtkValidationError => e
     validation_message = e.message
-    
+
     # if !e.skip_usage_info && entity_class && method_name
     #   usage_info = entity_class.get_usage_info(entity_name, method_name)
     #   validation_message += ", usage: #{usage_info}"
@@ -122,9 +123,9 @@ def resolve_direct_access(params, config_exists=nil)
   puts "Processing..." if config_exists
   # response = DTK::Client::Account.add_access(params[:ssh_key_path])
   response, matched_pub_key, matched_username = DTK::Client::Account.add_key(params[:ssh_key_path])
-  
+
   if !response.ok?
-    DTK::Client::OsUtil.print("We were not able to add access for current user. #{response.error_message}. In order to properly use dtk-shell you will have to add access manually ('dtk account add-ssh-key').\n", :yellow) 
+    DTK::Client::OsUtil.print("We were not able to add access for current user. #{response.error_message}. In order to properly use dtk-shell you will have to add access manually ('dtk account add-ssh-key').\n", :yellow)
   elsif matched_pub_key
     # message will be displayed by add key # TODO: Refactor this flow
     DTK::Client::OsUtil.print("Provided SSH PUB key has already been added.", :yellow)
@@ -136,7 +137,7 @@ def resolve_direct_access(params, config_exists=nil)
     # DTK::Client::OsUtil.print("Your SSH PUB key has been successfully added.", :yellow)
     DTK::Client::Configurator.add_current_user_to_direct_access()
   end
-  
+
 
   response
 end
@@ -159,7 +160,7 @@ module DTK
 
         def check(response_ruby_obj)
           # check for errors in response
-             
+
           unless response_ruby_obj["errors"].nil?
             error_msg       = ""
             error_internal  = nil
@@ -179,7 +180,7 @@ module DTK
 
             # normalize it for display
             error_msg = error_msg.empty? ? 'Internal DTK Client error, please try again' : "#{error_msg}"
-            
+
             # if error_internal.first == true
             if error_code == "unauthorized"
               raise DTK::Client::DtkError, "[UNAUTHORIZED] Your session has been suspended, please log in again."
@@ -190,7 +191,7 @@ module DTK
             elsif error_code == "forbidden"
               raise DTK::Client::DtkLoginRequiredError, "[FORBIDDEN] Access not granted, please log in again."
             elsif error_code == "timeout"
-              raise DTK::Client::DtkError, "[TIMEOUT ERROR] Server is taking too long to respond." 
+              raise DTK::Client::DtkError, "[TIMEOUT ERROR] Server is taking too long to respond."
             elsif error_code == "connection_refused"
               raise DTK::Client::DtkError, "[CONNECTION REFUSED] Connection refused by server."
             elsif error_code == "resource_not_found"
@@ -235,7 +236,7 @@ module DTK
 
       CONFIG_FILE = ::DTK::Client::Configurator::CONFIG_FILE
       CRED_FILE = ::DTK::Client::Configurator::CRED_FILE
-      
+
       REQUIRED_KEYS = [:server_host]
 
       def self.[](k)
@@ -255,9 +256,9 @@ module DTK
       end
 
       def load_config_file()
-        parse_key_value_file(CONFIG_FILE).each{|k,v|self[k]=v}           
+        parse_key_value_file(CONFIG_FILE).each{|k,v|self[k]=v}
       end
-      
+
       def validate
         #TODO: need to check for legal values
         missing_keys = REQUIRED_KEYS - keys
@@ -318,12 +319,12 @@ module DTK
       def self.set_timeout(timeout_sec)
         DefaultRestOpts[:timeout] = timeout_sec
       end
-               
+
 
       def rest_url(route=nil)
         protocol, port = "http", Config[:server_port].to_s
         protocol, port = "https", Config[:secure_connection_server_port].to_s if Config[:secure_connection] == "true"
-        
+
         "#{protocol}://#{Config[:server_host]}:#{port}/rest/#{route}"
       end
 
@@ -444,10 +445,10 @@ module DTK
       # enable SSL verification
       DefaultRestOpts.merge!(:verify_ssl => OpenSSL::SSL::VERIFY_PEER)
       # Net:HTTP from Ruby 1.8.7 doesn't verify SSL certs correctly
-      # this is a CA bundle downloaded from http://curl.haxx.se/docs/caextract.html, 
+      # this is a CA bundle downloaded from http://curl.haxx.se/docs/caextract.html,
       # and it will only be used for 1.8.7, otherwise the default (system) CA will be used
       DefaultRestOpts.merge!(:ssl_ca_file => File.expand_path('../lib/config/cacert.pem', File.dirname(__FILE__)))
-    
+
       def get_raw(url)
         RestClientWrapper.get_raw(url, {}, DefaultRestOpts.merge(:cookies => @cookies))
       end

data/lib/domain/git_adapter.rb

@@ -5,9 +5,9 @@ module DTK
     class GitAdapter
       attr_accessor :git_repo
 
-      def initialize(repo_dir, branch = nil, opts = {})
+      def initialize(repo_dir, local_branch_name = nil)
         @git_repo = Git.init(repo_dir)
-        @git_repo.branch(branch) if branch
+        @local_branch_name = local_branch_name 
       end
 
       def changed?
@@ -103,7 +103,7 @@ module DTK
       end
 
       def head_commit_sha()
-        current_branch.gcommit.sha
+        ret_local_branch.gcommit.sha
       end
 
       def find_remote_sha(ref)
@@ -129,7 +129,7 @@ module DTK
             raise Error.new("Illegal type parameter (#{type}) passed to merge_relationship") 
         end
 
-        local_sha = current_branch.gcommit.sha
+        local_sha = ret_local_branch.gcommit.sha
 
         opts[:ret_commit_shas][:local_sha] = local_sha if opts[:ret_commit_shas]
       
@@ -162,7 +162,7 @@ module DTK
       end
       
       def push_with_remote(remote, remote_branch)
-        branch_for_push = "#{current_branch_name}:refs/heads/#{remote_branch||current_branch_name}"
+        branch_for_push = "#{local_branch_name}:refs/heads/#{remote_branch||local_branch_name}"
         @git_repo.push(remote, branch_for_push)
       end
 
@@ -174,7 +174,15 @@ module DTK
       end
 
       def pull_remote_to_local(remote_branch, local_branch, remote='origin')
+        # special case; if no branches and local_branch differs from master
+        # creates master plus local_branch
+        # special_case must be calculated before pull
+        special_case = current_branch().nil? and local_branch != 'master'
         @git_repo.pull(remote,"#{remote_branch}:#{local_branch}")
+        if special_case
+          @git_repo.branch(local_branch).checkout
+          @git_repo.branch('master').delete
+        end
       end
 
       def merge(remote_branch_ref)
@@ -195,18 +203,31 @@ module DTK
         File.exists?(repo_dir)
       end
 
-      def current_branch_name
-        current_branch.name
+      def local_branch_name
+        ret_local_branch.name
+      end
+
+      def ret_local_branch
+        # This build in assumption that just one local branch
+        unless ret = current_branch()
+          raise Error.new("Unexpected that current_branch() is nil")
+        end
+        if @local_branch_name
+          unless ret.name == @local_branch_name
+            raise Error.new("Unexpected that @local_branch_name (#{@local_branch_name}) does not equal current branch (#{current_branch()})")
+          end
+        end
+        ret
       end
 
-      def current_branch
+      def current_branch()
         @git_repo.branches.local.find { |b| b.current }
       end
 
       TEMP_BRANCH = "temp_branch"
 
       def merge_theirs(remote_branch_ref)
-        branch = current_branch_name
+        branch = local_branch_name
 
         # Git is not agile enoguh to work with following commands so we are using native commands to achive this
         Dir.chdir(repo_dir) do

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.17"
+  VERSION="0.5.18"
 end