dtk-client 0.9.0 → 0.9.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGY4MjY3MzI0Mzg2MzVlYWQ5YmE0N2YzZjU1NjNiODA5NzU1MTU5Yw==
-  data.tar.gz: !binary |-
-    ZThiYjk4YThmM2I4OTg2YTRlNzZhNTVlNjkxNWJlY2Q2YjI3Y2YwMQ==
+SHA1:
+  metadata.gz: 65f98d3a29d9f7cbd1368bdb0ef41a7d5f294fa6
+  data.tar.gz: 1edf46630c80023aac016dfa21414fb9a27098ba
 SHA512:
-  metadata.gz: !binary |-
-    YjU0OGY2NjhkZmRiMGI1NmM1OTVlNTFmZjkxYjVkNGNlZjMyZjE1MDZlYThm
-    ZjQyMDQzNjZjN2QzMzYwMGFiNGY3MjQ3NjBkMzQxNTQ2NTA0ZDFmNWZlNGZh
-    MmU1YmUwNzI1MzNmN2RhNDdmYjM1ZWY3MTdjNWY1ZDI1MmE3NjM=
-  data.tar.gz: !binary |-
-    ZGQyZDhjOWQ3Njc3ZmM5YmQ3OWJjYTcyNzA5YTRlZTM2ZTU5NTA1ZDU3MmZm
-    NjNmYWVmODFkMTY5NGMwMjM4ODI3ZGQ2YWE5MGI1YzUxNTE1ZGQxMWRlNWNl
-    YzRjZTRjNzFlYmQ1ZTE0NzYyOTBiY2Q4ODU3ZmNhOWM2YjdkODU=
+  metadata.gz: 12ed89cec1938c97083425aa8528d9ab14d2ed478abcd4c9bd1bda3432e44ac9a1c26cbf16ec843f36cdb1a1ae62983c51c4e7d8f7aab42b42f7a86cf3d57301
+  data.tar.gz: 4b2664285e145724fb4eeebcb14390eb990ea0183b2dad8076801ea1baaab1623176a106351090cb1ea5f76d2b79b1939b3f7f2b5b318b4c868d81a79387ba04

data/README.md

@@ -11,11 +11,11 @@ It's main purpose is to provide an easy to use interface for importing modules,
 ---
 #### Sytstem requirements
 
-- Ruby 1.9.3 
+- Ruby 1.9.3
 - Unix OS
 
 ---
-#### Installation 
+#### Installation
 
 For DTK Client to work, following steps have to be done:
 
@@ -23,7 +23,7 @@ For DTK Client to work, following steps have to be done:
 - RSA Keys Generated
 
 To install DTK Client gem, execute:
- 
+
 `gem install dtk-client`
 
 ---
@@ -34,7 +34,7 @@ There are two ways for DTK Client to run
 - via an interactive shell (<tt>dtk-shell</tt>)
 - by executing DTK Client commands (ie. <tt>dtk service list</tt>)
 
-If it is the first time that the DTK Client is being used (by either of the ways), following prompts will appear: 
+If it is the first time that the DTK Client is being used (by either of the ways), following prompts will appear:
 
 ```
 Please enter the DTK server address (example: instance.dtk.io)
@@ -46,10 +46,10 @@ Password:
 
 ```
 After entering the correct data, following message will appear:
- 
+
 `SSH key 'dtk-client' added successfully!`
 
-This means that the DTK Server has successfully registered DTK Client and the client is ready for use. 
+This means that the DTK Server has successfully registered DTK Client and the client is ready for use.
 
 ---
 #### DTK Client configuration
@@ -83,15 +83,24 @@ Component and Service modules that are installed, or modules that are imported a
 ---
 
 ## Advanced features
+#### Development mode
+
+When using DTK Client in Development mode, gems from `Gemfile_dev` must be installed and used when running DTK Client or DTK Client Shell:
+
+```
+bundle install --gemfile Gemfile_dev
+BUNDLE_GEMFILE=Gemfile_dev bundle exec ruby ./bin/dtk-shell
+```
+
 #### DTK Repoman
 
-DTK Repoman is a Git based repository for publishing and installing component modules and service modules. DTK Repoman has it's own users, known as catalog users. The inital setup should register the DTK Client to the Public Catalog users. 
+DTK Repoman is a Git based repository for publishing and installing component modules and service modules. DTK Repoman has it's own users, known as catalog users. The inital setup should register the DTK Client to the Public Catalog users.
 
 Successfully registered DTK Client on DTK Repoman enables execution of commands such as:
 
 `dtk service-module list --remote` - lists service moduels on remote visible to the catalog user
 
-`dtk component-module install namespace/component-module-name` - install component module 
+`dtk component-module install namespace/component-module-name` - install component module
 
 Switching from public user to a commercial user can be done with `dtk account set-catalog-credentials`. This will initate a prompt for catalog username and password
 

data/lib/command_helpers/service_importer.rb

@@ -159,7 +159,7 @@ module DTK::Client
           # import from Repo Manager
           new_context_params = ::DTK::Shell::ContextParams.new([module_name])
           new_context_params.override_method_argument!('option_2', version) if version && !version.eql?('master')
-          new_context_params.forward_options(:skip_cloning => false, :skip_auto_install => true, :module_type => module_type).merge!(opts)
+          new_context_params.forward_options(:skip_cloning => false, :skip_auto_install => true, :module_type => module_type, :ignore_component_error => true).merge!(opts)
           response = ContextRouter.routeTask(module_type, 'install', new_context_params, @conn)
         end
 

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

@@ -237,7 +237,7 @@ module DTK::Client
       task_status_stream(assembly_or_workspace_id)
     end
 
-    def converge_aux(context_params,opts={})
+    def converge_aux(context_params, opts = {})
       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 = parse_params?(task_params_string)
@@ -248,7 +248,11 @@ module DTK::Client
       if response.data and response.data.size > 0
         error_message = "The following violations were found; they must be corrected before workspace can be converged"
         OsUtil.print(error_message, :red)
-        return response.render_table(:violation)
+        if opts[:are_there_violations]
+          return response.render_table(:violation), true
+        else
+          return response.render_table(:violation)
+        end
       end
 
       post_body = PostBody.new(
@@ -619,6 +623,7 @@ module DTK::Client
       }
 
       post_body.merge!(:namespace => namespace) if namespace
+      post_body.merge!(:auto_complete_links => options.auto_complete) if options.auto_complete?
       post rest_url("assembly/add_component"), post_body
     end
 
@@ -1548,6 +1553,16 @@ module DTK::Client
     end
 
     def stage_aux(context_params)
+      new_context_params = get_deploy_or_stage_context(context_params, options)
+      ContextRouter.routeTask(:service_module, "stage", new_context_params, @conn)
+    end
+
+    def deploy_aux(context_params)
+      new_context_params = get_deploy_or_stage_context(context_params, options)
+      ContextRouter.routeTask(:service_module, "deploy", new_context_params, @conn)
+    end
+
+    def get_deploy_or_stage_context(context_params, options)
       assembly_template_name, instance_name = context_params.retrieve_arguments([:option_1!, :option_2], method_argument_names)
 
       service_module_name, assembly, assembly_name = assembly_template_name.split('/')
@@ -1565,19 +1580,59 @@ module DTK::Client
       new_context_params.method_arguments = [assembly_name]
       new_context_params.method_arguments << instance_name if instance_name
 
-      fwd_opts  = {}
-      in_target = options["in-target"]
-      node_size = options.node_size
-      os_type   = options.os_type
-      version   = options.version
+      fwd_opts         = {}
+      in_target        = options["in-target"]
+      node_size        = options.node_size
+      os_type          = options.os_type
+      version          = options.version
+      no_auto_complete = options.no_auto_complete
+      is_target        = options.is_target?
+      parent_service   = options.parent_service
+      do_not_encode    = options.do_not_encode
+      stream_results   = options['stream-results']
 
       fwd_opts.merge!(:in_target => in_target) if in_target
       fwd_opts.merge!(:node_size => node_size) if node_size
       fwd_opts.merge!(:os_type => os_type) if os_type
       fwd_opts.merge!(:version => version) if version
+      fwd_opts.merge!(:no_auto_complete => no_auto_complete) if no_auto_complete
+      fwd_opts.merge!(:is_target => is_target) if is_target
+      fwd_opts.merge!(:parent_service => parent_service) if parent_service
+      fwd_opts.merge!(:do_not_encode => do_not_encode) if do_not_encode
+      fwd_opts.merge!('stream-results' => stream_results) if stream_results
       new_context_params.forward_options(fwd_opts)
 
-      response = ContextRouter.routeTask(:service_module, "stage", new_context_params, @conn)
+      new_context_params
+    end
+
+    def set_default_target_aux(context_params)
+      target_instance_name = context_params.retrieve_arguments([:option_1!], method_argument_names)
+      post_body = {
+        :assembly_id => target_instance_name
+      }
+      post rest_url("assembly/set_default_target"), post_body
+    end
+
+    def set_required_attributes_converge_aux(context_params, opts = {})
+      assembly_or_workspace_id = context_params.retrieve_arguments([REQ_ASSEMBLY_OR_WS_ID], method_argument_names)
+
+      message             = " You will have to converge service instance manually!"
+      attributes_response = set_required_attributes_aux(assembly_or_workspace_id, :assembly, :instance, message)
+      return attributes_response if attributes_response.is_a?(Response) && !attributes_response.ok?
+
+      response, violations = converge_aux(context_params, { :are_there_violations => true })
+      return response unless response.ok?
+
+      if violations
+        forwarded_options = context_params.get_forwarded_options()
+        context_params.forward_options(forwarded_options.merge!(:violations => true))
+      else
+        instance_name        = "/service/#{context_params.get_forwarded_options[:instance_name]}"
+        opts[:instance_name] = instance_name
+        DTK::Client::OsUtil.print("Service instance '#{instance_name}' deployment has been started. Changing context to '#{instance_name}'.", :green)
+      end
+
+      response
     end
   end
 end

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

@@ -17,7 +17,7 @@
 #
 module DTK::Client
   module SetRequiredParamsMixin
-    def set_required_attributes_aux(id,type,subtype=nil)
+    def set_required_attributes_aux(id, type, subtype = nil, additional_message = nil)
       id_field = "#{type}_id".to_sym
       post_body = {
         id_field => id,
@@ -32,7 +32,7 @@ module DTK::Client
         response.set_data('Message' => "No parameters to set.")
         response
       else
-        param_bindings = DTK::Shell::InteractiveWizard.resolve_missing_params(missing_params)
+        param_bindings = DTK::Shell::InteractiveWizard.resolve_missing_params(missing_params, additional_message)
         post_body = {
           id_field => id,
           :av_pairs_hash => param_bindings.inject(Hash.new){|h,r|h.merge(r[:id] => r[:value])}

data/lib/commands/thor/assembly.rb

@@ -201,16 +201,25 @@ module DTK::Client
       response
     end
 
-    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE]", "Stage assembly in target."
-    method_option "in-target",:aliases => "-t" ,
-      :type => :string,
-      :banner => "TARGET-NAME/ID",
-      :desc => "Target (id) to create assembly in"
-    #hidden option
+    desc "ASSEMBLY-NAME/ID stage-target [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly as target instance."
+    method_option :settings, :type => :string, :aliases => '-s'
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
     method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    def stage_target(context_params)
+    end
+
+
+    desc "ASSEMBLY-NAME/ID stage [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly in target."
+    method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
     method_option :settings, :type => :string, :aliases => '-s'
-    method_option :node_size, :type => :string, :aliases => "--node-size"
-    method_option :os_type, :type => :string, :aliases => "--os-type"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    method_option "instance-bindings", :type => :string
     def stage(context_params)
       assembly_template_id, service_module_id, name = context_params.retrieve_arguments([:assembly_id!, :service_module_id, :option_1],method_argument_names)
       post_body = {
@@ -258,22 +267,24 @@ module DTK::Client
       return response
     end
 
+    desc "ASSEMBLY-NAME/ID deploy-target [INSTANCE-NAME] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly as target instance."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy_target(context_params)
+    end
 
-#    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [--settings SETTINGS-NAME1[,..]]", "Stage assembly in target."
-#     version_method_option
-    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [--settings SETTINGS-NAME1[,..]] [-m COMMIT-MSG]", "Stage and deploy assembly in target."
-    #hidden option
-    method_option "instance-bindings",
-      :type => :string
-#    method_option "in-target",:aliases => "-t" ,
-#      :type => :string,
-#      :banner => "TARGET-NAME/ID",
-#      :desc => "Target (id) to create assembly in"
-    method_option "commit_msg",:aliases => "-m" ,
-      :type => :string,
-      :banner => "COMMIT-MSG",
-      :desc => "Commit message"
-    method_option :settings, :type => :string, :aliases => '-s'
+    desc "ASSEMBLY-NAME/ID deploy [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly in target."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
     def deploy(context_params)
       context_params.forward_options(options)
       assembly_template_id, service_module_id, name = context_params.retrieve_arguments([:assembly_id!, :service_module_id, :option_1],method_argument_names)

data/lib/commands/thor/dtk.rb

@@ -26,14 +26,18 @@ module DTK::Client
       ['component','attribute','utils','node','task','component-template','assembly','remotes']
     end
 
-    desc "workspace","Sandbox for development and testing"
-    def workspace
-      # API descriptor, SYM_LINK!
+    if ::DTK::Configuration.get(:development_mode)
+      desc "workspace","Sandbox for development and testing"
+      def workspace
+        # API descriptor, SYM_LINK!
+      end
     end
 
-    desc "target","Targets"
-    def target
-      # API descriptor, SYM_LINK!
+    if ::DTK::Configuration.get(:development_mode)
+      desc "target","Targets"
+      def target
+        # API descriptor, SYM_LINK!
+      end
     end
 
 
@@ -70,9 +74,11 @@ module DTK::Client
       # API descriptor
     end
 
-    desc "test-module", "DTK definitions for modeling/defining individual test components."
-    def test_module
-      # API descriptor
+    if ::DTK::Configuration.get(:development_mode)
+      desc "test-module", "DTK definitions for modeling/defining individual test components."
+      def test_module
+        # API descriptor
+      end
     end
 
     # desc "node", "Commands to list, query, and delete/destroy node instances."
@@ -85,9 +91,11 @@ module DTK::Client
     #   # API descriptor
     # end
 
-    desc "node-template", "Node Templates that map to machine images and containers."
-    def node_template
-      # API descriptor
+    if ::DTK::Configuration.get(:development_mode)
+      desc "node-template", "Node Templates that map to machine images and containers."
+      def node_template
+        # API descriptor
+      end
     end
 
     # desc "component-template","Commands to list and query component templates."
@@ -130,10 +138,11 @@ module DTK::Client
       end
     end
 
-
-    desc "provider", "Manage infrastructure providers and deployment targets (ie: EC2 and us-east)"
-    def provider
-      # API descriptor
+    if ::DTK::Configuration.get(:development_mode)
+      desc "provider", "Manage infrastructure providers and deployment targets (ie: EC2 and us-east)"
+      def provider
+        # API descriptor
+      end
     end
 
     # we do not need help here

data/lib/commands/thor/service.rb

@@ -710,7 +710,8 @@ TODO: will put in dot release and will rename to 'extend'
 
     # only supported at node-level
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/assembly>)
-    desc "SERVICE-NAME/ID add-component COMPONENT", "Add a component to the service."
+    desc "SERVICE-NAME/ID add-component COMPONENT [--auto-complete]", "Add a component to the service. Use --auto-complete to link components automatically"
+    method_option :auto_complete, :type => :boolean, :default => true
     def add_component(context_params)
       response = create_component_aux(context_params)
 
@@ -830,17 +831,102 @@ TODO: will put in dot release and will rename to 'extend'
       grep_aux(context_params)
     end
 
-    desc "stage ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "Stage assembly in target."
+    desc "stage ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly in target."
     method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
-    method_option :node_size, :type => :string, :aliases => "--node-size"
-    method_option :os_type, :type => :string, :aliases => "--os-type"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
     version_method_option
-    #hidden options
+    #hidden option
     method_option "instance-bindings", :type => :string
-    method_option :settings, :type => :string, :aliases => '-s'
     def stage(context_params)
       stage_aux(context_params)
     end
 
+    desc "set-default-target INSTANCE-NAME/ID", "Set default target service instance."
+    def set_default_target(context_params)
+      set_default_target_aux(context_params)
+    end
+
+    desc "stage-target ASSEMBLY-TEMPLATE [INSTANCE-NAME] -t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly as target instance."
+    method_option :settings, :type => :string, :aliases => '-s'
+    method_option :auto_complete, :type => :boolean, :default => true
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    def stage_target(context_params)
+      response = stage_aux(context_params)
+      return response unless response.ok?
+
+      # when changing context send request for getting latest assemblies instead of getting from cache
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      return response
+    end
+
+    desc "deploy-target ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly as target instance."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy_target(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
+    desc "deploy ASSEMBLY-TEMPLATE [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Deploy assembly in target."
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
+    desc "SERVICE-NAME/ID set-required-attributes-and-converge", "Interactive dialog to set required attributes that are not currently set", :hide => true
+    def set_required_attributes_and_converge(context_params)
+      begin
+        response = set_required_attributes_converge_aux(context_params)
+      rescue DTK::Client::DtkError::InteractiveWizardError => e
+        @@invalidate_map << :service
+        @@invalidate_map << :assembly
+
+        # if skip correction wizzard still go to newly created service instance
+        if instance_name = (context_params.get_forwarded_options()||{})[:instance_name]
+          MainContext.get_context.change_context(["/service/#{instance_name}"])
+        end
+
+        raise e
+      end
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      # if instance_name = opts[:instance_name]
+      #   MainContext.get_context.change_context([instance_name])
+      # end
+
+      response
+    end
   end
 end

data/lib/commands/thor/service_module.rb

@@ -22,10 +22,12 @@ dtk_require_from_base("dtk_logger")
 dtk_require_from_base("util/os_util")
 dtk_require_from_base("commands/thor/assembly")
 dtk_require_from_base('command_helpers/service_importer')
+dtk_require_from_base('task_status')
 dtk_require_common_commands('thor/common')
 dtk_require_common_commands('thor/module')
 dtk_require_common_commands('thor/poller')
 dtk_require_common_commands('thor/assembly_template')
+dtk_require_common_commands('thor/pull_clone_changes')
 
 module DTK::Client
   class ServiceModule < CommandBaseThor
@@ -38,6 +40,7 @@ module DTK::Client
       include ModuleMixin
       include Poller
       include AssemblyTemplateMixin
+      include TaskStatusMixin
 
       def get_service_module_name(service_module_id)
         get_name_from_id_helper(service_module_id)
@@ -59,6 +62,101 @@ module DTK::Client
 
         return name, version
       end
+
+      def stage_aux(context_params)
+        if context_params.is_there_identifier?(:assembly)
+          service_module_id, service_module_name, assembly_template_name, name = context_params.retrieve_arguments([:service_module_id!, :service_module_name!, :assembly_name!, :option_2], method_argument_names)
+        else
+          service_module_id, service_module_name, assembly_template_name, name = context_params.retrieve_arguments([:service_module_id!, :service_module_name!, :option_1!, :option_2], method_argument_names)
+        end
+
+        post_body = { :assembly_id => assembly_template_name }
+
+        # special case when we need service module id
+        context_params.pure_cli_mode = true
+        post_body[:service_module_id] = service_module_id if context_params.pure_cli_mode
+
+        # using this to make sure cache will be invalidated after new assembly is created from other commands e.g.
+        # 'assembly-create', 'install' etc.
+        @@invalidate_map << :assembly
+
+        fwd_options       = context_params.get_forwarded_options()
+        in_target         = fwd_options[:in_target]||options["in-target"]
+        instance_bindings = options["instance-bindings"]
+        settings          = parse_service_settings(options["settings"])
+        node_size         = fwd_options[:node_size]||options.node_size
+        os_type           = fwd_options[:os_type]||options.os_type
+        version           = fwd_options[:version]||options.version
+        no_auto_complete  = fwd_options[:no_auto_complete]||options.no_auto_complete
+        parent_service    = fwd_options[:parent_service]||options.parent_service
+        is_target         = fwd_options[:is_target]||options.is_target?
+        do_not_encode     = fwd_options[:do_not_encode]
+        assembly_list     = Assembly.assembly_list()
+
+        if assembly_template_name.to_s =~ /^[0-9]+$/
+          assembly_template_name = DTK::Client::Assembly.get_assembly_template_name_for_service(assembly_template_name, service_module_name)
+          assembly_template_name, version = get_name_and_version_from_assembly_template(assembly_template_name)
+        else
+          namespace, module_name = get_namespace_and_name(service_module_name, ':')
+          assembly_template_name = "#{module_name}/#{assembly_template_name}"
+        end
+        assembly_template_name.gsub!(/(::)|(\/)/,'-') if assembly_template_name
+
+        if name
+          raise DTK::Client::DtkValidationError, "Unable to stage service with name '#{name}'. Service with specified name exists already!" if assembly_list.include?(name)
+        else
+          name = get_assembly_stage_name(assembly_list, assembly_template_name)
+        end
+
+        post_body.merge!(:target_id => in_target) if in_target
+        post_body.merge!(:name => name) if name
+        post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
+        post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
+        post_body.merge!(:node_size => node_size) if node_size
+        post_body.merge!(:os_type => os_type) if os_type
+        post_body.merge!(:version => version) if version
+        post_body.merge!(:service_module_name => service_module_name) if service_module_name
+        post_body.merge!(:no_auto_complete => no_auto_complete) if no_auto_complete
+        post_body.merge!(:parent_service => parent_service) if parent_service
+        post_body.merge!(:is_target => is_target) if is_target
+        post_body.merge!(:do_not_encode => do_not_encode) if do_not_encode
+
+        response = post rest_url("assembly/stage"), post_body
+      end
+
+      def deploy_aux(context_params)
+        forwarded_options = context_params.get_forwarded_options()
+        context_params.forward_options(forwarded_options.merge!(:do_not_encode => true))
+        stage_response = stage_aux(context_params)
+        return stage_response unless stage_response.ok?
+
+        if service_instance = stage_response.data['new_service_instance']
+          instance_name = service_instance['name']
+
+          DTK::Client::OsUtil.print("Service instance '/service/#{instance_name}' has been created!",:yellow)
+
+          new_context_params = DTK::Shell::ContextParams.new
+          new_context_params.add_context_to_params("service", "service")
+          new_context_params.add_context_name_to_params("service", "service", instance_name)
+          new_context_params.forward_options(:instance_name => instance_name)
+
+          response = ContextRouter.routeTask("service", "set_required_attributes_and_converge", new_context_params, @conn)
+
+          # change context to newly created service instance
+          MainContext.get_context.change_context(["/service/#{instance_name}"])
+
+          return response unless response.ok?
+
+          if forwarded_options['stream-results'] || options['stream-results']
+            forwarded_options = new_context_params.get_forwarded_options()
+            task_status_stream(instance_name) unless forwarded_options[:violations]
+          end
+
+          response
+        else
+          fail DtkError.new('Service instance is not staged properly, please try again!')
+        end
+      end
     end
 
     def self.extended_context()
@@ -68,6 +166,21 @@ module DTK::Client
             :endpoint => "service_module",
             :url => "service_module/list_assemblies",
             :opts => {}
+          },
+          :stage_target => {
+            :endpoint => "service_module",
+            :url => "service_module/list_assemblies",
+            :opts => {}
+          },
+          :deploy_target => {
+            :endpoint => "service_module",
+            :url => "service_module/list_assemblies",
+            :opts => {}
+          },
+          :deploy => {
+            :endpoint => "service_module",
+            :url => "service_module/list_assemblies",
+            :opts => {}
           }
         }
       }
@@ -127,7 +240,11 @@ module DTK::Client
             # ["stage", "stage [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "# Stage assembly in target."],
             # ["deploy","deploy [-v VERSION] [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
             # ["deploy","deploy [INSTANCE-NAME] [-t TARGET-NAME/ID] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
-            ["deploy","deploy [INSTANCE-NAME] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
+            # ["deploy","deploy [INSTANCE-NAME] [-m COMMIT-MSG]", "# Stage and deploy assembly in target."],
+            ["stage-target","stage-target [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "# Stage assembly as target instance."],
+            ["stage","stage [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "# Stage assembly in target."],
+            ["deploy-target","deploy-target [INSTANCE-NAME] [-v VERSION] [--no-auto-complete]", "# Deploy assembly as target instance."],
+            ["deploy","deploy [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "# Deploy assembly in target."],
             ["list-nodes","list-nodes", "# List all nodes for given assembly."],
             ["list-components","list-components", "# List all components for given assembly."],
             ["list-settings","list-settings", "# List all settings for given assembly."]
@@ -483,68 +600,43 @@ module DTK::Client
       if old_dir and (old_dir != module_final_dir)
         FileUtils.rm_rf(old_dir) unless namespace
       end
+
       DTK::Client::OsUtil.print("Module '#{new_module_name}' has been created and module directory moved to #{repo_obj.repo_dir}",:yellow) unless namespace
 
       response
     end
 
-    desc "SERVICE-MODULE-NAME/ID stage ASSEMBLY-NAME [INSTANCE-NAME] [-t TARGET-NAME/ID] [--node-size NODE-SIZE-SPEC] [--os-type OS-TYPE] [-v VERSION]", "Stage assembly in target."
-    method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
+    desc "SERVICE-MODULE-NAME/ID stage-target ASSEMBLY-NAME [INSTANCE-NAME] [-v VERSION] [--no-auto-complete]", "Stage assembly as target instance."
     method_option :settings, :type => :string, :aliases => '-s'
-    method_option :node_size, :type => :string, :aliases => "--node-size"
-    method_option :os_type, :type => :string, :aliases => "--os-type"
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    # method_option :parent_service, :type => :string, :aliases => '-t'
     version_method_option
-    #hidden option
+    #hidden options
     method_option "instance-bindings", :type => :string
-    def stage(context_params)
-      service_module_id, service_module_name, assembly_template_name, name = context_params.retrieve_arguments([:service_module_id!, :service_module_name!, :option_1!, :option_2], method_argument_names)
-      post_body = {
-        :assembly_id => assembly_template_name
-      }
-
-      # special case when we need service module id
-      context_params.pure_cli_mode = true
-      post_body[:service_module_id] = service_module_id if context_params.pure_cli_mode
+    method_option :is_target, :type => :boolean, :default => true
+    def stage_target(context_params)
+      response = stage_aux(context_params)
+      return response unless response.ok?
 
-      # using this to make sure cache will be invalidated after new assembly is created from other commands e.g.
-      # 'assembly-create', 'install' etc.
+      # when changing context send request for getting latest assemblies instead of getting from cache
+      @@invalidate_map << :service
       @@invalidate_map << :assembly
 
-      fwd_options       = context_params.get_forwarded_options()
-      in_target         = fwd_options[:in_target]||options["in-target"]
-      instance_bindings = options["instance-bindings"]
-      settings          = parse_service_settings(options["settings"])
-      node_size         = fwd_options[:node_size]||options.node_size
-      os_type           = fwd_options[:os_type]||options.os_type
-      version           = fwd_options[:version]||options.version
-      assembly_list     = Assembly.assembly_list()
-
-      if assembly_template_name.to_s =~ /^[0-9]+$/
-        assembly_template_name = DTK::Client::Assembly.get_assembly_template_name_for_service(assembly_template_name, service_module_name)
-        assembly_template_name, version = get_name_and_version_from_assembly_template(assembly_template_name)
-      else
-        namespace, module_name = get_namespace_and_name(service_module_name, ':')
-        assembly_template_name = "#{module_name}/#{assembly_template_name}"
-      end
-      assembly_template_name.gsub!(/(::)|(\/)/,'-') if assembly_template_name
-
-      if name
-        raise DTK::Client::DtkValidationError, "Unable to stage service with name '#{name}'. Service with specified name exists already!" if assembly_list.include?(name)
-      else
-        name = get_assembly_stage_name(assembly_list, assembly_template_name)
-      end
-
-      post_body.merge!(:target_id => in_target) if in_target
-      post_body.merge!(:name => name) if name
-      post_body.merge!(:instance_bindings => instance_bindings) if instance_bindings
-      post_body.merge!(:settings_json_form => JSON.generate(settings)) if settings
-      post_body.merge!(:node_size => node_size) if node_size
-      post_body.merge!(:os_type => os_type) if os_type
-      post_body.merge!(:version => version) if version
-      post_body.merge!(:service_module_name => service_module_name) if service_module_name
+      return response
+    end
 
-      response = post rest_url("assembly/stage"), post_body
+    desc "SERVICE-MODULE-NAME/ID stage ASSEMBLY-NAME [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete]", "Stage assembly in target."
+    method_option "in-target", :aliases => "-t", :type => :string, :banner => "TARGET-NAME/ID", :desc => "Target (id) to create assembly in"
+    method_option :settings, :type => :string, :aliases => '-s'
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    version_method_option
+    #hidden option
+    method_option "instance-bindings", :type => :string
+    def stage(context_params)
+      response = stage_aux(context_params)
       return response unless response.ok?
+
       # when changing context send request for getting latest assemblies instead of getting from cache
       @@invalidate_map << :service
       @@invalidate_map << :assembly
@@ -716,6 +808,42 @@ module DTK::Client
       create_new_version_aux(context_params)
     end
 
+    desc "SERVICE-MODULE-NAME/ID deploy-target ASSEMBLY-NAME [INSTANCE-NAME] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly as target instance."
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    method_option :is_target, :type => :boolean, :default => true
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy_target(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
+    desc "SERVICE-MODULE-NAME/ID deploy ASSEMBLY-NAME [INSTANCE-NAME] [-t PARENT-SERVICE-INSTANCE-NAME/ID] [-v VERSION] [--no-auto-complete] [--stream-results]", "Deploy assembly in target."
+    method_option :no_auto_complete, :type => :boolean, :default => false, :aliases => '--no-ac'
+    method_option :parent_service, :type => :string, :aliases => '-t'
+    method_option 'stream-results', :aliases => '-s', :type => :boolean, :default => false, :desc => "Stream results"
+    version_method_option
+    #hidden options
+    method_option "instance-bindings", :type => :string
+    # method_option :settings, :type => :string, :aliases => '-s'
+    def deploy(context_params)
+      response = deploy_aux(context_params)
+      return response unless response.ok?
+
+      @@invalidate_map << :service
+      @@invalidate_map << :assembly
+
+      response
+    end
+
     #
     # DEVELOPMENT MODE METHODS
     #

data/lib/commands/thor/workspace.rb

@@ -324,7 +324,8 @@ module DTK::Client
 
     #only supported at node-level
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
-    desc "WORKSPACE-NAME/ID add-component COMPONENT", "Add a component to a workspace."
+    desc "WORKSPACE-NAME/ID add-component COMPONENT [--auto-complete]", "Add a component to a workspace. Use --auto-complete to link components automatically"
+    method_option :auto_complete, :type => :boolean, :default => true
     def add_component(context_params)
       response = create_component_aux(context_params)
       return response unless response.ok?

data/lib/dtk-client/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 #
 module DtkClient
-  VERSION="0.9.0"
+  VERSION="0.9.1"
 end

data/lib/dtk_error.rb

@@ -94,15 +94,21 @@ module DTK
           super(:client)
         end
       end
+
       class Server < InternalError
         def initialize(error_msg,opts={})
           super(error_msg,opts.merge(:where => :server))
         end
         def self.label(*args)
           super(:server)
-          end
+        end
       end
 
+      class InteractiveWizardError < self
+        def initialize(error_msg, opts={})
+          super(error_msg, opts)
+        end
+      end
     end
   end
 end

data/lib/shell/context.rb

@@ -149,7 +149,7 @@ module DTK
           warning_message = restricted[:message]
           node_specific = restricted[:node_specific]
 
-          DTK::Client::OsUtil.print_warning(warning_messag) if warning_message
+          DTK::Client::OsUtil.print_warning(warning_message) if warning_message
           # end
 
           # Validate and change context

data/lib/shell/interactive_wizard.rb

@@ -138,7 +138,7 @@ module DTK
 
       # takes hash maps with description of missing params and
       # returns array of hash map with key, value for each missed param
-      def self.resolve_missing_params(param_list)
+      def self.resolve_missing_params(param_list, additional_message = nil)
         begin
           user_provided_params, checkup_hash = [], {}
 
@@ -156,7 +156,7 @@ module DTK
             puts "Please enter #{string_identifier}:"
             while line = Readline.readline(": ", true)
               id = param_info['id']
-              user_provided_params << {:id => id, :value => line}
+              user_provided_params << {:id => id, :value => line, :display_name => param_info['display_name']}
               checkup_hash[id] = {:value => line, :description => description}
               break
             end
@@ -177,7 +177,7 @@ module DTK
         rescue Interrupt => e
           puts
           # TODO: Provide original error here
-          raise DTK::Client::DtkError, "You have decided to skip correction wizard."
+          raise DTK::Client::DtkError::InteractiveWizardError, "You have decided to skip correction wizard.#{additional_message}"
         end
 
         return user_provided_params

data/lib/shell.rb

@@ -39,6 +39,20 @@ ALIAS_COMMANDS = {
   'rm' => 'delete'
 }
 
+class MainContext
+  include Singleton
+
+  attr_accessor :context
+
+  def initialize
+    @context = DTK::Shell::Context.new
+  end
+
+  def self.get_context
+    MainContext.instance.context
+  end
+end
+
 # METHODS
 
 # support for alias commands (ls for list, cd for cc etc.)
@@ -74,7 +88,6 @@ def run_shell_command()
     puts e.backtrace if ::DTK::Configuration.get(:development_mode)
     retry
   rescue Interrupt => e
-    #system('stty', stty_save) # Restore
     retry
   rescue Exception => e
     client_internal_error = DTK::Client::DtkError::Client.label()
@@ -91,10 +104,11 @@ end
 
 def init_shell_context()
   begin
-    @context      = DTK::Shell::Context.new
+    # @context      = DTK::Shell::Context.new
     @shell_header = DTK::Shell::HeaderShell.new
+
     # loads root context
-    @context.load_context()
+    MainContext.get_context.load_context()
 
     @t1   = nil
     Readline.completion_append_character=''
@@ -124,7 +138,7 @@ def execute_shell_command(line, prompt)
       return prompt
     end
     # when using help on root this is needed
-    line = 'dtk help' if (line == 'help' && @context.root?)
+    line = 'dtk help' if (line == 'help' && MainContext.get_context.root?)
 
     args = Shellwords.split(line)
     cmd = args.shift
@@ -145,30 +159,30 @@ def execute_shell_command(line, prompt)
     if ('cc' == cmd)
       # in case there is no params we just reload command
       args << "/" if args.empty?
-      prompt = @context.change_context(args, cmd)
+      prompt = MainContext.get_context.change_context(args, cmd)
     elsif ('popc' == cmd)
-        @context.dirs.shift()
-        args << (@context.dirs.first.nil? ? '/' : @context.dirs.first)
-        prompt = @context.change_context(args, cmd)
+        MainContext.get_context.dirs.shift()
+        args << (MainContext.get_context.dirs.first.nil? ? '/' : MainContext.get_context.dirs.first)
+        prompt = MainContext.get_context.change_context(args, cmd)
     elsif ('pushc' == cmd)
       if args.empty?
-        args << (@context.dirs[1].nil? ? '/' : @context.dirs[1])
-        @context.dirs.unshift(args.first)
-        @context.dirs.uniq!
-        prompt = @context.change_context(args, cmd)
+        args << (MainContext.get_context.dirs[1].nil? ? '/' : MainContext.get_context.dirs[1])
+        MainContext.get_context.dirs.unshift(args.first)
+        MainContext.get_context.dirs.uniq!
+        prompt = MainContext.get_context.change_context(args, cmd)
       else
-        prompt = @context.change_context(args)
+        prompt = MainContext.get_context.change_context(args)
         # using regex to remove dtk: and > from path returned by change_context
         # e.g transform dtk:/assembly/node> to /assembly/node
         full_path = prompt.match(/[dtk:](\/.*)[>]/)[1]
-        @context.dirs.unshift(full_path)
+        MainContext.get_context.dirs.unshift(full_path)
       end
     elsif ('dirs' == cmd)
-      puts @context.dirs.inspect
+      puts MainContext.get_context.dirs.inspect
     else
 
       # get all next-context-candidates (e.g. for assembly get all assembly_names)
-      context_candidates = @context.get_ac_candidates_for_context(@context.active_context.last_context(), @context.active_context())
+      context_candidates = MainContext.get_context.get_ac_candidates_for_context(MainContext.get_context.active_context.last_context(), MainContext.get_context.active_context())
 
       # this part of the code is used for calling of nested commands from base context (dtk:/>assembly/assembly_id converge)
       # base_command is used to check if first command from n-level is valid e.g.
@@ -178,29 +192,29 @@ def execute_shell_command(line, prompt)
       revert_context = false
 
       if context_candidates.include?(base_command)
-        @context.change_context([cmd])
+        MainContext.get_context.change_context([cmd])
         cmd = args.shift
         revert_context = true
       end
 
       if cmd.nil?
-        prompt = @context.change_context(["-"]) if revert_context
+        prompt = MainContext.get_context.change_context(["-"]) if revert_context
         raise DTK::Client::DtkValidationError, "You have to provide command after context name. Usage: CONTEXT-TYPE/CONTEXT-NAME COMMAND [ARG1] .. [ARG2]."
       end
 
       # send monkey patch class information about context
-      Thor.set_context(@context)
+      Thor.set_context(MainContext.get_context)
 
       # we get command and hash params, will return Validation error if command is not valid
-      entity_name, method_name, context_params, thor_options, invalid_options = @context.get_command_parameters(cmd,args)
+      entity_name, method_name, context_params, thor_options, invalid_options = MainContext.get_context.get_command_parameters(cmd,args)
 
       # check if command is executed from parent context (e.g assembly_name list-nodes)
       if context_candidates.include?(method_name)
         context_params.add_context_to_params(method_name, entity_name, method_name)
         method_name = context_params.method_arguments.shift if context_params.method_arguments.size > 0
       else
-        unless @context.method_valid?(method_name)
-          prompt = @context.change_context(["-"]) if revert_context
+        unless MainContext.get_context.method_valid?(method_name)
+          prompt = MainContext.get_context.change_context(["-"]) if revert_context
           raise DTK::Client::DtkValidationError, "Method '#{method_name}' is not valid in current context."
         end
       end
@@ -209,19 +223,25 @@ def execute_shell_command(line, prompt)
       raise DTK::Client::DtkValidationError.new("Option '#{invalid_options.first||method_name}' is not valid for current command!", true) unless invalid_options.empty?
 
       # execute command via Thor
+      current_contex_path = MainContext.get_context.active_context.full_path
       top_level_execute(entity_name, method_name, context_params, thor_options, true)
 
       # when 'delete' or 'delete-and-destroy' command is executed reload cached tasks with latest commands
       unless (args.nil? || args.empty?)
-        @context.reload_cached_tasks(entity_name) if (method_name.include?('delete') || method_name.include?('import'))
+        MainContext.get_context.reload_cached_tasks(entity_name) if (method_name.include?('delete') || method_name.include?('import'))
       end
 
       # check execution status, prints status to sttout
       DTK::Shell::StatusMonitor.check_status()
 
+      # if we change context while executing command, change prompt as well
+      unless current_contex_path.eql?(MainContext.get_context.active_context.full_path)
+        prompt = "dtk:#{MainContext.get_context.active_context.full_path}>"
+      end
+
       # after nested command called from base context is executed successfully, return to context which command is executed from
       # this is the same as 'cd -' command is executed
-      prompt = @context.change_context(["-"]) if revert_context
+      prompt = MainContext.get_context.change_context(["-"]) if revert_context
     end
   rescue DTK::Client::DSLParsing => e
     DTK::Client::OsUtil.print(e.message, :red)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-18 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
@@ -140,14 +140,14 @@ dependencies:
   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
@@ -382,17 +382,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.8
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.