dtk-client 0.10.2 → 0.10.3

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

@@ -0,0 +1,34 @@
+#
+# 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::Command
+    module Module 
+      subcommand_def 'publish' do |c|
+        command_body c, 'publish', 'Publish module installed on server to the repo manager' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to publish; not need if in the module directory'
+          sc.action do |_global_options, options, _args|
+            module_ref = module_ref_in_options_or_context(options)
+            Operation::Module.publish(:module_ref => module_ref, :directory_path => options[:directory_path])
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/cli/command/module/pull_dtkn.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::Command
+    module Module 
+      subcommand_def 'pull-dtkn' do |c|
+        command_body c, 'pull-dtkn', 'Pull content from repo manager to client module directory and push to server' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing content to update; not need if in the module directory'
+          sc.action do |_global_options, options, _args|
+            module_ref = module_ref_in_options_or_context(options)
+            Operation::Module.pull_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj)
+            Operation::Module.push(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path])
+          end
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,34 @@
+#
+# 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::Command
+    module Module 
+      subcommand_def 'push-dtkn' do |c|
+        command_body c, 'push-dtkn', 'Push content from client module directory to repo manager' do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to module directory containing updates to push; not need if in the module directory'
+          sc.action do |_global_options, options, _args|
+            module_ref = module_ref_in_options_or_context(options)
+            Operation::Module.push_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path])
+          end
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -35,7 +35,7 @@ module DTK::Client
             version        = options[:version] || module_ref.version
             service_name   = options[:service_name]
             force          = options[:f]
-            directory_path = options[:directory_path]
+            directory_path = options[:directory_path] || @base_dsl_file_obj.parent_dir
 
             Validation.validate_name(service_name) if service_name
 

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

@@ -17,26 +17,32 @@
 #
 module DTK::Client
   module CLI::Command
-    module Module 
+    module Module
       subcommand_def 'uninstall' do |c|
         c.arg Token::Arg.module_name, :optional => true
         command_body c, :uninstall, 'Uninstall module from server' do |sc|
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to uninstall module from server'
           sc.flag Token.directory_path
           sc.flag Token.version
+          sc.flag Token.uninstall_name
           sc.action do |_global_options, options, args|
             version = options[:version]
 
-            module_ref =
-              if module_name = args[0]
-                module_ref_in_options_or_context?(:module_ref => module_name, :version => (version || 'master'))
+            module_refs_opts = {:ignore_parsing_errors => true}
+            if options[:uninstall_name].nil?
+              module_ref =
+                if module_name = args[0]
+                  module_ref_in_options_or_context?({:module_ref => module_name, :version => (version || 'master')}, module_refs_opts)
+                else
+                  module_ref_in_options_or_context(options, module_refs_opts)
+                end
               else
-                module_ref_in_options_or_context(options)
-              end
+                module_name = options["name"]
+            end
 
             raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
 
-            Operation::Module.uninstall(:module_ref => module_ref, :skip_prompt => options[:skip_prompt])
+            Operation::Module.uninstall(:module_ref => module_ref, :skip_prompt => options[:skip_prompt], :name => options[:uninstall_name], :version => version)
           end
         end
       end

data/lib/cli/command/module.rb

@@ -21,7 +21,20 @@ module DTK::Client
       module Module 
         include Command::Mixin
 
-        ALL_SUBCOMMANDS = ['install', 'list', 'list-assemblies', 'push', 'uninstall', 'clone', 'list-remotes', 'stage']
+        ALL_SUBCOMMANDS = [
+          'install',
+          'list',
+          'list-assemblies',
+          'push',
+          'uninstall',
+          'clone',
+          'list-remotes',
+          'push-dtkn',
+          'stage',
+          'pull-dtkn',
+          'publish',
+          'delete-from-remote'
+        ]
         command_def :desc => 'Subcommands for interacting with DTK modules'
         ALL_SUBCOMMANDS.each { |subcommand| require_relative("module/#{subcommand.gsub(/-/,'_')}") } 
       end

data/lib/cli/command/options.rb

@@ -19,6 +19,8 @@ module DTK::Client
   module CLI
     module Command
       class Options
+        attr_reader :opts_hash
+
         def initialize(opts_hash)
           @opts_hash = opts_hash
         end

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

@@ -28,7 +28,7 @@ module DTK::Client; module CLI
             args = {
               :service_instance => service_instance,
               :force            => force,
-              :directory_path   => options[:directory_path]
+              :module_dir       => @base_dsl_file_obj.parent_dir
             }
             Operation::Service.converge(args)
           end

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

@@ -35,7 +35,7 @@ module DTK::Client; module CLI
             args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
-              :directory_path   => directory_path,
+              :directory_path   => directory_path || base_dsl_file_obj.parent_dir,
               :recursive        => recursive,
               :force            => force
             }

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

@@ -29,11 +29,14 @@ module DTK::Client
             
             action        = args[0]
             action_params = args[1]
-
+            directory_path = options[:d] || @base_dsl_file_obj.parent_dir
+            
             args = {
               :service_instance => service_instance,
               :action           => action,
-              :action_params    => action_params
+              :action_params    => action_params,
+              :directory_path   => directory_path,
+              :command          => 'exec'
             }
             
             response = Operation::Service.exec(args)

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

@@ -28,11 +28,14 @@ module DTK::Client
             
             action        = args[0]
             action_params = args[1]
+            directory_path = options[:d] || @base_dsl_file_obj.parent_dir
 
             args = {
               :service_instance => service_instance,
               :action           => action,
-              :action_params    => action_params
+              :action_params    => action_params,
+              :directory_path   => directory_path,
+              :command          => 'exec-sync'
             }
             response = Operation::Service.exec(args)
 

data/lib/cli/command/service/{list_dependent_modules.rb → list_dependencies.rb}

@@ -18,13 +18,13 @@
 module DTK::Client; module CLI
   module Command
     module Service
-      subcommand_def 'list-dependent-modules' do |c|
-        command_body c, 'list-dependent-modules', 'List dependent modules associated with service instance.' do |sc|
+      subcommand_def 'list-dependencies' do |c|
+        command_body c, 'list-dependencies', 'List dependent modules associated with service instance.' do |sc|
           sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
 
           sc.action do |_global_options, options, _args|
             service_instance =  service_instance_in_options_or_context(options)
-            Operation::Service.list_dependent_modules(:service_instance => service_instance)
+            Operation::Service.list_dependencies(:service_instance => service_instance)
           end
         end
       end

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

@@ -21,27 +21,34 @@ module DTK::Client; module CLI
       subcommand_def 'uninstall' do |c|
         command_body c, :uninstall, 'Uninstalls the service instance from the server' 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.uninstall_name
           sc.switch Token.skip_prompt, :desc => 'Skip prompt that checks if user wants to delete the service instance'
           sc.switch Token.purge, :desc => 'Delete the service instance directory on the client'
-          sc.switch Token.force, :desc => 'Removes service instance with all nodes and modules'
+          sc.switch Token.delete, :desc => 'Removes service instance with all nodes and modules'
           sc.switch Token.recursive, :desc => 'Delete dependent service instances'
           sc.action do |_global_options, options, args|
             directory_path = options[:directory_path]
             purge          = options[:purge]
-            force          = options[:force]
+            delete         = options[:delete]
             recursive      = options[:recursive]
+            name           = options[:uninstall_name]
 
             if purge && (!directory_path || (directory_path == @base_dsl_file_obj.parent_dir?))
               raise Error::Usage, "If use option '#{option_ref(:purge)}' then need to call from outside directory and use option '#{option_ref(:directory_path)}'"
             end
-            service_instance = service_instance_in_options_or_context(options)
+            
+            if name.nil? 
+              service_instance = service_instance_in_options_or_context(options, :ignore_parsing_errors => true) 
+            else 
+              service_instance = name
+            end
 
             args = {
               :service_instance => service_instance,
               :skip_prompt      => options[:skip_prompt],
               :directory_path   => directory_path,
               :purge            => purge,
-              :force            => force,
+              :delete           => delete,
               :recursive        => recursive
             }
             Operation::Service.uninstall(args)

data/lib/cli/command/service.rb

@@ -33,7 +33,7 @@ module DTK::Client
           'list-actions',
           'list-attributes',
           'list-component-links',
-          'list-dependent-modules',
+          'list-dependencies',
           'list-components',
           'list-nodes',
           'list-violations',

data/lib/cli/command/token.rb

@@ -47,11 +47,13 @@ module DTK::Client
         :identity_file           => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
         :mode                    => Flag.new(:mode, 'MODE', 'Mode'),
         :namespace               => Flag.new(:n, 'NAMESPACE', 'Namespace'),
+        :uninstall_name          => Flag.new(:name, 'NAME', 'Module name to uninstall'),
         
 
         # switches
         # Switch constructor args order: key, desc, opts={}
         :all          => Switch.new(:all, 'All'),
+        :delete       => Switch.new(:delete, 'Delete'),
         :force        => Switch.new(:f, 'Force'),
         :purge        => Switch.new(:purge, 'Purge'),
         :push         => Switch.new(:push, 'Push changes'),
@@ -74,6 +76,7 @@ module DTK::Client
         :module_name      => 'NAMESPACE/MODULE-NAME',
         :target_directory => 'TARGET-DIRECTORY',
         :attribute_name   => 'ATTRIBUTE-NAME',
+        :keypair_name     => 'KEYPAIR-NAME',
         :attribute_value  => 'VALUE'
       }
       

data/lib/cli/command.rb

@@ -23,7 +23,7 @@ module DTK::Client
       require_relative('command/subcommand')
       require_relative('command/options')
       # above must be included before below
-      ALL_COMMANDS = [:service, :module]
+      ALL_COMMANDS = [:service, :module, :account]
       ALL_COMMANDS.each { |command_name| require_relative("command/#{command_name}") }
       
       def self.command_module(command_name)

data/lib/cli/context/attributes.rb

@@ -39,7 +39,7 @@ module DTK::Client::CLI
 
       def value_from_base_dsl_file(key)
          if @special_keys.has_key?(key)
-@special_keys[key] = @context.value_from_base_dsl_file?(key)
+           @special_keys[key] = @context.value_from_base_dsl_file?(key)
            @special_keys[key]
          else
            @special_keys[key] = @context.value_from_base_dsl_file?(key)

data/lib/cli/context/type/account.rb

@@ -0,0 +1,42 @@
+#
+# 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
+  class Context
+    module Type
+      class Account < Context
+        include Command::Account
+        include Command::Service
+        include Command::Module
+
+        COMMAND_DEFS = [:service, :module, :account]
+
+        def add_command_defs!
+         COMMAND_DEFS.each {|cmd| add_command(cmd)}
+        end
+
+        def context_type
+          'service'
+        end
+
+        def allowed_commands_defs
+          COMMAND_DEFS.map { |cmd| cmd.to_s }
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/context/type/module.rb

@@ -21,8 +21,9 @@ module DTK::Client; module CLI
       class Module < Context
         include Command::Module
         include Command::Service        
+        include Command::Account
 
-        COMMAND_DEFS = [:service, :module]
+        COMMAND_DEFS = [:service, :module, :account]
 
         def add_command_defs!
          COMMAND_DEFS.each {|cmd| add_command(cmd)}

data/lib/cli/context/type/service.rb

@@ -21,8 +21,9 @@ module DTK::Client::CLI
       class Service < Context
         include Command::Service
         include Command::Module
+        include Command::Account
 
-        COMMAND_DEFS = [:service, :module]
+        COMMAND_DEFS = [:service, :module, :account]
 
         def add_command_defs!
          COMMAND_DEFS.each {|cmd| add_command(cmd)}

data/lib/cli/context.rb

@@ -31,6 +31,7 @@ module DTK::Client
         @base_dsl_file_obj   = base_dsl_file_obj
         @command_processor   = Processor.default
         @context_attributes  = Attributes.new(self)
+        @options             = {}
         add_command_defs_defaults_and_hooks!
       end
       private :initialize
@@ -62,20 +63,83 @@ module DTK::Client
       attr_reader :context_attributes, :base_dsl_file_obj
 
       def module_ref_from_base_dsl_file?
-        parsed_module = base_dsl_file_obj.parse_content(:common_module_summary)
-        namespace   = parsed_module.val(:Namespace)
-        module_name = parsed_module.val(:ModuleName)
-        version     = parsed_module.val(:ModuleVersion) || 'master'
+        parsed_module_hash = parse_module_content_and_create_hash
+        namespace          = parsed_module_hash[:namespace]
+        module_name        = parsed_module_hash[:module_name]
+        version            = parsed_module_hash[:version] || 'master'
+
         if namespace and module_name
           client_dir_path = base_dsl_file_obj.parent_dir?
           ModuleRef.new(:namespace => namespace, :module_name => module_name, :version => version, :client_dir_path => client_dir_path)
         end
       end
 
+      def parse_module_content_and_create_hash
+        parsed_hash = {}
+
+        begin
+          parsed_module = base_dsl_file_obj.parse_content(:common_module_summary)
+          parsed_hash = {
+            :namespace   => parsed_module.val(:Namespace),
+            :module_name => parsed_module.val(:ModuleName),
+            :version     => parsed_module.val(:ModuleVersion)
+          }
+        rescue Error::Usage => error
+          # if there is syntax error in dsl, we still want to get namespace, name, and version
+          # will be used in commands like 'dtk module uninstall', ... where we want to uninstall module even if parsing errors in yaml
+          if content = @options[:ignore_parsing_errors] && base_dsl_file_obj.content
+            ret_module_info_from_raw_content(parsed_hash, content)
+          else
+            raise error
+          end
+        end
+
+        parsed_hash
+      end
+
+      # get namespace, name and version from raw file content and return as parsed_hash
+      def ret_module_info_from_raw_content(parsed_hash, content)
+        info_found = lambda {|input_hash| (input_hash[:namespace] && input_hash[:module_name] && input_hash[:version]) }
+
+        content.each_line do |line|
+          if line_match = line.match(/(^module:)(.*)/)
+            name_found      = true
+            full_name       = line_match[2].strip
+            namespace, name = full_name.split('/')
+            parsed_hash.merge!(:namespace => namespace, :module_name => name)
+          elsif line_match = line.match(/(^version:)(.*)/)
+            version_found = true
+            parsed_hash.merge!(:version => line_match[2].strip)
+          end
+
+          break if info_found.call(parsed_hash)
+        end
+      end
+
       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.parse_content(:service_module_summary).val(:Name)
+        parse_conent_and_ret_service_name
+      end
+
+      def parse_conent_and_ret_service_name
+        begin
+          base_dsl_file_obj.parse_content(:service_module_summary).val(:Name)
+        rescue Error::Usage => error
+          if content = @options[:ignore_parsing_errors] && base_dsl_file_obj.content
+            ret_service_name_from_raw_content(content)
+          else
+            raise error
+          end
+        end
+      end
+
+      def ret_service_name_from_raw_content(content)
+        content.each_line do |line|
+          if line_match = line.match(/(^name:)(.*)/)
+            return line_match[2].strip
+          end
+        end
       end
 
       # opts can have keys
@@ -97,11 +161,14 @@ module DTK::Client
          ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top
         ]
 
-      def module_ref_in_options_or_context(options)
-        module_ref_in_options_or_context?(options) || raise_error_when_missing_context(:module_ref, options)
+      def module_ref_in_options_or_context(options, module_refs_opts = {})
+        module_ref_in_options_or_context?(options, module_refs_opts) || raise_error_when_missing_context(:module_ref, options)
       end
 
-      def module_ref_in_options_or_context?(options)
+      def module_ref_in_options_or_context?(options, module_refs_opts = {})
+        # using :ignore_parsing_errors to ret namespace, name and version from .yaml file even if there are parsing errors
+        @options.merge!(:ignore_parsing_errors => module_refs_opts[:ignore_parsing_errors])
+
         if options[:module_ref]
           opts = {:namespace_module_name => options[:module_ref]}
           opts.merge!(:version => options[:version]) if options[:version]
@@ -114,11 +181,14 @@ module DTK::Client
         end
       end
 
-      def service_instance_in_options_or_context(options)
-        service_instance_in_options_or_context?(options) || raise_error_when_missing_context(:service_instance, options)
+      def service_instance_in_options_or_context(options, service_refs_opts = {})
+        service_instance_in_options_or_context?(options, service_refs_opts) || raise_error_when_missing_context(:service_instance, options)
       end
       
-      def service_instance_in_options_or_context?(options)
+      def service_instance_in_options_or_context?(options, service_refs_opts = {})
+        # using :ignore_parsing_errors to ret namespace, name and version from .yaml file even if there are parsing errors
+        @options.merge!(:ignore_parsing_errors => service_refs_opts[:ignore_parsing_errors])
+
         if ret = options[:service_instance]
           ret
         else
@@ -163,7 +233,7 @@ module DTK::Client
       end
 
       def command_processor_object_methods
-        @@command_processor_object_methods ||= Processor::Methods.all 
+        @@command_processor_object_methods ||= Processor::Methods.all
       end
 
     end

data/lib/cli/version.rb

@@ -1,8 +1,24 @@
+#
+# 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
   module Client
     module CLI
-      VERSION="0.10.2"
+      VERSION="0.10.3"
     end
   end
 end
-