dtk-client 0.7.1.1 → 0.7.2

data/lib/execute/script/add_tenant_without_router.rb

@@ -0,0 +1,87 @@
+class DTK::Client::Execute::Script
+  class AddTenantWithoutRouter < self
+    def self.ret_params_from_argv()
+      banner = "Usage: dtk-execute add-tenant-no-router TENANT-NAME CATALOG-USERNAME -p PASSWORD [-s SERVICE-INSTANCE]"
+      tenant_name = catalog_username = tenant_number = nil
+      if ARGV.size > 2
+        tenant_name = ARGV[1]
+        if tenant_name =~ /^dtk([0-9]+)$/
+          tenant_number = $1
+        else
+          raise ErrorUsage.new("TENANT-NAME must be of form 'dtkNUMs', like dtk601")
+        end
+        catalog_username = ARGV[2]
+      else
+        show_help_and_exit(banner)
+      end
+
+      params = Hash.new 
+      process_params_from_options(banner) do |opts|
+        opts.on( '-p', '--password PASSWORD', "Password for tenant and catalog" ) do |pw|
+          params[:password] = pw
+        end
+        opts.on( '-s', '--service SERVICE-INSTANCE', "Name of Service instance" ) do |s|
+          params[:service_instance] = s
+        end
+      end
+
+      # TODO: use opt parser to enforce that :password option is manditory
+      unless password = params[:password]
+        raise ErrorUsage.new("Password is mandatory; use -p commnd line option")
+      end
+      service_instance = params[:service_instance] || "dtkhost#{tenant_number[0]}"
+      to_add = {
+        :tenant_name      => tenant_name,
+        :catalog_username => catalog_username,
+        :service_instance => service_instance
+      }
+      params.merge(to_add)
+    end
+
+    def self.execute_with_params(params)
+      tenant_name =  params[:tenant_name]
+      catalog_username = params[:catalog_username]
+      service = params[:service_instance]
+      password = params[:password]
+      node = params[:node_name] || 'server'
+      
+      component_with_namespace = "dtk-meta-user:dtk_tenant[#{tenant_name}]"
+      component_namespace, component = (component_with_namespace =~ /(^[^:]+):(.+$)/; [$1,$2])
+
+      av_pairs = {
+        :catalog_username => catalog_username,
+        :tenant_password  => password,
+        :catalog_password => password
+      }
+      
+      ExecuteContext(:print_results => true) do
+        result = call 'service/add_component',
+          :service               => service,
+          :node                  => node,
+          :component             => component,
+          :namespace             => component_namespace,
+          :donot_update_workflow => true
+        
+        av_pairs.each_pair do |a,v|
+          result = call 'service/set_attribute',
+            :service        => service,
+            :attribute_path => "#{node}/#{component}/#{a}",
+            :value          => v
+        end
+        
+        ['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_without_router',
+          :workflow_params => {'name' => tenant_name}
+        
+      end
+    end
+  end
+end

data/lib/shell/context.rb

@@ -172,14 +172,6 @@ module DTK
         # component-templates to autocomplete
         extended_candidates, new_context, line_buffer_first = {}, nil, nil
         command_clazz = Context.get_command_class(active_context_copy.last_command_name)
-        # require 'debugger'
-        # Debugger.start
-        # debugger
-        # unless (line_buffer.empty? || line_buffer.strip().empty?)
-        #   line_buffer_last = line_buffer.split(' ').last
-        #   line_buffer = line_buffer.split(' ').first
-        #   line_buffer.gsub!('-','_') unless (line_buffer.nil? || line_buffer.empty?)
-        # end
 
         unless (line_buffer.empty? || line_buffer.strip().empty?)
           line_buffer = line_buffer.split(' ')
@@ -336,6 +328,16 @@ module DTK
           clazz = DTK::Shell::Context.get_command_class(command)
           error_message, invalid_context = validate_command(clazz, current_context_clazz, command, active_context_copy)
 
+          # restrict utils subcontext in service/service_name/node_group only
+          if active_context_copy.last_context_is_shadow_entity? && active_context_copy.last_context.shadow_entity().eql?('node_group')
+            if current_context_clazz.respond_to?(:multi_context_children)
+              multi_context_children = current_context_clazz.multi_context_children()
+              if command.eql?('utils') && multi_context_children.include?(command.to_sym)
+                return active_context_copy, "'#{command}' context is not valid.", invalid_context
+              end
+            end
+          end
+
           break if error_message
           # if we are dealing with new entries add them to active_context
           active_context_copy.push_new_context(command, command) if (i >= ac_size)
@@ -748,6 +750,11 @@ module DTK
               n_level_ac_candidates.concat(node_names)
             end
 
+            # restrict autocomple to utils subcontext in service/service_name/node_group only
+            if active_context_copy.last_context_is_shadow_entity? && active_context_copy.last_context().shadow_entity().eql?('node_group')
+              n_level_ac_candidates.delete('utils')
+            end
+
             n_level_ac_candidates
           end
         else
@@ -911,7 +918,6 @@ module DTK
               options_param_args = nil
               invalid_options << e
               break
-              # raise DTK::Client::DtkValidationError, "Option '#{e}' is not valid for current command!"
             else
               options_param_args << e
               options_param_args << args[i+1] unless type == :boolean

data/lib/shell/domain/context_params.rb

@@ -8,6 +8,8 @@ module DTK::Shell
       @current_context  = ActiveContext.new
       @method_arguments = override_method_arguments
       @thor_options     = Hash.new
+
+      @method_arguments
     end
 
     def add_context_to_params(context_name, entity_name, context_value = nil)

data/lib/shell/help_monkey_patch.rb

@@ -237,6 +237,10 @@ class Thor
         if @@shell_context && @@shell_context.active_context.current_identifier?
           sub_children += command_clazz.valid_children() if command_clazz.respond_to?(:valid_children)
           sub_children += command_clazz.invisible_context_list()
+          # remove utils subcontext from help in service/service_name/node_group only
+          if @@shell_context.active_context.last_context_is_shadow_entity? && @@shell_context.active_context.shadow_entity().eql?('node_group')
+            sub_children.delete(:utils)
+          end
         else
           if command_clazz.respond_to?(:validation_list)
             sub_children += ["#{last_command_name}-identifier"]

data/lib/util/os_util.rb

@@ -233,7 +233,7 @@ module DTK
         # color   - Symbol describing the color to be used on STDOUT
         #
         # Void
-        def print(message, color)
+        def print(message, color = :white)
           puts colorize(message, color)
         end
 
@@ -286,6 +286,7 @@ module DTK
             load File.expand_path('../../lib/shell/domain/active_context.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/domain/context_params.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/domain/override_tasks.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/shell.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/context.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/domain/git_adapter.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/command_helpers/git_repo.rb', File.dirname(__FILE__))

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-08 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
@@ -70,42 +70,42 @@ dependencies:
   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.1
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0.1
+        version: 0.7.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
@@ -228,8 +228,9 @@ files:
 - lib/commands/common/thor/purge_clone.rb
 - lib/commands/common/thor/push_clone_changes.rb
 - lib/commands/common/thor/push_to_remote.rb
+- lib/commands/common/thor/remotes.rb
 - lib/commands/common/thor/reparse.rb
-- lib/commands/common/thor/set_required_params.rb
+- lib/commands/common/thor/set_required_attributes.rb
 - lib/commands/common/thor/task_status.rb
 - lib/commands/common/thor/test_action_agent.rb
 - lib/commands/thor/account.rb
@@ -247,6 +248,7 @@ files:
 - lib/commands/thor/node_template.rb
 - lib/commands/thor/project.rb
 - lib/commands/thor/provider.rb
+- lib/commands/thor/remotes.rb
 - lib/commands/thor/repo.rb
 - lib/commands/thor/service.rb
 - lib/commands/thor/service_module.rb
@@ -281,10 +283,11 @@ files:
 - 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/execute/script.rb
+- lib/execute/script/add_tenant.rb
+- lib/execute/script/add_tenant_without_router.rb
 - lib/git-logs/git.log
 - lib/parser/adapters/option_parser.rb
 - lib/parser/adapters/thor.rb
@@ -353,17 +356,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.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.

data/lib/execute/examples.rb

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

data/lib/execute/examples/add_tenant.rb

@@ -1,42 +0,0 @@
-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