dtk-client 0.11.8.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1243437980492193969d331349b58e87d20f6c
-  data.tar.gz: '08e0afe0380f0d2eee56edf002005fb098850c94'
+  metadata.gz: a47a56ce9cda25aab4fb83c4941859a6b2939fee
+  data.tar.gz: 1f9c0660dde04474cc27df2167157601aaa1e4b2
 SHA512:
-  metadata.gz: 1b23957da3a9aa6347e43ed156956fc51773a9deb15b6b8bd45b57c6a4504740a4e0a6afc80e999dbf0a307b40cf5ee9952e9065f0fe4a53186854d879938d3f
-  data.tar.gz: 8dbbc1ebfba62af5cf4d85815cf62e7c926152ba27eca693d625c858508fd51cc24451ddf258847d8d9d8d6cb6dc2bae1247117dbda4e8d5bdef68315bc06ce3
+  metadata.gz: 2e3ea6163e3da2e95a2a9e9e37f435892338bb2d8290d181ac43241e7d5c2b46a5a296b3488aaf1f08f8d18eeb504dbe0e8e8b73715583faaf38e6a2656ee164
+  data.tar.gz: 9b61099f14cb4251fe9eab8d7fdb42a0987caf718f07db5130dc94529202fdf3c46d905f640aeff4e20e78738cdd570546a2bf19662a51f505775d82dce9da9a

data/dtk-client.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'dtk-common-core','0.11.1.1'
+  spec.add_dependency 'dtk-common-core','0.12.0'
   spec.add_dependency 'gli', '2.13.4'
   spec.add_dependency 'highline', '1.7.8'
   spec.add_dependency 'colorize', '0.7.7'
   spec.add_dependency 'git', '1.2.9'
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
-  spec.add_dependency 'dtk-dsl', '1.1.3'
-  spec.add_dependency 'dtk-network-client', '1.0.1.1'
+  spec.add_dependency 'dtk-dsl', '~> 1.1.3'
+  spec.add_dependency 'dtk-network-client', '1.0.2'
 end

data/lib/cli/command/module/install.rb

@@ -251,6 +251,7 @@ module DTK::Client
             rescue Exception => e
               # if does not exist on repoman try getting version from server
               versions = get_versions_from_server(module_ref)
+              raise e if versions.empty?
             end
 
             if versions.empty?

data/lib/cli/command/service/add.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client; module CLI
+  module Command
+    module Service
+      subcommand_def 'add' do |c|
+        command_body c, 'add', 'Add service instance content' do |sc|
+          sc.flag Token.path, :desc => "supported paths are 'dependencies/name', 'components/name', 'actions/name'"
+          sc.flag Token.relative_path, :desc => "Relative path of file to edit in service instance content"
+          sc.action do |_global_options, options, _args|
+            args = {
+              service_instance: service_instance_in_options_or_context(options),
+              path: options[:path],
+              relative_path: options[:relative_path]
+            }
+            Operation::Service.add(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service/delete.rb

@@ -20,14 +20,15 @@ module DTK::Client; module CLI
     module Service
       subcommand_def 'delete' do |c|
         command_body c, :delete, 'Destroys the running infrastructure associated with the service instance' do |sc|
-        sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory associated; not needed if executed in service instance directory'
+          # sc.flag Token.path, :desc => "Delete specific part of service instance. Supported paths are 'dependencies/[name]', 'components/[name]', 'actions/[name]'"
+
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.recursive, :desc => 'Delete all service instances staged into specified target'
           sc.switch Token.force, :desc => 'Ignore changes and destroy the running service instance'
-          # sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
+
           sc.action do |_global_options, options, args|
             directory_path   = options[:directory_path]
-            purge            = options[:purge]
             recursive        = options[:recursive]
             force            = options[:f]
             service_instance = service_instance_in_options_or_context(options)
@@ -37,7 +38,8 @@ module DTK::Client; module CLI
               :skip_prompt      => options[:skip_prompt],
               :directory_path   => directory_path || base_dsl_file_obj.parent_dir,
               :recursive        => recursive,
-              :force            => force
+              :force            => force,
+              # :path             => options[:path]
             }
             Operation::Service.delete(args)
           end

data/lib/cli/command/service/describe.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client; module CLI
+  module Command
+    module Service
+      subcommand_def 'describe' do |c|
+        command_body c, 'describe', 'Describe service instance content' do |sc|
+          sc.flag Token.path, :desc => "supported paths are 'dependencies', 'components/[name]', 'actions/[name]' "
+          sc.action do |_global_options, options, _args|
+            args = {
+              service_instance: service_instance_in_options_or_context(options),
+              path: options[:path]
+            }
+            Operation::Service.describe(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service.rb

@@ -51,7 +51,9 @@ module DTK::Client
           #  'stop',
 
           'task-status',
-          'uninstall'
+          'uninstall',
+          'describe'
+          # 'add'
         ]
 
         command_def :desc => 'Subcommands for creating and interacting with DTK service instances'

data/lib/cli/command/token.rb

@@ -52,6 +52,7 @@ module DTK::Client
         :format                    => Flag.new(:format, 'FORMAT', 'Choose in which format to display data (ex. TABLE, YAML)'),
         :sleep                     => Flag.new(:sleep, '', ''),
         :attempts                  => Flag.new(:attempts, '', ''),
+        :path                      => Flag.new(:path, 'PATH', 'Path'),
 
         # switches
         # Switch constructor args order: key, desc, opts={}

data/lib/cli/context.rb

@@ -124,7 +124,8 @@ module DTK::Client
 
       def service_instance_from_base_dsl_file?
         #raise_error_when_missing_context(:service_instance) unless base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top
-        base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+        # base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+        base_dsl_file_obj.file_type == DTK::DSL::FileType::ServiceInstance::DSLFile::Top::Hidden
         parse_conent_and_ret_service_name
       end
 
@@ -164,7 +165,8 @@ module DTK::Client
       FILE_TYPES = 
         [
          ::DTK::DSL::FileType::CommonModule::DSLFile::Top,
-         ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+         ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top,
+         ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top::Hidden
         ]
 
       def module_ref_object_from_options_or_context?(options, module_refs_opts = {})

data/lib/cli/directory_parser/file_system.rb

@@ -91,7 +91,7 @@ module DTK::Client; module CLI
       # returns an array of strings that are file paths; except bakup files (e.g. bak.dtk.service.yaml)
       def matching_file_paths(dir_path, path_info)
         return [] if File.exist?("#{dir_path}/.nested_module")
-        Dir.glob("#{dir_path}/*").select { |file_path| File.file?(file_path) and !is_backup_file?(file_path) and path_info.matches?(file_path) }
+        Dir.glob("#{dir_path}/*", File::FNM_DOTMATCH).select { |file_path| File.file?(file_path) and !is_backup_file?(file_path) and path_info.matches?(file_path) }
       end
 
       def is_backup_file?(file_path)
@@ -126,7 +126,8 @@ module DTK::Client; module CLI
         def self.ranking_for_types
           @ranking_for_types ||= {
             DTK::DSL::FileType::CommonModule::DSLFile::Top => 2,
-            DTK::DSL::FileType::ServiceInstance::DSLFile::Top => 1
+            DTK::DSL::FileType::ServiceInstance::DSLFile::Top => 1,
+            DTK::DSL::FileType::ServiceInstance::DSLFile::Top::Hidden => 0
           }
         end
 
@@ -137,7 +138,8 @@ module DTK::Client; module CLI
         def self.input_types
           {
             'module' => DTK::DSL::FileType::CommonModule::DSLFile::Top,
-            'service' => DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+            'service' => DTK::DSL::FileType::ServiceInstance::DSLFile::Top::Hidden
+            # 'service' => DTK::DSL::FileType::ServiceInstance::DSLFile::Top
           }
         end
       end

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.8.1"
+      VERSION="0.12.0"
     end
   end
 end

data/lib/client/operation/module/install.rb

@@ -72,19 +72,6 @@ module DTK::Client
           raise Error::Usage, "Module '#{@base_module_ref.print_form}' exists already"
         end
 
-        # unless dependent_modules.empty?
-        #   begin
-        #     if @has_remote_repo
-        #       DependentModules.install(@base_module_ref, dependent_modules, opts)
-        #     else
-        #       DependentModules.install_with_local(@base_module_ref, dependent_modules, opts)
-        #     end
-        #   rescue TerminateInstall
-        #     @print_helper.print_terminated_installation
-        #     return nil
-        #   end
-        # end
-
         @print_helper.print_continuation_installing_base_module
 
         base_path = @base_module_ref.client_dir_path || @file_obj.parent_dir?

data/lib/client/operation/service/add.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Add < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          path             = args.required(:path)
+          relative_path    = args.required(:relative_path)
+
+          content = yaml_to_hash(FileHelper.get_content?(relative_path))
+
+          query_string_hash = QueryStringHash.new(:service_instance => service_instance, path: path, content: content)
+          rest_post "#{BaseRoute}/add_by_path", query_string_hash
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/service/delete.rb

@@ -20,25 +20,29 @@ module DTK::Client
     class Delete < self
       def self.execute(args = Args.new)
         wrap_operation(args) do |args|
-          service_instance = args.required(:service_instance)
+          @service_instance = args.required(:service_instance)
           recursive        = args.required(:recursive)
           force            = args[:force]
           directory_path   = args[:directory_path]
 
-          unless args[:skip_prompt]
-            return false unless Console.prompt_yes_no("Are you sure you want to delete the content of service instance '#{service_instance}' ?", :add_options => true)
-          end
+          if path = args[:path]
+            delete_service_path(path)
+          else
+            unless args[:skip_prompt]
+              return false unless Console.prompt_yes_no("Are you sure you want to delete the content of service instance '#{@service_instance}' ?", :add_options => true)
+            end
 
-          error_msg = "To allow delete to go through, invoke 'dtk push' to push the changes to server before invoking delete again"
-          GitRepo.modified_with_diff?(directory_path || @module_ref.client_dir_path, { :error_msg => error_msg, :command => 'delete' }) unless force
-          post_body = PostBody.new(
-            :service_instance => service_instance,
-            :recursive? => recursive
-          )
-          response = rest_post("#{BaseRoute}/delete", post_body)
+            error_msg = "To allow delete to go through, invoke 'dtk push' to push the changes to server before invoking delete again"
+            GitRepo.modified_with_diff?(directory_path || @module_ref.client_dir_path, { :error_msg => error_msg, :command => 'delete' }) unless force
+            post_body = PostBody.new(
+              :service_instance => @service_instance,
+              :recursive? => recursive
+            )
+            response = rest_post("#{BaseRoute}/delete", post_body)
 
-          OsUtil.print_info("Delete procedure started. For more information use 'dtk task-status'.")
-          display_node_info(response.data)
+            OsUtil.print_info("Delete procedure started. For more information use 'dtk task-status'.")
+            display_node_info(response.data)
+          end
         end
       end
 
@@ -53,8 +57,16 @@ module DTK::Client
         end
       end
 
-    end
-  end
-end
+      def self.delete_service_path(path)
+        return false unless Console.prompt_yes_no("Are you sure you want to delete '#{path}' ?", :add_options => true)
 
+        post_body = PostBody.new(
+          :service_instance => @service_instance,
+          :path => path
+        )
+        rest_post("#{BaseRoute}/delete_by_path", post_body)
+      end
 
+    end
+  end
+end

data/lib/client/operation/service/describe.rb

@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Describe < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance  = args.required(:service_instance)
+          path              = args[:path]
+          query_string_hash = QueryStringHash.new
+
+          query_string_hash.merge!(path: path) if path
+          rest_get "#{BaseRoute}/#{service_instance}/describe", query_string_hash
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/service.rb

@@ -46,7 +46,9 @@ module DTK::Client
         :start,
         :stop,
         :task_status,
-        :uninstall
+        :uninstall,
+        :describe,
+        :add
       ]
       OPERATIONS.each { |operation| require_relative("service/#{operation}") }
 

data/lib/client/util/auxiliary.rb

@@ -30,5 +30,9 @@ module DTK::Client
     def hash_to_yaml(hash_content)
       YAML.dump(hash_content)
     end
+
+    def yaml_to_hash(yaml_content)
+      YAML.load(yaml_content)
+    end
   end
 end

data/lib/client/util/file_helper.rb

@@ -0,0 +1,7 @@
+module DTK::Client
+  module FileHelper
+    def self.get_content?(file_path)
+      File.open(file_path).read if file_path && File.exists?(file_path)
+    end
+  end
+end

data/lib/client/util.rb

@@ -31,4 +31,5 @@ module DTK
   require_relative('util/query_string_hash')
   require_relative('util/interactive_wizard')
   require_relative('util/validation')
+  require_relative('util/file_helper')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.8.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
   name: dtk-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1.1
+        version: 1.0.2
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -194,11 +194,13 @@ files:
 - lib/cli/command/module/update.rb
 - lib/cli/command/options.rb
 - lib/cli/command/service.rb
+- lib/cli/command/service/add.rb
 - lib/cli/command/service/cancel_task.rb
 - lib/cli/command/service/clone.rb
 - lib/cli/command/service/converge.rb
 - lib/cli/command/service/create_workspace.rb
 - lib/cli/command/service/delete.rb
+- lib/cli/command/service/describe.rb
 - lib/cli/command/service/destroy.rb
 - lib/cli/command/service/edit.rb
 - lib/cli/command/service/eject.rb
@@ -315,12 +317,14 @@ files:
 - lib/client/operation/module/update.rb
 - lib/client/operation/module_service_common.rb
 - lib/client/operation/service.rb
+- lib/client/operation/service/add.rb
 - lib/client/operation/service/cancel_task.rb
 - lib/client/operation/service/clone_service.rb
 - lib/client/operation/service/commit_and_push.rb
 - lib/client/operation/service/converge.rb
 - lib/client/operation/service/create_workspace.rb
 - lib/client/operation/service/delete.rb
+- lib/client/operation/service/describe.rb
 - lib/client/operation/service/destroy.rb
 - lib/client/operation/service/edit.rb
 - lib/client/operation/service/eject.rb
@@ -387,6 +391,7 @@ files:
 - lib/client/util/console.rb
 - lib/client/util/disk_cacher.rb
 - lib/client/util/dtk_path.rb
+- lib/client/util/file_helper.rb
 - lib/client/util/hash_with_optional_keys.rb
 - lib/client/util/interactive_wizard.rb
 - lib/client/util/os_util.rb
@@ -423,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.