epc 1.0.3 → 1.0.4

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

@@ -1,17 +1,10 @@
 module EPC::Command
   class UnarchiveProjectCommand < UnarchiveCommand
 
-    def execute(project = nil)
-      path = File.expand_path(":")
+    def execute(params = [])
+      require_object
 
-      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})
-
-      raise FatalError, "Project could not be inferred." if project_id.nil?
-
-      status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{project_id}", {:archived => false})
+      status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{object_id}", {:archived => false})
       if status.successful?
         say("Project has been unarchived.")
       else

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

@@ -2,23 +2,9 @@ module EPC::Command
   class UpdateProjectCommand < BaseCommand
     UPDATABLE_ATTRIBUTES = ["project_name", "project_type"]
 
-    def execute(project = nil, *args)
-      path = "."
-      path = File.expand_path(path)
-
-      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
+    def execute(args)
+      require_object
+      path = File.expand_path(".")
 
       args_hash = {}
       args.each do |arg|
@@ -39,7 +25,7 @@ module EPC::Command
         end
       end
       unless args_hash.empty?
-        status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{project_id}", args_hash)
+        status, response, message = client.put(EPC::Config::PROJECTS_PATH + "/#{object_id}", args_hash)
         if status.failure?
           say("Update failed with: [#{response[:message]}]")
         else
@@ -47,6 +33,7 @@ module EPC::Command
         end
         return status
       else
+        say("You must specify an attribute to be updated: [#{UPDATABLE_ATTRIBUTES.join(",")}]")
         say(EPC::Help::COMMAND_USAGES[:update_project])
         return 1
       end

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

@@ -0,0 +1,37 @@
+module EPC::Command
+  class CreateProjecttypeCommand < CreateCommand
+
+    def execute(args = [])
+      # raise FatalError, "You need to specify all mandatory parameters" if args.size < 5
+
+      params = {}
+      params[:name] = args[0]
+      params[:runtime] = args[1]
+      params[:framework] = args[2]
+      params[:build_type] = args[3]
+      params[:build_packaging] = args[4]
+      params[:deployable] = args[5]
+       
+      begin
+        params[:runtime_env_types] = []
+        args[6].split(",").each do |rti|
+          params[:runtime_env_types] << {:id => retrieve_identifier_for("RuntimeEnvType", rti)}
+        end
+      rescue Exception => ex
+        say("Unable to parse runtime-env-types parameter")
+        return 1
+      end
+
+      status, response, headers = client.post(EPC::Config::PROJECT_TYPES_PATH, params)
+
+      if status.successful?
+        say("ProjectType [#{args[0]}] created")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+    end
+
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,61 @@
+module EPC::Command
+  class UpdateProjecttypeCommand < UpdateCommand
+
+    UPDATABLE_ATTRIBUTES = ["name", "runtime", "framework", "build_type", "build_packaging", "deployable", "runtime_env_types"]
+  
+    def execute(args)
+
+      raise FatalError, "You need to specify at least one attribute to update.\nUpdatable attributes are: [#{UPDATABLE_ATTRIBUTES.join(', ')}]" if args.size < 1
+      params = {}
+
+      args.each do |arg|
+        key, val = arg.split("=")
+        next if key.blank?
+        if key == :runtime_env_types
+          begin
+            params[:runtime_env_types] = []
+            args[6].split(",").each do |rti|
+              params[:runtime_env_types] << {:id => retrieve_identifier_for("RuntimeEnvType", rti)}
+            end
+          rescue Exception => ex
+            say("Unable to parse runtime-env-types parameter")
+            return 1
+          end
+        else
+          params[key] = val
+        end
+      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::PROJECT_TYPES_PATH + "/#{object_id}")
+
+      unless status.successful?
+        say("Request failed: [#{response[:message]}]")
+        return 1
+      end
+
+      type_attrs = response.merge(params.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo})
+       
+      status, response, headers = client.put(EPC::Config::PROJECT_TYPES_PATH + "/#{object_id}", type_attrs)
+
+      if status.successful?
+        say("Project type updated")
+      else
+        say("Request failed: [#{response[:message]}]")
+      end
+
+      return status
+
+    end
+
+  end
+end

data/lib/epc/command/push_command.rb

@@ -58,12 +58,12 @@ module EPC::Command
         project_id, project_name = infer_project_context(nil, path, solution_id, {:get_project_name => true})
         say("\nPushing #{project_name}...")
         begin
-          zip_path = zip_source(path)
-          return 1 unless zip_path
+          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])
+          status, url, signature, id = create_push(project_name, solution_name, sha1, @options[:note], @options[:direct_deploy])
           if status.successful?
-            pushed = push_zip(zip_path, url, signature)
+            pushed = push_zip(zip_path, url, signature, @options[:direct_deploy])
             resp = confirm_push(id)
             if resp[:build_id].present? && !@options[:skip_build]
               poll_for_build_status(resp[:build_id]) unless @options[:no_poll].present?
@@ -87,9 +87,10 @@ module EPC::Command
 
     private
 
-    def create_push(project_name, solution_name, sha1, note = nil)
+    def create_push(project_name, solution_name, sha1, note = nil, direct_deploy=nil)
       status, response, headers = client.post("#{EPC::Config::PUSHES_PATH}",
-                                              { :project_name => project_name, :solution_name => solution_name, :sha1 => sha1, :note => note})
+                                              { :project_name => project_name, :solution_name => solution_name,
+                                                :sha1 => sha1, :note => note, :direct_deploy => direct_deploy})
       if status.successful?
         say("Successfully created a push with [#{target_url}]")
         return status, response[:url], response[:signature], response[:id]
@@ -156,7 +157,7 @@ module EPC::Command
       return full_paths, relative_paths
     end
 
-    def push_zip(zip_path, url, signature)
+    def push_zip(zip_path, url, signature, direct_deploy=nil)
       # create API returns a URL that includes protocol://host/solution_name/project_name/version
 
       status, response, headers = http_client.post(url,
@@ -168,7 +169,7 @@ module EPC::Command
         raise BasicError, "Failed to push the zip file to the build area [status = #{status}]. Aborting push command."
       end
 
-    ensure File.delete zip_path if File.exists? zip_path
+    ensure File.delete zip_path if direct_deploy.nil? && File.exists?(zip_path)
     end
 
     def check_push_directory(path)
@@ -186,8 +187,13 @@ module EPC::Command
       if project_type == "Java Web Archive" || project_type == "Java Library"
         src_path = File.join(path, "src")
         raise BasicError, "#{path} does not include a src directory" if !File.exists?(src_path) && !File.directory?(src_path)
+        source_path = src_path
+      else
+        source_path = path
       end
 
+      raise BasicError, "The directory you are pushing is empty" if Dir.glob(File.join(source_path,'*')).blank?
+
       return true
     end
   end

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

@@ -1,9 +1,18 @@
 module EPC::Command
   class CreateRoleCommand < BaseCommand
-    def execute(*params)
-      role = params[1]
-      raise FatalError, "You must specify a role name" if role.blank? 
 
+    def execute(args = [])
+      role = args[0]
+
+      if @options[:file].present?
+        return handle_file_role_creation
+      else
+        return create_role(role)[0]
+      end
+    end
+
+    def create_role(role)
+      raise FatalError, "You must specify a role name" if role.blank? 
       status, response, headers = client.post(EPC::Config::ROLES_PATH, {:name => role})
 
       if status.successful?
@@ -11,7 +20,21 @@ module EPC::Command
       else
         say("Request failed: [#{response[:message]}]")
       end
+      return status, response[:id]
+    end
+
+    def handle_file_role_creation
+      contents = EPC::Config.read_content_as_json(@options[:file])
+      role = contents["name"]
+      status, role_id = create_role(role)
+
+      return 1 unless status.successful?
+
+      batch_add(role_id,contents)
+
+      return 0
 
     end
+
   end
 end

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

@@ -1,16 +1,14 @@
 module EPC::Command
   class DeleteRoleCommand < DeleteCommand
 
-    def execute(role = nil, *args)
+    def execute(args = [])
 
-      proceed = ask_yn("Are you sure you want to delete the [#{role}] role? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] role? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      role_id = retrieve_identifier_for("Role", role)
-
-      status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/system/true")
+      status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{object_id}/system/true")
 
       if status.successful?
         say("Role deleted")

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

@@ -1,9 +1,13 @@
 module EPC::Command
   class ListRolesCommand < BaseCommand
-    def execute(target = nil)
+    def execute(args = [])
+
+			if has_target?
+        if target_type.downcase != "user"
+          say("Target type must be User")
+          return 1
+        end
 
-			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

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

@@ -1,22 +1,25 @@
 module EPC::Command
   class ShowRoleCommand < ShowCommand
 
-    def execute(role = nil, *args)
+    def execute(args = [])
       @showable_translations = {
         :groups => :user_groups
       }
 
-      role_id = retrieve_identifier_for("Role", role)
+      @showables = args.map(&:to_sym) rescue []
 
-      status, response, headers = client.get(EPC::Config::ROLES_PATH + "/#{role_id}?include=users,user_groups,grants")
-
-      @showables = args[1..-1].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]}]")
         return 1
       end
 
+      if @options[:json].present?
+        say response.to_json
+        return 0
+      end
+
       role_table = EPC::TabularOutputter.new([response], [:id, :name])
       users_table = EPC::TabularOutputter.new(response[:users], [:id, :name])
       user_groups_table = EPC::TabularOutputter.new(response[:user_groups], [:id, :name])

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

@@ -1,94 +1,42 @@
 module EPC::Command
   class UpdateRoleCommand < UpdateCommand
 
-    required_options :add_user, :remove_user, :add_group, :remove_group, :add_grant, :remove_grant, :mode => :any?, :message => "You must specify a user/group/grant to added or removed"
+    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(role = nil, *args)
-      role_id = retrieve_identifier_for("Role", role)
+    def execute(args = [])
+      role_id = object_id
 
-      if @options[:add_user].present?
-        user_id = retrieve_identifier_for("User", @options[:add_user])
-        params = []
-        params << {:member_id => user_id.to_i, :member_type => "User"}
-
-        status, response, headers = client.put(EPC::Config::ROLES_PATH + "/#{role_id}/assign_members", {:role_memberships => params})
-        say("User added to role") if status.successful?
+      if @options[:file].present?
+        data = EPC::Config.read_content_as_json(@options[:file])
+        batch_add(object_id, data)
       end
 
+      if @options[:add_user].present?
+        status = add_user(role_id, @options[:add_user])
+      end
 
       if @options[:remove_user].present?
-        user_id = retrieve_identifier_for("User", @options[:add_user])
-        status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/remove_member", {:member_id => @options[:remove_user], :member_type => "User"})
-        say("User removed from role") if status.successful?
+        status = remove_user(role_id, @options[:remove_user])
       end
 
       if @options[:add_group].present?
-        group_id = retrieve_identifier_for("UserGroup", @options[:add_group])
-        params = []
-        params << {:member_id => group_id.to_i, :member_type => "UserGroup"}
-
-        status, response, headers = client.put(EPC::Config::ROLES_PATH + "/#{role_id}/assign_members", {:role_memberships => params})
-        say("UserGroup added to role") if status.successful?
+        status = add_group(role_id, @options[:add_group])
       end
 
 
       if @options[:remove_group].present?
-        group_id = retrieve_identifier_for("UserGroup", @options[:remove_group])
-        status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/remove_member", {:member_id => group_id, :member_type => "UserGroup"})
-        say("UserGroup removed from role") if status.successful?
+        status = remove_group(role_id, @options[:remove_group])
       end
 
-
-
       if @options[:add_grant].present?
-        secured_type, action, secured_id = @options[:add_grant].split(":")
-        raise FatalError, "Grant incorrectly specified" if secured_type.blank? || action.blank?
-
-        params = {}
-        params[:grant_action] = action
-        params[:permitted_type] = "Role"
-        params[:permitted_id] = role_id.to_i
-        params[:secured_type] = secured_type
-        params[:secured_id] = secured_id if secured_id.present?
-
-
-        status, response, headers = client.post(EPC::Config::GRANTS_PATH, params)
-
-        if status.successful?
-          say("Role permission updated")
-        end
+        status = add_grant(role_id, @options[:add_grant])
       end
 
 
       if @options[:remove_grant].present?
-        secured_type, action, secured_id = @options[:remove_grant].split(":")
-        status, response, headers = client.get(EPC::Config::ROLES_PATH + "/#{role_id}/grants")
-
-        if status.successful?
-          grant_id = response.detect do |g|
-            found = (g[:action] == action)
-            found = found && (g[:secured_type].to_s == secured_type)
-            if secured_id.blank?
-              found = found && g[:secured_id].blank?
-            else
-              found = found && (g[:secured_id].to_s == secured_id)
-            end
-            found
-          end[:id] rescue nil
-
-          raise FatalError, "Permission couldn't be determined" if grant_id.blank?
-
-          status, response, headers = client.delete(EPC::Config::GRANTS_PATH + "/#{grant_id}")
-
-          if status.successful?
-            say("Role permission deleted")
-          end
-        end
+        status = remove_grant(role_id, @options[:remove_grant])
       end
 
-
-
-      say("Request failed: [#{response[:message]}]") unless status.successful?
       return status
     end
   end