epc 1.0.3 → 1.0.4

data/lib/epc/command/group/update_group_command.rb

@@ -1,24 +1,26 @@
 module EPC::Command
   class UpdateGroupCommand < BaseCommand
 
-    required_options :add_user, :remove_user, :mode => :any?, :message => "You must specify a user/group/grant to added or removed"
+    required_options :add_user, :remove_user, :mode => :any?, :message => "You must specify a user to added or removed"
 
-    def execute(group = nil, *args)
-
-      group_id = retrieve_identifier_for("UserGroup", group)
+    def execute(args)
 
       failures = []
       if @options[:add_user].present?
-        status, response, headers = client.put(EPC::Config::GROUPS_PATH + "/#{group_id}/add_user", {:user_id => @options[:add_user]})
+        user_id = retrieve_identifier_for("User", @options[:add_user])
+        raise FatalError, "User not found" if user_id.blank?
+        status, response, headers = client.put(EPC::Config::GROUPS_PATH + "/#{object_id}/add_user", {:user_id => user_id})
         say("User added to group") if status.successful?
       end
 
       if @options[:remove_user].present?
-        status, response, headers = client.put(EPC::Config::GROUPS_PATH + "/#{group_id}/remove_user", {:user_id => @options[:remove_user]})
+        user_id = retrieve_identifier_for("User", @options[:remove_user])
+        raise FatalError, "User not found" if user_id.blank?
+        status, response, headers = client.put(EPC::Config::GROUPS_PATH + "/#{object_id}/remove_user", {:user_id => user_id})
         say("User removed from group") if status.successful?
       end
 
-      say("Request failed: [#{response[:message]}]") if status.failure?
+      say("Request failed: [#{response[:message]}]") unless status.successful?
       return status
     end
 

data/lib/epc/command/library/create_library_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class CreateLibraryCommand < BaseCommand
     
-    def execute(target = nil, *args)
+    def execute(args = [])
 
       raise FatalError, "Parameters incorrectly specified" if args.size < 3
 
@@ -9,7 +9,6 @@ module EPC::Command
       params[:name] = args[0]
 
       params[:language_id] = retrieve_identifier_for("LibraryLanguage", args[1])
-      
 
       raise InputError, "Unable to determine library language" if params[:language_id].nil? || params[:language_id] == 0
 

data/lib/epc/command/library/delete_library_command.rb

@@ -1,16 +1,15 @@
 module EPC::Command
   class DeleteLibraryCommand < BaseCommand
 
-    def execute(library = nil, *args)
+    def execute(args)
+      require_object
 
-      proceed = ask_yn("Are you sure you want to delete the [#{library}] library? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] library? [Yn] ")
       if proceed.upcase == 'N'
         return 1
       end
 
-      library_id = retrieve_identifier_for("Library", library.split(":"))
-
-      status, response, headers = client.delete(EPC::Config::LIBRARIES_PATH + "/#{library_id}")
+      status, response, headers = client.delete(EPC::Config::LIBRARIES_PATH + "/#{object_id}")
       if status.successful?
         say("Library deleted")
       else

data/lib/epc/command/library/list_libraries_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListLibrariesCommand < BaseCommand
 
-    def execute(target = nil, *args)
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::LIBRARIES_PATH)
 
       if status.failure?

data/lib/epc/command/librarylanguage/create_librarylanguage_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class CreateLibrarylanguageCommand < BaseCommand
 
-    def execute(target = nil, *names)
+    def execute(names = [])
 
       raise FatalError, "You need to specify a name for the language" if names.blank?
 

data/lib/epc/command/librarylanguage/delete_librarylanguage_command.rb

@@ -1,15 +1,13 @@
 module EPC::Command
   class DeleteLibrarylanguageCommand < DeleteCommand
    
-    def execute(language = nil, *args)
-      proceed = ask_yn("Are you sure you want to delete the [#{language}] language? [Yn] ")
+    def execute(args = [])
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] language? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      language_id = retrieve_identifier_for("LibraryLanguage", language)
-
-      status, response, headers = client.delete(EPC::Config::LIBRARY_LANGUAGES_PATH + "/#{language_id}")
+      status, response, headers = client.delete(EPC::Config::LIBRARY_LANGUAGES_PATH + "/#{object_id}")
 
       if status.successful?
         say("Language deleted")

data/lib/epc/command/librarylanguage/list_librarylanguages_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListLibrarylanguagesCommand < BaseCommand
 
-    def execute(target = nil)
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::LIBRARY_LANGUAGES_PATH)
       if status.failure?
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/librarylanguage/update_librarylanguage_command.rb

@@ -1,15 +1,14 @@
 module EPC::Command
-  class UpdateLibrarylanguageCommand < BaseCommand
+  class UpdateLibrarylanguageCommand < UpdateCommand
    
-    def execute(language = nil, *args)
+    def execute(args = [])
+      require_object
 
       new_name = args[0] rescue nil
 
       raise FatalError, "You need to specify the new library language name" if new_name.blank?
 
-      language_id = retrieve_identifier_for("LibraryLanguage", language)
-
-      status, response, headers = client.put(EPC::Config::LIBRARY_LANGUAGES_PATH + "/#{language_id}", :name => new_name )
+      status, response, headers = client.put(EPC::Config::LIBRARY_LANGUAGES_PATH + "/#{object_id}", :name => new_name )
 
       if status.successful?
         say("Language updated")

data/lib/epc/command/libraryset/create_libraryset_command.rb

@@ -1,13 +1,12 @@
 module EPC::Command
   class CreateLibrarysetCommand < BaseCommand
 
-    def execute(*params)
+    def execute(params = [])
 
-      set = params[1]
-      language = params[2]
+      set = params[0]
+      language = params[1]
 
       raise FatalError, "You need to specify a name for the set" if set.blank?
-
       raise FatalError, "You need to specify a language" if language.blank?
 
       params = {}
@@ -15,6 +14,8 @@ module EPC::Command
 
       params[:language_id] = retrieve_identifier_for("LibraryLanguage", language)
 
+      raise InputError, "Request failed: Language [#{language}] not found" if params[:language_id].blank? && @options[:file].blank?
+
       status, response, headers = client.post(EPC::Config::LIBRARY_SETS_PATH, params)
       if status.successful?
         say("Set [#{set}] created")

data/lib/epc/command/libraryset/delete_libraryset_command.rb

@@ -1,15 +1,13 @@
 module EPC::Command
-  class DeleteLibrarysetCommand < BaseCommand
+  class DeleteLibrarysetCommand < DeleteCommand
    
-    def execute(set = nil, *args)
-      proceed = ask_yn("Are you sure you want to delete the [#{set}] set? [Yn] ")
+    def execute(args = [])
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] set? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      set_id = retrieve_identifier_for("LibrarySet", set)
-
-      status, response, headers = client.delete(EPC::Config::LIBRARY_SETS_PATH + "/#{set_id}")
+      status, response, headers = client.delete(EPC::Config::LIBRARY_SETS_PATH + "/#{object_id}")
 
       if status.successful?
         say("Set deleted")

data/lib/epc/command/libraryset/list_librarysets_command.rb

@@ -1,8 +1,8 @@
 require 'time'
 module EPC::Command
-  class ListLibrarysetsCommand < BaseCommand
+  class ListLibrarysetsCommand < ListCommand
 
-    def execute(target = nil)
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::LIBRARY_SETS_PATH)
       if status.failure?
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/libraryset/show_libraryset_command.rb

@@ -2,10 +2,10 @@ require 'time'
 module EPC::Command
   class ShowLibrarysetCommand < BaseCommand
 
-    def execute(library_set = nil, *args)
-      library_set_id = retrieve_identifier_for("LibrarySet", library_set)
+    def execute(args = [])
+      require_object
 
-      status, response, headers = client.get(EPC::Config::LIBRARY_SETS_PATH + "/#{library_set_id}")
+      status, response, headers = client.get(EPC::Config::LIBRARY_SETS_PATH + "/#{object_id}")
 
       if status.failure?
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/libraryset/update_libraryset_command.rb

@@ -3,9 +3,10 @@ module EPC::Command
 
     required_options :add_library, :remove_library, :mode => :any?, :message => "You must specify a library to added or removed"
    
-    def execute(set = nil, *args)
+    def execute(args)
+      require_object
 
-      set_id = retrieve_identifier_for("LibrarySet", set)
+      set_id = object_id
 
       if @options[:add_library].present?
         lib = @options[:add_library]
@@ -24,7 +25,7 @@ module EPC::Command
         lib = @options[:remove_library]
         lib_id = extract_library_id(lib)
 
-        status, response, headers = client.post(EPC::Config::LIBRARY_SETS_PATH + "/#{set_id}/detach_library/#{lib_id}")
+        status, response, headers = client.delete(EPC::Config::LIBRARY_SETS_PATH + "/#{set_id}/detach_library/#{lib_id}")
         if status.successful?
           say("Library [#{lib}] removed from set")
         else

data/lib/epc/command/list_command.rb

@@ -1,21 +1,17 @@
 module EPC::Command
   class ListCommand < BaseCommand
 
-    def execute(object_type = nil, *params)
-      klass = "EPC::Command::List#{pluralize(object_type.to_s).gsub("-","").capitalize}Command" 
-      params = normalize_params(params)
-      command = eval(klass).new(client, @options)
-      command.go(*params)
-    end
-
-    private
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args, {:skip_object_resolution => Proc.new{|type, id| type.downcase == "versions"}})
+      raise FatalError, "Object type cound not be determined" if @object_type.blank?
+      @klass_name = "EPC::Command::List#{@object_type.to_s.gsub("-","").capitalize}Command"
+      command = eval(@klass_name)
+      command.include_module("config") if object_type.downcase == "configs"
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
 
-    def pluralize(string)
-      case string.downcase
-      when "library"
-        return "Libraries"
-      end
-      return string + "s"
     end
 
   end

data/lib/epc/command/list_objecttypes_command.rb

@@ -1,6 +1,6 @@
 module EPC::Command
   class ListObjecttypesCommand < BaseCommand
-    def execute
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::OBJECT_TYPES_PATH)
 
       if status.failure?

data/lib/epc/command/objectrole/create_objectrole_command.rb

@@ -1,12 +1,11 @@
 module EPC::Command
   class CreateObjectroleCommand < BaseCommand
-    def execute(*params)
-      obj_type, obj_id = params[0].split(":") rescue [nil, nil]
-      name = params[1]
+    def execute(args = [])
+      name = args[0]
 
-      raise FatalError, "Parameters incorrectly specified" if obj_type.blank? || obj_id.blank? || name.blank?
+      raise FatalError, "Name is required" if name.blank?
 
-      status, response, headers = client.post(EPC::Config::ROLES_PATH, {:name => name, :owner_type => obj_type, :owner_id => obj_id})
+      status, response, headers = client.post(EPC::Config::ROLES_PATH, {:name => name, :owner_type => target_type, :owner_id => target_id})
 
       if status.successful?
         say("Role [#{name}] created")

data/lib/epc/command/objectrole/list_objectroles_command.rb

@@ -1,15 +1,10 @@
 module EPC::Command
   class ListObjectrolesCommand < BaseCommand
 
-    def execute(target = nil)
-      
-      raise FatalError, "You must specify an TargetType and TargetId" if target.blank?
-
-      obj_type, obj_id = target.split(":")
-
-      raise FatalError, "Parameters specified incorrectly" if obj_type.blank? || obj_id.blank?
+    def execute(args = [])
+      require_target
 
-      status, response, headers = client.get(EPC::Config::ROLES_PATH + "/for_object/#{obj_type}/#{obj_id}")
+      status, response, headers = client.get(EPC::Config::ROLES_PATH + "/for_object/#{target_type}/#{target_id}")
 
       if status.successful?
         roles_table = EPC::TabularOutputter.new(response, [:id, :name])

data/lib/epc/command/objectrole/update_objectrole_command.rb

@@ -4,9 +4,11 @@ module EPC::Command
     required_options :add_user, :remove_user, :add_group, :remove_group, :add_grant, :remove_grant, :mode => :any?, :message => "You must specify a user/group/grant to added or removed"
 
     def execute(role = nil, *args)
-      role_id = retrieve_identifier_for("Role", role.split("."))
+      role_id = retrieve_identifier_for("Role", object_id.split(":"))
 
       cmd = UpdateRoleCommand.new(client, @options)
+      cmd.object_id = role_id
+      cmd.object_type = "Role"
       return cmd.execute(role_id)
 
     end

data/lib/epc/command/permission/list_permissions_command.rb

@@ -1,6 +1,6 @@
 module EPC::Command
   class ListPermissionsCommand < BaseCommand
-    def execute(*args)
+    def execute(args = [])
 
       status, response, headers = client.get(EPC::Config::PERMISSIONS_PATH)
 

data/lib/epc/command/permissiongroup/list_permissiongroups_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListPermissiongroupsCommand < BaseCommand
 
-    def execute(*args)
+    def execute(args = [])
 
       status, response, headers = client.get(EPC::Config::PERMISSIONS_PATH)
 

data/lib/epc/command/plugin/create_plugin_command.rb

@@ -1,9 +1,8 @@
 module EPC::Command
   class CreatePluginCommand < CreateCommand
 
-    def execute(*args)
+    def execute(args = [])
       keys = [:name, :plugin_version, :group]
-      args = args[1..3] rescue nil
 
       raise FatalError, "You need to specify the name, version and group for the plugin" if args.size < 3
       params = {}

data/lib/epc/command/plugin/delete_plugin_command.rb

@@ -1,16 +1,14 @@
 module EPC::Command
-  class DeletePluginCommand < UpdateCommand
+  class DeletePluginCommand < DeleteCommand
   
-    def execute(plugin = nil, *args)
+    def execute(argss = [])
 
-     proceed = ask_yn("Are you sure you want to delete the [#{plugin}] plugin? [Yn] ")
+     proceed = ask_yn("Are you sure you want to delete the [#{object_id}] plugin? [Yn] ")
       if proceed.upcase == 'N'
         return 1
       end
 
-      plugin_id = retrieve_identifier_for("Plugin", plugin)
-
-      status, response, headers = client.delete(EPC::Config::PLUGINS_PATH + "/#{plugin_id}")
+      status, response, headers = client.delete(EPC::Config::PLUGINS_PATH + "/#{object_id}")
 
       if status.successful?
         say("Plugin deleted")

data/lib/epc/command/plugin/list_plugins_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListPluginsCommand < BaseCommand
 
-    def execute(*args)
+    def execute(args)
 
 
       status, response, headers = client.get(EPC::Config::PLUGINS_PATH)

data/lib/epc/command/plugin/show_plugin_command.rb

@@ -1,12 +1,9 @@
 module EPC::Command
   class ShowPluginCommand < ShowCommand
 
-    def execute(plugin = nil, *args)
+    def execute(args = [])
 
-      plugin_id = retrieve_identifier_for("Plugin", plugin.split(":"))
-
-
-      status, response, headers = client.get(EPC::Config::PLUGINS_PATH + "/#{plugin_id}")
+      status, response, headers = client.get(EPC::Config::PLUGINS_PATH + "/#{object_id}")
 
       if status.successful?
         plugin_table = EPC::TabularOutputter.new([response], [:id, :name, :plugin_version, :group, :inherited, :extensions])

data/lib/epc/command/plugin/update_plugin_command.rb

@@ -2,11 +2,7 @@ module EPC::Command
   class UpdatePluginCommand < UpdateCommand
     UPDATABLE_ATTRIBUTES = ["name", "plugin_version", "group", "inherited", "extensions", "executions", "configuration"]
   
-    def execute(plugin = nil, *args)
-
-      plugin_id = retrieve_identifier_for("Plugin", plugin)
-
-      args = args[1..3] rescue nil
+    def execute(args)
 
       raise FatalError, "You need to specify at least one attribute to update" if args.size < 1
       params = {}
@@ -27,7 +23,7 @@ module EPC::Command
     
       raise InputError, "You need to specify at least one attribute to update" if params.blank?
   
-      status, response, headers = client.put(EPC::Config::PLUGINS_PATH + "/#{plugin_id}", params)
+      status, response, headers = client.put(EPC::Config::PLUGINS_PATH + "/#{object_id}", params)
 
       if status.successful?
         say("Plugin updated")

data/lib/epc/command/project/archive_project_command.rb

@@ -1,18 +1,10 @@
 module EPC::Command
   class ArchiveProjectCommand < ArchiveCommand
 
-    def execute(project = nil)
-      path = "."
-      path = File.expand_path(path)
+    def execute(args = [])
+      require_object
 
-      solution_name, project_name = project.split(":") rescue [nil, nil]
-
-      solution_id, solution_name = infer_solution_context(solution_name, path, {:get_solution_name => true})
-      project_id, project_name = infer_project_context(project_name, path, solution_id, {:get_project_name => true})
-
-      raise FatalError, "Project could not be inferred" if project_id.nil?
-
-      status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{project_id}", {:archived => true})
+      status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{object_id}", {:archived => true})
       if status.successful?
         say("Project has been archived.")
       else
@@ -22,4 +14,3 @@ module EPC::Command
     end
   end
 end
-