dtk-client 0.7.2.1 → 0.7.3

data/lib/util/module_util.rb

@@ -14,6 +14,10 @@ module DTK
         module_namespace ? resolve_name(module_name, module_namespace) : module_name
       end
 
+      def self.module_name(module_type)
+        module_type.gsub('_',' ')
+      end
+
       # returns [namespace,name]; namespace can be null if cant determine it
       def self.full_module_name_parts?(name_or_full_module_name)
         if name_or_full_module_name.nil?

data/lib/util/os_util.rb

@@ -145,6 +145,10 @@ module DTK
             end
         end
 
+        def temp_git_remote_location()
+          File::join(dtk_local_folder, 'temp_remote_location')
+        end
+
         def component_clone_location()
           clone_base_path(:component_module)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.2.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +216,8 @@ files:
 - lib/commands/common/thor/assembly_workspace.rb
 - lib/commands/common/thor/clone.rb
 - lib/commands/common/thor/common.rb
+- lib/commands/common/thor/common_base.rb
+- lib/commands/common/thor/create_target.rb
 - lib/commands/common/thor/edit.rb
 - lib/commands/common/thor/inventory_parser.rb
 - lib/commands/common/thor/list_diffs.rb
@@ -287,7 +289,6 @@ files:
 - 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

data/lib/execute/script/add_tenant_without_router.rb

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