dtk-client 0.9.1 → 0.10.0

data/lib/cli/command/mixin.rb

@@ -0,0 +1,101 @@
+#
+# 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::CLI
+  module Command
+    module Mixin
+
+      module Common
+        private
+        def mangled_method(command_name)
+          "command_defs__#{command_name}".to_sym
+        end
+      end
+
+      include Common
+      
+      def add_command(command_name)
+        send(mangled_method(command_name))
+      end
+
+      def command_body(c, name, desc, &body)
+        c.desc(desc)
+        c.command(name) { |sc| body.call(Subcommand.new(sc)) }
+      end
+
+      def option_ref(flag_name)
+        Token::Flag.option_ref(flag_name)
+      end
+
+      def opt(flag_name)
+        options[Token::Flag.opt(flag_name)]
+      end
+
+      private
+      
+      def self.included(klass)
+        klass.extend(Class)
+      end
+
+      module Class
+        include Common
+
+        def command_def(opts = {})
+          command_name = command_name()
+          mangled_method = mangled_method(command_name)
+          subcommand_mangled_methods = all_subcommands.map { |subcommand_name| mangled_subcommand_method(subcommand_name) }
+
+          block = proc do
+            if context_attributes[:only_context_commands]
+              subcommand_mangled_methods.each do |subcommand_mangled_method|
+                instance_eval { send(subcommand_mangled_method, self) }
+              end
+            else
+              desc opts[:desc] if opts[:desc]
+              command command_name do |c|
+                subcommand_mangled_methods.each do |subcommand_mangled_method| 
+                  instance_eval { send(subcommand_mangled_method, c) }
+                end
+              end
+            end
+          end
+          class_eval { define_method(mangled_method, &block) }
+        end
+
+        def subcommand_def(subcommand_name, &block)
+          mangled_subcommand_method = mangled_subcommand_method(subcommand_name)
+          class_eval { define_method(mangled_subcommand_method, &block) }
+        end
+
+        private
+
+        def mangled_subcommand_method(subcommand_name)
+          "#{mangled_method(command_name)}__#{subcommand_name}".to_sym
+        end
+
+        def all_subcommands
+          self::ALL_SUBCOMMANDS
+        end
+
+        def command_name
+          self.to_s.split('::').last.downcase.to_sym
+        end
+      end
+
+    end
+  end
+end

data/lib/cli/command/module/clone.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::Command
+    module Module 
+      subcommand_def 'clone' do |c|
+        c.arg Token::Arg.module_name
+        c.arg Token::Arg.target_directory, :optional => true
+        command_body c, :clone, 'Clone content from server module directory to client' do |sc|
+          sc.flag Token.version
+          sc.action do |_global_options, options, args|
+            module_name = args[0]
+            module_ref  = module_ref_in_options_or_context(:module_ref => module_name, :version => options[:version])
+            arg = {
+              :module_ref       => module_ref,
+              :module_name      => module_name,
+              :target_directory => args[1]
+            }
+            Operation::Module.clone_module(arg)
+          end
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,52 @@
+#
+# 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 'install' do |c|
+        c.arg Token::Arg.module_name, :optional => true
+        command_body c, :install, 'Install a module on the server from a client directory or from the DTK remote catalog (DTKN)' do |sc|
+          sc.flag Token.version
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to directory containing content to install'
+          sc.action do |_global_options, options, args|
+            directory_path = options[:directory_path]
+            version = options[:version]
+
+            # install from dtkn (later probably from other remote catalogs)
+            if module_name = args[0]
+              module_ref = module_ref_in_options_or_context?(:module_ref => module_name, :version => (version || 'master'))
+              target_repo_dir = Operation::Module.install_from_catalog(:module_ref => module_ref, :version => options[:version], :directory_path => directory_path)
+            end
+
+            raise Error::Usage, "You can use version only with 'namespace/name' provided" if version && module_name.nil?
+
+            if target_repo_dir
+              directory_path ||= target_repo_dir.data[:target_repo_dir]
+            end
+
+            install_opts = directory_path ? { :directory_path => directory_path, :version => (version || 'master') } : options
+            module_ref = module_ref_in_options_or_context?(install_opts)
+            flag = true unless options["d"].nil?
+            Operation::Module.install(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :flag => flag)
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,31 @@
+#
+# 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 'list' do |c|
+        command_body c, 'list', 'List modules' do |sc|
+          sc.action do 
+            Operation::Module.list
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+#
+# 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 'list-assemblies' do |c|
+        command_body c, 'list-assemblies', 'List assemblies from all modules or specified module' do |sc|
+          sc.switch Token.all, :desc => 'List assemblies from all modules'
+          sc.flag Token.directory_path
+          sc.action do |_global_options, options, _args| 
+            opts = {}
+            unless options[:all]
+              if module_ref = module_ref_in_options_or_context?(options)
+                opts.merge!(:module_ref => module_ref)
+              end
+            end
+            Operation::Module.list_assemblies(opts)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/cli/command/module/push.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' do |c|
+        command_body c, :push, 'Push content from client module directory to server' 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(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj)
+          end
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,46 @@
+#
+# 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 '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.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'))
+              else
+                module_ref_in_options_or_context(options)
+              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])
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/cli/command/module.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
+  module CLI
+    module Command
+      module Module 
+        include Command::Mixin
+
+        # TODO: removed push command until fixed by jira: DTK-2667
+        # ALL_SUBCOMMANDS = ['install', 'list', 'list-assemblies', 'push', 'uninstall', 'clone']
+         ALL_SUBCOMMANDS = ['install', 'list', 'list-assemblies', 'uninstall', 'clone']
+        command_def :desc => 'Subcommands for interacting with DTK modules'
+        ALL_SUBCOMMANDS.each { |subcommand| require_relative("module/#{subcommand.gsub(/-/,'_')}") } 
+      end
+    end
+  end
+end
+

data/lib/cli/command/options.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
+  module CLI
+    module Command
+      class Options
+        def initialize(opts_hash)
+          @opts_hash = opts_hash
+        end
+        
+        def [](canonical_name_or_opt)
+          key = Token.opt?(canonical_name_or_opt) || canonical_name_or_opt
+          @opts_hash[key]
+        end
+      end
+    end
+  end
+end

data/lib/cli/command/service/cancel_task.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; module CLI
+  module Command
+    module Service
+      subcommand_def 'cancel-task' do |c|
+        command_body c, 'cancel-task', 'Cancels the most recent executing task.' 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.action do |_global_options, options, args|
+            service_instance = service_instance_in_options_or_context(options)
+            Operation::Service.cancel_task(:service_instance => service_instance)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service/converge.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 'converge' do |c|
+        command_body c, :converge, "Converge service instance" do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory; not needed if executed in the service instance directory'
+
+          sc.action do |_global_options, options, _args|
+            service_instance = service_instance_in_options_or_context(options)
+
+            args = {
+              :service_instance => service_instance
+            }
+            Operation::Service.converge(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/{parser/adapters/thor/common_option_defs.rb → cli/command/service/create_workspace.rb}

@@ -15,24 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK; module Client
-  class CommandBaseThor
-    module CommonOptionDefs
-      module Mixin
-        def required_option(key)
-          key = key.to_s
-          unless options.has_key?(key)
-            raise DtkError, "[ERROR] The mandatory option --#{key} is missing" 
+module DTK::Client; module CLI
+  module Command
+    module Service
+      subcommand_def 'create-workspace' do |c|
+        c.arg Token::Arg.workspace_name, :optional => true
+        command_body c, 'create-workspace', 'Create empty workspace' do |sc|
+          sc.flag Token.parent_service_instance
+          sc.action do |_global_options, options, args|
+            args = {
+              :workspace_name => args[0],
+              :target_service  => options[:parent_service_instance]
+            }
+            Operation::Service.create_workspace(args)
           end
-          options[key]
-        end
-      end
-      module ClassMixin
-        def version_method_option()
-          method_option "version",:aliases => "-v",
-          :type => :string, 
-          :banner => "VERSION",
-          :desc => "Version"
         end
       end
     end

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

@@ -0,0 +1,47 @@
+#
+# 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 'destroy' do |c|
+        command_body c, :destroy, 'Destroys the running infrastructure associated with the service instance and 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.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.action do |_global_options, options, args|
+            directory_path = options[:directory_path]
+            purge          = options[:purge]
+
+            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)
+
+            args = {
+              :service_instance => service_instance,
+              :skip_prompt      => options[:skip_prompt],
+              :directory_path   => directory_path,
+              :purge            => purge
+            }
+            Operation::Service.destroy(args)
+          end
+        end
+      end
+    end
+  end
+end; end

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

@@ -0,0 +1,47 @@
+#
+# 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 'edit' do |c|
+        EDIT_DEFAULT_FILE = 'dtk.service.yaml'
+        command_body c, :edit, "Call editor on selected file in service instance" do |sc|
+          sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory; not needed if executed in the service instance directory'
+          sc.flag Token.relative_path, :desc => "Relative path of file to edit in service instance directory if omitted then main dsl file '#{EDIT_DEFAULT_FILE}' is used"
+          sc.flag Token.commit_message
+          sc.switch Token.push, :desc => 'Commit and push changes made from editing to server'
+          
+          sc.action do |_global_options, options, _args|
+            relative_path    = options[:relative_path] || EDIT_DEFAULT_FILE
+            service_instance = service_instance_in_options_or_context(options)
+            # @base_dsl_file_obj.parent_dir must go after ervice_instance_in_options_or_context, which can reset @base_dsl_file_obj
+            module_directory = @base_dsl_file_obj.parent_dir
+
+            args = {
+              :service_instance   => service_instance,
+              :absolute_file_path => "#{module_directory}/#{relative_path}",
+              :commit_message     => options[:commit_message],
+              :push_after_edit    => options[:push]
+            }
+            Operation::Service.edit(args)
+          end
+        end
+      end
+    end
+  end
+end; end

data/lib/cli/command/service/exec.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::Command
+    module Service
+      subcommand_def 'exec' do |c|
+        c.arg Token::Arg.action
+        c.arg Token::Arg.action_params, :optional => true
+        command_body c, :exec, 'Execute action asynchronously' do |sc|
+          sc.action do |_global_options, options, args|
+            service_instance = service_instance_in_options_or_context(options)
+            
+            action        = args[0]
+            action_params = args[1]
+
+            args = {
+              :service_instance => service_instance,
+              :action           => action,
+              :action_params    => action_params
+            }
+            Operation::Service.exec(args)
+          end
+        end
+      end
+    end
+  end
+end