epc 1.0.3 → 1.0.4

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

@@ -1,14 +1,14 @@
 module EPC::Command
-  class ListConfigsCommand < BaseCommand
+  class ListConfigsCommand < ListCommand
 
-    def execute(target = nil)
+    def execute(args = [])
       sol_or_project_configs = false
-      
+
       path = File.expand_path(".")
 
-      config_type, config_id = extract_configuration_level(path, target)
+      config_type, config_id = extract_configuration_level(path, [target_type, target_id])
 
-      raise FatalError, "Configuration context could not inferred" if config_type.nil?
+      raise FatalError, "Configuration context could not inferred" if config_type.nil? || config_id.nil?
 
       request_path = EPC::Config::CONFIGURATIONS_PATH+"/#{config_type}/#{config_id}"
 

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

@@ -1,17 +1,18 @@
 module EPC::Command
   class UpdateConfigCommand < UpdateCommand
     
-    def execute(name = nil, *args )
+    def execute(args)
 
-      target = args[0]
-      value = args[1]
-
-      path = "."
-      path = File.expand_path(path)
+      value = args[0]
+      path = File.expand_path(".")
 
       @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 InputError, "Config type invalid. Must be one of: [#{CreateConfigCommand::CONFIG_LEVELS.values.join(",")}]" if config_type.blank?
+      raise InputError, "Configuration context could not be determined" if config_id.blank?
+
       request_path = EPC::Config::CONFIGURATIONS_PATH+"/#{config_type}/#{config_id}"
 
       if ["solution", "project"].include?(config_type.downcase) && !@options[:stage].nil?
@@ -27,7 +28,7 @@ module EPC::Command
 
       keys = response
 
-      key_id = keys.detect{|k| k[:name] == name}[:id] rescue nil
+      key_id = keys.detect{|k| k[:name] == object_id}[:id] rescue nil
       
       if key_id.nil?
         say("Key does not exist.") 
@@ -35,7 +36,7 @@ module EPC::Command
       end
 
       params = {
-        :name => name,
+        :name => object_id,
       }
       params[:value] = value unless value.nil?
       params[:required] = @options[:required]
@@ -45,7 +46,7 @@ module EPC::Command
 
       if status.successful?
         unless response[:id].nil?
-          say("#{name} saved.")
+          say("#{object_id} saved.")
         end
       else
         say("Request failed with message [#{response[:message]}]")

data/lib/epc/command/copy_command.rb

@@ -0,0 +1,14 @@
+module EPC::Command
+  class CopyCommand < BaseCommand
+
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      raise FatalError, "Could not determine ObjectType" if @object_type.blank?
+      @klass_name = "EPC::Command::Copy#{@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/create_command.rb

@@ -1,11 +1,15 @@
 module EPC::Command
   class CreateCommand < BaseCommand
 
-    def execute(object_type = nil, *params)
-      klass = "EPC::Command::Create#{object_type.to_s.gsub("-","").capitalize}Command" 
-      params = normalize_params(params)
-      command = eval(klass).new(client, @options)
-      command.go(*params)
+    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::Create#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name)
+      command.include_module(object_type)
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
     end
 
   end

data/lib/epc/command/delete_command.rb

@@ -1,15 +1,15 @@
 module EPC::Command
   class DeleteCommand < BaseCommand
     
-    def execute(object = nil, *params)
-      @object_type = object.split(":").first rescue nil
-      @object_id = object.split(":")[1..-1].join(":") rescue nil
-      raise FatalError, "Object incorrectly specified" if @object_type.blank?
-      klass = "EPC::Command::Delete#{@object_type.to_s.gsub("-","").capitalize}Command" 
-      params = normalize_params(params)
-      command = eval(klass).new(client, @options)
-      check_params
-      command.go(@object_id, *params)
+    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 == "config" || type.downcase == "objectrole"}})
+      @klass_name = "EPC::Command::Delete#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name)
+      command.include_module(object_type)
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
     end
 
   end

data/lib/epc/command/{copy_deployment_command.rb → deployment/copy_deployment_command.rb}

@@ -1,12 +1,13 @@
 module EPC::Command
-  class CopyDeploymentCommand < BaseCommand
+  class CopyDeploymentCommand < CopyCommand
 
-    def execute(deployment_id = nil, stage = nil)
-      path = File.expand_path(".")
+    def execute(args = [])
+      require_object
+      stage = args[0]
 
-      raise FatalError, "You must specify a deployment id and the stage name" if deployment_id.nil? || stage.nil?
+      raise FatalError, "You must specify a deployment id and the stage name" if stage.nil?
 
-      status, response, headers = client.post(EPC::Config::DEPLOYMENTS_PATH + "/#{deployment_id}/copy", {:stage_name => stage})
+      status, response, headers = client.post(EPC::Config::DEPLOYMENTS_PATH + "/#{object_id}/copy", {:stage_name => stage})
 
       if status.failure?
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/deployment/create_deployment_command.rb

@@ -1,14 +1,12 @@
 module EPC::Command
-  class CreateDeploymentCommand < BaseCommand
-    def execute(*params)
+  class CreateDeploymentCommand < CreateCommand
+    def execute(args = [])
 
-      target_type, target_id = params[0].split(":") rescue [nil, nil]
-      stage_name = params[1]
+      stage_name = args[0]
 
       path = File.expand_path(".")
 
       stage_name = "Development" if stage_name.nil?
-      solution_name = @options[:solution_name]
 
       solution_id, solution_name = infer_solution_context(target_id, path, {:get_solution_name => true})
 
@@ -19,12 +17,12 @@ module EPC::Command
         return 1
       end
 
-      versions, instances = {}, {}
-      versions, instances = parse_projects(@options[:project_name]) unless blank?(@options[:project_name])
+      versions, instances, memory = {}, {}, {}
+      versions, instances, memory = parse_projects(@options[:project_name]) unless blank?(@options[:project_name])
 
       begin
-        status, @id = create_deployment(solution_name, stage_name, versions, instances)
-        return status unless status.successful?
+        status, @id = create_deployment(solution_name, stage_name, versions, instances, memory)
+        return status
       rescue Exception => ex
         say("Create deployment failed [Exception Caught (#{ex.class.name}): #{ex.to_s}].")
         return 1
@@ -44,16 +42,17 @@ module EPC::Command
     end
 
     def execute_internal(stage_name = nil)
-      execute(stage_name)
+      execute([stage_name])
       return @id
     end
     
     private
     
-    def create_deployment(solution_name, stage_name, versions = nil, instances = nil)
+    def create_deployment(solution_name, stage_name, versions = nil, instances = nil, memory = nil)
       params = {:solution_name => solution_name, :stage_name => stage_name}
       params[:versions] = versions unless blank?(versions)
       params[:instances] = instances unless blank?(instances)
+      params[:runtime_memory] = memory unless blank?(memory)
       status, response, headers = client.post("#{EPC::Config::DEPLOYMENTS_PATH}", params)
       if status.successful?
         say("Successfully created deployment [#{response[:id]}] with [#{target_url}]")
@@ -65,18 +64,19 @@ module EPC::Command
     end
 
     def parse_projects(data)
-      return [], [] if data.blank?
+      return [], [], [] if data.blank?
       versions = []
       instances = []
+      memory = []
       projects_data = data.split("|")  
       projects_data.each do |project_data|
-        project_id, ver, inst = project_data.split(":")
+        project_id, ver, inst, mem = project_data.split(":")
         next if blank?(project_id)
         versions << {:project_id => project_id, :version => ver} unless blank?(ver)
         instances << {:project_id => project_id, :instances => inst} unless blank?(inst)
+        memory << {:project_id => project_id, :runtime_memory => mem} unless blank?(mem)
       end
-
-      return versions, instances
+      return versions, instances, memory
     end
   end
 end

data/lib/epc/command/deployment/list_deployments_command.rb

@@ -2,12 +2,10 @@
 module EPC::Command
   class ListDeploymentsCommand < BaseCommand
 
-    def execute(target = nil, *args)
-      target_type, target_id = target.split(":") rescue [nil, nil]
+    def execute(args = [])
       path = File.expand_path(".")
 
-
-      if target.present?
+      if target_type.present?
         id = retrieve_identifier_for(target_type, target_id)
         if target_type.downcase == "solution"
           url = EPC::Config::SOLUTIONS_PATH + "/#{id}/deployments"

data/lib/epc/command/deployment/show_deployment_command.rb

@@ -2,15 +2,15 @@ require 'time'
 module EPC::Command
   class ShowDeploymentCommand < ShowCommand
 
-    def execute(deployment_id = nil, *args)
-
-      status, response, headers = client.get(EPC::Config::DEPLOYMENTS_PATH + "/#{deployment_id}?include=solution,deployment_stage,approvals,deployer,submitter")
+    def execute(args)
+      
+      status, response, headers = client.get(EPC::Config::DEPLOYMENTS_PATH + "/#{object_id}?include=solution,deployment_stage,approvals,deployer,submitter")
       if status.failure?
         say("Request failed: [#{response[:message]}]")
         return status
       end
 
-      @showables = args[1..-1].map(&:to_sym) rescue []
+      @showables = args.map(&:to_sym) rescue []
 
       response[:created_at] = Time.parse(response[:created_at]).strftime("%m/%d/%Y %I:%M%p") unless response[:created_at].nil?
       response[:updated_at] = Time.parse(response[:updated_at]).strftime("%m/%d/%Y %I:%M%p") unless response[:updated_at].nil?
@@ -27,8 +27,6 @@ module EPC::Command
         say(deployments_table.print)
       end
 
-
-
       if show? :approvals
         say("\nApprovals:")
         approvals_table = EPC::TabularOutputter.new(response[:approvals], [:id, :name, :approved, :approver_id, :approver_name])
@@ -42,7 +40,7 @@ module EPC::Command
           projects.each do |project|
             say("\n##  #{project[:name]}")
             project[:uri] = project[:uris].first unless project[:uris].nil?
-            projects_table = EPC::TabularOutputter.new([project], [:id, :name, :version, :status, :uri, :instances])
+            projects_table = EPC::TabularOutputter.new([project], [:id, :name, :version, :status, :uri, :instances, :deployed_project_id])
             say(projects_table.print)
 
             config_values = project[:config_values]

data/lib/epc/command/deployment/submit_deployment_command.rb

@@ -0,0 +1,15 @@
+module EPC::Command
+  class SubmitDeploymentCommand < SubmitCommand
+    def execute(args = [])
+      require_object
+
+      status, response, headers = client.put(EPC::Config::DEPLOYMENTS_PATH + "/#{object_id}/submit")
+      if status.successful?
+        say("Deployment submitted for approval")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+      return status
+    end
+  end
+end

data/lib/epc/command/deployment/update_deployment_command.rb

@@ -1,23 +1,14 @@
 module EPC::Command
   class UpdateDeploymentCommand < BaseCommand
 
-    def execute(deployment_id = nil, target = nil, *args)
-
-      project_id = target.split(":")[1] rescue nil
+    def execute(args)
 
       instances = @options[:instances]
       uris = @options[:uris]
 
       raise FatalError, "You need to specify either an instance count or uris" if blank?(instances) && blank?(uris)
 
-      if numeric?(project_id)
-        field = :id
-        project_id = project_id.to_i
-      else
-        field = :name
-      end
-
-      deployed_project_id = get_deployed_project_id(deployment_id, field, project_id)
+      deployed_project_id = get_deployed_project_id(object_id, target_id)
 
       raise FatalError, "Deployed project id not found" if deployed_project_id.nil?
       
@@ -25,7 +16,7 @@ module EPC::Command
       params[:instances] = instances.to_i unless blank?(instances)
       params[:uris] = uris.split(",") unless blank?(uris)
 
-      status, response, headers = client.put(EPC::Config::DEPLOYMENTS_PATH + "/#{deployment_id}/deployed_projects/#{deployed_project_id}", params)
+      status, response, headers = client.put(EPC::Config::DEPLOYMENTS_PATH + "/#{object_id}/deployed_projects/#{deployed_project_id}", params)
 
       if status.successful?
         say("Deployment updated")
@@ -37,7 +28,7 @@ module EPC::Command
 
     private
 
-    def get_deployed_project_id(deployment_id, project_field, value)
+    def get_deployed_project_id(deployment_id, value)
       status, response, headers = client.get(EPC::Config::DEPLOYMENTS_PATH + "/#{deployment_id}")
 
       raise FatalError, "Deployed projects retrieval failed: [#{response[:message]}]" if status.failure?
@@ -45,7 +36,7 @@ module EPC::Command
       return nil if response.blank?
 
       projects = response[:solution][:projects] rescue []
-      deployed_project_id = projects.detect{|p| p[project_field] == value}[:deployed_project_id] rescue nil
+      deployed_project_id = projects.detect{|p| p[:id] == value}[:deployed_project_id] rescue nil
       
       deployed_project_id
     end

data/lib/epc/command/deployment/vote_deployment_command.rb

@@ -0,0 +1,23 @@
+module EPC::Command
+  class VoteDeploymentCommand < VoteCommand
+
+    def execute(args = [])
+      require_object
+
+      if @options[:approval] == "approve"
+        approved = true
+      else
+        approved = false
+      end
+
+      status, response, headers = client.put(EPC::Config::DEPLOYMENTS_PATH + "/#{object_id}/vote", {:approved => approved})
+      if status.successful?
+        say("Deployment [#{object_id}] has been #{approved ? "approved" : "rejected"} by you.")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+      return status
+    end
+
+  end
+end

data/lib/epc/command/deploymentstage/list_deploymentstages_command.rb

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

data/lib/epc/command/detachfrom_command.rb

@@ -0,0 +1,13 @@
+module EPC::Command
+  class DetachfromCommand < 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::Detachfrom#{@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/group/create_group_command.rb

@@ -1,10 +1,10 @@
 module EPC::Command
   class CreateGroupCommand < BaseCommand
 
-    def execute(*params)
-      name = params[1]
+    def execute(args = [])
+      name = args[0]
 
-      raise FatalError, "You need to specify a name for the group" if name.blank?
+      raise FatalError, "Name is required" if name.blank?
 
       status, response, headers = client.post(EPC::Config::GROUPS_PATH, {:name => name})
 

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

@@ -1,16 +1,15 @@
 module EPC::Command
   class DeleteGroupCommand < DeleteCommand
    
-    def execute(group = nil, *args)
+    def execute(args)
+      require_object
 
-      proceed = ask_yn("Are you sure you want to delete the [#{group}] group? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] group? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      group_id = retrieve_identifier_for("UserGroup", group)
-
-      status, response, headers = client.delete(EPC::Config::GROUPS_PATH + "/#{group_id}")
+      status, response, headers = client.delete(EPC::Config::GROUPS_PATH + "/#{object_id}")
 
       if status.successful?
         say("Group deleted")

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

@@ -1,10 +1,9 @@
 module EPC::Command
   class ShowGroupCommand < BaseCommand
-    def execute(group = nil, *args)
+    def execute(args)
 
-      group_id = retrieve_identifier_for("UserGroup", group)
 
-      status, response, headers = client.get(EPC::Config::GROUPS_PATH + "/#{group_id}?include=users")
+      status, response, headers = client.get(EPC::Config::GROUPS_PATH + "/#{object_id}?include=users")
 
       unless status.successful?
         say("Request failed: [#{response[:message]}]")