dtk-client 0.11.7 → 0.11.8

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

@@ -25,7 +25,7 @@ module DTK::Client
             arg = {}
             unless options[:n].nil?
               arg = {
-                :module_namespace => options[:n]
+                :namespace => options[:n]
               }
             end
             

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

@@ -19,11 +19,12 @@ 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|
+        command_body c, 'publish', 'Publish module installed on server to the dtk network' 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.switch Token.update_lock
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_options_or_context(options)
-            Operation::Module.publish(:module_ref => module_ref, :directory_path => options[:directory_path])
+            Operation::Module.publish(:module_ref => module_ref, update_lock_file: options['update-lock'], :directory_path => options[:directory_path], :base_dsl_file_obj => @base_dsl_file_obj)
           end
         end
       end

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

@@ -19,7 +19,7 @@ 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|
+        command_body c, 'pull-dtkn', 'Pull content from dtk network 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.switch Token.force
           sc.switch Token.update_deps
@@ -35,7 +35,7 @@ module DTK::Client
               :update_deps         => options[:update_deps]
             }
             Operation::Module.pull_dtkn(operation_args)
-            Operation::Module.push(operation_args.merge(:method => "pulled"))
+            # Operation::Module.push(operation_args.merge(:method => "pulled"))
           end
         end
       end

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

@@ -21,9 +21,10 @@ module DTK::Client
       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.switch Token.update_lock
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_options_or_context(options)
-            Operation::Module.push(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj)
+            Operation::Module.push(module_ref: module_ref, update_lock_file: options['update-lock'], base_dsl_file_obj: @base_dsl_file_obj, context: self)
           end
         end
       end

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

@@ -19,11 +19,12 @@ 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|
+        command_body c, 'push-dtkn', 'Push content from client module directory to dtk network' 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.switch Token.update_lock
           sc.action do |_global_options, options, _args|
             module_ref = module_ref_object_from_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])
+            Operation::Module.push_dtkn(:module_ref => module_ref, :base_dsl_file_obj => @base_dsl_file_obj, :directory_path => options[:directory_path], update_lock_file: options['update-lock'])
           end
         end
       end

data/lib/cli/command/module/unpublish.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 'unpublish' do |c|
+        c.arg Token::Arg.module_name
+        command_body c, 'unpublish', 'Unpublish module version from the DTK remote catalog (DTKN)' do |sc|
+          sc.flag Token.version
+          sc.switch Token.skip_prompt
+          sc.switch Token.force, :desc => 'Force delete'
+          
+          sc.action do |_global_options, options, args|
+            module_ref = module_ref_object_from_options_or_context?(:module_ref => args[0], :version => options[:version])
+            operation_args = {
+              :module_ref  => module_ref,
+              :skip_prompt => options[:skip_prompt],
+              :force       => options[:f]
+            }
+            Operation::Module.unpublish(operation_args)
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/cli/command/module/update.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::Command
+    module Module 
+      subcommand_def 'update' do |c|
+        command_body c, 'update', 'Update module dependencies to the latest available on dtk network' 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_object_from_options_or_context(options)
+            Operation::Module.update(:module_ref => module_ref, :directory_path => options[:directory_path], :base_dsl_file_obj => @base_dsl_file_obj)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/cli/command/module.rb

@@ -32,7 +32,9 @@ module DTK::Client
           'push',
           'push-dtkn',
           'stage',
-          'uninstall'
+          'uninstall',
+          'unpublish'
+          # 'update'
         ]
 
         command_def :desc => 'Subcommands for interacting with DTK modules'

data/lib/cli/command/token.rb

@@ -57,7 +57,7 @@ module DTK::Client
         # Switch constructor args order: key, desc, opts={}
         :all          => Switch.new(:all, 'All'),
         :base         => Switch.new(:base, 'Create base service instance'),
-        :breakpoint       => Switch.new([:b, :breakpoint], 'Add breakpoint'),
+        :breakpoint   => Switch.new([:b, :breakpoint], 'Add breakpoint'),
         :delete       => Switch.new(:delete, 'Delete'),
         :force        => Switch.new([:f, :force], 'Force'),
         :purge        => Switch.new(:purge, 'Purge'),
@@ -69,7 +69,9 @@ module DTK::Client
         :dependencies => Switch.new(:deps, 'Dependencies'),
         :u            => Switch.new([:u, :unset], 'Unset attribute'),
         :recursive    => Switch.new(:r, 'Recursive'),
-        :update_deps  => Switch.new('update-deps', "Skip prompt and update all dependencies or skip prompt and don't update all dependencies  (on master)", :negatable => true, :default_value => 'prompt')
+        :update_deps  => Switch.new('update-deps', "Skip prompt and update all dependencies or skip prompt and don't update all dependencies  (on master)", :negatable => true, :default_value => 'prompt'),
+        :skip_server  => Switch.new('skip-server', 'Do not install module on server'),
+        :update_lock  => Switch.new([:u, 'update-lock'], 'Update lock file with new dependencies')
       }
 
       ARG_TOKENS = {
@@ -90,7 +92,11 @@ module DTK::Client
         :base_cmp         => 'BASE-COMPONENT',
         :deps_on_cmp      => 'DEPENDS-ON-COMPONENT',
         :service          => 'SERVICE',
-        :service_name     => 'SERVICE-NAME'
+        :service_name     => 'SERVICE-NAME',
+        :namespace        => 'NAMESPACE',
+        :user             => 'USER',
+        :permissions      => 'PERMISSIONS',
+        :group            => 'GROUP',
       }
       
     end

data/lib/cli/context.rb

@@ -58,9 +58,15 @@ module DTK::Client
         end
       end
 
+      def module_ref_object_from_options_or_context(options, module_refs_opts = {})
+        module_ref_object_from_options_or_context?(options, module_refs_opts) || raise_error_when_missing_context(:module_ref, options)
+      end
+
+      attr_reader :base_dsl_file_obj
+
       private
 
-      attr_reader :context_attributes, :base_dsl_file_obj
+      attr_reader :context_attributes
 
       def module_ref_from_base_dsl_file?
         parsed_module_hash = parse_module_content_and_create_hash
@@ -161,10 +167,6 @@ module DTK::Client
          ::DTK::DSL::FileType::ServiceInstance::DSLFile::Top
         ]
 
-      def module_ref_object_from_options_or_context(options, module_refs_opts = {})
-        module_ref_object_from_options_or_context?(options, module_refs_opts) || raise_error_when_missing_context(:module_ref, options)
-      end
-
       def module_ref_object_from_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])

data/lib/cli/directory_parser/file_system.rb

@@ -26,10 +26,7 @@ module DTK::Client; module CLI
       #   :dir_path - string
       # Returns FileObj object or nil that match a file_type
       def matching_file_obj?(file_types, opts = {})
-        ret = nil
-        file_types = [file_types] unless file_types.kind_of?(Array)
-
-        file_type, file_path = matching_type_and_path?(file_types, opts)
+        file_type, file_path = matching_type_and_path?(Array(file_types), opts)
         file_obj_opts = {
           dir_path: opts[:dir_path],
           current_dir: OsUtil.current_dir,
@@ -48,53 +45,52 @@ module DTK::Client; module CLI
       # opts can have keys:
       #  :dir_path
       #  :file_path
+      #  :flag
       # returns nil or [file_type, path]
       def matching_type_and_path?(file_types, opts = {})
-        ret = nil
-        flag = opts[:flag]
-        if path = opts[:file_path]
-          file_types.each do | file_type |
-            if file_type.matches?(path)
-              return [file_type, path]
-            end
+        matches = 
+          if path = opts[:file_path]
+            file_types.map { | file_type | file_type.matches?(path) && [file_type, path] }.compact
+          else
+            base_dir = OsUtil.home_dir
+            current_dir = opts[:dir_path] || OsUtil.current_dir
+            most_nested_matching_types_and_paths(file_types, current_dir, base_dir, flag: opts[:flag])
           end
+        
+        case matches.size
+        when 0
+          nil
+        when 1
+          matches.first
         else
-          file_types.each do | file_type |
-            if path = most_nested_matching_file_path?(file_type, flag, :current_dir => opts[:dir_path])
-              return [file_type, path]
-            end
-          end
+          MultipleMatches.resolve(matches)
         end
-        ret
       end
 
-      # return either a string file path or of match to file_type working from current directory and 'outwards'
-      # until base_path in file_type (if it exists)
       # opts can have keys
-      #  :current_dir if set means start from this dir; otherwise start from computed current dir
-      def most_nested_matching_file_path?(file_type, flag, opts = {})
-        base_dir = file_type.base_dir || OsUtil.home_dir
-        current_dir = opts[:current_dir] || OsUtil.current_dir
-        check_match_recurse_on_failure?(file_type, current_dir, base_dir, flag)
-      end
+      #   :flag
+      def most_nested_matching_types_and_paths(file_types, current_dir, base_dir, opts = {})
+        # matches will be an array of [file_type, path]
+        matches = []
+        file_types.each do |file_type| 
+          matching_file_paths(current_dir, file_type).each { |path|  matches << [file_type, path] }
+        end
+
+        return matches unless matches.empty?
 
-      def check_match_recurse_on_failure?(file_type, current_dir, base_dir, flag)
-        match = matching_file_paths(current_dir, file_type)
-        if match.empty?
-          unless current_dir == base_dir
-            if parent_path = OsUtil.parent_dir?(current_dir)
-              check_match_recurse_on_failure?(file_type, parent_path, base_dir, flag) unless flag
-            end
+        next_level_matches = []
+        unless current_dir == base_dir or opts[:flag]
+          if parent_path = OsUtil.parent_dir?(current_dir)
+            next_level_matches = most_nested_matching_types_and_paths(file_types, parent_path, base_dir, opts)
           end
-        elsif match.size == 1
-          match.first
-        else
-          raise Error, "Unexpected that more than one match: #{match.join(', ')}"
         end
+        next_level_matches
       end
 
+
       # 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) }
       end
 
@@ -102,6 +98,50 @@ module DTK::Client; module CLI
         regex = Regexp.new("\.bak\.dtk\.(service|module)\.(yml|yaml)$")
         file_path =~ regex
       end
+
+      module MultipleMatches
+        def self.resolve(matches)
+          # first try to make decission based on user's input e.g. 'dtk module ...' or 'dtk service ...'
+          if input_rank = rank_based_on_input
+            top_match = matches.select { |match| match.first == input_rank }
+            return top_match.first if top_match && !top_match.empty?
+          end
+
+          augmented_matches = matches.map { |match| { match: match, ranking: type_ranking(match[0]) } }
+          not_treated_types = augmented_matches.select { |aug_match| aug_match[:ranking].nil? }
+          fail Error, "No ranking for types: #{not_treated_types.map { |aug_match| aug_match[:match][0] }.join(', ')}" unless not_treated_types.empty?
+
+          ndx_matches = {}
+          augmented_matches.each { |aug_match| (ndx_matches[aug_match[:ranking]] ||= []) << aug_match[:match] }
+          top_matches = ndx_matches[ndx_matches.keys.sort.first]
+          fail Error, "Cannot choice between types: #{top_matches.map{ |match| match[0] }.join(', ')}" if top_matches.size > 1
+          top_matches.first
+        end
+
+        def self.type_ranking(type)
+          ranking_for_types[type]
+        end
+        
+        # lower is preferred
+        def self.ranking_for_types
+          @ranking_for_types ||= {
+            DTK::DSL::FileType::CommonModule::DSLFile::Top => 2,
+            DTK::DSL::FileType::ServiceInstance::DSLFile::Top => 1
+          }
+        end
+
+        def self.rank_based_on_input
+          input_types[ARGV.first]
+        end
+
+        def self.input_types
+          {
+            'module' => DTK::DSL::FileType::CommonModule::DSLFile::Top,
+            'service' => DTK::DSL::FileType::ServiceInstance::DSLFile::Top
+          }
+        end
+      end
+
     end
   end
 end; end

data/lib/cli/processor/plugin/gli.rb

@@ -46,6 +46,8 @@ module DTK::Client; module CLI
               nil
             elsif err.kind_of?(Error)
               raise err
+            elsif err.kind_of?(DTK::Network::Client::Error)
+              raise Error::DtkNetwork.new(err.message, :backtrace => err.backtrace)
             else
               raise Error::Client.new(err.message, :backtrace => err.backtrace)
             end

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.7"
+      VERSION="0.11.8"
     end
   end
 end

data/lib/client/error/subclasses.rb

@@ -108,5 +108,17 @@ module DTK::Client
         super(msg_to_pass_to_super, :backtrace => NO_BACKTRACE)
       end
     end
+
+    class DtkNetwork < self
+      # opts can have keys
+      #  :backtrace
+      def initialize(error_msg, opts = {})
+        msg_to_pass_to_super = "[DTK NETWORK ERROR] #{error_msg}"
+        super(msg_to_pass_to_super, opts.merge(:where => :dtk_network))
+      end
+      def self.label(*_args)
+        super(:dtk_network)
+      end
+    end
   end
 end

data/lib/client/git_repo/adapter/git_gem.rb

@@ -149,7 +149,9 @@ module DTK::Client
       end
 
       def untracked
-        status.is_a?(Hash) ? status.untracked().keys : status.untracked().collect { |file| file.first }
+        @git_repo.lib.command_lines('ls-files', ['--others', '--exclude-standard'])
+        # Replaced below with above because did not take into account what was in .gitignore
+        # status.is_a?(Hash) ? status.untracked().keys : status.untracked().collect { |file| file.first }
       end
 
       def deleted

data/lib/client/operation/account/add_to_group.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class AddToGroup < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          DtkNetworkClient::AddToGroup.run(args.required(:group), args.required(:user))
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/account/chmod.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class Chmod < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          DtkNetworkClient::Chmod.run(args.required(:namespace), args.required(:permissions))
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/account/create_namespace.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class CreateNamespace < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          DtkNetworkClient::CreateNamespace.run(args.required(:namespace))
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/account/delete_namespace.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class DeleteNamespace < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          DtkNetworkClient::DeleteNamespace.run(args.required(:namespace))
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/account/list_namespaces.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class ListNamespaces < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          response = DtkNetworkClient::ListNamespaces.run
+          Response.new(response)
+        end.set_render_as_table!
+      end
+    end
+  end
+end

data/lib/client/operation/account/remove_from_group.rb

@@ -0,0 +1,29 @@
+#
+# 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::Account
+    class RemoveFromGroup < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          DtkNetworkClient::RemoveFromGroup.run(args.required(:group), args.required(:user))
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/client/operation/account.rb

@@ -19,7 +19,20 @@ module DTK::Client
   class Operation
     class Account < self
       RoutePrefix = 'account'
-      OPERATIONS = [:list_ssh_keys, :delete_ssh_key, :add_ssh_key, :set_password, :set_catalog_credentials, :register_catalog_user]
+      OPERATIONS = [
+        :list_ssh_keys,
+        :delete_ssh_key,
+        :add_ssh_key,
+        :set_password,
+        :set_catalog_credentials,
+        :register_catalog_user,
+        :add_to_group,
+        :remove_from_group,
+        :create_namespace,
+        :chmod,
+        :delete_namespace,
+        :list_namespaces
+      ]
       OPERATIONS.each { |operation| require_relative("#{RoutePrefix}/#{operation}") }