dtk-client 0.5.18 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2MwM2Q0NGFmOTdhNmZiYzUzMWNjMGNkMTg4YzM1YWFlN2Y2ZjJlMw==
-  data.tar.gz: !binary |-
-    OTY2OWU3ODA4OGFlZTAwMDZlNmUwOGNiMDA3MzVjZWJlYTk4ZjlmNA==
+SHA1:
+  metadata.gz: 924cb223833c0f10b4c810b3e1d7f5dc74ce274e
+  data.tar.gz: e8c98938d95c03ec4b60d61b613ec35e9e7954c7
 SHA512:
-  metadata.gz: !binary |-
-    MmIxYjQ4ZGVhMDRlYjViODI5YzdjOTgzNjlmYTI5M2Y1NTdkOTc3YTEzZjk3
-    YmM2ZjRhYjVkODFmNjQwODRmMjdkZjRmMzY1ZmYyZGMxYzg4ZWM5MWE3MWIy
-    ZjdlODEyMTIwOWFmM2ViYTUyMzZkMTFmNDU4ZGQ5MGU2ZDg1NTQ=
-  data.tar.gz: !binary |-
-    ZWZkYjM2MzIzNmU5NGNlOTA0YTU3Zjk4NzU1MWU0ZDZlOGRmMTllYTFlM2U5
-    NjVlYjEzNzZkZTJjMzllYzg5ZWQzMmFmYThmM2U4MTM3MGNhYmE2M2UxMWYz
-    NTViYjlmNjAyOGViMjUyOTVmMjMyNGRhOWU3ZDNjMTNiZTdjZDg=
+  metadata.gz: 8a855b4408447bc5545a9ef6f0e879c0c7e07d1436e302d6884c35b632863d59b63934d57e420657cfb0cc43b1a92cfb219f8bbf790f89246988921de3fa886a
+  data.tar.gz: ce5d0a8bb741436c1fd73971306a0d6b836208e6b2483f7f63899a6d50532199603dd1c2c4e39d286517b1bc0ee926c6b2c8897208775f812c6ebf5aac213b62

data/lib/command_helpers/test_module_creator.rb

@@ -8,13 +8,14 @@ module DTK::Client
 				Response.wrap_helper_actions do
 		      modules_dir = OsUtil.test_clone_location()
 		      FileUtils.mkdir_p(modules_dir) unless File.directory?(modules_dir)
-		      module_name = ModuleUtil.filter_module_name(module_name)
 		      target_repo_dir = OsUtil.module_location(type,module_name)
+
 		      begin
-		      	FileUtils.mkdir(target_repo_dir)
+		      	FileUtils.mkdir_p(target_repo_dir)
 		        generate_model(module_name, target_repo_dir)
 		        generate_serverspec_files(module_name, target_repo_dir)
 		      rescue => e
+		      	additional_error_msg = ""
 		        error_msg = "Create of directory (#{target_repo_dir}) failed."
 		        additional_error_msg = "Directory already exists" if e.message.include? "File exists"
 		        raise DTK::ErrorUsage.new(error_msg + " " + additional_error_msg,:log_error=>false)

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

@@ -51,33 +51,41 @@ module DTK::Client
 
     # mode will be :create or :update
     # service_module_name_x can be name or fullname (NS:MOduleName)
-    def promote_assembly_aux(mode,assembly_or_workspace_id,service_module_name_x=nil,assembly_template_name=nil)
+    def promote_assembly_aux(mode,assembly_or_workspace_id,service_module_name_x=nil,assembly_template_name=nil,opts={})
+      namespace = nil
       post_body = {
         :assembly_id => assembly_or_workspace_id,
         :mode => mode.to_s
       }
+
       if service_module_name_x
         service_module_name = service_module_name_x
-        namespace = nil
         if service_module_name_x =~ /(^[^:]+):([^:]+$)/
           namespace,service_module_name = [$1,$2]
         end
         post_body.merge!(:service_module_name => service_module_name) 
-        if namespace
-          post_body.merge!(:namespace => namespace)
-        end
       end
+
+      namespace ||= opts[:default_namespace]
+      if namespace
+        post_body.merge!(:namespace => namespace)
+        post_body.merge!(:local_clone_dir_exists => true) if Helper(:git_repo).local_clone_dir_exists?(:service_module, service_module_name, :namespace => namespace)
+      end
+
       post_body.merge!(:assembly_template_name => assembly_template_name) if assembly_template_name
+      post_body.merge!(:use_module_namespace => true) if opts[:use_module_namespace]
       response = post rest_url("assembly/promote_to_template"), post_body
-      # when changing context send request for getting latest assembly_templates instead of getting from cache
-      # @@invalidate_map << :assembly_template
-
       return response unless response.ok?()
+
       #synchronize_clone will load new assembly template into service clone on workspace (if it exists)
-      commit_sha,workspace_branch,namespace = response.data(:commit_sha,:workspace_branch,:module_namespace)
+      commit_sha,workspace_branch,namespace,full_module_name = response.data(:commit_sha,:workspace_branch,:module_namespace,:full_module_name)
       service_module_name ||= response.data(:module_name)
       opts = {:local_branch=>workspace_branch, :namespace => namespace}
-      Helper(:git_repo).synchronize_clone(:service_module,service_module_name,commit_sha,opts)
+      response = Helper(:git_repo).synchronize_clone(:service_module,service_module_name,commit_sha,opts)
+      return response unless response.ok?
+
+      DTK::Client::OsUtil.print("New assembly template '#{assembly_template_name}' created in service module '#{full_module_name}'.", :yellow) if mode == :create
+      response
     end
 
     def list_violations_aux(context_params)
@@ -631,6 +639,15 @@ module DTK::Client
         return unless Console.confirmation_prompt("Are you sure you want to delete and destroy all nodes in the workspace"+'?')
       end
 
+      unsaved_modules = check_if_unsaved_changes(assembly_or_workspace_id)
+      unless unsaved_modules.empty?
+        return unless Console.confirmation_prompt("Purging the workspace will cause unsaved changes in component module(s) '#{unsaved_modules.join(',')}' to be lost. Do you still want to proceed"+'?')
+      end
+
+      # purge local clone
+      response = purge_clone_aux(:all,:assembly_module => {:assembly_name => 'workspace'})
+      return response unless response.ok?
+
       post_body = {
         :assembly_id => assembly_or_workspace_id
       }
@@ -848,7 +865,7 @@ module DTK::Client
         filtered.reject! do |r|
           match = r.to_s.include?(filter_pattern)
           if r["node_id"] && r["node_id"] != node_id
-            node_id = r["node_id"]
+            node_id = (r["node_id"] && r["node_id"].to_s)
             node_name = r["node_name"]
           end
 

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

@@ -187,7 +187,7 @@ module DTK::Client
       namespace, local_module_name = get_namespace_and_name(module_name, ModuleUtil::NAMESPACE_SEPERATOR)
 
       # Create component module from user's input git repo
-      response = Helper(:git_repo).create_clone_with_branch(module_type.to_sym, local_module_name, git_repo_url)
+      response = Helper(:git_repo).create_clone_with_branch(module_type.to_sym, local_module_name, git_repo_url, nil, nil, namespace)
 
       # Raise error if git repository is invalid
       # raise DtkError,"Git repository URL '#{git_repo_url}' is invalid." unless response.ok?

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

@@ -22,5 +22,23 @@ module DTK::Client
       end
       response
     end
+
+    def check_if_unsaved_changes(assembly_or_workspace_id, opts={})
+      unsaved_modules = []
+      post_body = {
+        :assembly_id => assembly_or_workspace_id,
+        :subtype     => 'instance'
+      }
+      response = post rest_url("assembly/get_component_modules"), post_body
+
+      if response.ok?
+        response.data.each do |cmp_mod|
+          unsaved_modules << "#{cmp_mod['namespace_name']}:#{cmp_mod['display_name']}" if cmp_mod['local_copy_diff']
+        end
+      end
+
+      unsaved_modules
+    end
+
   end
 end

data/lib/commands/thor/assembly.rb

@@ -267,7 +267,7 @@ module DTK::Client
       # we check current options and forwarded options (from deploy method)
       in_target = options["in-target"] || context_params.get_forwarded_thor_option("in-target")
       instance_bindings = options["instance-bindings"]
-      settings = options["settings"]
+      settings = parse_service_settings(options["settings"])
       assembly_list = Assembly.assembly_list()
 
       if name

data/lib/commands/thor/node_template.rb

@@ -16,25 +16,7 @@ module DTK::Client
     def self.validation_list(context_params)
       get_cached_response(:node_template, "node/list", {:subtype => 'template'})
     end
-=begin
-  #Not implemented yet
-    desc "NODE-TEMPLATE-NAME/ID info", "Get information about given node template."
-    method_option :list, :type => :boolean, :default => false
-    def info(context_params)
-      node_template_id = context_params.retrieve_arguments([:node_template_id!],method_argument_names)
-      data_type = :node
 
-      post_body = {
-        :node_id => node_template_id,
-        :subtype => 'template'
-      }
-      response = post rest_url("node/info"), post_body
-
-      response.render_table(data_type) unless options.list?
-
-      return response
-    end
-=end
 #    desc "list --all -t [TARGET-NAME]", "List all node templates."
     desc "list", "List all node templates."
     method_option :all, :type => :boolean, :default => false
@@ -62,6 +44,50 @@ module DTK::Client
       }
       post rest_url("node/image_upgrade"), post_body
     end
+
+    desc "add-node-template NODE-TEMPLATE-NAME TARGET-NAME/ID --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
+    method_option "os"
+    method_option "image-id",:aliases => "-i" 
+    method_option "size",:aliases => "-s" 
+    def add_node_template(context_params)
+      node_template_name, target_id = context_params.retrieve_arguments([:option_1!, :option_2!],method_argument_names)
+      missing_opts = ['os','image-id'].reject{|k|options.has_key?(k)}
+      unless  missing_opts.empty?
+        pl = (missing_opts.size > 1)
+        missing = missing_opts.map{|o|"--#{o}"}.join(',')
+        raise DtkError, "[ERROR] The mandatory #{plural?(pl,'option')} (#{missing}) #{plural?(pl,'is/are')} missing" 
+      end
+      size_array = options[:size] && options[:size].split(',')
+      post_body = post_body(
+        :node_template_name => node_template_name,
+        :target_id => target_id,
+        :operating_system => options['os'],
+        :image_id => options['image-id'],
+        :size_array => size_array
+      )
+      post rest_url("node/add_node_template"), post_body
+    end
+
+=begin
+  #Not implemented yet
+    desc "NODE-TEMPLATE-NAME/ID info", "Get information about given node template."
+    method_option :list, :type => :boolean, :default => false
+    def info(context_params)
+      node_template_id = context_params.retrieve_arguments([:node_template_id!],method_argument_names)
+      data_type = :node
+
+      post_body = {
+        :node_id => node_template_id,
+        :subtype => 'template'
+      }
+      response = post rest_url("node/info"), post_body
+
+      response.render_table(data_type) unless options.list?
+
+      return response
+    end
+=end
+
 =begin
     #TODO: move to form desc "NODE-TEMPLATE-NAME/ID stage [INSTANCE-NAME]"
     #will then have to reverse arguments

data/lib/commands/thor/service.rb

@@ -205,7 +205,13 @@ TODO: overlaps with different meaning
     desc "SERVICE-NAME/ID create-assembly [NAMESPACE:]SERVICE-MODULE-NAME ASSEMBLY-NAME", "Create a new assembly from this service instance in the designated service module."
     def create_assembly(context_params)
       assembly_id, service_module_name, assembly_template_name = context_params.retrieve_arguments([:service_id!,:option_1!,:option_2!],method_argument_names)
-      response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name)
+
+      # need default_namespace for create-assembly because need to check if local service-module directory existst in promote_assembly_aux
+      resp = post rest_url("namespace/default_namespace_name")
+      return resp unless resp.ok?
+      default_namespace = resp.data
+
+      response = promote_assembly_aux(:create,assembly_id,service_module_name,assembly_template_name,{:default_namespace=>default_namespace})
       return response unless response.ok?
 
       @@invalidate_map << :assembly
@@ -236,7 +242,8 @@ TODO: overlaps with different meaning
         else
           [nil,nil]
         end
-      response = promote_assembly_aux(:update,assembly_id, service_module_name, assembly_template_name)
+
+      response = promote_assembly_aux(:update,assembly_id, service_module_name, assembly_template_name,{:use_module_namespace=>true})
       return response unless response.ok?
       @@invalidate_map << :assembly
       Response::Ok.new()
@@ -525,6 +532,11 @@ TODO: will put in dot release and will rename to 'extend'
         return unless Console.confirmation_prompt("Are you sure you want to delete and destroy service '#{assembly_name}' and its nodes"+'?')
       end
 
+      unsaved_modules = check_if_unsaved_changes(assembly_id)
+      unless unsaved_modules.empty?
+        return unless Console.confirmation_prompt("Deleting this service will cause unsaved changes in component module(s) '#{unsaved_modules.join(',')}' to be lost. Do you still want to proceed"+'?')
+      end
+
       # purge local clone
       response = purge_clone_aux(:all,:assembly_module => {:assembly_name => assembly_name})
       return response unless response.ok?

data/lib/commands/thor/workspace.rb

@@ -198,8 +198,15 @@ module DTK::Client
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
     def create_assembly(context_params)
       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)
+
+      # need default_namespace for create-assembly because need to check if local service-module directory existst in promote_assembly_aux
+      resp = post rest_url("namespace/default_namespace_name")
+      return resp unless resp.ok?
+      default_namespace = resp.data
+
+      response = promote_assembly_aux(:create,workspace_id,service_module_full_name,assembly_template_name,{:default_namespace=>default_namespace})
       return response unless response.ok?
+
       if options.purge?
         response = purge_aux(context_params)
         return response unless response.ok?
@@ -425,6 +432,12 @@ module DTK::Client
       set_attribute_aux(context_params)
     end
 
+    desc "WORKSPACE-NAME/ID set-required-params", "Interactive dialog to set required params that are not currently set"
+    def set_required_params(context_params)
+      workspace_id = context_params.retrieve_arguments([:workspace_id!],method_argument_names)
+      set_required_params_aux(workspace_id,:assembly,:instance)
+    end
+
 #    desc "WORKSPACE-NAME/ID start [NODE-ID-PATTERN]", "Starts all workspace's nodes,  specific nodes can be selected via node id regex."
     desc "WORKSPACE-NAME/ID start [NODE-NAME]", "Starts all the workspace nodes. A single node can be selected."
     def start(context_params)

data/lib/dtk-client/version.rb

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

data/lib/parser/adapters/thor.rb

@@ -414,6 +414,21 @@ module DTK
           !possible_id.to_s.match(/^[0-9]+$/).nil?
         end
 
+        # helper for error messages; prints singular or plural version
+        # tem will be of form singural/plural or simple term in which case plural formed by adding 's'
+        def plural?(is_plural,term)
+          singular_plural = term.split('/')
+          if singular_plural.size == 1
+            singular_plural << "#{singular_plural[0]}s"
+          end
+          singular_plural[is_plural ? 1 : 0]
+        end
+
+        # removes nil values
+        def post_body(hash)
+          hash.inject(Hash.new){|h,(k,v)|v.nil? ? h : h.merge(k => v)} 
+        end
+
         # User input prompt
         def user_input(message)
           trap("INT", "SIG_IGN")
@@ -431,10 +446,17 @@ module DTK
           return about, about[0..-2].to_sym
         end
 
-        # check for delimiter '/', if present returns namespace and name for module/service
+        # check for delimiter, if present returns namespace and name for module/service
         # returns: namespace, name
         def get_namespace_and_name(input_remote_name, delimiter)
-          (input_remote_name||'').include?(delimiter) ? input_remote_name.split(delimiter) : [nil, input_remote_name]
+          if (input_remote_name||'').include?(delimiter)
+            input_remote_name.split(delimiter)
+          # support ns/name as well as ns:name
+          elsif (input_remote_name||'').include?('/')
+            input_remote_name.split('/')
+          else
+            [nil, input_remote_name]
+          end
         end
 
         def get_namespace_and_name_for_component(component_full_name)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.6.0
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -56,98 +56,98 @@ dependencies:
   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
   name: dtk-common-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.10
 - !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
@@ -328,17 +328,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.