epc 1.0.4 → 1.0.6

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

@@ -22,7 +22,7 @@ module EPC::Command
       status, response, headers = client.get(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}/projects#{include}")
 
       if status.failure?
-        say("Projects retrieval failed with [#{response[:message]}]")
+        say_err("Projects retrieval failed with [#{response[:message]}]")
       elsif response.empty?
         say("You have no projects created. You can create them with epc create project.")
       else

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

@@ -4,6 +4,7 @@ module EPC::Command
 
     
     def execute(args = [])
+      require_object
       @showable_translations = {
         :config => :config_values,
         :services => :service_versions,
@@ -14,7 +15,7 @@ module EPC::Command
 
       status, response, message = client.get(EPC::Config::PROJECTS_PATH + "/#{object_id}?include=dependencies,roles,config_values,service_versions,libraries,pushed_versions")
       if status.failure?
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
         return status
       end
 

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

@@ -8,10 +8,9 @@ module EPC::Command
       if status.successful?
         say("Project has been unarchived.")
       else
-        say("Project could not be unarchived. Request failed with: [#{response[:message]}]")
+        say_err("Project could not be unarchived. Request failed with: [#{response[:message]}]")
       end
       return status
     end
   end
 end
-

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

@@ -20,14 +20,14 @@ module EPC::Command
       args_hash.each do |attr, val|
         unless UPDATABLE_ATTRIBUTES.include?(attr)
           args_hash.delete(attr)
-          say("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
+          say_err("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
           next
         end
       end
       unless args_hash.empty?
         status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{object_id}", args_hash)
         if status.failure?
-          say("Update failed with: [#{response[:message]}]")
+          say_err("Update failed with: [#{response[:message]}]")
         else
           say("Update succesful")
         end

data/lib/epc/command/projecttype/create_projecttype_command.rb

@@ -2,7 +2,7 @@ module EPC::Command
   class CreateProjecttypeCommand < CreateCommand
 
     def execute(args = [])
-      # raise FatalError, "You need to specify all mandatory parameters" if args.size < 5
+      raise FatalError, "You need to specify all mandatory parameters" if args.size < 5
 
       params = {}
       params[:name] = args[0]
@@ -18,7 +18,7 @@ module EPC::Command
           params[:runtime_env_types] << {:id => retrieve_identifier_for("RuntimeEnvType", rti)}
         end
       rescue Exception => ex
-        say("Unable to parse runtime-env-types parameter")
+        say_err("Unable to parse runtime-env-types parameter")
         return 1
       end
 
@@ -27,7 +27,7 @@ module EPC::Command
       if status.successful?
         say("ProjectType [#{args[0]}] created")
       else
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       end
 
       return status

data/lib/epc/command/projecttype/delete_projecttype_command.rb

@@ -2,6 +2,7 @@ module EPC::Command
   class DeleteProjecttypeCommand < DeleteCommand
 
     def execute(args = [])
+      require_object
 
       proceed = ask_yn("Are you sure you want to delete the [#{object_id}] ProjectType? [Yn] ")
       if proceed.upcase == 'N'
@@ -13,7 +14,7 @@ module EPC::Command
       if status.successful?
         say("Project type deleted")
       else
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       end
 
       return status

data/lib/epc/command/projecttype/list_projecttypes_command.rb

@@ -5,7 +5,7 @@ module EPC::Command
       status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH)
 
       if status.failure?
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       elsif response.empty?
         say("No project types defined")
       else

data/lib/epc/command/projecttype/show_projecttype_command.rb

@@ -2,11 +2,12 @@ module EPC::Command
   class ShowProjecttypeCommand < BaseCommand
 
     def execute(args = [])
+      require_object
 
       status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH + "/#{object_id}")
 
       if status.failure?
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       else
         type_table = EPC::TabularOutputter.new([response], [:id, :name, :runtime, :framework, :build_type])
         say(type_table.print)

data/lib/epc/command/projecttype/update_projecttype_command.rb

@@ -4,6 +4,7 @@ module EPC::Command
     UPDATABLE_ATTRIBUTES = ["name", "runtime", "framework", "build_type", "build_packaging", "deployable", "runtime_env_types"]
   
     def execute(args)
+      require_object
 
       raise FatalError, "You need to specify at least one attribute to update.\nUpdatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]" if args.size < 1
       params = {}
@@ -29,7 +30,7 @@ module EPC::Command
       params.each do |attr, val|
         unless UPDATABLE_ATTRIBUTES.include?(attr)
           params.delete(attr)
-          say("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
+          say_err("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
           next
         end
       end
@@ -39,7 +40,7 @@ module EPC::Command
       status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH + "/#{object_id}")
 
       unless status.successful?
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
         return 1
       end
 
@@ -50,7 +51,7 @@ module EPC::Command
       if status.successful?
         say("Project type updated")
       else
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       end
 
       return status

data/lib/epc/command/pull_command.rb

@@ -65,10 +65,12 @@ module EPC::Command
             refresh_command.options[:prompt_refresh] = false if first_time_pull
             refresh_command.execute(path)
             return 0
+          else
+            say_err("\nCould not retrieve URL")
           end
         end
       rescue Exception => ex
-        say("Pull failed [#{ex.to_s}].")
+        say_err("Pull failed [#{ex.to_s}].")
       end
       return 1
     end
@@ -92,7 +94,7 @@ module EPC::Command
         say("Successfully confirmed the pull with [#{target_url}]")
         true
       else
-        say("Pull confirmation failed [#{response[:message]}].")
+        say_err("Pull confirmation failed [#{response[:message]}].")
         false
       end
     end
@@ -100,14 +102,14 @@ module EPC::Command
     def prep_solution_directory(path, solution_name)
       solution_id = get_resource_id(EPC::Config::SOLUTIONS_PATH, :name, solution_name)
       if solution_id.nil?
-        say("Solution not found")
+        say_err("Solution not found")
         return false
       end
 
       begin
         Dir.mkdir(File.join(path, solution_name))
       rescue Exception => ex
-        say(ex.to_s)
+        say_err(ex.to_s)
         return false
       end
 
@@ -116,7 +118,7 @@ module EPC::Command
           f.write({:id => solution_id, :name => solution_name}.to_json)
         end
       rescue Exception => ex
-        say(ex.to_s)
+        say_err(ex.to_s)
         return false
       end
       return true
@@ -145,14 +147,14 @@ module EPC::Command
           count += 1
           break
         else
-          say("Poller failed to get the pull URL. Aborting.")
+          say_err("Poller failed to get the pull URL. Aborting.")
           failed = true
           break
         end
       end
 
       if count > GIVEUP_TICKS
-        say("\nServer is taking too long to update the pull URL. Please contact the AgileMethods support team.")
+        say_err("\nServer is taking too long to update the pull URL. Please contact the AgileMethods support team.")
       end
       [false, nil, nil]
     end
@@ -163,12 +165,12 @@ module EPC::Command
     
     def check_pull_directory(path)
       unless File.exists?(path)
-        say("Pull path does not exist")
+        say_err("Pull path does not exist")
         return false
       end
       
       unless File.directory?(path)
-        say("Pull path is not a directory")
+        say_err("Pull path is not a directory")
         return false
       end
       return true
@@ -183,7 +185,7 @@ module EPC::Command
         open(zip_path, "wb") { |io| io.write(response) }
         [true, zip_path]
       else
-        say("Failed to pull the zip file from the build repository [status = #{status}]. Aborting pull command.")
+        say_err("Failed to pull the zip file from the build repository [status = #{status}]. Aborting pull command.")
         [false, nil]
       end
     end

data/lib/epc/command/push_command.rb

@@ -11,10 +11,16 @@ module EPC::Command
     ZIP_FILE_EXCLUDES = %w(pom.xml)
     ZIP_EXT_EXCLUDES = ['.class', '.jar']
 
-    def execute(project_name = nil)
+    def execute(*args)
       path = "."  
       path = File.expand_path(path)
 
+      @klass_name = "push"
+      params = resolve_context(args,
+                                :accept_no_object => true,
+                                :skip_object_resolution => Proc.new{|type, id| true},
+                                :skip_target_resolution => Proc.new{|type, id| true})
+
 
       if @options[:no_poll].present? && @options[:timeout].present?
         raise InputError, "You cannot specify both --nopoll and --timeout options at the same time"
@@ -23,45 +29,55 @@ module EPC::Command
       @timeout = GIVEUP_TICKS
       parse_timeout_value
 
-      solution_id, solution_name = infer_solution_context(nil, path)
+      if has_object? && has_target?
+        raise InputError, "When manually specifying solution and project context you must provide the path to the file with --direct-deploy" if @options[:direct_deploy].blank?
+        solution_name = object_id
+        project_name = target_id
+        paths = [@options[:direct_deploy]]
+      end
+
 
-      raise FatalError, "Solution could not be inferred" if solution_id.nil?
+      if solution_name.blank? && project_name.blank?
+        solution_id, solution_name = infer_solution_context(nil, path)
+        raise FatalError, "Solution could not be inferred" if solution_id.nil?
 
-      if EPC::Config.is_solution_dir?(path)
-        if project_name.nil?
-          proceed = ask_yn("You are pushing the [#{solution_name}] solution. Correct: [Yn]? ") 
-          paths = Dir.glob(path +"/*/").select{|dir| EPC::Config.is_project_dir?(dir)}
+        if EPC::Config.is_solution_dir?(path)
+          if project_name.nil?
+            proceed = ask_yn("You are pushing the [#{solution_name}] solution. Correct: [Yn]? ") 
+            paths = Dir.glob(path +"/*/").select{|dir| EPC::Config.is_project_dir?(dir)}
+          else
+            project_id, p_name = infer_project_context(project_name, path, solution_id, {:get_project_name => true})
+            raise FatalError, "Project not found. Please run this command with the correct project name." if !project_name.nil? && (p_name.nil? || p_name.empty?)
+            proceed = ask_yn("You are pushing the [#{p_name}] project belonging to the [#{solution_name}] solution. Correct: [Yn]? ") 
+            paths = [path + "/#{project_name}"]
+          end
+        elsif EPC::Config.is_project_dir?(path)
+          project_id, project_name = infer_project_context(p_name, path, solution_id, false)
+          raise FatalError if project_id.nil?
+          proceed = ask_yn("You are pushing the [#{project_name}] project belonging to the [#{solution_name}] solution. Correct: [Yn]? ") 
+          paths = [path]
         else
-          project_id, p_name = infer_project_context(project_name, path, solution_id, {:get_project_name => true})
-          raise FatalError, "Project not found. Please run this command with the correct project name." if !project_name.nil? && (p_name.nil? || p_name.empty?)
-          proceed = ask_yn("You are pushing the [#{p_name}] project belonging to the [#{solution_name}] solution. Correct: [Yn]? ") 
-          paths = [path + "/#{project_name}"]
+          say("This command must be run from a solution/project directory")
+          return 1
         end
-      elsif EPC::Config.is_project_dir?(path)
-        project_id, project_name = infer_project_context(p_name, path, solution_id, false) 
-        raise FatalError if project_id.nil?
-        proceed = ask_yn("You are pushing the [#{project_name}] project belonging to the [#{solution_name}] solution. Correct: [Yn]? ") 
-        paths = [path]
-      else
-        say("This command must be run from a solution/project directory")
-        return 1
-      end
 
-      if (proceed.upcase == "N" rescue true )
-        return 1
-      end
+        if (proceed.upcase == "N" rescue true )
+          return 1
+        end
 
-      raise FatalError, "Nothing to push" if paths.empty?
+        raise FatalError, "Nothing to push" if paths.empty?
+      end
 
       @versions = []
       paths.each do |path|
-        project_id, project_name = infer_project_context(nil, path, solution_id, {:get_project_name => true})
+        project_id, project_name = infer_project_context(nil, path, solution_id, {:get_project_name => true}) unless project_name.present? && has_target?
         say("\nPushing #{project_name}...")
         begin
           zip_path = @options[:direct_deploy].present? ? @options[:direct_deploy] : zip_source(path)
           raise FatalError, "File missing: #{zip_path}" unless zip_path && File.exists?(zip_path)
           sha1 = sha1(zip_path)
-          status, url, signature, id = create_push(project_name, solution_name, sha1, @options[:note], @options[:direct_deploy])
+          zip_file_name = @options[:direct_deploy].present? ? File.basename(zip_path) : nil
+          status, url, signature, id = create_push(project_name, solution_name, sha1, @options[:note], zip_file_name)
           if status.successful?
             pushed = push_zip(zip_path, url, signature, @options[:direct_deploy])
             resp = confirm_push(id)
@@ -105,7 +121,7 @@ module EPC::Command
         say("Successfully confirmed the push with [#{target_url}]")
         response
       else
-        say("Push confirmation failed [#{response[:message]}].")
+        say_err("Push confirmation failed [#{response[:message]}].")
         nil
       end
     end
@@ -175,12 +191,12 @@ module EPC::Command
     def check_push_directory(path)
       project_type = EPC::Config.get_project_value(path, "project_type")["name"] rescue ""
       unless File.exists?(path)
-        say("#{path} does not exist")
+        say_err("#{path} does not exist")
         return false
       end
 
       unless File.directory?(path)
-        say("#{path} is not a directory")
+        say_err("#{path} is not a directory")
         return false
       end
 

data/lib/epc/command/role/create_role_command.rb

@@ -18,7 +18,7 @@ module EPC::Command
       if status.successful?
         say("Role [#{role}] created")
       else
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       end
       return status, response[:id]
     end

data/lib/epc/command/role/delete_role_command.rb

@@ -2,6 +2,7 @@ module EPC::Command
   class DeleteRoleCommand < DeleteCommand
 
     def execute(args = [])
+      require_object
 
       proceed = ask_yn("Are you sure you want to delete the [#{object_id}] role? [Yn] ")
       if proceed.upcase == "N"
@@ -13,7 +14,7 @@ module EPC::Command
       if status.successful?
         say("Role deleted")
       else
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
       end
 
       return status

data/lib/epc/command/role/list_roles_command.rb

@@ -3,10 +3,7 @@ module EPC::Command
     def execute(args = [])
 
 			if has_target?
-        if target_type.downcase != "user"
-          say("Target type must be User")
-          return 1
-        end
+        raise InputError, "Target type must be User" if target_type.downcase != "user"
 
 				status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{target_id}?include=roles")
 				response = response[:roles]
@@ -22,7 +19,7 @@ module EPC::Command
 					say(roles_table.print)
 				end
 			else
-				say("Request failed: [#{response[:message]}]")
+				say_err("Request failed: [#{response[:message]}]")
 			end
 
 			return status

data/lib/epc/command/role/show_role_command.rb

@@ -2,16 +2,16 @@ module EPC::Command
   class ShowRoleCommand < ShowCommand
 
     def execute(args = [])
+      require_object
       @showable_translations = {
         :groups => :user_groups
       }
-
       @showables = args.map(&:to_sym) rescue []
 
       status, response, headers = client.get(EPC::Config::ROLES_PATH + "/#{object_id}?include=users,user_groups,grants")
 
       unless status.successful?
-        say("Request failed: [#{response[:message]}]")
+        say_err("Request failed: [#{response[:message]}]")
         return 1
       end
 

data/lib/epc/command/role/update_role_command.rb

@@ -4,6 +4,7 @@ module EPC::Command
     required_options :add_user, :remove_user, :add_group, :remove_group, :add_grant, :remove_grant, :file, :mode => :any?, :message => "You must specify a user/group/grant to added or removed"
 
     def execute(args = [])
+      require_object
       role_id = object_id
 
       if @options[:file].present?
@@ -32,7 +33,6 @@ module EPC::Command
         status = add_grant(role_id, @options[:add_grant])
       end
 
-
       if @options[:remove_grant].present?
         status = remove_grant(role_id, @options[:remove_grant])
       end