epc 1.0.2 → 1.0.3

data/lib/epc/command/{archive_project_command.rb → project/archive_project_command.rb}

@@ -1,10 +1,11 @@
 module EPC::Command
-  class ArchiveProjectCommand < BaseCommand
-    def execute(project_name = nil)
+  class ArchiveProjectCommand < ArchiveCommand
+
+    def execute(project = nil)
       path = "."
       path = File.expand_path(path)
 
-      solution_name = @options[:solution_name]
+      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})

data/lib/epc/command/{delete_project_command.rb → project/delete_project_command.rb}

@@ -1,19 +1,23 @@
 module EPC::Command
   class DeleteProjectCommand < BaseCommand
-    def execute(project_name = nil)
+    def execute(project = nil, target = nil)
       path = "."
       path = File.expand_path(path)
 
-      solution_name = @options[:solution_name]
+      ids = project.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, :get_solution_name => true)
       project_id, project_name = infer_project_context(project_name, path, solution_id, {:get_project_name => true})
 
-      if project_id.nil?
-        say("Project name could not be inferred")
-        say(EPC::Help::COMMAND_USAGES[:delete_project])
-        return 1
-      end
+
+      raise FatalError, "Project name could not be inferred" if project_id.nil?
 
       question = "You are deleting the project [#{project_id}"
       if project_name.nil?

data/lib/epc/command/{list_projects_command.rb → project/list_projects_command.rb}

@@ -1,21 +1,20 @@
 module EPC::Command
   class ListProjectsCommand < BaseCommand
 
-    def execute(solution_name = nil)
+    def execute(target = nil)
       path = File.expand_path(".")
 
-      if numeric?(solution_name)
-        solution_id = solution_name.to_i
-      else
-        solution_id, solution_name = infer_solution_context(solution_name, path)
+      if target.present?
+        target_type, target_id = target.split(":")
+        solution_id = retrieve_identifier_for("Solution", target_id)
       end
 
-      if solution_id.nil?
-        say("Solution could not be inferred")
-        say(EPC::Help::COMMAND_USAGES[:list_projects])
-        return 1
+      if solution_id.blank?
+        solution_id, solution_name = infer_solution_context(nil, path)
       end
 
+      raise InputError, "Solution could not be inferred" if solution_id.nil?
+
       status, response, headers = client.get(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}/projects")
 
       if status.failure?

data/lib/epc/command/{show_project_command.rb → project/show_project_command.rb}

@@ -1,19 +1,33 @@
 require 'time'
 module EPC::Command
-  class ShowProjectCommand < BaseCommand
+  class ShowProjectCommand < ShowCommand
+
     
-    def execute(project_name = nil)
-      path = "."
-      path = File.expand_path(path)
+    def execute(object_id = nil, *args)
+      @showable_translations = {
+        :config => :config_values,
+        :services => :service_versions
+      }
+
+      path = File.expand_path(".")
 
-      solution_name = @options[:solution_name]
+      ids = object_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)
 
       raise FatalError, "Project could not be found" if project_id.nil? || project_id == 0
 
-      status, response, message = client.get(EPC::Config::PROJECTS_PATH + "/#{project_id}?include=dependencies,roles,config_values")
+      @showables = args[1..-1].map(&:to_sym) rescue []
+
+      status, response, message = client.get(EPC::Config::PROJECTS_PATH + "/#{project_id}?include=dependencies,roles,config_values,service_versions,libraries")
       if status.failure?
         say("Request failed: [#{response[:message]}]")
         return status
@@ -24,51 +38,72 @@ module EPC::Command
       response[:last_push_date] = Time.parse(response[:last_push_date]).strftime("%m/%d/%Y %I:%M%p") unless response[:last_push_date].nil? || response[:last_push_date] == "N/A"
       response[:last_build_status] = nil if response[:last_build_status] == "N/A" # temp hack 
       response[:last_build_status] = (response[:last_build_status] ? "BUILT" : "FAILED" rescue nil) unless response[:last_build_status].nil?
+      response[:last_push_by_id] = response[:last_push_by][:id]
+      response[:last_push_by_name] = response[:last_push_by][:name]
 
-      projects_table = EPC::TabularOutputter.new([response], {:id => "ID", :name => "NAME", :uri_name => "URI NAME", :created_at => "CREATED AT", :last_build_status => "BUILD STATUS", :last_build_date => "BUILD DATE", :last_build_version => "BUILD VERSION"})
-  
-      unless response[:dependency_definitions].nil? || response[:dependency_definitions].empty?
-        dependencies = []
-        response[:dependency_definitions].each do |dep_def|
-          dependencies << {
-            id:         dep_def[:dependency_id],
-            project_id: dep_def[:dependency][:id],
-            name: dep_def[:dependency][:name],
-            type: dep_def[:dependency_kind]
-          }
-        end
+      response[:dependencies] = []
+      response[:dependency_definitions].each do |dep_def|
+        response[:dependencies] << {
+          id:         dep_def[:dependency_id],
+          project_id: dep_def[:dependency][:id],
+          name: dep_def[:dependency][:name],
+          type: dep_def[:dependency_kind]
+        }
       end
 
-      response[:last_push_by_id] = response[:last_push_by][:id]
-      response[:last_push_by_name] = response[:last_push_by][:name]
+      @response = response
+
+      projects_table = EPC::TabularOutputter.new([response], {:id => "ID", :name => "NAME", :uri_name => "URI NAME", :created_at => "CREATED AT", :last_build_status => "BUILD STATUS", :last_build_date => "BUILD DATE", :last_build_version => "BUILD VERSION"})
+  
       last_push_table = EPC::TabularOutputter.new([response], {:last_push_by_id => "USER ID", :last_push_by_name => "USER NAME", :last_push_date => "DATE"})
-      dependencies_table = EPC::TabularOutputter.new(dependencies, [:id, :project_id, :name, :type])
+
+      dependencies_table = EPC::TabularOutputter.new(response[:dependencies], [:id, :project_id, :name, :type])
 
       config_values_table = EPC::TabularOutputter.new(response[:config_values], [:id, :name, :no_override, :value, :value_type, :required])
+
       roles_table = EPC::TabularOutputter.new(response[:roles], [:id, :name])
 
-      say("\nProject details:")
-      say(projects_table.print)
-      
-      say("\nLast push info:")
-      say(last_push_table.print)
+      services_table = EPC::TabularOutputter.new(response[:service_versions], [:id, :label, :definition_name])
+
+      libraries_table = EPC::TabularOutputter.new(response[:libraries], [:id, :name, :language, :library_version, :group])
 
-      unless dependencies.nil? || dependencies.empty?
+      if @showables.blank?
+        say("\nProject details:")
+        say(projects_table.print)
+        
+        say("\nLast push info:")
+        say(last_push_table.print)
+      end
+
+      if show? :dependencies
         say("\nDependencies:")
         say(dependencies_table.print)
       end
 
-      unless response[:config_values].nil? || response[:config_values].empty?
+      if show? :config
         say("\nConfig values:")
         say(config_values_table.print)
       end
 
-      unless response[:roles].nil? || response[:roles].empty?
+      if show? :roles
         say("\nRoles:")
         say(roles_table.print)
       end
+
+      if show? :services
+        say("\nServices:")
+        say(services_table.print)
+      end
+
+      if show? :libraries
+        say("\nLibraries:")
+        say(libraries_table.print)
+      end
+
       return status
     end
+
   end
+
 end
 

data/lib/epc/command/{unarchive_project_command.rb → project/unarchive_project_command.rb}

@@ -1,9 +1,10 @@
 module EPC::Command
-  class UnarchiveProjectCommand < BaseCommand
-    def execute(project_name = nil)
-      path = File.expand_path(".")
+  class UnarchiveProjectCommand < UnarchiveCommand
 
-      solution_name = @options[:solution_name]
+    def execute(project = nil)
+      path = File.expand_path(":")
+
+      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_solution_name => true})

data/lib/epc/command/{update_project_command.rb → project/update_project_command.rb}

@@ -2,22 +2,28 @@ module EPC::Command
   class UpdateProjectCommand < BaseCommand
     UPDATABLE_ATTRIBUTES = ["project_name", "project_type"]
 
-    def execute(*args)
+    def execute(project = nil, *args)
       path = "."
       path = File.expand_path(path)
 
-      solution_name = @options[:solution_name]
-      project_name = @options[:project_name]
+      ids = project.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, :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? || project_id == 0
 
       args_hash = {}
       args.each do |arg|
         key, val = arg.split("=")
+        next if key.nil?
         args_hash[key] = val
       end
 
@@ -26,7 +32,7 @@ module EPC::Command
       end
 
       args_hash.each do |attr, val|
-        if !UPDATABLE_ATTRIBUTES.include?(attr)
+        unless UPDATABLE_ATTRIBUTES.include?(attr)
           args_hash.delete(attr)
           say("Cannot update #{attr}. Updatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]")
           next

data/lib/epc/command/{list_projecttypes_command.rb → projecttype/list_projecttypes_command.rb}

@@ -1,7 +1,7 @@
 module EPC::Command
   class ListProjecttypesCommand < BaseCommand
 
-    def execute
+    def execute(target = nil)
       status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH)
 
       if status.failure?

data/lib/epc/command/{show_projecttype_command.rb → projecttype/show_projecttype_command.rb}

@@ -1,10 +1,11 @@
 module EPC::Command
   class ShowProjecttypeCommand < BaseCommand
 
-    def execute(project_type = nil)
-      raise FatalError, "You must specify a project type id" if project_type.nil?
+    def execute(project_type = nil, *args)
 
-      status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH + "/#{project_type}")
+      project_type_id = retrieve_identifier_for("ProjectType", project_type)
+
+      status, response, headers = client.get(EPC::Config::PROJECT_TYPES_PATH + "/#{project_type_id}")
 
       if status.failure?
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/pull_command.rb

@@ -45,22 +45,26 @@ module EPC::Command
         status, id = create_pull(solution_name)
         if status.successful?
           say("Pulling - ")
-          shown, url = poll_for_pull_url(id)
-          if shown
-            tmpdir = Dir.tmpdir
-            pulled, zip_path = pull_zip(url, tmpdir)
-            if pulled
-              if create_dir
-                return 1 unless prep_solution_directory(path, solution_name)
-                path = File.join(path, solution_name)
-              end
+          success, url, response = poll_for_pull_url(id)
+          if success
+            zip_path = nil
+            if url
+              tmpdir = Dir.tmpdir
+              pulled, zip_path = pull_zip(url, tmpdir)
+              return 1 unless pulled
+            end
+            if create_dir
+              return 1 unless prep_solution_directory(path, solution_name)
+              path = File.join(path, solution_name)
+            end
+            if zip_path
               unzip_solution(zip_path, path)
               confirm_pull(id)
-              refresh_command = EPC::Command::RefreshSolutionCommand.new(client, @options)
-              refresh_command.options[:prompt_refresh] = false if first_time_pull
-              refresh_command.execute(path)
-              return 0
             end
+            refresh_command = EPC::Command::RefreshSolutionCommand.new(client, @options)
+            refresh_command.options[:prompt_refresh] = false if first_time_pull
+            refresh_command.execute(path)
+            return 0
           end
         end
       rescue Exception => ex
@@ -93,15 +97,6 @@ module EPC::Command
       end
     end
     
-    def sign_pull(id)
-      status, response, headers = client.put("#{EPC::Config::PULLS_PATH}/#{id}/sign")
-      if status.successful?
-        return status, nil, response[:signed_url]
-      else
-        return status, response[:error_code], nil
-      end
-    end
-
     def prep_solution_directory(path, solution_name)
       solution_id = get_resource_id(EPC::Config::SOLUTIONS_PATH, :name, solution_name)
       if solution_id.nil?
@@ -138,10 +133,16 @@ module EPC::Command
         end 
         sleep(SLEEP_TIME)
         
-        status, code, url = sign_pull(id)
-        if status.successful? || (status == 404 && code == 801)
+        status, response, headers = sign_pull(id)
+
+        if status.successful?
+          say("\n")
+          return true, response[:signed_url], response
+        end
+
+        if status == 404 && response[:error_code] == 801
+
           count += 1
-          next if url.nil? || url.empty?
           break
         else
           say("Poller failed to get the pull URL. Aborting.")
@@ -150,17 +151,14 @@ module EPC::Command
         end
       end
 
-
-      if url
-        [true, url]
-      elsif failed
-        [false, nil]
-      else
-        if count > GIVEUP_TICKS
-          say("\nServer is taking too long to update the pull URL. Please contact the AgileMethods support team.")
-        end
-        [false, nil]
+      if count > GIVEUP_TICKS
+        say("\nServer is taking too long to update the pull URL. Please contact the AgileMethods support team.")
       end
+      [false, nil, nil]
+    end
+
+    def sign_pull(id)
+      client.put("#{EPC::Config::PULLS_PATH}/#{id}/sign")
     end
     
     def check_pull_directory(path)

data/lib/epc/command/{delete_role_command.rb → role/delete_role_command.rb}

@@ -1,15 +1,14 @@
 module EPC::Command
-  class DeleteRoleCommand < BaseCommand
-    required_arguments_count 1, :message => "You must specify the role id/name"
+  class DeleteRoleCommand < DeleteCommand
 
-    def execute(role = nil)
+    def execute(role = nil, *args)
 
       proceed = ask_yn("Are you sure you want to delete the [#{role}] role? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      role_id = retrieve_system_role_identifier(role)
+      role_id = retrieve_identifier_for("Role", role)
 
       status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/system/true")
 

data/lib/epc/command/{list_roles_command.rb → role/list_roles_command.rb}

@@ -1,9 +1,10 @@
 module EPC::Command
   class ListRolesCommand < BaseCommand
-    def execute
+    def execute(target = nil)
 
-			if @options[:user].present?
-				status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{@options[:user]}?include=roles")
+			if target.present?
+        target_type, target_id = target.split(":")
+				status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{target_id}?include=roles")
 				response = response[:roles]
 			else
 				status, response, headers = client.get(EPC::Config::ROLES_PATH + "?system_roles=true")

data/lib/epc/command/{show_role_command.rb → role/show_role_command.rb}

@@ -1,13 +1,17 @@
 module EPC::Command
-  class ShowRoleCommand < BaseCommand
-    required_arguments_count 1, :message => "You need to specify a role id/name"
+  class ShowRoleCommand < ShowCommand
 
-    def execute(role = nil)
+    def execute(role = nil, *args)
+      @showable_translations = {
+        :groups => :user_groups
+      }
 
-      role_id = retrieve_system_role_identifier(role)
+      role_id = retrieve_identifier_for("Role", role)
 
       status, response, headers = client.get(EPC::Config::ROLES_PATH + "/#{role_id}?include=users,user_groups,grants")
 
+      @showables = args[1..-1].map(&:to_sym) rescue []
+
       unless status.successful?
         say("Request failed: [#{response[:message]}]")
         return 1
@@ -18,23 +22,27 @@ module EPC::Command
       user_groups_table = EPC::TabularOutputter.new(response[:user_groups], [:id, :name])
       grants_table = EPC::TabularOutputter.new(response[:grants], [:id, :action, :secured_type, :secured_id])
 
-      say("Role:")
-      say(role_table.print)
-      say("\n")
+      @response = response
+
+      if @showables.blank?
+        say("Role:")
+        say(role_table.print)
+        say("\n")
+      end
 
-      if response[:users].present?
+      if show? :users
         say("Users:")
         say(users_table.print)
         say("\n")
       end
 
-      if response[:user_groups].present?
+      if show? :groups
         say("User groups:")
         say(user_groups_table.print)
         say("\n")
       end
 
-      if response[:grants].present?
+      if show? :grants
         say("Grants:")
         say(grants_table.print)
         say("\n")