dtk-client 0.5.13 → 0.5.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJlZDdmMWJjOGQ1ZGQ3YWFiMjE0N2RiZmUyOGQzMTQ1NGM2ZmI0Ng==
+    ODg5ZmJhZjg4YWIxZGY3YmQ5OWY5OTE4NDFiYmFmOWMzNWQ2ODk3NQ==
   data.tar.gz: !binary |-
-    NzAzNTJiNDNhYmE4NTNlZGJlYWFiYjBhNGQ1MjQxMWUxMTJiZWM0ZQ==
+    OTQ3MGVkMDQ1NzY2YWJmNmNiZjJmZjFkMmVlYTA1Yjg4MzU5MzEzNg==
 SHA512:
   metadata.gz: !binary |-
-    ZmM1MzkxMzEwNDVlYzZiNzQwZDAyYTM5N2VhZjEzZmQzNDJiNDhkOWVmNTI0
-    NWQyNTYzNDkzNWViM2Q0MDRjZWQ3NjU1YTQxZjQ0ZmU5YjNjMzgwOTA4OWJh
-    MThkNzBhN2RlZDQxZDg1YTRhOWNiMGRiMTdiYjZiMDMyMTFlYjA=
+    ODdkYWU3NGJlZWFjNDgyOWJhODZkY2I2ZmFlNWMzYzYyODAwNzY4NDAxMjk4
+    MWFkMzc3ODdlYjJkZTI3ZWUxZGE5ZWVmZTk4NmZiODU0NGYzNWFjNzBmMTUx
+    MzRhZjJjNmIzODRhNmE1NjhkZTE5YjM4NjM1NzFmMWMzNGJkNjI=
   data.tar.gz: !binary |-
-    MWJmYjViNmE2MmQwNWY4NTFkYWU3NzVlNWY5M2MwNzg2ODU1MTNlYWFjMjVl
-    MjA5NDdmOWY2ZWE4OWFmOTllMjdmYTQzOTQ0OTc4ZjlhOGQ3MGVlNWEwZTI1
-    OGEzNzA3OWRhYmQ2ZjVlYTEzMzk0NmU3MWRiY2EyMjE2NjY5N2Y=
+    MDVmOTQ4MDZiNjVjOWQxODg5M2Y4YzFiODMzY2VmN2Q1YzZlYWIxMDk5MjNl
+    YjhmNTRkNzRmMjQ2NGQ3NjcyOWIwZDNhNjVjZDVmNjQ4NmI4YmNlNzIzNzU4
+    MGE0YTk2MzI0MDYwMDFiODUxOTQzODlhYzkzMDIyOWZhMzQzMzE=

data/dtk-client.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/dtk-client/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Rich PELAVIN"]
   gem.email         = ["rich@reactor8.com"]
-  gem.description   = %q{Dtk client is CLI tool used for communication with Reactor8.}
+  gem.description   = %q{The DTK Client is a command line tool to interact with your DTK Server and DTK Service Catalog instance(s).}
   gem.summary       = %q{DTK CLI client for DTK server interaction.}
   gem.homepage      = "https://github.com/rich-reactor8/dtk-client"
   gem.licenses      = ["GPL-3.0"]

data/lib/command_helpers/service_importer.rb

@@ -24,7 +24,7 @@ module DTK::Client
 
       unless does_not_exist.empty?
         module_names = does_not_exist.collect{|x| "#{x['namespace']}/#{x['name']}"}
-        OsUtil.print("Component modules '#{module_names}' required by service module does not exist on repo manager and will not be imported!", :yellow)
+        OsUtil.print("You do no have access to component modules '#{module_names}' required by service module, or they do not exist on repo manager and will not be imported!", :yellow)
         return false unless Console.confirmation_prompt("Do you want to continue with import of available component modules and service module"+'?')
       end
       

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

@@ -0,0 +1,54 @@
+module DTK::Client
+  module AccessControlMixin
+
+    def chmod_aux(module_id, permission_string, namespace = nil)
+      permission_selector = PermissionUtil.validate_permissions!(permission_string.downcase)
+      post_body = {
+        :module_id => module_id,
+        :permission_selector => permission_selector,
+        :rsa_pub_key         => SSHUtil.rsa_pub_key_content(),
+        :remote_module_namespace => namespace
+      }
+      post rest_url("#{resolve_module_type}/remote_chmod"), post_body
+    end
+
+    def chown_aux(module_id, remote_user, namespace = nil)
+      post_body = {
+        :module_id => module_id,
+        :remote_user => remote_user,
+        :rsa_pub_key         => SSHUtil.rsa_pub_key_content(),
+        :remote_module_namespace => namespace
+      }
+      post rest_url("#{resolve_module_type}/remote_chown"), post_body
+    end
+
+    def collaboration_aux(action, module_id, users, groups, namespace = nil)
+      raise DtkValidationError, "You must provide --users or --groups to this command" if users.nil? && groups.nil?
+      post_body = {
+        :module_id => module_id,
+        :users  => users,
+        :groups => groups,
+        :action => action,
+        :remote_module_namespace => namespace,
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
+      }
+      post rest_url("#{resolve_module_type}/remote_collaboration"), post_body
+    end
+
+    def collaboration_list_aux(module_id, namespace = nil)
+      post_body = {
+        :module_id => module_id,
+        :remote_module_namespace => namespace,
+        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
+      }
+      post rest_url("#{resolve_module_type}/list_remote_collaboration"), post_body
+    end
+
+  private
+
+    def resolve_module_type
+      self.class == DTK::Client::ComponentModule ? 'component_module' : 'service_module'
+    end
+
+  end
+end

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

@@ -569,7 +569,7 @@ module DTK::Client
       post_body.merge!(:value => value) if value
       post_body.merge!(:required => true) if options.required?
       post_body.merge!(:dynamic => true) if options.dynamic?
-      if datatype = options.type
+      if datatype = options['type']
         post_body.merge!(:datatype => datatype)
       end
       post rest_url("assembly/set_attributes"), post_body

data/lib/commands/thor/component_module.rb

@@ -3,6 +3,7 @@ dtk_require_common_commands('thor/list_diffs')
 dtk_require_common_commands('thor/push_to_remote')
 dtk_require_common_commands('thor/pull_from_remote')
 dtk_require_common_commands('thor/push_clone_changes')
+dtk_require_common_commands('thor/access_control')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/reparse')
 dtk_require_common_commands('thor/purge_clone')
@@ -71,6 +72,7 @@ module DTK::Client
       include PurgeCloneMixin
       include ListDiffsMixin
       include ServiceImporter
+      include AccessControlMixin
 
       def get_module_name(module_id)
         get_name_from_id_helper(module_id)
@@ -539,47 +541,6 @@ TODO: might deprecate
       return response         
     end
 
-      # commented out for now -> changed to push but leaving commented out if run into some issues with push
-# #   desc "COMPONENT-MODULE-NAME/ID push-to-dtkn [-n NAMESPACE] [-v VERSION]", "Push local copy of component module to remote repository."
-#     # version_method_option
-#     desc "COMPONENT-MODULE-NAME/ID push-to-dtkn [-n NAMESPACE]", "Push local copy of component module to remote repository."
-#     method_option "namespace",:aliases => "-n",
-#         :type => :string, 
-#         :banner => "NAMESPACE",
-#         :desc => "Remote namespace"
-#     def push_to_dtkn(context_params)
-#       component_module_id, component_module_name = context_params.retrieve_arguments([:component_module_id!, :component_module_name!],method_argument_names)
-#       version = options["version"]
-
-#       if component_module_name.to_s =~ /^[0-9]+$/
-#         component_module_id   = component_module_name
-#         component_module_name = get_module_name(component_module_id)
-#       end
-
-#       modules_path    = OsUtil.module_clone_location()
-#       module_location = "#{modules_path}/#{component_module_name}#{version && "-#{version}"}"
-
-#       unless File.directory?(module_location)
-#         if Console.confirmation_prompt("Unable to push to remote because module '#{component_module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
-#           response = clone_aux(:component_module,component_module_id,version,false)
-          
-#           if(response.nil? || response.ok?)
-#             reparse_aux(module_location)
-#             push_to_remote_aux(:component_module, component_module_id, component_module_name, options["namespace"], version)  if Console.confirmation_prompt("Would you like to push changes to remote"+'?')
-#           end
-
-#           return response
-#         else
-#           # user choose not to clone needed module
-#           return
-#         end
-#       end
-
-#       reparse_aux(module_location)
-#       push_to_remote_aux(:component_module, component_module_id, component_module_name, options["namespace"], version)
-#     end
-
-#   desc "COMPONENT-MODULE-NAME/ID pull-from-dtkn [-n NAMESPACE] [-v VERSION]", "Update local component module from remote repository."
     desc "COMPONENT-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local component module from remote repository."
     method_option "namespace",:aliases => "-n",
       :type => :string, 
@@ -615,8 +576,65 @@ TODO: might deprecate
         raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}"
       end
     end
+
     PullCatalogs = ["dtkn"]
 
+    desc "COMPONENT-MODULE-NAME/ID chown REMOTE-USER", "Set remote module owner"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def chown(context_params)
+      component_module_id, remote_user = context_params.retrieve_arguments([:component_module_id!,:option_1!],method_argument_names)
+      chown_aux(component_module_id, remote_user, options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID chmod PERMISSION-SELECTOR", "Update remote permissions e.g. ug+rw , user and group get RW permissions"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def chmod(context_params)
+      component_module_id, permission_selector = context_params.retrieve_arguments([:component_module_id!,:option_1!],method_argument_names)
+      chmod_aux(component_module_id, permission_selector, options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID make-public", "Make this module public"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def make_public(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      chmod_aux(component_module_id, "o+r", options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID make-private", "Make this module private"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def make_private(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      chmod_aux(component_module_id, "o-rwd", options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID add-collaborators", "Add collabrators users or groups comma seperated (--users or --groups)"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    method_option "users",:aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
+    method_option "groups",:aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
+    def add_collaborators(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      collaboration_aux(:add, component_module_id, options.users, options.groups, options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID remove-collaborators", "Remove collabrators users or groups comma seperated (--users or --groups)"
+    method_option "namespace",:aliases => "-n",:type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    method_option "users",:aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
+    method_option "groups",:aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
+    def remove_collaborators(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      collaboration_aux(:remove, component_module_id, options.users, options.groups, options.namespace)
+    end
+
+    desc "COMPONENT-MODULE-NAME/ID list-collaborators", "List collaborators for given module"
+    method_option "namespace",:aliases => "-n",:type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def list_collaborators(context_params)
+      component_module_id = context_params.retrieve_arguments([:component_module_id!],method_argument_names)
+      response = collaboration_list_aux(component_module_id, options.namespace)
+      response.render_table(:module_collaborators)
+      response
+    end
+
+
     #### end: commands to interact with remote repo ###
 
     #### commands to manage workspace and versioning ###

data/lib/commands/thor/dtk.rb

@@ -6,13 +6,18 @@ module DTK::Client
 
     # entities that are not available on root but later in n-context
     def self.additional_entities()
-      ['target','component','attribute','utils','node','task','component-template','assembly']
+      ['component','attribute','utils','node','task','component-template','assembly']
     end
 
     desc "workspace","Sandbox for development and testing"
     def workspace
       # API descriptor, SYM_LINK!
     end
+
+    desc "target","Targets"
+    def target
+      # API descriptor, SYM_LINK!
+    end
     
 
     # NOTE

data/lib/commands/thor/provider.rb

@@ -25,7 +25,7 @@ module DTK::Client
         :identifier_only => {
           :target      => [
             ['list-nodes',"list-nodes","# Lists node instances in given targets."],
-            ['list-assemblies',"list-assemblies","# Lists assembly instances in given targets."]
+            ['list-services',"list-services","# Lists assembly instances in given targets."]
           ]
         }
       })

data/lib/commands/thor/service.rb

@@ -439,7 +439,8 @@ TODO: will put in dot release and will rename to 'extend'
     #  post rest_url("assembly/list_smoketests"), post_body
     #end
 
-    desc "SERVICE-NAME/ID grant-access SYS-USER NAME [PATH-TO-PUB-KEY]", "Grant access to given service and its nodes" 
+    desc "SERVICE-NAME/ID grant-access SYS-USER NAME [PATH-TO-PUB-KEY] [--nodes NODE-NAMES]", "Grant access to given service and its nodes"
+    method_option :nodes, :type => :string, :default => nil
     def grant_access(context_params)
       service_id, system_user, rsa_key_name, path_to_rsa_pub_key = context_params.retrieve_arguments([:service_id!,:option_1!, :option_2!, :option_3],method_argument_names)
 
@@ -451,7 +452,8 @@ TODO: will put in dot release and will rename to 'extend'
         :system_user => system_user, 
         :rsa_pub_name => rsa_key_name, 
         :rsa_pub_key => rsa_pub_key_content, 
-        :assembly_id => service_id 
+        :assembly_id => service_id,
+        :target_nodes => options.nodes
       }
 
       return response unless response.ok?
@@ -463,15 +465,17 @@ TODO: will put in dot release and will rename to 'extend'
       nil
     end
 
-    desc "SERVICE-NAME/ID revoke-access SYS-USER NAME", "Revoke access to given service and its nodes" 
+    desc "SERVICE-NAME/ID revoke-access SYS-USER NAME [--nodes NODE-NAMES]", "Revoke access to given service and its nodes"
+    method_option :nodes, :type => :string, :default => nil
     def revoke_access(context_params)
       service_id, system_user, rsa_key_name = context_params.retrieve_arguments([:service_id!,:option_1!, :option_2!],method_argument_names)
-
+      
       response = post_file rest_url("assembly/initiate_ssh_pub_access"), { 
         :agent_action => :revoke_access,
         :system_user => system_user, 
         :rsa_pub_name => rsa_key_name,
-        :assembly_id => service_id 
+        :assembly_id => service_id,
+        :target_nodes => options.nodes
       }
 
       return response unless response.ok?

data/lib/commands/thor/service_module.rb

@@ -5,6 +5,7 @@ dtk_require_common_commands('thor/clone')
 dtk_require_common_commands('thor/push_to_remote')
 dtk_require_common_commands('thor/pull_from_remote')
 dtk_require_common_commands('thor/push_clone_changes')
+dtk_require_common_commands('thor/access_control')
 dtk_require_common_commands('thor/edit')
 dtk_require_common_commands('thor/reparse')
 dtk_require_from_base("dtk_logger")
@@ -27,6 +28,7 @@ module DTK::Client
       include ReparseMixin
       include ServiceImporter
       include PurgeCloneMixin
+      include AccessControlMixin
 
       def get_service_module_name(service_module_id)
         get_name_from_id_helper(service_module_id)
@@ -107,7 +109,7 @@ module DTK::Client
 
     desc "SERVICE-MODULE-NAME/ID list-component-modules","List component modules associated with service module."
     method_option :remote, :type => :boolean, :default => false
-    def list_comoponent_modules(context_params)
+    def list_component_modules(context_params)
       context_params.method_arguments = ["modules"]
       list(context_params)
     end
@@ -387,6 +389,61 @@ module DTK::Client
     end
     PullCatalogs = ["dtkn"]
 
+    desc "SERVICE-MODULE-NAME/ID chown REMOTE-USER", "Set remote module owner"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def chown(context_params)
+      service_module_id, remote_user = context_params.retrieve_arguments([:service_module_id!,:option_1!],method_argument_names)
+      chown_aux(service_module_id, remote_user, options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID chmod PERMISSION-SELECTOR", "Update remote permissions e.g. ug+rw , user and group get RW permissions"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def chmod(context_params)
+      service_module_id, permission_selector = context_params.retrieve_arguments([:service_module_id!,:option_1!],method_argument_names)
+      chmod_aux(service_module_id, permission_selector, options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID make-public", "Make this module public"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def make_public(context_params)
+      service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
+      chmod_aux(service_module_id, "o+r", options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID make-private", "Make this module private"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def make_private(context_params)
+      service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
+      chmod_aux(service_module_id, "o-rwd", options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID add-collaborators", "Add collabrators users or groups comma seperated (--users or --groups)"
+    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    method_option "users",:aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
+    method_option "groups",:aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
+    def add_collaborators(context_params)
+      service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
+      collaboration_aux(:add, service_module_id, options.users, options.groups, options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID remove-collaborators", "Remove collabrators users or groups comma seperated (--users or --groups)"
+    method_option "namespace",:aliases => "-n",:type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    method_option "users",:aliases => "-u", :type => :string, :banner => "USERS", :desc => "User collabrators"
+    method_option "groups",:aliases => "-g", :type => :string, :banner => "GROUPS", :desc => "Group collabrators"
+    def remove_collaborators(context_params)
+      service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
+      collaboration_aux(:remove, service_module_id, options.users, options.groups, options.namespace)
+    end
+
+    desc "SERVICE-MODULE-NAME/ID list-collaborators", "List collaborators for given module"
+    method_option "namespace",:aliases => "-n",:type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
+    def list_collaborators(context_params)
+      service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
+      response = collaboration_list_aux(component_module_id, options.namespace)
+      response.render_table(:module_collaborators)
+      response
+    end
+
     ##
     #
     # internal_trigger: this flag means that other method (internal) has trigger this.

data/lib/commands/thor/target.rb

@@ -15,6 +15,27 @@ module DTK::Client
       list_targets(context_params)
     end
 
+    desc "TARGET-NAME/ID import-nodes","Reads from inventory dsl and populates the node instance objects in the dtk server."
+    def import_nodes(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+
+      post_body = {
+          :target_id => target_id
+        }
+
+      response  = post rest_url("target/import_nodes"), post_body
+      return response unless response.ok?
+
+      if response.data.empty?
+        OsUtil.print("No new nodes to import!", :yellow)
+      else
+        OsUtil.print("Successfully imported nodes:", :yellow)
+        response.data.each do |node|
+          OsUtil.print("#{node}", :yellow)
+        end
+      end
+    end
+
     desc "TARGET-NAME/ID list-services","Lists service instances in given targets."
     def list_services(context_params)
       context_params.method_arguments = ["assemblies"]

data/lib/core.rb

@@ -12,6 +12,8 @@ require 'pp'
 dtk_require_from_base('domain/response')
 dtk_require_from_base('util/os_util')
 dtk_require_from_base('util/ssh_util')
+dtk_require_from_base('util/common_util')
+dtk_require_from_base('util/permission_util')
 dtk_require("config/configuration")
 
 def top_level_execute(entity_name, method_name, context_params=nil, options_args=nil, shell_execute=false)

data/lib/domain/git_adapter.rb

@@ -192,7 +192,7 @@ module DTK
       end
 
       def repo_exists?
-        Dir.exists?(repo_dir)
+        File.exists?(repo_dir)
       end
 
       def current_branch_name

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.13"
+  VERSION="0.5.14"
 end

data/lib/shell/context.rb

@@ -879,8 +879,8 @@ module DTK
           end
         end
 
-        # remove thor_options
-        args = args - options_param_args unless options_param_args.nil?
+        # remove thor_options but only once
+        args = Client::CommonUtil.substract_array_once(args, options_param_args, true) unless options_param_args.nil?
 
         return args, options_param_args, invalid_options
       end

data/lib/util/common_util.rb

@@ -0,0 +1,20 @@
+module DTK
+  module Client
+    module CommonUtil
+      class << self
+        def substract_array_once(array1, array2, substract_from_back = false)
+          # we substract from reverse if flag set
+          array1 = array1.reverse if substract_from_back
+
+          array2.each do |element|
+            if index = array1.index(element)
+              array1.delete_at(index)
+            end
+          end
+
+          substract_from_back ? array1.reverse : array1
+        end
+      end
+    end
+  end
+end

data/lib/util/os_util.rb

@@ -243,9 +243,14 @@ module DTK
             load File.expand_path('../../lib/shell/domain.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/domain/git_adapter.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/command_helpers/git_repo.rb', File.dirname(__FILE__))
-            path = File.expand_path('../../lib/commands/thor/*.rb', File.dirname(__FILE__))
-            Dir[path].each do |thor_class_file|
-              load thor_class_file
+            paths = []
+            paths << File.expand_path('../../lib/commands/thor/*.rb', File.dirname(__FILE__))
+            paths << File.expand_path('../../lib/commands/common/thor/*.rb', File.dirname(__FILE__))
+
+            paths.each do |path|
+              Dir[path].each do |thor_class_file|
+                load thor_class_file
+              end
             end
           end
         end

data/lib/util/permission_util.rb

@@ -0,0 +1,14 @@
+module DTK
+  module Client
+    module PermissionUtil
+      class << self
+        def validate_permissions!(permission_string)
+          # matches example: u-rw, ugo+r, go+w
+          match = permission_string.match(/^[ugo]+[+\-][rwd]+$/)
+          raise DTK::Client::DtkValidationError, "Provided permission expression ('#{permission_string}') is not valid" unless match
+          permission_string
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +178,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
-description: Dtk client is CLI tool used for communication with Reactor8.
+description: The DTK Client is a command line tool to interact with your DTK Server
+  and DTK Service Catalog instance(s).
 email:
 - rich@reactor8.com
 executables:
@@ -203,6 +204,7 @@ files:
 - lib/command_helpers/service_importer.rb
 - lib/command_helpers/service_link.rb
 - lib/commands.rb
+- lib/commands/common/thor/access_control.rb
 - lib/commands/common/thor/action_result_handler.rb
 - lib/commands/common/thor/assembly_workspace.rb
 - lib/commands/common/thor/clone.rb
@@ -270,9 +272,11 @@ files:
 - lib/shell/interactive_wizard.rb
 - lib/shell/parse_monkey_patch.rb
 - lib/shell/status_monitor.rb
+- lib/util/common_util.rb
 - lib/util/console.rb
 - lib/util/dtk_puppet.rb
 - lib/util/os_util.rb
+- lib/util/permission_util.rb
 - lib/util/ssh_util.rb
 - lib/view_processor.rb
 - lib/view_processor/augmented_simple_list.rb