dtk-client 0.7.1 → 0.7.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d6d5f969664f0353c5a8389cb2ff93c540eb3e69
-  data.tar.gz: e7161714340eceba543449faceaeed05244c96f6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzU5NzQ4MDE1NmNlMTU2NmViZWNkODkzMzRjOTMzMWVmMDI3MmVkZQ==
+  data.tar.gz: !binary |-
+    NDJjZDIyMmVkYjY2ZDdlOGY2ZjY1ODljYWI2YzBhMDA1NzVjMDUyNQ==
 SHA512:
-  metadata.gz: 84773c714f5c6ec8b62c6fe5e3d3aebdd26a75097864e2be1caa5fd217a142109f3ce82a7f0b085182ffcf6de58ad39460504e2e890ddc2b1fab037bccd51427
-  data.tar.gz: bad5dfff733069e5538294cc04910251bfcdd8fbbade2e60fe73a479737100cf070f42d9f2e2c7ea7661ca6c1c879c048fb3cea7221a02f870f11ddc21e4b1a4
+  metadata.gz: !binary |-
+    NmZjOWE0YmRlZjVkY2M0YThlNDUzMzc1NTA0MGIxOTQxMDQwZTdjM2ZmNWFk
+    MzRiMDVlZTBmZjUwODhlYjE5NjNlYTE0OTZmMGRhMDNmNDYzM2Y0YTkxMTc5
+    NTY4MmU3NmFmNzhmNjVkYzY1NjY2MTBmZTQ0Y2M3OTlmY2IxMzM=
+  data.tar.gz: !binary |-
+    ZDllMmIyYjQ2NGMyY2ZlYzc4MDM2Y2M5YzM1MTI1MmE0NTYyOTljOGY2YmRl
+    ODRlYzg5ZTM4MTVjNWNmODI3ODNlZTgxNWU2ZWJkMzQ0ODVhZGViYjYzNzE1
+    MjUyMDAyNGViNjkyMWY1YjI2M2YwNjBmYjdjM2I1OWE3MWY0OGQ=

data/bin/dtk-execute

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../lib/client', File.dirname(__FILE__))
+require File.expand_path('../lib/execute', File.dirname(__FILE__))
+require File.expand_path('../lib/configurator', File.dirname(__FILE__))
+
+include DTK::Client
+
+Configurator.check_config_exists
+
+# if connection parameters are not set up properly, print warning and exit dtk_shell
+conn = Session.get_connection()
+exit if validate_connection(conn)
+
+require 'optparse'
+banner = "Usage: dtk-execute add-tenant TENANT-NAME"
+tenant_name = nil
+if ARGV.size == 2
+  if ARGV[0] == 'add-tenant'
+    tenant_name = ARGV[1]
+  end
+end
+unless tenant_name
+  # forces usage then exit
+  ARGV[0] = '--help'
+end
+options = {}
+OptionParser.new do |opts|
+  opts.banner = banner
+end.parse!
+  
+Execute.add_tenant(tenant_name)

data/dtk-client.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = "#{DtkClient::VERSION}.#{ARGV[3]}".chomp(".")
 
+  gem.add_dependency 'mime-types','~> 1.25'
   gem.add_dependency 'bundler','>= 1.2.4'
   gem.add_dependency 'json_pure' ,'1.7.4'
   gem.add_dependency 'diff-lcs','1.1.3'
-  gem.add_dependency 'mime-types','~> 1.25'
   gem.add_dependency 'hirb','~> 0.7.0'
   gem.add_dependency 'thor','~> 0.15.4'
   gem.add_dependency 'erubis','~> 2.7.0'
-  gem.add_dependency 'dtk-common-core','0.7.0'
+  gem.add_dependency 'dtk-common-core','0.7.0.1'
   gem.add_dependency 'git','~> 1.2.6'
   gem.add_dependency 'colorize','~> 0.5.8'
   gem.add_dependency 'highline', '1.6.16'

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

@@ -9,6 +9,8 @@ dtk_require_common_commands('thor/set_required_params')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/purge_clone')
 dtk_require_common_commands('thor/list_diffs')
+dtk_require_common_commands('thor/action_result_handler')
+
 LOG_SLEEP_TIME_W   = DTK::Configuration.get(:tail_log_frequency)
 
 module DTK::Client
@@ -110,7 +112,18 @@ module DTK::Client
     end
 
     def converge_aux(context_params)
-      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
+      assembly_or_workspace_id,task_action,task_params_string = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1,:option_2],method_argument_names)
+      
+      task_params = nil
+      if task_params_string
+        task_params = task_params_string.split(',').inject(Hash.new) do |h,av|
+          av_split = av.split('=')
+          unless av_split.size == 2
+            raise DTK::Client::DtkValidationError, "The task parameters (#{task_params_string}) is ill-formed"
+          end
+          h.merge(av_split[0] => av_split[1])
+        end
+      end
 
       post_body = {
         :assembly_id => assembly_or_workspace_id
@@ -126,6 +139,8 @@ module DTK::Client
       end
 
       post_body.merge!(:commit_msg => options.commit_msg) if options.commit_msg
+      post_body.merge!(:task_action => task_action) if task_action
+      post_body.merge!(:task_params => task_params) if task_params
 
       response = post rest_url("assembly/create_task"), post_body
       return response unless response.ok?
@@ -590,6 +605,61 @@ module DTK::Client
       response
     end
 
+    def grant_access_aux(context_params)
+      service_id, system_user, rsa_key_name, path_to_rsa_pub_key = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :option_1!, :option_2!, :option_3],method_argument_names)
+
+      path_to_rsa_pub_key ||= SSHUtil.default_rsa_pub_key_path()
+      rsa_pub_key_content = SSHUtil.read_and_validate_pub_key(path_to_rsa_pub_key)
+
+      response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
+        :agent_action => :grant_access,
+        :system_user => system_user,
+        :rsa_pub_name => rsa_key_name,
+        :rsa_pub_key => rsa_pub_key_content,
+        :assembly_id => service_id,
+        :target_nodes => options.nodes
+      }
+
+      return response unless response.ok?
+
+      action_results_id = response.data(:action_results_id)
+
+      print_action_results(action_results_id)
+
+      nil
+    end
+
+    def revoke_access_aux(context_params)
+      service_id, system_user, rsa_key_name = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID, :option_1!, :option_2!],method_argument_names)
+
+      response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
+        :agent_action => :revoke_access,
+        :system_user => system_user,
+        :rsa_pub_name => rsa_key_name,
+        :assembly_id => service_id,
+        :target_nodes => options.nodes
+      }
+
+      return response unless response.ok?
+
+      action_results_id = response.data(:action_results_id)
+
+      print_action_results(action_results_id)
+
+      nil
+    end
+
+    def list_ssh_access_aux(context_params)
+      service_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID],method_argument_names)
+
+      response = post_file rest_url("assembly/list_ssh_access"), {
+        :assembly_id => service_id
+      }
+
+      response.render_table(:ssh_access)
+      response
+    end
+
     def set_target_aux(context_params)
       assembly_or_workspace_id, target_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1!],method_argument_names)
       post_body = {
@@ -738,7 +808,22 @@ module DTK::Client
         :node_id => node_id
       }
       response = post(rest_url("assembly/delete_node"),post_body)
-      # @@invalidate_map << :assembly_node
+      response
+    end
+
+    def delete_node_group_aux(context_params)
+      assembly_or_workspace_id, node_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID,:option_1!],method_argument_names)
+
+      unless options.force?
+        what = "node"
+        return unless Console.confirmation_prompt("Are you sure you want to delete and destroy #{what} '#{node_id}'"+'?')
+      end
+
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :node_id => node_id
+      }
+      response = post(rest_url("assembly/delete_node_group"),post_body)
       response
     end
 

data/lib/commands/thor/service.rb

@@ -89,8 +89,11 @@ module DTK::Client
           },
           :delete_node => {
             :endpoint => "assembly",
-            :url => "assembly/info_about",
-            :opts => {:subtype=>"instance", :about=>"nodes"}
+            :url => "assembly/get_nodes_without_node_groups"
+          },
+          :delete_node_group => {
+            :endpoint => "assembly",
+            :url => "assembly/get_node_groups"
           }
         }
       }
@@ -236,6 +239,8 @@ module DTK::Client
       Response::Ok.new()
     end
 
+    # TODO: DTK-1986 introduces the hidden optional terms [WORKFLOW-ACTION [WORKFLOW-PARAMS]]
+    # desc "SERVICE-NAME/ID converge [-m COMMIT-MSG] [WORKFLOW-ACTION [WORKFLOW-PARAMS]]", "Converge service instance."
     desc "SERVICE-NAME/ID converge [-m COMMIT-MSG]", "Converge service instance."
     method_option "commit_msg",:aliases => "-m" ,
       :type => :string,
@@ -479,64 +484,20 @@ TODO: will put in dot release and will rename to 'extend'
     desc "SERVICE-NAME/ID grant-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Grants ssh access to user account USER-ACCOUNT for nodes in service instance"
     method_option :nodes, :type => :string, :default => nil
     def grant_access(context_params)
-      service_id, system_user, rsa_key_name, path_to_rsa_pub_key = context_params.retrieve_arguments([:service_id!,:option_1!, :option_2!, :option_3],method_argument_names)
-
-      path_to_rsa_pub_key ||= SSHUtil.default_rsa_pub_key_path()
-      rsa_pub_key_content = SSHUtil.read_and_validate_pub_key(path_to_rsa_pub_key)
-
-      response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
-        :agent_action => :grant_access,
-        :system_user => system_user,
-        :rsa_pub_name => rsa_key_name,
-        :rsa_pub_key => rsa_pub_key_content,
-        :assembly_id => service_id,
-        :target_nodes => options.nodes
-      }
-
-      return response unless response.ok?
-
-      action_results_id = response.data(:action_results_id)
-
-      print_action_results(action_results_id)
-
-      nil
+      grant_access_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID revoke-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Revokes ssh access to user account USER-ACCOUNT for nodes in service instance"
     method_option :nodes, :type => :string, :default => nil
     def revoke_access(context_params)
-      service_id, system_user, rsa_key_name = context_params.retrieve_arguments([:service_id!,:option_1!, :option_2!],method_argument_names)
-
-      response = post_file rest_url("assembly/initiate_ssh_pub_access"), {
-        :agent_action => :revoke_access,
-        :system_user => system_user,
-        :rsa_pub_name => rsa_key_name,
-        :assembly_id => service_id,
-        :target_nodes => options.nodes
-      }
-
-      return response unless response.ok?
-
-      action_results_id = response.data(:action_results_id)
-
-      print_action_results(action_results_id)
-
-      nil
+      revoke_access_aux(context_params)
     end
 
     desc "SERVICE-NAME/ID list-ssh-access", "List SSH access for each of the nodes"
     def list_ssh_access(context_params)
-      service_id = context_params.retrieve_arguments([:service_id!],method_argument_names)
-
-      response = post_file rest_url("assembly/list_ssh_access"), {
-        :assembly_id => service_id
-      }
-
-      response.render_table(:ssh_access)
-      response
+      list_ssh_access_aux(context_params)
     end
 
-
     desc "SERVICE-NAME/ID info", "Get info about content of the service."
     def info(context_params)
       info_aux(context_params)
@@ -672,6 +633,21 @@ TODO: will put in dot release and will rename to 'extend'
       return response
     end
 
+    desc "SERVICE-NAME/ID delete-node-group ^^NODE-NAME [-y]","Delete node group and all nodes that are part of that group."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def delete_node_group(context_params)
+      response = delete_node_group_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      return response
+    end
+
     desc "HIDE_FROM_BASE delete NAME/ID [-y]","Delete node, terminating it if the node has been spun up."
     def delete(context_params)
       if context_params.is_last_command_eql_to?(:node)

data/lib/commands/thor/workspace.rb

@@ -8,6 +8,7 @@ dtk_require_common_commands('thor/task_status')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/purge_clone')
 dtk_require_common_commands('thor/assembly_workspace')
+dtk_require_common_commands('thor/action_result_handler')
 # LOG_SLEEP_TIME_W   = DTK::Configuration.get(:tail_log_frequency)
 
 module DTK::Client
@@ -18,6 +19,7 @@ module DTK::Client
       include EditMixin
       include PurgeCloneMixin
       include AssemblyWorkspaceMixin
+      include ActionResultHandler
       
       def get_workspace_name(workspace_id)
         get_name_from_id_helper(workspace_id)
@@ -65,8 +67,11 @@ module DTK::Client
           },
           :delete_node => {
             :endpoint => "assembly",
-            :url => "assembly/info_about",
-            :opts => {:subtype=>"instance", :about=>"nodes"}
+            :url => "assembly/get_nodes_without_node_groups"
+          },
+          :delete_node_group => {
+            :endpoint => "assembly",
+            :url => "assembly/get_node_groups"
           }
         }
       }
@@ -336,6 +341,21 @@ module DTK::Client
       return response
     end
 
+    desc "WORKSPACE-NAME/ID delete-node-group ^^NODE-NAME [-y]","Delete node group and all nodes that are part of that group."
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def delete_node_group(context_params)
+      response = delete_node_group_aux(context_params)
+
+      @@invalidate_map << :assembly
+      @@invalidate_map << :assembly_node
+      @@invalidate_map << :service
+      @@invalidate_map << :service_node
+      @@invalidate_map << :workspace
+      @@invalidate_map << :workspace_node
+
+      return response
+    end
+
     desc "WORKSPACE-NAME/ID unlink-components TARGET-CMP-NAME SOURCE-CMP-NAME [DEPENDENCY-NAME]", "Remove a component link."
     def unlink_components(context_params)
       unlink_components_aux(context_params)
@@ -383,6 +403,23 @@ module DTK::Client
     def grep(context_params)
       grep_aux(context_params)
     end
+
+    desc "WORKSPACE-NAME/ID grant-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Grants ssh access to user account USER-ACCOUNT for nodes in workspace"
+    method_option :nodes, :type => :string, :default => nil
+    def grant_access(context_params)
+      grant_access_aux(context_params)
+    end
+
+    desc "WORKSPACE-NAME/ID revoke-access USER-ACCOUNT PUB-KEY-NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Revokes ssh access to user account USER-ACCOUNT for nodes in workspace"
+    method_option :nodes, :type => :string, :default => nil
+    def revoke_access(context_params)
+      revoke_access_aux(context_params)
+    end
+
+    desc "WORKSPACE-NAME/ID list-ssh-access", "List SSH access for each of the nodes"
+    def list_ssh_access(context_params)
+      list_ssh_access_aux(context_params)
+    end
     
     desc "WORKSPACE-NAME/ID info", "Get info about content of the workspace."
     def info(context_params)
@@ -450,6 +487,11 @@ module DTK::Client
       list_violations_aux(context_params)
     end
 
+    desc "WORKSPACE-NAME/ID print-includes", "Finds includes in the workspace."
+    def print_includes(context_params)
+      print_includes_aux(context_params)
+    end
+
     desc "WORKSPACE-NAME/ID purge [-y]", "Purge the workspace, deleting and terminating any nodes that have been spun up."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def purge(context_params)

data/lib/core.rb

@@ -469,10 +469,10 @@ module DTK
       # In development mode we want bigger timeout allowing us to debbug on server while still
       # keeping connection alive and receivinga response
       if ::DTK::Configuration.get(:development_mode)
-        DefaultRestOpts = {:timeout => 2000, :open_timeout => 2, :error_response_class => Client::Response::Error}
+        DefaultRestOpts = {:timeout => 2000, :open_timeout => 10, :error_response_class => Client::Response::Error}
         # DefaultRestOpts = {:timeout => 50, :open_timeout => 2, :error_response_class => Client::Response::Error}
       else
-        DefaultRestOpts = {:timeout => 100, :open_timeout => 1, :error_response_class => Client::Response::Error}
+        DefaultRestOpts = {:timeout => 100, :open_timeout => 10, :error_response_class => Client::Response::Error}
       end
 
       # enable SSL verification

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.1"
+  VERSION="0.7.1.1"
 end

data/lib/execute/command/api_call/map.rb

@@ -0,0 +1,43 @@
+class DTK::Client::Execute
+  class Command::APICall
+    class Map < Hash
+      def initialize(hash={})
+        super()
+        replace(hash)
+      end
+
+      def translate(api_params={},opts={})
+        if Rest::Post.matches?(type())
+          Command::RestCall::Post.new(:path => path(),:body => translate_to_rest_body(api_params,opts))
+        else
+          raise "Type in following map is not defined not defined: #{self.inspect}"
+        end
+      end
+
+     private
+      def translate_to_rest_body(api_params,opts)
+        body().inject(Hash.new) do |h,(k,v)|
+          # if TranslationTerm.matches is false then v is a constant
+          processed_v = 
+            if TranslationTerm.matches?(v)
+              v.instance_form().translate(k,api_params,opts)
+            else 
+              v
+            end
+          h.merge(k => processed_v)
+        end
+      end
+
+      def type()
+        self[:type]
+      end
+      def path()
+        self[:path]
+      end
+      def body()
+        self[:body]
+      end
+
+    end
+  end
+end

data/lib/execute/command/api_call/service.rb

@@ -0,0 +1,73 @@
+class DTK::Client::Execute
+  class Command::APICall
+    class Service < self
+      def self.object_type()
+        :service
+      end
+
+      CommandMap = {
+        :add_component => Map.new(
+          :type => Rest::Post,                             
+          :path => 'assembly/add_component',
+          :body => {
+            :assembly_id           => Required(:service),
+            :subtype               => 'instance',
+            :node_id               => Required(:node),
+            :component_template_id => Required(:component),
+            :idempotent            => Equal::OrDefault(true),
+            :donot_update_workflow => Equal::OrDefault(false)
+          }
+        ),
+
+        :set_attribute => Map.new(
+          :type => Rest::Post,                             
+          :path => 'assembly/set_attributes',
+          :body => {
+            :assembly_id => Required(:service),
+            :pattern     => Required(:attribute_path),
+            # TODO: support FN
+            # :pattern   => FN{"#{Required(:node)}/#{Required(:component)}/#{Required(:attribute)}"
+            :value       => Required::Equal
+          }
+        ),
+
+        :link_components => Map.new(
+          :type => Rest::Post,                             
+          :path => 'assembly/add_service_link',
+          :body => {
+            :assembly_id         => Required(:service),
+            :input_component_id  => Required(:input_component),
+            :output_component_id => Required(:output_component),
+          }
+        ),
+
+        :execute_workflow  => 
+        [
+         Map.new(
+           :type => Rest::Post,                             
+           :path => 'assembly/create_task',
+           :body => {
+             :assembly_id => Required(:service),
+             :task_action => Required(:workflow_name),       
+             :task_params => Required(:workflow_params)
+            }
+         ),
+         Map.new(
+           :type => Rest::Post,                             
+           :path => 'task/execute',
+           :body => {
+             :task_id => PreviousResponse(:task_id)
+           }
+         )]
+      }
+
+      module CustomMapping
+        # example would be
+        # def self.command(params)
+        #  ...
+        # end
+      end
+      
+    end
+  end
+end

data/lib/execute/command/api_call/translation_term.rb

@@ -0,0 +1,103 @@
+class DTK::Client::Execute
+  class Command::APICall
+
+    # abstract classes
+    class TranslationTerm
+      def self.matches?(obj)
+        obj.kind_of?(self) or
+        (obj.kind_of?(Class) and obj <= self)
+      end
+
+      def self.instance_form()
+        new()
+      end
+      def instance_form()
+        self
+      end
+
+      class Operation < self
+      end
+
+      class Param < self
+       private
+        def index(api_params,key)
+          api_params[key]
+        end
+
+        def index_required(api_params,key)
+          unless has_key?(api_params,key)
+            raise ErrorUsage.new("Missing key '#{key}' in params: #{api_params.inspect}")
+          end
+          index(api_params,key)
+        end
+
+        def has_key?(api_params,key)
+          api_params.has_key?(key)
+        end
+
+      end
+    end
+
+    # concrete classes
+
+    class Rest < TranslationTerm::Operation
+      class Post < self
+      end
+    end
+
+    class Required < TranslationTerm::Param
+      def initialize(input_key=nil)
+        @input = input_key
+      end
+
+      def translate(key,api_params,opts={})
+        index_required(api_params,@input||key)
+      end
+
+      class Equal < self
+      end
+    end
+
+    class Equal < TranslationTerm::Param
+      def translate(key,api_params,opts={})
+        index(api_params,key)
+      end
+
+      class Required < self
+        def translate(key,api_params,opts={})
+          index_required(api_params,key)
+        end
+      end
+       
+      def self.OrDefault(default_value)
+        OrDefault.new(default_value)
+      end
+
+      class OrDefault < self
+        def initialize(default_value)
+          @default_value = default_value
+        end
+        def translate(key,api_params,opts={})
+          has_key?(api_params,key) ? index(api_params,key) : @default_value
+        end
+      end
+    end
+
+    class PreviousResponse < TranslationTerm::Param
+      def initialize(response_key)
+        @response_key = response_key
+      end
+      def translate(key,api_params,opts={})
+        unless last_result = opts[:last_result]
+          raise ErrorUsage.new("PreviousResponse used before results computed")
+        end
+        match = nil
+        unless matching_key = [@response_key.to_s,@response_key.to_sym].find{|k|last_result.has_key?(k)}
+          raise ErrorUsage.new("Key #{@response_key} in PreviousResponse not found in last results (#{last_result.inspect})")
+        end
+        last_result[matching_key]
+      end
+    end
+  end
+end
+

data/lib/execute/command/api_call.rb

@@ -0,0 +1,43 @@
+class DTK::Client::Execute
+  class Command
+    class APICall < self
+
+      # order matters; having these defs before requires; plus order of these requires
+      def self.Required(key)
+        Required.new(key)
+      end
+      def self.PreviousResponse(response_key)
+        PreviousResponse.new(response_key)
+      end
+      dtk_require('api_call/translation_term')
+      dtk_require('api_call/map')
+      dtk_require('api_call/service')
+
+
+       # calss block where on one or more commands that achieve the api
+      def raw_executable_commands(&block)
+        method = required(:method).to_sym
+        case required(:object_type).to_sym
+         when :service
+           Service.raw_executable_commands(method,&block)
+         else
+          raise ErrorUsage.new("The object_type '#{object_type}' is not supported")
+        end
+      end
+
+     private
+      def self.raw_executable_commands(method,&block)
+        if command_map = self::CommandMap[method]
+          array_form(command_map).each{|raw_command|block.call(raw_command)}
+        else
+          raise ErrorUsage.new("The method on '#{method}' on object type '#{object_type()}' is not supported")
+        end
+      end
+
+      def self.array_form(obj)
+        obj.kind_of?(Array) ? obj : [obj]
+      end
+
+    end
+  end
+end

data/lib/execute/command/rest_call.rb

@@ -0,0 +1,20 @@
+class DTK::Client::Execute
+  class Command
+    class RestCall < self
+      # TODO: allow calls like 'converge' which is a macro; we either directly support or have a sub class of RestCall called macro
+      attr_reader :path
+      def initialize(hash)
+        super
+        @path = required(:path)
+      end
+
+      class Post < self
+        attr_reader :body
+        def initialize(hash)
+          super
+          @body = optional?(:body)||{}
+        end
+      end
+    end
+  end
+end

data/lib/execute/command.rb

@@ -0,0 +1,23 @@
+class DTK::Client::Execute
+  class Command
+    dtk_require('command/rest_call')
+    dtk_require('command/api_call')
+
+    attr_reader :result_var,:input_hash
+    def initialize(input_hash)
+      @input_hash = input_hash
+      @result_var = optional?(:result_var)
+    end
+
+   private
+    def required(key)
+      unless @input_hash.has_key?(key)
+        raise ErrorUsage.new("Missing required key '#{key}' in: #{@input_hash.inspect}")
+      end
+      @input_hash[key]
+    end
+    def optional?(key)
+      @input_hash[key]
+    end
+  end
+end

data/lib/execute/command_processor/rest_call.rb

@@ -0,0 +1,43 @@
+class DTK::Client::Execute; class CommandProcessor
+  class RestCall< self
+    extend ::DTK::Client::CommandBase # TODO: have a Base that is not just for commands (CommandBase)
+    
+    def self.execute(rest_command)
+      response = raw_execute(rest_command)
+      if response.ok?
+        response.data
+      else
+        raise Error.new(response,rest_command)
+      end
+    end
+
+    private
+    def self.raw_execute(rest_command)
+      if rest_command.kind_of?(Command::RestCall::Post)
+        post(rest_url(rest_command.path),rest_command.body)
+      else
+        raise ErrorUsage.new("Unexpected Rest Command type: #{rest_command.class}")
+      end      
+    end
+
+    class Error < ErrorUsage
+      def initialize(response_not_ok,rest_command)
+        error_print_form = error_print_form(response_not_ok)
+        error_msg = "Bad Rest response from call (#{rest_command.input_hash.inspect}:\n #{error_print_form}"
+        super(error_msg)
+      end
+     private
+      def error_print_form(response_not_ok)
+        ret_obj = 
+          if errors = response_not_ok['errors']
+            errors.size == 1 ? errors.first : errors
+           else
+            response_not_ok
+          end
+        ret_obj.kind_of?(String) ? ret_obj : ret_obj.inspect
+      end
+    end
+
+  end
+end; end
+

data/lib/execute/command_processor.rb

@@ -0,0 +1,13 @@
+class DTK::Client::Execute
+  class CommandProcessor
+    dtk_require('command_processor/rest_call')
+
+    def self.execute(command)
+      if command.kind_of?(Command::RestCall)
+        RestCall.execute(command)
+      else
+        raise ErrorUsage.new("Unexpected Command type: #{command.class}")
+      end
+    end
+  end
+end

data/lib/execute/error_usage.rb

@@ -0,0 +1,4 @@
+class DTK::Client::Execute
+  class ErrorUsage < ::DTK::Client::Error
+  end
+end

data/lib/execute/examples/add_tenant.rb

@@ -0,0 +1,42 @@
+class DTK::Client::Execute
+
+  def self.add_tenant(tenant_name,params={})
+    component = "dtk_tenant[#{tenant_name}]"
+    service = 'dtkhost5'
+    node = 'server'
+    tenant_password = params[:tenant_password] || 'foo'
+    catalog_user_name = params[:catalog_user_name] || tenant_name
+
+    ExecuteContext(:print_results => true) do
+      result = call 'service/add_component',
+        :service               => service,
+        :node                  => node,
+        :component             => component,
+        :donot_update_workflow => true
+      
+      result = call 'service/set_attribute',
+        :service        => service,
+        :attribute_path => "#{node}/#{component}/tenant_password",
+        :value          => tenant_password
+
+      result = call 'service/set_attribute',
+        :service        => service,
+        :attribute_path => "#{node}/#{component}/catalog_user_name",
+        :value          => catalog_user_name
+
+      ['dtk_postgresql::databases'].each do |shared_service_component|
+        result = call 'service/link_components',
+          :service          => service,
+          :input_component  => "#{node}/#{component}",
+          :output_component => "#{node}/#{shared_service_component}"
+      end
+
+      result = call 'service/execute_workflow',
+        :service         => service,
+        :workflow_name   => 'add_tenant',
+        :workflow_params => {'name' => tenant_name}
+        
+
+    end
+  end
+end

data/lib/execute/examples.rb

@@ -0,0 +1,3 @@
+class DTK::Client::Execute
+  dtk_require('examples/add_tenant')
+end

data/lib/execute/execute_context/result_store.rb

@@ -0,0 +1,20 @@
+class DTK::Client::Execute
+  class ExecuteContext
+    class ResultStore < Hash
+      def store(result,result_index=nil)
+        self[result_index||Index.last] = result
+      end
+
+      def get_last_result?()
+        self[Index.last]
+      end
+      
+      module Index
+        def self.last()
+          Last
+        end
+        Last = :last
+      end
+    end
+  end
+end

data/lib/execute/execute_context.rb

@@ -0,0 +1,70 @@
+class DTK::Client::Execute
+  class ExecuteContext
+    dtk_require('execute_context/result_store')
+
+    module ClassMixin
+      def ExecuteContext(opts={},&block)
+        ExecuteContext.new(opts).execute(&block)
+      end
+    end
+
+    def initialize(opts={})
+      @print_results = opts[:print_results]
+      @proxy = Proxy.new()
+    end
+
+    def execute(&block)
+      result, command = instance_eval(&block)
+      result
+    end
+
+    def method_missing(m, *args, &block)
+      result, command = @proxy.send(m, *args, &block)
+      if @print_results
+        pp(:command => command.input_hash(),:result => result) 
+      end
+      [result, command]
+    end
+
+    # commands in the execute context
+    class Proxy
+      def initialize()
+        @result_store = ResultStore.new()
+      end
+
+      def call(object_type__method,params={})
+        object_type, method = split_object_type__method(object_type__method)
+        api_command = Command::APICall.new(:object_type => object_type, :method => method, :params => params)
+        result = nil
+        api_command.raw_executable_commands() do |raw_command|
+          last_result = @result_store.get_last_result?()
+          command = raw_command.translate(params,:last_result => last_result)
+          result = CommandProcessor.execute(command)
+          @result_store.store(result)
+        end
+        [result, api_command]
+      end
+      
+      def post_rest_call(path,body={})
+        command = Command::RestCall::Post.new(:path => path, :body => body, :last_result => @last_result)
+        result = CommandProcessor.execute(command)
+        [result, command]
+      end
+
+     private 
+      # returns [object_type, method]
+      def split_object_type__method(str)
+        DelimitersObjectTypeMethod.each do |d| 
+          if str =~ Regexp.new("(^[^#{d}]+)#{d}([^#{d}]+$)") 
+            return [$1,$2]
+          end
+        end
+        raise ErrorUsage.new("Illegal term '#{str}'")
+      end
+      
+      DelimitersObjectTypeMethod = ['\/']
+    end
+
+  end
+end
+

data/lib/execute.rb

@@ -0,0 +1,13 @@
+module DTK::Client
+  class Execute
+    # The order matters
+    dtk_require('execute/error_usage')
+    dtk_require('execute/command')
+    dtk_require('execute/command_processor')
+    dtk_require('execute/execute_context')
+    dtk_require('execute/examples')
+
+    extend ExecuteContext::ClassMixin
+  end
+end
+

data/lib/shell/context.rb

@@ -7,6 +7,7 @@ module DTK
 
     class Context
       include DTK::Client::Auxiliary
+      include DTK::Client::CommandBase
 
       # client commands
       CLIENT_COMMANDS       = ['cc','exit','clear','pushc','popc','dirs','help']
@@ -792,7 +793,9 @@ module DTK
           id = entity_name.identifier
           opts[id_label] = id
 
-          response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint.to_sym, url, opts)
+          # response_ruby_obj = DTK::Client::CommandBaseThor.get_cached_response(endpoint.to_sym, url, opts)
+          # when extended context autocomplete always send new request
+          response_ruby_obj = post rest_url(url), opts
           return [] if(response_ruby_obj.nil? || !response_ruby_obj.ok?)
 
           response_ruby_obj.data.each do |d|

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.1.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -52,60 +66,46 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
@@ -114,40 +114,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.0.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
@@ -184,6 +184,7 @@ email:
 - rich@reactor8.com
 executables:
 - dtk
+- dtk-execute
 - dtk-shell
 extensions: []
 extra_rdoc_files: []
@@ -192,6 +193,7 @@ files:
 - Gemfile_dev
 - README.md
 - bin/dtk
+- bin/dtk-execute
 - bin/dtk-shell
 - dtk-client.gemspec
 - lib/auxiliary.rb
@@ -269,6 +271,20 @@ files:
 - lib/dtk_constants.rb
 - lib/dtk_logger.rb
 - lib/error.rb
+- lib/execute.rb
+- lib/execute/command.rb
+- lib/execute/command/api_call.rb
+- lib/execute/command/api_call/map.rb
+- lib/execute/command/api_call/service.rb
+- lib/execute/command/api_call/translation_term.rb
+- lib/execute/command/rest_call.rb
+- lib/execute/command_processor.rb
+- lib/execute/command_processor/rest_call.rb
+- lib/execute/error_usage.rb
+- lib/execute/examples.rb
+- lib/execute/examples/add_tenant.rb
+- lib/execute/execute_context.rb
+- lib/execute/execute_context/result_store.rb
 - lib/git-logs/git.log
 - lib/parser/adapters/option_parser.rb
 - lib/parser/adapters/thor.rb
@@ -337,17 +353,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.