epc 1.0.3 → 1.0.4

data/lib/epc.rb

@@ -25,6 +25,10 @@ module EPC
   end
   
   module Command
+    autoload(:Role, "#{ROOT}/epc/modules/role")
+    autoload(:Config, "#{ROOT}/epc/modules/config")
+
+
     autoload(:BaseCommand, "#{ROOT}/epc/command/base_command")
     autoload(:BuildCommand, "#{ROOT}/epc/command/build_command")
     autoload(:ListConfigsCommand, "#{ROOT}/epc/command/config/list_configs_command")
@@ -48,7 +52,7 @@ module EPC
     autoload(:UnarchiveSolutionCommand, "#{ROOT}/epc/command/solution/unarchive_solution_command")
     autoload(:ListServicetypesCommand, "#{ROOT}/epc/command/servicetype/list_servicetypes_command")
     autoload(:CreateServicedefinitionCommand, "#{ROOT}/epc/command/servicedefinition/create_servicedefinition_command")
-    autoload(:UndefineServiceCommand, "#{ROOT}/epc/command/undefine_service_command")
+    autoload(:DeleteServicedefinitionCommand, "#{ROOT}/epc/command/servicedefinition/delete_servicedefinition_command")
     autoload(:ListServicedefinitionsCommand, "#{ROOT}/epc/command/servicedefinition/list_servicedefinitions_command")
     autoload(:CreateServiceversionCommand, "#{ROOT}/epc/command/serviceversion/create_serviceversion_command")
     autoload(:ListServiceversionsCommand, "#{ROOT}/epc/command/serviceversion/list_serviceversions_command")
@@ -59,13 +63,13 @@ module EPC
     autoload(:CreateUserCommand, "#{ROOT}/epc/command/user/create_user_command")
     autoload(:CreateDeploymentCommand, "#{ROOT}/epc/command/deployment/create_deployment_command")
     autoload(:ShowDeploymentCommand, "#{ROOT}/epc/command/deployment/show_deployment_command")
-    autoload(:SubmitDeploymentCommand, "#{ROOT}/epc/command/submit_deployment_command")
-    autoload(:VoteDeploymentCommand, "#{ROOT}/epc/command/vote_deployment_command")
+    autoload(:SubmitDeploymentCommand, "#{ROOT}/epc/command/deployment/submit_deployment_command")
+    autoload(:VoteDeploymentCommand, "#{ROOT}/epc/command/deployment/vote_deployment_command")
     autoload(:ListDeploymentsCommand, "#{ROOT}/epc/command/deployment/list_deployments_command")
     autoload(:ListDeploymentstagesCommand, "#{ROOT}/epc/command/deploymentstage/list_deploymentstages_command")
     autoload(:DeployCommand, "#{ROOT}/epc/command/deploy_command")
     autoload(:UndeployCommand, "#{ROOT}/epc/command/undeploy_command")
-    autoload(:CopyDeploymentCommand, "#{ROOT}/epc/command/copy_deployment_command")
+    autoload(:CopyDeploymentCommand, "#{ROOT}/epc/command/deployment/copy_deployment_command")
     autoload(:ListApprovalsCommand, "#{ROOT}/epc/command/list_approvals_command")
     autoload(:CreateDependencyCommand, "#{ROOT}/epc/command/create_dependency_command")
     autoload(:ListDependenciesCommand, "#{ROOT}/epc/command/list_dependencies_command")
@@ -85,7 +89,6 @@ module EPC
     autoload(:ShowProjecttypeCommand, "#{ROOT}/epc/command/projecttype/show_projecttype_command")
     autoload(:UpdateDeploymentCommand, "#{ROOT}/epc/command/deployment/update_deployment_command")
     autoload(:InfoCommand, "#{ROOT}/epc/command/info_command")
-    autoload(:ListVersionsCommand, "#{ROOT}/epc/command/list_versions_command")
     autoload(:ArchiveProjectCommand, "#{ROOT}/epc/command/project/archive_project_command")
     autoload(:UnarchiveProjectCommand, "#{ROOT}/epc/command/project/unarchive_project_command")
     autoload(:ListAttachedlibrariesCommand, "#{ROOT}/epc/command/list_attachedlibraries_command")
@@ -130,14 +133,31 @@ module EPC
     autoload(:ShowPluginCommand, "#{ROOT}/epc/command/plugin/show_plugin_command")
     autoload(:UpdatePluginCommand, "#{ROOT}/epc/command/plugin/update_plugin_command")
     autoload(:DeletePluginCommand, "#{ROOT}/epc/command/plugin/delete_plugin_command")
+    autoload(:AttachtoProjectCommand, "#{ROOT}/epc/command/project/attachto_project_command")
+    autoload(:DetachfromProjectCommand, "#{ROOT}/epc/command/project/detachfrom_project_command")
+    autoload(:ListRuntimetypesCommand, "#{ROOT}/epc/command/runtimetype/list_runtimetypes_command")
+    autoload(:CreateRuntimeCommand, "#{ROOT}/epc/command/runtime/create_runtime_command")
+    autoload(:DeleteRuntimeCommand, "#{ROOT}/epc/command/runtime/delete_runtime_command")
+    autoload(:UpdateRuntimeCommand, "#{ROOT}/epc/command/runtime/update_runtime_command")
+    autoload(:CreateProjecttypeCommand, "#{ROOT}/epc/command/projecttype/create_projecttype_command")
+    autoload(:DeleteProjecttypeCommand, "#{ROOT}/epc/command/projecttype/delete_projecttype_command")
+    autoload(:UpdateProjecttypeCommand, "#{ROOT}/epc/command/projecttype/update_projecttype_command")
+    autoload(:ShowProjectSnapshotCommand, "#{ROOT}/epc/command/project/show_project_snapshot_command")
+    autoload(:ListUserpropertiesCommand, "#{ROOT}/epc/command/userproperty/list_user_properties_command")
 
 
     autoload(:CreateCommand, "#{ROOT}/epc/command/create_command")
     autoload(:ListCommand, "#{ROOT}/epc/command/list_command")
     autoload(:ShowCommand, "#{ROOT}/epc/command/show_command")
+    autoload(:AttachtoCommand, "#{ROOT}/epc/command/attachto_command")
     autoload(:UpdateCommand, "#{ROOT}/epc/command/update_command")
     autoload(:DeleteCommand, "#{ROOT}/epc/command/delete_command")
     autoload(:ArchiveCommand, "#{ROOT}/epc/command/archive_command")
     autoload(:UnarchiveCommand, "#{ROOT}/epc/command/unarchive_command")
+    autoload(:AttachtoCommand, "#{ROOT}/epc/command/attachto_command")
+    autoload(:DetachfromCommand, "#{ROOT}/epc/command/detachfrom_command")
+    autoload(:CopyCommand, "#{ROOT}/epc/command/copy_command")
+    autoload(:VoteCommand, "#{ROOT}/epc/command/vote_command")
+    autoload(:SubmitCommand, "#{ROOT}/epc/command/submit_command")
   end
 end

data/lib/epc/client/json_client.rb

@@ -8,7 +8,7 @@ module EPC::Client
         status, body, headers = super(url, 'application/json', skip_signature)
         [status, json_parse(body), headers]
       rescue JSON::ParserError
-        raise BadResponse, "Can't parse response into JSON", body
+        raise BadResponse, "Invalid response received. Response status: #{status}", body
       end
     end
 
@@ -17,7 +17,7 @@ module EPC::Client
         status, body, headers = super(url, payload.to_json, 'application/json', {}, skip_signature)
         [status, json_parse(body), headers]
       rescue JSON::ParserError
-        raise BadResponse, "Can't parse response into JSON", body
+        raise BadResponse, "Invalid response received. Response status: #{status}", body
       end
     end
 
@@ -26,7 +26,7 @@ module EPC::Client
         status, body, headers = super(url, payload.to_json, 'application/json')
         [status, json_parse(body), headers]
       rescue JSON::ParserError
-        raise BadResponse, "Can't parse response into JSON", body
+        raise BadResponse, "Invalid response received. Response status: #{status}", body
       end
     end
     
@@ -35,7 +35,7 @@ module EPC::Client
         status, body, headers = super(url, payload.to_json, 'application/json')
         [status, json_parse(body), headers]
       rescue JSON::ParserError
-        raise BadResponse, "Can't parse response into JSON", body
+        raise BadResponse, "Invalid response received. Response status: #{status}", body
       end
     end
     

data/lib/epc/command/archive_command.rb

@@ -1,12 +1,13 @@
 module EPC::Command
   class ArchiveCommand < BaseCommand
 
-    def execute(object = nil)
-      @object_type, @object_id = @object.split(":") rescue [nil, nil]
-      raise FatalError, "Object incorrectly specified" if @object_type.blank? 
-      klass = "EPC::Command::Archive#{@object_type.to_s.gsub("-","").capitalize}Command" 
-      command = eval(klass).new(client, @options)
-      command.go(@object_id)
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      @klass_name = "EPC::Command::Archive#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name).new(client, @options)
+      command.context_params = context_params
+      command.go(params)
     end
   end
 end

data/lib/epc/command/attachto_command.rb

@@ -0,0 +1,13 @@
+module EPC::Command
+  class AttachtoCommand < BaseCommand
+
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      @klass_name = "EPC::Command::Attachto#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name).new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
+    end
+  end
+end

data/lib/epc/command/base_command.rb

@@ -11,6 +11,12 @@ module EPC
       attr_reader :client
       attr_reader :options
 
+      attr_accessor :object_type 
+      attr_accessor :object_id
+      attr_accessor :target_type 
+      attr_accessor :target_id
+      attr_accessor :klass_name
+
       @@retrieval_rules = {
         :Role => {
           :required_type => :numeric, 
@@ -47,6 +53,13 @@ module EPC
         @@required_options << {:name => opts, :mode => options_hash[:mode], :message => options_hash[:message]}
       end
 
+      def self.include_module(object_type)
+        mod = object_type.capitalize
+        if EPC::Config.module_exists?(mod)
+          self.send :include, eval("EPC::Command::#{mod}")
+        end
+      end
+
       def initialize(client, options = {})
         @client = client
         @options = options.dup
@@ -60,10 +73,26 @@ module EPC
           say("You must be logged in to run this command")
           return 1
         else
+          check_options
           return translate_status_to_exit_code(execute(*args))
         end
       end
 
+      def check_options
+        @@required_options.each do |req_opt|
+          raise FatalError, req_opt[:message] unless req_opt[:name].map{|opt| @options[opt].present?}.send(req_opt[:mode])
+
+        end	
+      end
+    
+      def context_params
+        return [object_type, object_id, target_type, target_id]
+      end
+
+      def context_params=(params)
+        @object_type, @object_id, @target_type, @target_id = params
+      end
+
       private
 
       def translate_status_to_exit_code(status)
@@ -102,11 +131,90 @@ module EPC
         value.respond_to?(:empty?) ? value.empty? : !value
       end
 
+      def pluralize(string)
+        case string.downcase
+        when "library" then return "libraries"
+        when "dependency" then return "dependencies"
+        end
+        return string + "s"
+      end
+
       def check_params
         return if ["solution", "project"].include?(@object_type.downcase)
         raise FatalError, "You need to specify the #{@object_type.downcase} identifier" if @object_id.blank?
       end
 
+      def has_target?
+        return target_type.present? && target_id.present?
+      end
+
+      def require_object
+        raise InputError, "#{object_type.capitalize} not found" if object_type.blank? || object_id.blank?
+      end
+
+      def require_target
+        raise InputError, "Target incorrectly specified" if target_type.blank? || target_id.blank?
+      end
+
+      def resolve_context(args, opts = {})
+        defaults = {
+          :skip_object_resolution => Proc.new{|type, id| false},
+          :skip_target_resolution => Proc.new{|type, id| false}
+        }.merge!(opts)
+        @object_id, @object_type, args = parse_context_param(args, defaults[:skip_object_resolution])
+        raise InputError, "Invalid command" if @object_type.blank?
+        @target_id, @target_type, args = parse_context_param(args, defaults[:skip_target_resolution])
+        return args
+      end
+
+      def parse_context_param(params, skip_proc)
+        return [nil, nil, params] unless is_context_param?((params.first rescue nil))
+        param = params.shift
+        param_parts = param.split(":") 
+        type = param_parts[0]
+        id = param_parts[1..-1].join(":")
+        if skip_proc.call(type, id)
+          return id, type, params
+        else
+          if has_local_context?(type)
+            return infer_local_context(type, id).insert(-1, params)
+          else
+            return [retrieve_identifier_for(translate_type(type), id), type, params]
+          end
+        end
+      end
+
+      def translate_type(type)
+        return "UserGroup" if type.downcase == "group"
+        return "RuntimeEnv" if type.downcase == "runtime"
+        return "RuntimeEnvType" if type.downcase == "runtimetype"
+        return "Project" if type.downcase == "dependency"
+        return type
+      end
+
+      def has_local_context?(type)
+        return ["solution", "project"].include?(type.downcase)
+      end
+
+      def infer_local_context(type, id)
+        path = File.expand_path(".")
+        if type.downcase == "solution"
+          solution_id, solution_name = infer_solution_context(id, path)
+          return [solution_id, type]
+        elsif type.downcase == "project"
+          ids = id.split(":") rescue [nil, nil]
+          if ids.size == 1
+            project_name = ids[0]
+            solution_name = nil
+          elsif ids.size == 2
+            solution_name, project_name = ids
+          end
+          solution_id, solution_name = infer_solution_context(solution_name, path)
+          project_id, project_name = infer_project_context(project_name, path, solution_id)
+          return [project_id, type]
+        end
+      end
+
       def numeric?(value)
         return value.is_a?(Integer) || (value =~ /\d/) == 0
       end
@@ -157,18 +265,14 @@ module EPC
         return File.join(File.split(path)[0...-1])
       end
 
-      def normalize_params(params)
-        return params if is_target_param?(params.first)
-        return params.insert(0, "")
-      end
-
-      def is_target_param?(param)
+      def is_context_param?(param)
+        return false if param.blank?
         target_type = param.split(":").first rescue ""
-        return object_types.include?(target_type.downcase)
+        return object_types.include?(target_type.downcase) || object_types.map{|o| pluralize(o)}.include?(target_type.downcase)
       end
 
       def object_types
-        return %q(
+        return %w(
                     config
                     dependency
                     deployment
@@ -178,7 +282,10 @@ module EPC
                     librarylanguage
                     libraryset
                     objectrole
+                    objecttype
                     permission
+                    runtime
+                    runtimetype
                     permissiongroup
                     plugin
                     project
@@ -190,6 +297,8 @@ module EPC
                     serviceversion
                     solution
                     user
+                    metrics
+                    user-properties
         )
 
       end
@@ -197,7 +306,7 @@ module EPC
       def retrieve_identifier_for(entity, *args)
         entity = entity.to_sym
         match_value = args.join(":")
-        raise InternalError if match_value.blank?
+        return nil if match_value.blank?
         rule = @@retrieval_rules[entity.to_sym] || {:required_type => :numeric}
         if rule[:required_type] == :numeric
           if numeric?(match_value)
@@ -206,18 +315,16 @@ module EPC
             return identify_resource(entity, match_value)
           end
         end
-
-        raise InputError, "Request failed: [Resource Not Found]" if entity_identifier.nil?
         return entity_identifier
       end
 
       def identify_resource(object_type, object_identifier)
-        obj_identifier = CGI.escape(object_identifier).gsub(".", "%2e")
+        obj_identifier = CGI.escape(object_identifier).gsub(".", "%2e").gsub("+", "%20")
         status, response, headers = client.get(EPC::Config::OBJECT_TYPES_PATH + "/identify/#{object_type}/#{obj_identifier}")
         if status.successful?
           return response[:id]
         else
-          raise InputError, "Request failed: [#{object_type.capitalize} not found]"
+          return nil
         end
       end
 
@@ -269,7 +376,6 @@ module EPC
       # :get_project_name : for when you have a numeric project_id, but you also want the name
       def infer_project_context(p_identifier, path, s_identifier = nil, options = {})
         if p_identifier.blank?
-
           if EPC::Config.is_project_dir?(path)
             project_id = EPC::Config.get_project_value(path, "id")
             project_name = EPC::Config.get_project_value(path, "name")
@@ -372,21 +478,6 @@ module EPC
         digest.hexdigest
       end
 
-      def extract_configuration_level(path, target_string)
-        config_type, config_id = target_string.split(":") rescue [nil, nil]
-
-        if config_id.nil?
-          if EPC::Config.is_project_dir?(path)
-            config_id = EPC::Config.get_project_value(path, "id")
-            config_type = "Project"
-          elsif EPC::Config.is_solution_dir?(path)
-            config_id = EPC::Config.get_solution_value(path, "id")
-            config_type = "Solution"
-          end
-        end
-
-        return [config_type, config_id]
-      end
 
       def show_build_status(build_id)
         status, response, headers = client.get("#{EPC::Config::BUILDS_PATH}/#{build_id}/status")

data/lib/epc/command/config/create_config_command.rb

@@ -2,14 +2,14 @@ module EPC::Command
   class CreateConfigCommand < BaseCommand
     CONFIG_LEVELS = {
       :org => "Organization",
-      :runtime => "RuntimeEnvironment",
+      :runtime => "RuntimeEnv",
       :stage => "DeploymentStage",
       :solution => "Solution",
       :project => "Project",
       :user => "User"
     } 
 
-    def execute(target, *args)
+    def execute(args = [])
       raise FatalError, "You have to specify a key and its value." if args.empty? && @options[:file].nil?
 
       path = File.expand_path(".")
@@ -17,19 +17,15 @@ module EPC::Command
       @options[:value_type] = "text" if @options[:value_type].nil?
       @options[:required] = false if @options[:required].nil?
 
-      config_type, config_id = extract_configuration_level(path, target)
+      config_type, config_id = extract_configuration_level(path, [target_type, target_id])
 
-      raise FatalError, "You need to specify a config type" if config_type.blank?
+      raise InputError, "Config type invalid. Must be one of: [#{CONFIG_LEVELS.values.join(",")}]" if config_type.blank?
+
+      raise InputError, "Configuration context could not be determined" if config_id.blank?
 
       params = []
       if @options[:file].present?
-        params = EPC::Config.read_content_as_json(@options[:file])
-        params.each do |param|
-          if param[:configurable_type].nil? || param[:configurable_id].nil?
-            param[:configurable_type] = config_type
-            param[:configurable_id] = config_id
-          end
-        end
+        params = parse_config_value_file(@options[:file], config_type, config_id) 
       else
         args.each do |arg|
           name, value = arg.split("=")

data/lib/epc/command/config/delete_config_command.rb

@@ -1,16 +1,17 @@
 module EPC::Command
   class DeleteConfigCommand < DeleteCommand
 
-    def execute(key = nil, target = nil, *args)
+    def execute(args = [])
 
       path = "."
       path = File.expand_path(path)
+      key = object_id
 
-      config_type, config_id = extract_configuration_level(path, target)
+      config_type, config_id = extract_configuration_level(path, [target_type, target_id])
       request_path = EPC::Config::CONFIGURATIONS_PATH+"/#{config_type}/#{config_id}"
 
-      if ["solution", "project"].include?(config_type.downcase) && !@options[:stage_name].nil?
-        request_path += "/#{@options[:stage_name]}"
+      if ["solution", "project"].include?(config_type.downcase) && !@options[:stage].nil?
+        request_path += "/#{@options[:stage]}"
       end
 
       status, response, headers = client.get(request_path)
@@ -50,7 +51,6 @@ module EPC::Command
       end
       return status
 
-
     end
 
   end