dtk-client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 924cb223833c0f10b4c810b3e1d7f5dc74ce274e
-  data.tar.gz: e8c98938d95c03ec4b60d61b613ec35e9e7954c7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDc3MDgwYjMwMzU0MTM5Y2UzZGY5YTk4MGM3NDIxMTNkMjBlZjI0Ng==
+  data.tar.gz: !binary |-
+    N2QyN2FhN2JiMTNlZGU0YTM1YzAzYTE2ZGZiNTdlYjEyZGNmN2ZjMQ==
 SHA512:
-  metadata.gz: 8a855b4408447bc5545a9ef6f0e879c0c7e07d1436e302d6884c35b632863d59b63934d57e420657cfb0cc43b1a92cfb219f8bbf790f89246988921de3fa886a
-  data.tar.gz: ce5d0a8bb741436c1fd73971306a0d6b836208e6b2483f7f63899a6d50532199603dd1c2c4e39d286517b1bc0ee926c6b2c8897208775f812c6ebf5aac213b62
+  metadata.gz: !binary |-
+    NDVmZGE3ODE2NjFhZWNmMGUxNDQ0YWI3ODM0NGU2NjRlZGFkNzlhZGQ0YzA5
+    NGNhOTUwYzgxMmUxZDgwODU1ZDhiZDljYWNjNWEwM2I3MWM3OTQ5MjFkOTIz
+    MmYxNjBjZTQwZjI5ZWRlMTA0NDkxYmE0MTc5YzM3MTY1NzllNzg=
+  data.tar.gz: !binary |-
+    MGU0MjZmMDViY2FiNGY3ZGMyMzVjMWJmNGE0NjFhZTljNjA1ZTExZjVlNjY5
+    MjEzN2JjOWE3MTEzMmI4NmUyOGM1ZWZjNzE4OTI4YzgxZDQyOGU0YmU5ZDEw
+    NGU4MGRhMGUwZmYzYzE0NjkzZDZmYmY5ZTU4ZGVkYjQ0NGVkZTM=

data/lib/commands/thor/assembly.rb

@@ -204,7 +204,9 @@ module DTK::Client
       @@invalidate_map << :assembly
       
       assembly_template_name = get_assembly_name(assembly_template_id)
-      assembly_template_name.gsub!('::','-') if assembly_template_name
+      if assembly_template_name
+        assembly_template_name.gsub!(/(::)|(\/)/,'-')
+      end
 
       in_target = options["in-target"]
       instance_bindings = options["instance-bindings"]

data/lib/commands/thor/node_template.rb

@@ -45,29 +45,34 @@ 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"
+    desc "add-node-template NODE-TEMPLATE-NAME [-t TARGET-NAME/ID] --os OS --image-id IMAGE-ID --size SIZE[,SIZE2,..]", "Add new node template"
+    method_option "target",:aliases => "-t" 
     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
+      node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       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'],
+        :target_id => options['target'],
+        :operating_system => required_option('os'),
+        :image_id => required_option('image-id'),
         :size_array => size_array
       )
       post rest_url("node/add_node_template"), post_body
     end
 
+    desc "delete-node-template NODE-TEMPLATE-NAME", "Delete node template"
+    def delete_node_template(context_params)
+      node_template_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      post_body = post_body(
+        :node_template_name => node_template_name
+      )
+      post rest_url("node/delete_node_template"), post_body
+    end
+
 =begin
   #Not implemented yet
     desc "NODE-TEMPLATE-NAME/ID info", "Get information about given node template."

data/lib/dtk-client/version.rb

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

data/lib/parser/adapters/thor/common_option_defs.rb

@@ -1,11 +1,22 @@
 module DTK; module Client
   class CommandBaseThor
-    module CommonOptionDefsClassMixin
-      def version_method_option()
-        method_option "version",:aliases => "-v",
-        :type => :string, 
-        :banner => "VERSION",
-        :desc => "Version"
+    module CommonOptionDefs
+      module Mixin
+        def required_option(key)
+          key = key.to_s
+          unless options.has_key?(key)
+            raise DtkError, "[ERROR] The mandatory option --#{key} is missing" 
+          end
+          options[key]
+        end
+      end
+      module ClassMixin
+        def version_method_option()
+          method_option "version",:aliases => "-v",
+          :type => :string, 
+          :banner => "VERSION",
+          :desc => "Version"
+        end
       end
     end
   end

data/lib/parser/adapters/thor.rb

@@ -21,7 +21,7 @@ module DTK
       extend  TaskStatusMixin
       extend  Console
       include CommandHelperMixin
-      extend CommonOptionDefsClassMixin
+      extend CommonOptionDefs::ClassMixin
 
       @@cached_response = {}
       @@invalidate_map  = []
@@ -343,6 +343,8 @@ module DTK
 
       no_tasks do
 
+        include CommonOptionDefs::Mixin
+
         #
         # Run shell command directly from main, use with CAUTION
         #

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-08 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.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.