epc 1.0.2 → 1.0.3

data/test/command/list_deploymentstages_command_test.rb

@@ -1,13 +1,13 @@
 require 'test_helper'
 
-class ListStagesCommandTest < Test::Unit::TestCase
+class ListDeploymentstagesCommandTest < Test::Unit::TestCase
   should_require_login
 
   context "list solutions" do
     setup do 
       @mock_client = mock("Client")
 
-      @command = EPC::Command::ListStagesCommand.new(@mock_client) 
+      @command = EPC::Command::ListDeploymentstagesCommand.new(@mock_client) 
     end 
 
     should "show exception message status is not 201" do

data/test/command/list_metrics_command_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class ListMetricsCommandTest < Test::Unit::TestCase
+  should_require_login
+
+
+  context "execution" do
+    setup do
+      @mock_client = mock("Client")
+      @command = EPC::Command::ListMetricsCommand.new(@mock_client)
+    end
+
+    should "fail if status is not 200(ok)" do
+      @mock_client.expects(:get).with(EPC::Config::METRICS_PATH).returns([500, {:message => "System exception encountered"}, {}])
+      @command.expects(:say).with("Request failed: [System exception encountered]")
+      assert_equal 500, @command.execute
+    end
+
+    should "show a message if no metrics are returned" do
+      @mock_client.expects(:get).with(EPC::Config::METRICS_PATH).returns([200, {}, {}])
+      @command.expects(:say).with("No metrics available.")
+      assert_equal 200, @command.execute
+    end
+
+    should "show a message if no metrics are returned for a given target" do
+      @command = EPC::Command::ListMetricsCommand.new(@mock_client, {target: 'jimmy'})
+      @mock_client.expects(:get).with("#{EPC::Config::METRICS_PATH}?target=jimmy").returns([200, {}, {}])
+      @command.expects(:say).with("No metrics available for target jimmy.")
+      assert_equal 200, @command.execute
+    end
+
+    should "list metrics" do
+      metrics = [{target: 'target', id: 'id', name: 'name', type: 'type', function: 'function'}]
+      @mock_client.expects(:get).with(EPC::Config::METRICS_PATH).returns([200, metrics, {}])
+      @command.expects(:say)
+      assert_equal 200, @command.execute
+    end
+  end
+
+end

data/test/command/{list_rolepermissions_command_test.rb → list_permissions_command_test.rb}

@@ -1,12 +1,12 @@
 require 'test_helper'
 
-class ListRolepermissionsCommandTest < Test::Unit::TestCase
+class ListPermissionsCommandTest < Test::Unit::TestCase
   should_require_login
 
   context "execute" do
     setup do 
       @mock_client = mock("Client")
-      @command = EPC::Command::ListRolepermissionsCommand.new(@mock_client)
+      @command = EPC::Command::ListPermissionsCommand.new(@mock_client)
     end
 
     should "show a message if status is not 200" do

data/test/command/list_plugins_command_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class ListPluginsCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "execute" do
+    setup do
+      @mock_client = mock("Client")
+      @command = EPC::Command::ListPluginsCommand.new(@mock_client)
+    end
+
+    should "list the plugins" do
+      @mock_client.expects(:get).with(EPC::Config::PLUGINS_PATH).returns([200, [{}], {}])
+      @command.expects(:say)
+      @command.execute("")
+    end
+
+    should "report reason for request failure" do
+      @mock_client.expects(:get).with(EPC::Config::PLUGINS_PATH).returns([500, {:message => "System Exception"}, {}])
+      @command.expects(:say).with("Request failed: [System Exception]")
+      @command.execute("")
+    end
+
+  end
+
+
+end

data/test/command/list_projects_command_test.rb

@@ -11,11 +11,9 @@ class ListProjectsCommandTest < Test::Unit::TestCase
 
     should "fail if solution id can't be determined" do
       @command.expects(:infer_solution_context).returns(nil)
-      @command.expects(:say).with("Solution could not be inferred")
-      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:list_projects])
-
-     
-      assert_equal(@command.execute("FirstSolution"), 1)
+      assert_raise EPC::Error::InputError do 
+        assert_equal(@command.execute, 1)
+      end
     end
   end
 

data/test/command/list_roles_command_test.rb

@@ -34,12 +34,11 @@ class ListRolesCommandTest < Test::Unit::TestCase
       assert_equal(@command.execute, 200)
     end
 
-		should "retrieve roles for the user when --user is specified" do
-			@command.options[:user] = 1
+		should "retrieve roles for the user" do
 			@mock_client.expects(:get).with(EPC::Config::USERS_PATH + "/1?include=roles").
 				returns([200, {:roles => [{:id => 1, :name => "SuperAdmin"}, {:id => 2, :name => "Admin"}]}, {}])
       @command.expects(:say)
-      assert_equal(@command.execute, 200)
+      assert_equal(@command.execute("User:1"), 200)
 		end
   end
 

data/test/command/pull_command_test.rb

@@ -117,8 +117,10 @@ class PullCommandTest < Test::Unit::TestCase
       @mock_client.expects(:put).with("/api/v1/pulls/1/sign").
         returns([200, { :signed_url => "http://download/from/here" }, {}])
 
-      status, code, url = command.send(:sign_pull, 1)
-      
+      status, response, headers = command.send(:sign_pull, 1)
+      code = response[:error_code]
+      url = response[:signed_url]
+
       assert_equal(200, status)
       assert_nil(code)
       assert_equal("http://download/from/here", url)
@@ -130,8 +132,10 @@ class PullCommandTest < Test::Unit::TestCase
       @mock_client.expects(:put).with("/api/v1/pulls/1/sign").
         returns([404, { :message => "not found", :error_code => 801 }, {}])
 
-      status, code, url = command.send(:sign_pull, 1)
-    
+      status, response, headers = command.send(:sign_pull, 1)
+      code = response[:error_code]
+      url = response[:signed_url]
+
       assert_equal(404, status)
       assert_equal(801, code)
       assert_nil(url)
@@ -173,15 +177,15 @@ class PullCommandTest < Test::Unit::TestCase
       @command = EPC::Command::PullCommand.new(@mock_client)
     end
 
-    should "poll untill if receives and url" do
-      @command.expects(:sign_pull).returns([200, 1, "url_to_zip"])
-      assert_equal(@command.send(:poll_for_pull_url, 1), [true, "url_to_zip"])
+    should "poll until if receives and url" do
+      @command.expects(:sign_pull).returns([200, {:signed_url => "url_to_zip"}, nil])
+      assert_equal(@command.send(:poll_for_pull_url, 1), [true, "url_to_zip", {:signed_url => "url_to_zip"}])
     end
 
     should "notify when there's an error in polling" do
-      @command.expects(:sign_pull).returns([500, 1, nil])
+      @command.expects(:sign_pull).returns([500, {}, nil])
       @command.expects(:say).with("Poller failed to get the pull URL. Aborting.")
-      assert_equal(@command.send(:poll_for_pull_url, 1), [false, nil])
+      assert_equal(@command.send(:poll_for_pull_url, 1), [false, nil, nil])
     end
 
   end

data/test/command/show_group_command_test.rb

@@ -9,12 +9,6 @@ class ShowGroupCommandTest < Test::Unit::TestCase
       @command = EPC::Command::ShowGroupCommand.new(@mock_client)
     end
 
-    should "fail if no group is specified" do
-      assert_raise EPC::Error::FatalError do
-        assert_equal(@command.execute, 1)
-      end
-    end
-
     should "fail if status is not 200" do
       @mock_client.expects(:get).with(EPC::Config::GROUPS_PATH + "/1?include=users").
         returns([404, {:message => "Not Found"}, {}])
@@ -22,24 +16,8 @@ class ShowGroupCommandTest < Test::Unit::TestCase
       assert_equal(@command.execute(1), 1)
     end
 
-    should "fail if group_id can't be determined" do
-      @command.expects(:get_resource_id).with(EPC::Config::GROUPS_PATH, :name, "admins").returns(nil)
-      assert_raise EPC::Error::FatalError do
-        assert_equal(@command.execute("admins"), 1)
-      end
-    end
-
-    should "show a group specified by id" do
-      @mock_client.expects(:get).with(EPC::Config::GROUPS_PATH + "/1?include=users").
-        returns([200, {}, {}])
-      @command.expects(:say).at_least_once
-
-      assert_equal(@command.execute(1), 200)
-    end
-
-
     should "show a group specified by name" do
-      @command.expects(:get_resource_id).with(EPC::Config::GROUPS_PATH, :name, "admins").returns(1)
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:get).with(EPC::Config::GROUPS_PATH + "/1?include=users").
         returns([200, {:id => 1, :name => "Grp1", :users => [{:id => 1, :name => "Group Leader", :email => "group_leader@epaas.com"}]}, {}])
       @command.expects(:say).at_least_once

data/test/command/show_instances_command_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ShowInstancesCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "execution" do
+    setup do
+      @mock_client = mock("Client")
+      @id = "123"
+      @url = "#{EPC::Config::INSTANCES_PATH}/#{CGI.escape(@id)}/instances"
+      @command = EPC::Command::ShowInstancesCommand.new(@mock_client)
+    end
+
+    should "fail if no id is specified" do
+      @command.expects(:say).with("You must specify the deployed project id.")
+      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:show_instances])
+      assert_equal @command.execute, 1
+    end
+
+    should "fail if status is not 200 (ok)" do
+      @mock_client.expects(:get).with(@url).returns([500, {:message => "System exception encountered"}, {}])
+      @command.expects(:say).with("Request failed: [System exception encountered]")
+      assert_equal 500, @command.execute("", "", @id)
+    end
+
+    should "show deployed project instances" do
+      @mock_client.expects(:get).with(@url).returns([200, {instance_id: { active: true }},  {}])
+      @command.expects(:say)
+      assert_equal 200, @command.execute("", "",  @id)
+    end
+  end
+
+end

data/test/command/show_libraryset_command_test.rb

@@ -9,17 +9,6 @@ class ShowLibrarysetCommandTest < Test::Unit::TestCase
       @command = EPC::Command::ShowLibrarysetCommand.new(@mock_client)
     end
 
-    should "fail if library set is not specified" do
-      @command.expects(:say).with("You must specify a library-set")
-      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:show_libraryset])
-      assert_equal(@command.execute, 1)
-    end
-
-    should "fail if library set id can't be determined" do
-      @command.expects(:get_resource_id).with(EPC::Config::LIBRARY_SETS_PATH, :name, "lib-set").returns(nil) 
-      @command.expects(:say).with("Library set could not be determined")
-      assert_equal(@command.execute("lib-set"), 1)
-    end
 
     should "show error if status is not 201" do
       @mock_client.expects(:get).with(EPC::Config::LIBRARY_SETS_PATH+"/1").

data/test/command/show_metrics_command_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+class ShowMetricsCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "execution" do
+    setup do
+      @mock_client = mock("Client")
+      @id = "target"
+      @metrics = "mem-max"
+      @url = "#{EPC::Config::MONITORED_PATH}/#{CGI.escape(@id)}/metrics/#{CGI.escape(@metrics)}"
+      @redirect_url = "http://localhost/#{CGI.escape(@id)}/metrics/#{CGI.escape(@metrics)}"
+      @command = EPC::Command::ShowMetricsCommand.new(@mock_client, {graph: true})
+    end
+
+    should "fail if no target is specified" do
+      @command.expects(:say).with("You must specify the target object id.")
+      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:show_metrics])
+      assert_equal(@command.execute, 1)
+    end
+
+    should "fail if no metrics are specified" do
+      @command = EPC::Command::ShowMetricsCommand.new(@mock_client)
+      @command.expects(:say).with("You must specify the metrics to display.")
+      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:show_metrics])
+      assert_equal(@command.execute("", "", @id), 1)
+    end
+
+    should "fail if status is not 302 (ok)" do
+      @mock_client.expects(:get).with(@url).returns([500, {:message => "System exception encountered"}, {}])
+      @command.expects(:say).with("Request failed: [System exception encountered]")
+      assert_equal 500, @command.execute("", "", @id, @metrics)
+    end
+
+    should "fail if second status is not 200 (ok)" do
+      @mock_client.expects(:get).with(@url).returns([302, {}, {uri: @redirect_url}])
+      EPC::Client::HttpClient.any_instance.expects(:get).with(@redirect_url).returns([500, {:message => "System exception encountered"}, {}])
+      @command.expects(:say).with("Request failed: [System exception encountered]")
+      assert_equal 500, @command.execute("", "", @id, @metrics)
+    end
+
+    should "show metrics" do
+      @mock_client.expects(:get).with(@url).returns([302, {}, {uri: @redirect_url}])
+      json = '{"id":{"metric":{"start":0,"stop":2,"step":3,"data":[1,2,3]}}}'
+      EPC::Client::HttpClient.any_instance.expects(:get).with(@redirect_url).returns([200, json, {}])
+      @command.expects(:say).times(3)
+      assert_equal 200, @command.execute("", "", @id, @metrics)
+    end
+  end
+
+end

data/test/command/show_plugin_command_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class ShowPluginCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "execute" do
+    setup do
+      @mock_client = mock("Client")
+      @command = EPC::Command::ShowPluginCommand.new(@mock_client)
+    end
+
+    should "show the plugin" do
+      @command.expects(:retrieve_identifier_for).returns(1)
+      @mock_client.expects(:get).with(EPC::Config::PLUGINS_PATH + "/1").returns([200, {:id => 1, :name => "plugin_name", :plugin_version => "1", :group => "plugin_groups", :inherited => true, :extensions => false, :executions => "exec_string", :configuration => "config_string"}, {}])
+      @command.expects(:say).at_least_once
+      @command.execute("plugin_name")
+    end
+
+    should "report reason for request failure" do
+      @command.expects(:retrieve_identifier_for).returns(1)
+      @mock_client.expects(:get).with(EPC::Config::PLUGINS_PATH + "/1").returns([500, {:message => "System Exception"}, {}])
+      @command.expects(:say).with("Request failed: [System Exception]")
+      @command.execute("plugin_name")
+    end
+  end
+
+
+end

data/test/command/show_project_command_test.rb

@@ -33,7 +33,7 @@ class ShowProjectCommandTest < Test::Unit::TestCase
 
     should "show details about the requested project" do
       time = Time.now.to_s
-      @mock_client.expects(:get).with(EPC::Config::PROJECTS_PATH+"/1?include=dependencies,roles,config_values").
+      @mock_client.expects(:get).with(EPC::Config::PROJECTS_PATH+"/1?include=dependencies,roles,config_values,service_versions,libraries").
         returns(
           [
             200,

data/test/command/show_projecttype_command_test.rb

@@ -12,11 +12,6 @@ class ShowProjecttypeCommandTest < Test::Unit::TestCase
       @command = EPC::Command::ShowProjecttypeCommand.new(@mock_client)
     end
 
-    should "fail if project type can't be determined" do
-      assert_raise EPC::Error::FatalError do
-        assert_equal(@command.execute, 1)
-      end
-    end
   end
 
   context "retrieval " do

data/test/command/show_role_command_test.rb

@@ -26,7 +26,7 @@ class ShowRoleCommandTest < Test::Unit::TestCase
 
 
     should "show a role specified by name" do
-      @command.expects(:retrieve_system_role_identifier).returns(1)
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:get).with(EPC::Config::ROLES_PATH + "/1?include=users,user_groups,grants").
         returns([200, {:id => 1, :name => "admin", :users => [{:id => 1, :name => "Group Leader", :email => "group_leader@epaas.com"}], :user_groups => [{:id => 1, :name => "The Leaders"}]}, {}])
       @command.expects(:say).at_least_once

data/test/command/show_solution_command_test.rb

@@ -33,7 +33,7 @@ class ShowSolutionCommandTest < Test::Unit::TestCase
       assert_equal(@command.execute, 404)
     end
 
-    should "show details about the request solution" do
+    should "show details about the requested solution" do
       time1 = (Time.now - 5).to_s
       time2 = Time.now.to_s
       @mock_client.expects(:get).with(EPC::Config::SOLUTIONS_PATH+"/1?include=config_values,projects,deployments,deployment_configs").

data/test/command/show_user_command_test.rb

@@ -9,11 +9,6 @@ class ShowUserCommandTest < Test::Unit::TestCase
       @command = EPC::Command::ShowUserCommand.new(@mock_client)
     end
 
-    should "fail if no user is specified" do
-      @command.expects(:say).with("You need to specify a user id/email")
-      @command.expects(:say).with(EPC::Help::COMMAND_USAGES[:show_user])
-      assert_equal(@command.execute, 1)
-    end
 
     should "fail if status is not 200" do
       @mock_client.expects(:get).with(EPC::Config::USERS_PATH + "/1?include=user_groups").
@@ -22,14 +17,8 @@ class ShowUserCommandTest < Test::Unit::TestCase
       assert_equal(@command.execute(1), 404)
     end
 
-    should "fail if user_id can't be determined" do
-      @command.expects(:get_resource_id).with(EPC::Config::USERS_PATH, :email, "admin").returns(nil)
-      @command.expects(:say).with("User could not be found")
-
-      assert_equal(@command.execute("admin"), 1)
-    end
-
-    should "show a user specified by id" do
+    should "show a user" do
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:get).with(EPC::Config::USERS_PATH + "/1?include=user_groups").
         returns([200, {:id => 1, :name => "admin", :user_groups => [{:id => 1, :name => "Administrators"}]}, {}])
       @command.expects(:say).at_least_once
@@ -37,14 +26,5 @@ class ShowUserCommandTest < Test::Unit::TestCase
       assert_equal(@command.execute(1), 200)
     end
 
-
-    should "show a user specified by name" do
-      @command.expects(:get_resource_id).with(EPC::Config::USERS_PATH, :email, "admin").returns(1)
-      @mock_client.expects(:get).with(EPC::Config::USERS_PATH + "/1?include=user_groups").
-        returns([200, {}, {}])
-      @command.expects(:say)
-
-      assert_equal(@command.execute("admin"), 200)
-    end
   end
 end

data/test/command/update_config_command_test.rb

@@ -9,12 +9,6 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
       @command = EPC::Command::UpdateConfigCommand.new(@mock_client)
     end
 
-    should "fail if no key specified" do
-      @command.expects(:say).with("You have to specify a key and its value.")
-      assert_equal(@command.execute, 1)
-    end
-
-
     should "fail if status code is not 200" do
       @command.expects(:extract_configuration_level).returns(["Project", 1])
 
@@ -28,7 +22,7 @@ class UpdateConfigCommandTest < 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
 
@@ -41,7 +35,7 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
           {}])
 
       @command.expects(:say).with("Key does not exist.")
-      assert_equal(@command.execute("key1=value1"), 1)
+      assert_equal(@command.execute("key1", "", "value1"), 1)
 
     end
   end
@@ -67,7 +61,7 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
       ).returns([200, {:id => 1}, {}])
 
       @command.expects(:say).with("key1 saved.")
-      assert_equal(@command.execute("key1=value1"), 200)
+      assert_equal(@command.execute("key1", "", "value1"), 200)
     end
   end