dtk-client 0.7.1.1 → 0.7.2

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

@@ -0,0 +1,54 @@
+
+module DTK::Client
+  module RemotesMixin
+
+    def remote_remove_aux(context_params)
+      module_id, remote_name = context_params.retrieve_arguments([::DTK::Client::ModuleMixin::REQ_MODULE_ID,:option_1!], method_argument_names)
+      module_type = get_module_type(context_params)
+
+      unless options.force
+        return unless Console.confirmation_prompt("Are you sure you want to remove '#{remote_name}'?")
+      end
+
+      post_body = {
+        "#{module_type}_id".to_sym => module_id,
+        :remote_name => remote_name
+      }
+
+      response = post rest_url("#{module_type}/remove_git_remote"), post_body
+      return response unless response.ok?
+      OsUtil.print("Successfully removed remote '#{remote_name}'", :green)
+      nil
+    end
+
+    def remote_add_aux(context_params)
+      module_id, remote_name, remote_url = context_params.retrieve_arguments([::DTK::Client::ModuleMixin::REQ_MODULE_ID,:option_1!,:option_2!], method_argument_names)
+      module_type = get_module_type(context_params)
+
+      post_body = {
+        "#{module_type}_id".to_sym => module_id,
+        :remote_name => remote_name,
+        :remote_url  => remote_url
+      }
+
+      response = post rest_url("#{module_type}/add_git_remote"), post_body
+      return response unless response.ok?
+      OsUtil.print("Successfully added remote '#{remote_name}'", :green)
+      nil
+    end
+
+    def remote_list_aux(context_params)
+      module_id   = context_params.retrieve_arguments([::DTK::Client::ModuleMixin::REQ_MODULE_ID], method_argument_names)
+      module_type = get_module_type(context_params)
+
+      post_body = {
+        "#{module_type}_id".to_sym => module_id
+      }
+
+      response = post rest_url("#{module_type}/info_git_remote"), post_body
+      response.render_table(:remotes)
+    end
+
+
+  end
+end

data/lib/commands/common/thor/{set_required_params.rb → set_required_attributes.rb}

@@ -1,6 +1,6 @@
 module DTK::Client
   module SetRequiredParamsMixin
-    def set_required_params_aux(id,type,subtype=nil)
+    def set_required_attributes_aux(id,type,subtype=nil)
       id_field = "#{type}_id".to_sym
       post_body = {
         id_field => id,

data/lib/commands/thor/component.rb

@@ -16,7 +16,7 @@ module DTK::Client
         res = get_cached_response(:component_template, "component_module/info_about", { :component_module_id => component_module_id, :about => :components})
       else
         assembly_or_worspace_id, node_id, node_name = context_params.retrieve_arguments([[:service_id, :workspace_id], :node_id!, :node_name!])
-        
+
         post_body = {
           :assembly_id => assembly_or_worspace_id,
           :node_id     => node_id,
@@ -30,7 +30,7 @@ module DTK::Client
         else
           response = get_cached_response(:node_component, "node/info_about", post_body)
         end
-        
+
         modified_response = response.clone_me()
         modified_response['data'].each { |e| e['display_name'] = e['display_name'].split('/').last }
 

data/lib/commands/thor/component_module.rb

@@ -9,7 +9,7 @@ module DTK::Client
     end
 
     def self.valid_children()
-      [:component]
+      [:component, :remotes]
     end
 
     # this includes children of children - has to be sorted by n-level access
@@ -17,6 +17,10 @@ module DTK::Client
       [:component]
     end
 
+    def self.multi_context_children()
+      [[:component], [:remotes], [:component, :remotes]]
+    end
+
     def self.valid_child?(name_of_sub_context)
       return ComponentModule.valid_children().include?(name_of_sub_context.to_sym)
     end
@@ -32,13 +36,19 @@ module DTK::Client
             :self => [
               ["list"," list [--remote] [--diff] [-n NAMESPACE]","# List loaded or remote component modules. Use --diff to compare loaded and remote component modules."]
             ],
-            :"component" => [
+            :component => [
               ["list","list","# List all component templates."],
               ["list-attributes","list-attributes", "# List all attributes for given component."]
+            ],
+            :remotes => [
+              ["push-remote",  "push-remote [REMOTE-NAME] [--force]",  "# Push local changes to remote git repository"],
+              ["list-remotes",  "list-remotes",  "# List git remotes for given module"],
+              ["add-remote",    "add-remote REMOTE-NAME REMOTE-URL", "# Add git remote for given module"],
+              ["remove-remote", "remove-remote REPO-NAME [-y]", "# Remove git remote for given module"]
             ]
           },
           :identifier_only => {
-            :"component" => [
+            :component => [
               ["list-attributes","list-attributes", "# List all attributes for given component."]
             ]
           }
@@ -167,8 +177,18 @@ module DTK::Client
       :desc => "DTK Repo Manager from which to resolve requested module."
     def install(context_params)
       response = install_module_aux(context_params)
-      @@invalidate_map << :component_module if response && response.ok?
-
+      if response && response.ok?
+        @@invalidate_map << :component_module
+        # TODO: hack before clean up way to indicate to better format what is passed as hash; these lines print the created module,
+        # not the module_directory
+        if module_directory = response.data(:module_directory)
+          split = module_directory.split('/')
+          if split.size > 2
+            installed_module = split[split.size-2..split.size-1].join(':')
+            response = Response::Ok.new('installed_module' => installed_module)
+          end
+        end
+      end
       response
     end
 
@@ -389,7 +409,7 @@ module DTK::Client
      end
 
 #    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of component module to remote repository (dtkn)."
-    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of component module to remote repository (dtkn)."
+    desc "COMPONENT-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [--force]", "Push changes from local copy of component module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
@@ -399,7 +419,7 @@ module DTK::Client
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
     #hidden option for dev
-    method_option 'force-parse', :aliases => '-f', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def push_dtkn(context_params, internal_trigger=false)
       push_dtkn_module_aux(context_params, internal_trigger)
     end
@@ -415,6 +435,35 @@ module DTK::Client
       # list_diffs_module_aux(context_params)
     end
 
+    # REMOTE INTERACTION
+
+    desc "HIDE_FROM_BASE push-remote [REMOTE-NAME] [--force]", "Push local changes to remote git repository"
+    method_option :force, :type => :boolean, :default => false
+    def push_remote(context_params)
+      push_remote_module_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE list-remotes", "List git remotes for given module"
+    def list_remotes(context_params)
+      remote_list_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE add-remote REMOTE-NAME REMOTE-URL", "Add git remote for given module"
+    def add_remote(context_params)
+      remote_add_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE remove-remote REPO-NAME [-y]", "Remove git remote for given module"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def remove_remote(context_params)
+      remote_remove_aux(context_params)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID fork NAMESPACE", "Fork component module to new namespace"
+    def fork(context_params)
+      fork_aux(context_params)
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #

data/lib/commands/thor/dtk.rb

@@ -1,12 +1,12 @@
 
 module DTK::Client
 
-  # Following are descriptions of available commands 
+  # Following are descriptions of available commands
   class Dtk < CommandBaseThor
 
     # entities that are not available on root but later in n-context
     def self.additional_entities()
-      ['component','attribute','utils','node','task','component-template','assembly']
+      ['component','attribute','utils','node','task','component-template','assembly','remotes']
     end
 
     desc "workspace","Sandbox for development and testing"
@@ -18,7 +18,7 @@ module DTK::Client
     def target
       # API descriptor, SYM_LINK!
     end
-    
+
 
     # NOTE
     # Following methods are just api descriptors, invocation happens at "bin/dtk" entry point
@@ -37,7 +37,7 @@ module DTK::Client
     #   # API descriptor
     # end
 
-    #TODO: not exposed 
+    #TODO: not exposed
     #desc "dependency","DESCRIPTION TO BE ADDED."
     #def dependency
     #  # API descriptor
@@ -61,7 +61,7 @@ module DTK::Client
     # desc "node", "Commands to list, query, and delete/destroy node instances."
     # def node
     #   # API descriptor
-    # end    
+    # end
 
     # desc "node-group", "Add/Destroy/List available groups of nodes."
     # def node_group
@@ -82,7 +82,7 @@ module DTK::Client
     #desc "repo", "Part of dtk client which enables us to sync, destroy, view available repos."
     #def repo
     #  # API descriptor
-    #end    
+    #end
 
     #TODO: not supported yet
     #desc "project", "View available projects."
@@ -112,7 +112,7 @@ module DTK::Client
         # API descriptor
       end
     end
-    
+
 
     desc "provider", "Manage infrastructure providers and deployment targets (ie: EC2 and us-east)"
     def provider

data/lib/commands/thor/node.rb

@@ -1,5 +1,5 @@
 dtk_require_common_commands('thor/task_status')
-dtk_require_common_commands('thor/set_required_params')
+dtk_require_common_commands('thor/set_required_attributes')
 dtk_require_common_commands('thor/test_action_agent')
 
 module DTK::Client
@@ -242,10 +242,10 @@ module DTK::Client
       post rest_url("node/set_attributes"), post_body
     end
 
-    desc "NODE-NAME/ID set-required-params", "Interactive dialog to set required params that are not currently set"
-    def set_required_params(context_params)
+    desc "NODE-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
+    def set_required_attributes(context_params)
       node_id = context_params.retrieve_arguments([:node_id!],method_argument_names)
-      set_required_params_aux(node_id,:node)
+      set_required_attributes_aux(node_id,:node)
     end
 
     # desc "NODE-NAME/ID create-component COMPONENT-TEMPLATE-NAME/ID [-v VERSION]", "Add component template to node"

data/lib/commands/thor/node_group.rb

@@ -1,5 +1,5 @@
 dtk_require_common_commands('thor/task_status')
-dtk_require_common_commands('thor/set_required_params')
+dtk_require_common_commands('thor/set_required_attributes')
 module DTK::Client
   class NodeGroup < CommandBaseThor
     no_tasks do
@@ -27,10 +27,10 @@ module DTK::Client
       post rest_url("node_group/set_attributes"), post_body
     end
 
-    desc "NODE-GROUP-NAME/ID set-required-params", "Interactive dialog to set required params that are not currently set"
-    def set_required_params(context_params)
+    desc "NODE-GROUP-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
+    def set_required_attributes(context_params)
       node_group_id = context_params.retrieve_arguments([:node_group_id!],method_argument_names)
-      set_required_params_aux(node_group_id,:node_group)
+      set_required_attributes_aux(node_group_id,:node_group)
     end
 
     desc "create NODE-GROUP-NAME [-t TARGET-ID] [--spans-target]", "Create node group"

data/lib/commands/thor/remotes.rb

@@ -0,0 +1,32 @@
+module DTK::Client
+  class Remotes < CommandBaseThor
+
+    def self.valid_children()
+      []
+    end
+
+    # REMOTE INTERACTION
+    desc "push-remote", "Push local changes to remote git repository"
+    method_option :force, :aliases => '--force', :type => :boolean, :default => false
+    def push_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "list-remotes", "List git remotes for given module"
+    def list_remotes(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "add-remote", "Add git remote for given module"
+    def add_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+    desc "remove-remote", "Remove git remote for given module"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def remove_remote(context_params)
+      raise "NOT IMPLEMENTED"
+    end
+
+  end
+end

data/lib/commands/thor/service.rb

@@ -6,7 +6,7 @@ dtk_require_from_base("dtk_logger")
 dtk_require_from_base("util/os_util")
 dtk_require_from_base("command_helper")
 dtk_require_common_commands('thor/task_status')
-dtk_require_common_commands('thor/set_required_params')
+dtk_require_common_commands('thor/set_required_attributes')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/purge_clone')
 dtk_require_common_commands('thor/assembly_workspace')
@@ -149,7 +149,8 @@ module DTK::Client
             ['list-components',"list-components","# List components."]
           ],
           :utils => [
-            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
+#            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -689,6 +690,8 @@ TODO: will put in dot release and will rename to 'extend'
       get_netstats_aux(context_params)
     end
 
+=begin
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
     method_option :component, :type => :string, :desc => "Component name"
@@ -696,6 +699,7 @@ TODO: will put in dot release and will rename to 'extend'
     def execute_tests(context_params)
       execute_tests_aux(context_params)
     end
+=end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
     desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
@@ -704,10 +708,10 @@ TODO: will put in dot release and will rename to 'extend'
       get_ps_aux(context_params)
     end
 
-    desc "SERVICE-NAME/ID set-required-params", "Interactive dialog to set required params that are not currently set"
-    def set_required_params(context_params)
+    desc "SERVICE-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
+    def set_required_attributes(context_params)
       assembly_id = context_params.retrieve_arguments([:service_id!],method_argument_names)
-      set_required_params_aux(assembly_id,:assembly,:instance)
+      set_required_attributes_aux(assembly_id,:assembly,:instance)
     end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)

data/lib/commands/thor/service_module.rb

@@ -26,11 +26,15 @@ module DTK::Client
     end
 
     def self.valid_children()
-      [:"assembly"]
+      [:assembly, :remotes]
     end
 
     def self.all_children()
-      [:"assembly"]
+      [:assembly]
+    end
+
+    def self.multi_context_children()
+      [[:assembly], [:remotes], [:assembly, :remotes]]
     end
 
     def self.valid_child?(name_of_sub_context)
@@ -55,8 +59,14 @@ module DTK::Client
           :self => [
             ["list"," list [--remote] [--diff] [-n NAMESPACE]","# List service modules (local/remote). Use --diff to compare loaded and remote modules."]
           ],
-          :"assembly" => [
+          :assembly => [
             ["list","list","# List assemblies for given service module."]
+          ],
+          :remotes => [
+            ["push-remote",   "push-remote [REMOTE-NAME] [--force]",  "# Push local changes to remote git repository"],
+            ["list-remotes",  "list-remotes",  "# List git remotes for given module"],
+            ["add-remote",    "add-remote REMOTE-NAME REMOTE-URL", "# Add git remote for given module"],
+            ["remove-remote", "remove-remote REPO-NAME [-y]", "# Remove git remote for given module"]
           ]
         },
         :identifier_only => {
@@ -64,7 +74,7 @@ module DTK::Client
             ["list-assemblies","list-assemblies","# List assemblies associated with service module."],
             ["list-modules","list-modules","# List modules associated with service module."]
           ],
-          :"assembly" => [
+          :assembly => [
             ["info","info","# Info for given assembly in current service module."],
             ["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."],
@@ -522,7 +532,7 @@ module DTK::Client
     end
 
 #    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of service module to remote repository (dtkn)."
-    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of service module to remote repository (dtkn)."
+    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [--force]", "Push changes from local copy of service module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
@@ -531,6 +541,7 @@ module DTK::Client
         :type => :string,
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def push_dtkn(context_params, internal_trigger=false)
       push_dtkn_module_aux(context_params, internal_trigger)
     end
@@ -569,6 +580,31 @@ module DTK::Client
       response
     end
 
+
+    # REMOTE INTERACTION
+
+    desc "HIDE_FROM_BASE push-remote [REMOTE-NAME] [--force]", "Push local changes to remote git repository"
+    method_option :force, :type => :boolean, :default => false
+    def push_remote(context_params)
+      push_remote_module_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE list-remotes", "List git remotes for given module"
+    def list_remotes(context_params)
+      remote_list_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE add-remote REMOTE-NAME REMOTE-URL", "Add git remote for given module"
+    def add_remote(context_params)
+      remote_add_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE remove-remote REPO-NAME [-y]", "Remove git remote for given module"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def remove_remote(context_params)
+      remote_remove_aux(context_params)
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #