epc 1.0.3 → 1.0.4

data/lib/epc/command/runtime/create_runtime_command.rb

@@ -0,0 +1,34 @@
+module EPC::Command
+  class CreateRuntimeCommand < CreateCommand
+
+    def execute(args = [])
+      require_target
+
+      raise FatalError, "You need to specify all mandatory parameters" if args.size < 5
+
+      params = {}
+      params[:name] = args[0]
+      params[:target] = args[1]
+      params[:runtime_env_type_id] = target_id
+      params[:deployment_stage_id] = retrieve_identifier_for("DeploymentStage", args[2])
+      params[:username] = args[3]
+      params[:password] = args[4]
+      params[:info] = @options[:info] if @options[:info].present?
+      params[:agility_topology_id] = @options[:agility_topology] if @options[:agility_topology].present?
+      params[:agility_environment_id] = @options[:agility_environment] if @options[:agility_environment].present?
+
+      status, response, headers = client.post(EPC::Config::RUNTIMES_PATH, params)
+
+      if status.successful?
+        say("Runtime [#{args[0]}] created")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+
+    end
+
+  end
+
+end

data/lib/epc/command/runtime/delete_runtime_command.rb

@@ -0,0 +1,24 @@
+module EPC::Command
+  class DeleteRuntimeCommand < DeleteCommand
+  
+    def execute(args)
+
+     proceed = ask_yn("Are you sure you want to delete the [#{object_id}] runtime? [Yn] ")
+      if proceed.upcase == 'N'
+        return 1
+      end
+
+      status, response, headers = client.delete(EPC::Config::RUNTIMES_PATH + "/#{object_id}")
+
+      if status.successful?
+        say("Runtime deleted")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+
+    end
+
+  end
+end

data/lib/epc/command/runtime/list_runtimes_command.rb

@@ -1,10 +1,10 @@
 module EPC::Command
   class ListRuntimesCommand < BaseCommand
 
-    def execute(*args)
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::RUNTIMES_PATH)
       if status.failure?
-        say("Request failed with: [#{response['message']}]")
+        say("Request failed with: [#{response[:message]}]")
       else
         runtime_envs_table = EPC::TabularOutputter.new(response, [:id, :name])
         say(runtime_envs_table.print)

data/lib/epc/command/runtime/update_runtime_command.rb

@@ -0,0 +1,49 @@
+module EPC::Command
+  class UpdateRuntimeCommand < UpdateCommand
+
+    UPDATABLE_ATTRIBUTES = ["name", "target", "deployment_stage", "username", "password", "agility_topology", "agility_environment", "runtime_env_type_id", "info"]
+  
+    def execute(args)
+
+      raise FatalError, "You need to specify at least one attribute to update" if args.size < 1
+      params = {}
+
+      args.each do |arg|
+        key, val = arg.split("=")
+        next if key.blank?
+        params[key] = val
+      end
+
+      params.each do |attr, val|
+        unless UPDATABLE_ATTRIBUTES.include?(attr)
+          params.delete(attr)
+          say("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
+          next
+        end
+      end
+    
+      raise InputError, "You need to specify at least one attribute to update" if params.blank?
+
+      status, response, headers = client.get(EPC::Config::RUNTIMES_PATH + "/#{object_id}")
+
+      unless status.successful?
+        say("Request failed: [#{response[:message]}]")
+        return 1
+      end
+
+      runtime_attrs = response.merge(params.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo})
+       
+      status, response, headers = client.put(EPC::Config::RUNTIMES_PATH + "/#{object_id}", runtime_attrs)
+
+      if status.successful?
+        say("Plugin updated")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+
+    end
+
+  end
+end

data/lib/epc/command/runtimetype/list_runtimetypes_command.rb

@@ -0,0 +1,17 @@
+module EPC::Command
+  class ListRuntimetypesCommand < ListCommand
+    def execute(args = [])
+      status, response, headers = client.get(EPC::Config::RUNTIMES_PATH + "_types")
+
+      if status.successful?
+        types_table = EPC::TabularOutputter.new(response, [:id, :name])
+        say(types_table.print)
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+
+    end
+  end
+end

data/lib/epc/command/servicedefinition/create_servicedefinition_command.rb

@@ -1,16 +1,15 @@
 module EPC::Command
   class CreateServicedefinitionCommand < BaseCommand
     
-    def execute(target, *args)
+    def execute(args = [])
 
-      service_name = args.first
-      service_type = args[1]
+      require_target
 
-      raise FatalError, "You must specify both the service definition name and service type" if service_name.blank? || service_type.blank?
+      service_name = args.first
 
-      service_type_id = retrieve_identifier_for("ServiceType", service_type)
+      raise FatalError, "You must specify the name of the service definition" if service_name.blank?
 
-      status, response, headers = client.post(EPC::Config::SERVICE_DEFINITIONS_PATH, {:name => service_name, :type_id => service_type_id})
+      status, response, headers = client.post(EPC::Config::SERVICE_DEFINITIONS_PATH, {:name => service_name, :type_id => target_id})
       if status.failure?
         say("Service definition failed with: [#{response[:message]}]")
       else

data/lib/epc/command/servicedefinition/delete_servicedefinition_command.rb

@@ -0,0 +1,18 @@
+module EPC::Command
+  class DeleteServicedefinitionCommand < BaseCommand
+    
+    def execute(args = [])
+      require_object
+
+      status, response, headers = client.delete(EPC::Config::SERVICE_DEFINITIONS_PATH + "/#{object_id}")
+
+      if status.successful?
+        say("Service definition deleted")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+    end
+  end
+end

data/lib/epc/command/servicedefinition/list_servicedefinitions_command.rb

@@ -1,13 +1,13 @@
 module EPC::Command
   class ListServicedefinitionsCommand < BaseCommand
 
-    def execute(*args)
+    def execute(args = [])
 
       status, response, headers = client.get(EPC::Config::SERVICE_DEFINITIONS_PATH)
       if status.failure?
         say("Request failed with: [#{response['message']}]")
       elsif response.empty?
-        say("No service definitions found. You can define one with #{EPC::Help::COMMAND_USAGES[:define_service]}")
+        say("No service definitions found. You can create one with #{EPC::Help::COMMAND_USAGES[:create_servicedefinition]}")
       else
         response.each { |resp| resp[:definition_type] = resp[:service_type][:name] }
         definitions_table = EPC::TabularOutputter.new(response, [:id, :name, :definition_type])

data/lib/epc/command/servicetype/list_servicetypes_command.rb

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

data/lib/epc/command/serviceversion/create_serviceversion_command.rb

@@ -1,24 +1,20 @@
 module EPC::Command
-  class CreateServiceversionCommand < BaseCommand
+  class CreateServiceversionCommand < CreateCommand
     
-    def execute(*params)
-      label = params[1]
-      definition = params[2]
+    def execute(args = [])
+      label = args[0]
 
-      raise FatalError, "Label and definition identifier are both required." if label.nil? || definition.nil?
+      require_target
 
-      if numeric?(definition)
-        definition_id = definition.to_i
-      else
-        definition_id = get_resource_id(EPC::Config::SERVICE_DEFINITIONS_PATH, "name", definition)
-      end
+      raise FatalError, "You need to specify the label for this service definition" if label.blank?
 
-      raise InputError, "Service definition not found" if definition_id.nil?
+      @options[:backwards_compatible] = "false" if @options[:backwards_compatible].blank?
+      @options[:reversible] = "false" if @options[:reversible].blank?
 
       up_script = read_file(@options[:up_script]) unless blank?(@options[:up_script])
       down_script = read_file(@options[:down_script]) unless blank?(@options[:down_script])
 
-      status, response, headers = client.post(EPC::Config::SERVICE_VERSIONS_PATH, {:label => label, :definition_id => definition_id, :up_script => up_script, :down_script => down_script})
+      status, response, headers = client.post(EPC::Config::SERVICE_VERSIONS_PATH, {:label => label, :service_definition_id => target_id, :up_script => up_script, :down_script => down_script, :backwards_compatible => @options[:backwards_compatible], :reversible => @options[:reversible]})
 
       if status.successful?
         say("Service version successfully created.")

data/lib/epc/command/serviceversion/delete_serviceversion_command.rb

@@ -1,16 +1,14 @@
 module EPC::Command
   class DeleteServiceversionCommand < DeleteCommand
    
-    def execute(service_version = nil, *args)
+    def execute(args = [])
 
-      proceed = ask_yn("Are you sure you want to delete the [#{service_version}] service_version. Correct? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] service_version. Correct? [Yn] ")
       if proceed.upcase == 'N'
         return 1
       end
-      
-      service_version_id = retrieve_identifier_for("ServiceVersion", (service_version.split(":") rescue service_version))
 
-      status, response, headers = client.delete(EPC::Config::SERVICE_VERSIONS_PATH + "/#{service_version_id}")
+      status, response, headers = client.delete(EPC::Config::SERVICE_VERSIONS_PATH + "/#{object_id}")
 
       if status.successful?
         say("Service version deleted.")

data/lib/epc/command/serviceversion/list_serviceversions_command.rb

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListServiceversionsCommand < BaseCommand
 
-    def execute(target = nil)
+    def execute(args = [])
       status, response, headers = client.get(EPC::Config::SERVICE_VERSIONS_PATH)
 
       if status.failure?
@@ -10,6 +10,13 @@ module EPC::Command
         say("No service-versions have been defined.")
         say("You can define one with epc create service-version.")
       else
+        response.each do |service_version|
+          service_version[:service_definition_id], service_version[:service_definition_name] = if service_version[:service_definition].present?
+            [service_version[:service_definition][:id], service_version[:service_definition][:name]]
+          else
+            [nil, nil]
+          end
+        end
         service_versions_table = EPC::TabularOutputter.new(response, {:id => "ID", :label => "LABEL", :service_definition_id => "DEFINITION ID", :service_definition_name => "DEFINITION NAME"})
         say(service_versions_table.print)
       end

data/lib/epc/command/show_command.rb

@@ -1,15 +1,14 @@
 module EPC::Command
   class ShowCommand < 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::Show#{@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)
+      raise FatalError, "Could not determine ObjectType" if @object_type.blank?
+      @klass_name = "EPC::Command::Show#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name).new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
     end
 
     private

data/lib/epc/command/show_metrics_command.rb

@@ -1,10 +1,10 @@
 module EPC::Command
   class ShowMetricsCommand < BaseCommand
 
-    def execute(*args)
+    def execute(args = [])
 
-      id = args[2]
-      metrics = args[3]
+      id = args[0]
+      metrics = args[1]
 
       if id.nil?
         say("You must specify the target object id.")

data/lib/epc/command/solution/archive_solution_command.rb

@@ -1,15 +1,9 @@
 module EPC::Command
   class ArchiveSolutionCommand < ArchiveCommand
-    def execute(solution_name = nil)
+    def execute(args = [])
+      require_object
 
-      path = "."
-      path = File.expand_path(path)
-
-      solution_id, solution_name = infer_solution_context(solution_name, path, {:get_solution_name => true})
-
-      raise FatalError, "Solution could not be inferred" if solution_id.nil?
-
-      status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}", {:archived => true, :name => solution_name})
+      status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{object_id}", {:archived => true})
       if status.successful?
         say("Solution has been archived.")
       else
@@ -19,4 +13,3 @@ module EPC::Command
     end
   end
 end
-

data/lib/epc/command/solution/create_solution_command.rb

@@ -1,8 +1,8 @@
 module EPC::Command
   class CreateSolutionCommand < BaseCommand
 
-    def execute(*params)
-      name = params[1]
+    def execute(params)
+      name = params[0]
 
       begin
         status, response, headers = client.post("#{EPC::Config::SOLUTIONS_PATH}", { :name => name })

data/lib/epc/command/solution/delete_solution_command.rb

@@ -1,18 +1,14 @@
 module EPC::Command
   class DeleteSolutionCommand < DeleteCommand
-    def execute(solution_name = nil, *args)
+    def execute(args = [])
       path = File.expand_path(".")
-      solution_name = nil if solution_name.blank?
-      solution_id, solution_name = infer_solution_context(solution_name, path, :get_solution_name => true)
 
-      raise FatalError, "Solution could not be inferred" if solution_id.blank?
-
-      proceed = ask_yn("Are you sure you want to delete [#{solution_id} - #{solution_name}]. Correct? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete [#{object_id}]. Correct? [Yn] ")
       if proceed.upcase == 'N'
         return 1
       end
 
-      status, response, message = client.delete(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}")
+      status, response, message = client.delete(EPC::Config::SOLUTIONS_PATH + "/#{object_id}")
       if status.successful?
         remove_solution_metadata(project_solution_path(path)) if EPC::Config.is_solution_dir?(path) || EPC::Config.is_project_dir?(path)
         say("Solution deleted.")

data/lib/epc/command/solution/list_solutions_command.rb

@@ -2,8 +2,15 @@ require 'time'
 module EPC::Command
   class ListSolutionsCommand < BaseCommand
 
-    def execute(*args)
-      status, response, headers = client.get(EPC::Config::SOLUTIONS_PATH)
+    def execute(args = [])
+      fields = [:id, :name, :build_status, :created_at, :creator_id, :creator_name]
+      path = if @options[:archived]
+        fields << :archived
+        "?include=archived"
+      else
+        ""
+      end
+      status, response, headers = client.get(EPC::Config::SOLUTIONS_PATH + path)
 
       if status.failure?
         say("Solutions retrieval failed with [#{response[:message]}]")
@@ -14,8 +21,9 @@ module EPC::Command
           resp[:created_at] = Time.parse(resp[:created_at]).strftime("%m/%d/%Y %I:%M%p") 
           resp[:creator_id] = resp[:created_by][:id] rescue nil
           resp[:creator_name] = resp[:created_by][:name] rescue nil
+          resp[:archived] = ((resp[:archived].to_s == "true") ? 't' : 'f') if @options[:archived]
         end
-        solutions_table = EPC::TabularOutputter.new(response, [:id, :name, :build_status, :created_at, :creator_id, :creator_name])
+        solutions_table = EPC::TabularOutputter.new(response, fields)
         say(solutions_table.print)
       end
       return status

data/lib/epc/command/solution/show_solution_command.rb

@@ -2,14 +2,12 @@ require 'time'
 module EPC::Command
   class ShowSolutionCommand < ShowCommand
     
-    def execute(solution_name = nil, *args)
-      path = File.expand_path(".")
-
-      solution_id, solution_name = infer_solution_context(solution_name, path, {:get_solution_name => true})
+    def execute(args = [])
+      require_object
 
-      raise InputError, "Solution not found" if solution_id.nil?
+      path = File.expand_path(".")
 
-      status, response, message = client.get(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}?include=config_values,projects,deployments,deployment_configs")
+      status, response, message = client.get(EPC::Config::SOLUTIONS_PATH + "/#{object_id}?include=config_values,projects,deployments,deployment_configs")
       if status.failure?
         say("Request failed: [#{response[:message]}]")
         return status

data/lib/epc/command/solution/unarchive_solution_command.rb

@@ -1,20 +1,15 @@
 module EPC::Command
   class UnarchiveSolutionCommand < UnarchiveCommand
-    def execute(solution_name = nil)
-      path = "."
-      path = File.expand_path(path)
+    def execute(args = [])
 
-      solution_id, solution_name = infer_solution_context(solution_name, path, {:get_solution_name => true})
-
-      raise FatalError, "Solution could not be inferred" if solution_id.nil?
-
-      status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}", {:archived => false, :name => solution_name})
+      status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{object_id}", {:archived => false})
       if status.successful?
         say("Solution has been unarchived.")
       else
         say("Solution could not be unarchived. Request failed with: [#{response[:message]}]")
       end
       return status
+
     end
   end
 end