epc 1.0.3 → 1.0.4

data/lib/epc/modules/role.rb

@@ -0,0 +1,133 @@
+module EPC::Command
+  module Role
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+
+      def batch_add(role_id, data)
+        users = data["users"] rescue []
+        users.each do |user|
+          add_user(role_id, user["id"])
+        end
+
+        groups = data["user_groups"] rescue []
+        groups.each do |group|
+          add_group(role_id, group["id"])
+        end
+
+        grants = data["grants"] rescue []
+        grants.each do |grant|
+          add_grant(role_id, [grant["secured_type"], grant["action"], grant["secured_id"]].join(":"))
+        end
+
+      end
+
+      def add_user(role_id, user)
+        user_id = retrieve_identifier_for("User", 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})
+        if status.successful?
+          say("User [#{user}] added to role") 
+        else
+          say("Failed to add [#{user}]: [#{response[:message]}]")
+        end
+        return status
+      end
+
+
+      def remove_user(role_id, user)
+        user_id = retrieve_identifier_for("User", user)
+        status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/remove_member", {:member_id => @options[:remove_user], :member_type => "User"})
+
+        if status.successful?
+          say("User [#{user}] removed from role")
+        else
+          say("Failed to remove [#{user}]: [#{response[:message]}]")
+        end
+
+        return status
+      end
+
+      def add_group(role_id, group)
+        group_id = retrieve_identifier_for("UserGroup", 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})
+        if status.successful?
+          say("Group [#{group}] added to role") 
+        else
+          say("Failed to add [#{group}]: [#{response[:message]}]")
+        end
+
+        return status
+      end
+
+      def remove_group(role_id, group)
+        group_id = retrieve_identifier_for("UserGroup", group)
+        status, response, headers = client.delete(EPC::Config::ROLES_PATH + "/#{role_id}/remove_member", {:member_id => group_id, :member_type => "UserGroup"})
+        if status.successful?
+          say("Group [#{group}] removed from role") 
+        else
+          say("Failed to remove [#{group}]: [#{response[:message]}]")
+        end
+
+        return status
+      end
+
+      def add_grant(role_id, grant)
+        secured_type, action, secured_id = 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")
+        else
+          say("Request failed: [#{response[:message]}]")
+        end
+        return status
+      end
+
+      def remove_grant(role_id, grant)
+        secured_type, action, secured_id = 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")
+          else
+            say("Request failed: [#{response[:message]}]")
+          end
+        end
+        return status
+      end
+    end
+  end
+end

data/lib/epc/runner.rb

@@ -13,7 +13,7 @@ class EPC::Runner
   def initialize(args = [])
     @args = args
     @options = Hash.new
-    @parent_commands = %w(list define undefine refresh approve deny bind unbind attach detach submit copy set request)
+    @parent_commands = %w(define undefine refresh approve deny bind unbind attach detach request)
   end
 
   def run
@@ -35,14 +35,17 @@ class EPC::Runner
           say(ex.to_s)
           exit 1
         rescue FatalError => ex
-          command_name = EPC::Config.underscore(command_klass.class.to_s.split("::").last)
-          # say("USAGE: " + EPC::Help::COMMAND_USAGES[command_name.split("_")[0...-1].join("_").to_sym])
+          command_name = EPC::Config.underscore(command_klass.klass_name.to_s.split("::").last)
+          say("USAGE: " + EPC::Help::COMMAND_USAGES[command_name.split("_")[0...-1].join("_").to_sym])
           say(ex.to_s)
           exit 1
-        # rescue ArgumentError => ex
-        #   command_name = EPC::Config.underscore(command_klass.class.to_s.split("::").last)
-        #   say("Wrong number of attributes for #{command_name}")
-        #   # say("USAGE: " + EPC::Help::COMMAND_USAGES[command_name.split("_")[0...-1].join("_").to_sym])
+        rescue ArgumentError => ex
+          command_name = EPC::Config.underscore(command_klass.klass_name.to_s.split("::").last)
+          say("Wrong number of attributes for #{command_name}")
+          say("USAGE: " + EPC::Help::COMMAND_USAGES[command_name.split("_")[0...-1].join("_").to_sym])
+          exit 1
+        rescue NameError => ex
+          say "No such command"
           exit 1
         rescue BaseClient::HTTPException => ex
           say(ex.to_s)
@@ -78,7 +81,7 @@ class EPC::Runner
       opts.on('--down-script FILE')        { |file| @options[:down_script] = file}
       opts.on('--required')                { |required| @options[:required] = true }
       opts.on('--f FILE')                  { |file| @options[:file] = file }
-      opts.on('--file FILE')                  { |file| @options[:file] = file }
+      opts.on('--file FILE')               { |file| @options[:file] = file }
       opts.on('--force')                   { |force| @options[:force] = true }
       opts.on('-s NAME')                   { |name| @options[:solution_name] = name}
       opts.on('-S NAME')                   { |name| @options[:stage_name] = name}
@@ -129,8 +132,15 @@ class EPC::Runner
       opts.on('--timeout TIMEOUT')         { |timeout| @options[:timeout] = timeout}
       opts.on('--extensions')              { |ext| @options[:extensions] = true}
       opts.on('--inherited')               { |inherited| @options[:inherited] = true}
+      opts.on('--archived')                { |archived| @options[:archived] = true}
+      opts.on('--memory')                  { |memory| @options[:memory] = memory}
       opts.on('--configuration CONFIGURATION')  { |configuration| @options[:configuration] = configuration}
-      opts.on('--executions executions')  { |executions| @options[:executions] = executions}
+      opts.on('--agility-topology ID')     { |id| @options[:agility_topology] = id}
+      opts.on('--agility-environment ID')  { |id| @options[:agility_environment] = id}
+      opts.on('--executions executions')   { |executions| @options[:executions] = executions}
+      opts.on('--backwards-compatible')    { |val| @options[:backwards_compatible] = true}
+      opts.on('--reversible')              { |val| @options[:reversible] = true}
+      opts.on('--direct-deploy FILE')      { |file| @options[:direct_deploy] = file}
 
       opts.on('-p NAME') do |name|
         if @options[:project_name].nil?
@@ -161,16 +171,17 @@ class EPC::Runner
         exit 0
       else
         if command_name == "approve" || command_name == "deny"
-          @args.shift
-          klass_name = "EPC::Command::VoteDeploymentCommand"
+          klass_name = "EPC::Command::VoteCommand"
           @options[:approval] = command_name
         elsif @parent_commands.include?(command_name)
           subcommand_name = @args.shift.gsub("-", "")
           klass_name = "EPC::Command::#{command_name.to_s.capitalize}#{subcommand_name.to_s.capitalize}Command"
+        elsif command_name == "snapshot"
+          klass_name = "EPC::Command::ShowProjectSnapshotCommand"
         else
           klass_name = "EPC::Command::#{command_name.to_s.capitalize}Command"
         end
-        command_klass = eval(klass_name).new(client, @options)
+        command_klass = eval(klass_name.gsub("-", "")).new(client, @options)
       end
     rescue NameError => ex
       say("No such command: #{command_name} #{subcommand_name}")

data/lib/epc/version.rb

@@ -1,3 +1,3 @@
 module Epc
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/command/archive_project_command_test.rb

@@ -1,24 +1,13 @@
 require 'test_helper'
 
 class ArchiveProjectCommandTest < Test::Unit::TestCase
-  context "checks" do
-    setup do 
-      @mock_client = mock("Client")
-      @command = EPC::Command::ArchiveProjectCommand.new(@mock_client)
-    end
 
-    should "fail if no project id specified" do
-      assert_raise EPC::Error::FatalError do
-        assert_equal 1, @command.execute
-      end
-    end
-  end
   context "archiving" do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ArchiveProjectCommand.new(@mock_client)
-      @command.expects(:infer_solution_context).returns([1, "FirstSolution"])
-      @command.expects(:infer_project_context).returns([1, "FirstProject"])
+      @command.object_type = "Project"
+      @command.object_id = 1
     end
 
     should "fail if status is not 201" do

data/test/command/archive_solution_command_test.rb

@@ -1,27 +1,17 @@
 require 'test_helper'
 
 class ArchiveSolutionCommandTest < Test::Unit::TestCase
-  context "checks" do
-    setup do 
-      @mock_client = mock("Client")
-      @command = EPC::Command::ArchiveSolutionCommand.new(@mock_client)
-    end
 
-    should "fail if no solution specified" do
-      assert_raise EPC::Error::FatalError do
-        assert_equal 1, @command.execute
-      end
-    end
-  end
   context "archiving" do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ArchiveSolutionCommand.new(@mock_client)
-      @command.expects(:infer_solution_context).returns([1, "FirstSolution"])
+      @command.object_id = 1
+      @command.object_type = "Solution"
     end
 
     should "fail if status is not 201" do
-      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => true, :name => "FirstSolution"}).
+      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => true}).
         returns([404, {:message => "Not Found"}, {}])
 
       @command.expects(:say).with("Solution could not be archived. Request failed with: [Not Found]")
@@ -29,7 +19,7 @@ class ArchiveSolutionCommandTest < Test::Unit::TestCase
     end
 
     should "archive the solution" do
-      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => true, :name => "FirstSolution"}).
+      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => true}).
         returns([200, {}, {}])
 
       @command.expects(:say).with("Solution has been archived.")

data/test/command/copy_deployment_command_test.rb

@@ -8,12 +8,8 @@ class CopyDeploymentCommandTest < Test::Unit::TestCase
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::CopyDeploymentCommand.new(@mock_client)
-    end
-
-    should "fail if no deployment id specified" do
-      assert_raise EPC::Error::FatalError do
-        assert_equal(@command.execute, 1)
-      end
+      @command.object_id = 1
+      @command.object_type = "Deployment"
     end
 
     should "fail if status is not 201" do
@@ -21,7 +17,7 @@ class CopyDeploymentCommandTest < Test::Unit::TestCase
         returns([404, {:message => "Not Found"}, {}])
 
       @command.expects(:say).with("Request failed: [Not Found]")
-      assert_equal(@command.execute(1, "development"), 404)
+      assert_equal(@command.execute(["development"]), 404)
     end
 
     should "report the succesfull creation of new deployment" do
@@ -29,7 +25,7 @@ class CopyDeploymentCommandTest < Test::Unit::TestCase
         returns([201, {:id => 2}, {}])
 
       @command.expects(:say).with("Copied new deployment to the development stage. ID: 2")
-      assert_equal(@command.execute(1, "development"), 201)
+      assert_equal(@command.execute(["development"]), 201)
 
     end
 

data/test/command/create_config_command_test.rb

@@ -7,13 +7,13 @@ class CreateConfigCommandTest < Test::Unit::TestCase
   context "adding" do
     setup do
       @mock_client = mock("Client")
+      EPC::Command::CreateConfigCommand.send :include, EPC::Command::Config
       @command = EPC::Command::CreateConfigCommand.new(@mock_client)
-    
     end
 
     should "fail if no key specified" do
       assert_raise EPC::Error::FatalError do
-        @command.execute("")
+        @command.execute
       end
     end
 
@@ -28,22 +28,21 @@ class CreateConfigCommandTest < Test::Unit::TestCase
       ).returns([400, {:message => "Not Found"}, {}])
 
       @command.expects("say").with("Request failed with message [Not Found]")
-      assert_equal(@command.execute("", "key1=value1"), 400)
-       
+      assert_equal(@command.execute(["key1=value1"]), 400)
     end
 
 
     should "add to specified configuration level when option is specified" do
-      command = EPC::Command::CreateConfigCommand.new(@mock_client, {:user => 2})
+      @command.options[:user] = 2
 
-      command.expects(:extract_configuration_level).returns(["User", 2])
+      @command.expects(:extract_configuration_level).returns(["User", 2])
 
       @mock_client.expects(:post).with(EPC::Config::CONFIGURATIONS_PATH,
         {:config_values => [{:name => "key1", :value => "value1", :value_type => "text", :configurable_id => 2, :configurable_type => "User", :required => false, :no_override => nil}]}
       ).returns([201, {:id => 1}, {}])
 
-      command.expects(:say).with("Configuration values saved.")
-      assert_equal(command.execute("", "key1=value1"), 201)
+      @command.expects(:say).with("Configuration values saved.")
+      assert_equal(@command.execute(["key1=value1"]), 201)
 
     end
 
@@ -55,46 +54,47 @@ class CreateConfigCommandTest < Test::Unit::TestCase
       ).returns([201, {:id => 1}, {}])
 
       @command.expects(:say).with("Configuration values saved.")
-      assert_equal(@command.execute("", "key1=value1"), 201)
+      assert_equal(@command.execute(["key1=value1"]), 201)
     end
 
     should "add required key when --required flag is supplied" do
-      command = EPC::Command::CreateConfigCommand.new(@mock_client, {:required => true})
+      @command.options[:required] = true
 
-      command.expects(:extract_configuration_level).returns(["Project", 1])
+      @command.expects(:extract_configuration_level).returns(["Project", 1])
 
       @mock_client.expects(:post).with(EPC::Config::CONFIGURATIONS_PATH,
                                        {:config_values => [{:name => "key1", :value => "value1", :value_type => "text", :configurable_id => 1, :configurable_type => "Project", :required => true, :no_override => nil}]}
       ).returns([201, {:id => 1}, {}])
 
-      command.expects(:say).with("Configuration values saved.")
-      assert_equal(command.execute("", "key1=value1"), 201)
+      @command.expects(:say).with("Configuration values saved.")
+      assert_equal(@command.execute(["key1=value1"]), 201)
     end
 
     should "should accept value-type parameter" do
-      command = EPC::Command::CreateConfigCommand.new(@mock_client, {:value_type => "URL"})
+      @command.options[:value_type] = "URL"
 
-      command.expects(:extract_configuration_level).returns(["Project", 1])
+      @command.expects(:extract_configuration_level).returns(["Project", 1])
 
       @mock_client.expects(:post).with(EPC::Config::CONFIGURATIONS_PATH,
                                        {:config_values => [{:name => "key1", :value => "value1", :value_type => "URL", :configurable_id => 1, :configurable_type => "Project", :required => false, :no_override => nil}]}
       ).returns([201, {:id => 1}, {}])
 
-      command.expects(:say).with("Configuration values saved.")
-      assert_equal(command.execute("", "key1=value1"), 201)
+      @command.expects(:say).with("Configuration values saved.")
+      assert_equal(@command.execute(["key1=value1"]), 201)
     end
 
     should "should add the stage name parameter" do
-      command = EPC::Command::CreateConfigCommand.new(@mock_client, {:value_type => "URL", :stage => "Development"})
+      @command.options[:value_type] = "URL" 
+      @command.options[:stage] = "Development"
 
-      command.expects(:extract_configuration_level).returns(["Project", 1])
+      @command.expects(:extract_configuration_level).returns(["Project", 1])
 
       @mock_client.expects(:post).with(EPC::Config::CONFIGURATIONS_PATH,
                                        {:config_values => [{:name => "key1", :value => "value1", :value_type => "URL", :configurable_id => 1, :configurable_type => "Project", :required => false, :no_override => nil, :stage_name => "Development"}]}
       ).returns([201, {:id => 1}, {}])
 
-      command.expects(:say).with("Configuration values saved.")
-      assert_equal(command.execute("", "key1=value1"), 201)
+      @command.expects(:say).with("Configuration values saved.")
+      assert_equal(@command.execute(["key1=value1"]), 201)
     end
 
     should "read data from external file when prompted to" do
@@ -106,7 +106,7 @@ class CreateConfigCommandTest < Test::Unit::TestCase
       ).returns([201, {:id => 1}, {}])
 
       @command.expects(:say).with("Configuration values saved.")
-      assert_equal(@command.execute("", "key1=value1"), 201)
+      assert_equal(@command.execute(["key1=value1"]), 201)
     end
 
     should "fail if no config values were supplied" do
@@ -114,7 +114,7 @@ class CreateConfigCommandTest < Test::Unit::TestCase
         @command.options[:file] = "path_to_file"
         EPC::Config.expects(:read_content_as_json).returns([])
         @command.expects(:extract_configuration_level).returns(["Project", 1])
-        @command.execute("")
+        @command.execute
       end
       
     end

data/test/command/create_deployment_command_test.rb

@@ -42,7 +42,7 @@ class CreateDeploymentCommandTest < Test::Unit::TestCase
       @command.expects(:ask_yn).returns("Y")
       @command.expects(:say).with("Deployment creation failed [Not Found]. Aborting.")
       
-      assert_equal(@command.execute("", "Development"), 404)
+      assert_equal(@command.execute(["Development"]), 404)
     end
     
     should "report failure if it catches an exception" do
@@ -53,38 +53,39 @@ class CreateDeploymentCommandTest < Test::Unit::TestCase
       @command.expects(:ask_yn).returns("Y")
       @command.expects(:say).with("Create deployment failed [Exception Caught (StandardError): failed].")
       
-      assert_equal(@command.execute("", "Development"), 1)
+      assert_equal(@command.execute(["Development"]), 1)
     end
   end
 
-  context "deployment replacement" do
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::CreateDeploymentCommand.new(@mock_client, {:solution_name => "FirstSolution"})
-      @command.expects(:infer_solution_context).returns([1, "FirstSolution"])
-      @command.expects(:ask_yn).returns("Y")
-      @command.options[:replaces] = 1
-      @command.expects(:create_deployment).returns([200, 2])
-    end
-
-    should "issue a replacement request to core" do
-      @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/2", :stage_name => "no_change", :replaces_id => 1, :versions => "no_change").
-        returns([200, {}, {}])
-      @command.expects(:say).with("Replacement request successful")
-
-      @command.execute
-    end
-
-    should "notify if replacement request fails" do
-      @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/2", :stage_name => "no_change", :replaces_id => 1, :versions => "no_change").
-        returns([500, {:message => "System exception"}, {}])
-      @command.expects(:say).with("Replacement request failed: [System exception]")
-
-      @command.execute
-    end
-    
-
-  end
+  # context "deployment replacement" do
+  #   setup do
+  #     @mock_client = mock("Client")
+  #     @command = EPC::Command::CreateDeploymentCommand.new(@mock_client, {:solution_name => "FirstSolution"})
+  #     @command.target_id = "FirstSolution"
+  #     @command.expects(:infer_solution_context).returns([1, "FirstSolution"])
+  #     @command.expects(:ask_yn).returns("Y")
+  #     @command.options[:replaces] = 1
+  #     @command.expects(:create_deployment).returns([200, 2])
+  #   end
+
+  #   should "issue a replacement request to core" do
+  #     @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/2", :stage_name => "no_change", :replaces_id => 1, :versions => "no_change").
+  #       returns([200, {}, {}])
+  #     @command.expects(:say).with("Replacement request successful")
+
+  #     @command.execute()
+  #   end
+
+  #   should "notify if replacement request fails" do
+  #     @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/2", :stage_name => "no_change", :replaces_id => 1, :versions => "no_change").
+  #       returns([500, {:message => "System exception"}, {}])
+  #     @command.expects(:say).with("Replacement request failed: [System exception]")
+
+  #     @command.execute
+  #   end
+  #   
+
+  # end
   
   context "create_deployment" do
     setup do
@@ -125,12 +126,12 @@ class CreateDeploymentCommandTest < Test::Unit::TestCase
     end
 
     should "return blank results when passed blank data" do
-      assert_equal(@command.send(:parse_projects, []), [[], []])
+      assert_equal(@command.send(:parse_projects, []), [[], [], []])
     end
 
 
     should "parse projects" do
-      assert_equal(@command.send(:parse_projects, "1:2:3"), [[{:project_id => "1", :version => "2"}], [{:project_id => "1", :instances => "3"}]])
+      assert_equal(@command.send(:parse_projects, "1:2:3:4"), [[{:project_id => "1", :version => "2"}], [{:project_id => "1", :instances => "3"}],[{:project_id => "1", :runtime_memory => "4"}]])
     end
   end
 end