epc 1.0.3 → 1.0.4

data/test/command/show_project_command_test.rb

@@ -3,25 +3,12 @@ require 'test_helper'
 class ShowProjectCommandTest < Test::Unit::TestCase
   should_require_login
 
-  context "pre-execution checks" do
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::ShowProjectCommand.new(@mock_client)
-    end
-
-    should "fail if project type can't be determined" do
-      assert_raise EPC::Error::FatalError do
-        @command.expects(:infer_project_context).returns(nil)
-        assert_equal(@command.execute, 1)
-      end
-    end
-  end
-
   context "retrieval " do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ShowProjectCommand.new(@mock_client)
-      @command.expects(:infer_project_context).returns([1, "FirstProject"])
+      @command.object_id = 1
+      @command.object_type = "Project"
     end
 
     should "notify if retrieval fails" do
@@ -33,7 +20,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,service_versions,libraries").
+      @mock_client.expects(:get).with(EPC::Config::PROJECTS_PATH+"/1?include=dependencies,roles,config_values,service_versions,libraries,pushed_versions").
         returns(
           [
             200,
@@ -41,7 +28,8 @@ class ShowProjectCommandTest < Test::Unit::TestCase
               :id => 1, :name => "Project1", :uri_name => "project1", :solution_id => 1, :service_version_id => 1, :created_at => Time.now, :last_push_date => Time.now, :last_push_by => {:id => 1, :name => "PusherName"},
               :config_values => [{:id => 1, :name => "N1", :value => "V1"}],
               :roles => [{:id => 1, :name => "role 1"}],
-              :dependency_definitions => [{:dependency_id => 1, :dependency => {:id => 1, :name => "dep_name"}, :dependency_kind => "dep_kind"}]
+              :dependency_definitions => [{:dependency_id => 1, :dependency => {:id => 1, :name => "dep_name"}, :dependency_kind => "dep_kind"}],
+              :pushed_versions => []
             },
             {}
           ]

data/test/command/show_project_snapshot_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ShowProjectSnapshotCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "retrieval" do
+    setup do
+      @mock_client = mock("Client")
+      @command = EPC::Command::ShowProjectSnapshotCommand.new(@mock_client)
+      @project_id = 1
+      @version = 2
+    end
+
+    should "notify if retrieval fails" do
+      @mock_client.expects(:get).returns([404, {:message => "Resource not found"}, {}])
+      @command.expects(:say).with("Request failed: [Resource not found]")
+
+      assert_equal(@command.execute, 404)
+    end
+
+
+    should "show details about the requested project" do
+
+      @mock_client.expects(:get).with(EPC::Config::PROJECTS_PATH+"/#{@project_id}/snapshot/#{@version}").
+        returns([200, {"id"=>2, "name"=>"ProjectName", "uri_name"=>"uri-2", "archived"=>false}, {}])
+
+      @command.expects(:say).at_least_once
+      assert_equal(@command.execute("#{@project_id}:#{@version}"), 200)
+    end
+
+  end
+
+end

data/test/command/show_projecttype_command_test.rb

@@ -6,18 +6,12 @@ require 'mocha'
 class ShowProjecttypeCommandTest < Test::Unit::TestCase
   should_require_login
 
-  context "pre-execution checks" do
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::ShowProjecttypeCommand.new(@mock_client)
-    end
-
-  end
-
   context "retrieval " do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ShowProjecttypeCommand.new(@mock_client)
+      @command.object_type = "ProjectType"
+      @command.object_id = 1
     end
 
     should "show error if status is not 201" do
@@ -25,15 +19,15 @@ class ShowProjecttypeCommandTest < Test::Unit::TestCase
         returns([404, {:message => "Not Found"}, {}])
 
       @command.expects(:say).with("Request failed: [Not Found]")
-      assert_equal(@command.execute(1), 404)
+      assert_equal(@command.execute, 404)
     end
 
-    should "show details about the request solution" do
+    should "show details about the requested project-type" do
       @mock_client.expects(:get).with(EPC::Config::PROJECT_TYPES_PATH+"/1").
         returns([200, {:id => 1, :name => "JS", :runtime => "js", :framework => "node", :build_type => "build"}, {}])
 
       @command.expects(:say).at_least_once
-      assert_equal(@command.execute(1), 200)
+      assert_equal(@command.execute, 200)
     end
 
   end

data/test/command/show_role_command_test.rb

@@ -7,31 +7,24 @@ class ShowRoleCommandTest < Test::Unit::TestCase
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ShowRoleCommand.new(@mock_client)
+      @command.object_id = 1
+      @command.object_type = "Role"
     end
 
     should "fail if status is not 200" do
       @mock_client.expects(:get).with(EPC::Config::ROLES_PATH + "/1?include=users,user_groups,grants").
         returns([404, {:message => "Not Found"}, {}])
       @command.expects(:say).with("Request failed: [Not Found]")
-      assert_equal(@command.execute(1), 1)
+      assert_equal(@command.execute, 1)
     end
 
-    should "show a role specified by id" do
+    should "show a role" do
       @mock_client.expects(:get).with(EPC::Config::ROLES_PATH + "/1?include=users,user_groups,grants").
         returns([200, {}, {}])
       @command.expects(:say).at_least_once
 
-      assert_equal(@command.execute(1), 200)
+      assert_equal(@command.execute, 200)
     end
 
-
-    should "show a role specified by name" do
-      @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
-
-      assert_equal(@command.execute("admin"), 200)
-    end
   end
 end

data/test/command/show_solution_command_test.rb

@@ -6,25 +6,12 @@ require 'mocha'
 class ShowSolutionCommandTest < Test::Unit::TestCase
   should_require_login
 
-  context "pre-execution checks" do
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::ShowSolutionCommand.new(@mock_client)
-    end
-
-    should "fail if solution can't be determined" do
-      assert_raise EPC::Error::InputError do
-        @command.expects(:infer_solution_context).returns(nil)
-        assert_equal(@command.execute, 1)
-      end
-    end
-  end
-
   context "retrieval " do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ShowSolutionCommand.new(@mock_client)
-      @command.expects(:infer_solution_context).returns([1, "FirstSolution"])
+      @command.object_id = 1
+      @command.object_type = "Solution"
     end
 
     should "notify if retrieval fails" do

data/test/command/show_user_command_test.rb

@@ -7,6 +7,8 @@ class ShowUserCommandTest < Test::Unit::TestCase
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::ShowUserCommand.new(@mock_client)
+      @command.object_id = 1
+      @command.object_type = "User"
     end
 
 
@@ -14,16 +16,15 @@ class ShowUserCommandTest < Test::Unit::TestCase
       @mock_client.expects(:get).with(EPC::Config::USERS_PATH + "/1?include=user_groups").
         returns([404, {:message => "Not Found"}, {}])
       @command.expects(:say).with("Request failed: [Not Found]")
-      assert_equal(@command.execute(1), 404)
+      assert_equal(@command.execute, 404)
     end
 
     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
 
-      assert_equal(@command.execute(1), 200)
+      assert_equal(@command.execute, 200)
     end
 
   end

data/test/command/submit_deployment_command_test.rb

@@ -3,19 +3,12 @@ require 'test_helper'
 class SubmitDeploymentCommandTest < Test::Unit::TestCase
   should_require_login
 
-  context "execution" do
-    should "report error if deployment_id is nil" do
-      command = EPC::Command::SubmitDeploymentCommand.new(@mock_client)
-      command.expects(:say).with("You must specify a deployment id")
-      command.expects(:say).with(EPC::Help::COMMAND_USAGES[:submit_deployment]) 
-      command.execute(nil)
-    end   
-  end
-
   context "submitting" do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::SubmitDeploymentCommand.new(@mock_client)
+      @command.object_id = 1
+      @command.object_type = "Deployment"
     end
     
     should "submit the deployment if the status is 200" do
@@ -23,7 +16,7 @@ class SubmitDeploymentCommandTest < Test::Unit::TestCase
         returns([200, {:id => 1}, {}])
       
       @command.expects(:say).with("Deployment submitted for approval") 
-      assert_equal(@command.execute("1"), 200)
+      assert_equal(@command.execute, 200)
     end
     
     should "report failure if the status is not 200" do
@@ -31,7 +24,7 @@ class SubmitDeploymentCommandTest < Test::Unit::TestCase
       @mock_client.expects(:put).with("/api/v1/deployments/1/submit").
         returns([404, { :message => "Not Found"}, {}])
       @command.expects(:say).with("Request failed: [Not Found]")
-      assert_equal(@command.execute("1"), 404)
+      assert_equal(@command.execute, 404)
     end
   end
 end

data/test/command/unarchive_project_command_test.rb

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

data/test/command/unarchive_solution_command_test.rb

@@ -4,35 +4,25 @@ require 'shoulda'
 require 'mocha'
 
 class UnarchiveSolutionCommandTest < Test::Unit::TestCase
-  context "pre-execution checks" do
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::UnarchiveSolutionCommand.new(@mock_client)
-    end
 
-    should "fail if no solution specified" do
-      assert_raise EPC::Error::FatalError do
-        @command.execute
-      end
-    end
-  end
-  context "archiving" do
+  context "unarchiving" do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::UnarchiveSolutionCommand.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 => false, :name => "FirstSolution"}).
+      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => false}).
         returns([400, {:message => "Not Found"}, {}])
 
       @command.expects(:say).with("Solution could not be unarchived. Request failed with: [Not Found]")
       assert_equal(@command.execute, 400)
     end
 
-    should "archive the solution" do
-      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => false, :name => "FirstSolution"}).
+    should "unarchive the solution" do
+      @mock_client.expects(:put).with(EPC::Config::SOLUTIONS_PATH + "/1", {:archived => false}).
         returns([200, {}, {}])
 
       @command.expects(:say).with("Solution has been unarchived.")

data/test/command/update_config_command_test.rb

@@ -6,7 +6,12 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
   context "fail" do
     setup do
       @mock_client = mock("Client")
+      EPC::Command::UpdateConfigCommand.send :include, EPC::Command::Config
       @command = EPC::Command::UpdateConfigCommand.new(@mock_client)
+      @command.object_type = "Config"
+      @command.object_id = "key1"
+      @command.target_type = "Project"
+      @command.target_id = "1"
     end
 
     should "fail if status code is not 200" do
@@ -22,7 +27,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(["value1"]), 400)
        
     end
 
@@ -35,7 +40,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(["value1"]), 1)
 
     end
   end
@@ -44,11 +49,16 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::UpdateConfigCommand.new(@mock_client)
+
     end
 
 
     should "update keys" do
       @command = EPC::Command::UpdateConfigCommand.new(@mock_client, {:required => false})
+      @command.object_type = "Config"
+      @command.object_id = "key1"
+      @command.target_type = "Project"
+      @command.target_id = "1"
       @command.expects(:extract_configuration_level).returns(["Project", 1])
 
       @mock_client.expects(:get).with(EPC::Config::CONFIGURATIONS_PATH + "/Project/1").
@@ -56,12 +66,13 @@ class UpdateConfigCommandTest < Test::Unit::TestCase
           [{:name => "key1", :value => "value2", :value_type => "data", :required => false, :id => 1, :configurable_id => 1, :configurable_type => "Project"}], 
           {}])
 
+
       @mock_client.expects(:put).with(EPC::Config::CONFIGURATIONS_PATH+"/1",
         {:name => "key1", :value => "value1", :required => false}
       ).returns([200, {:id => 1}, {}])
 
       @command.expects(:say).with("key1 saved.")
-      assert_equal(@command.execute("key1", "", "value1"), 200)
+      assert_equal(@command.execute(["value1"]), 200)
     end
   end
 

data/test/command/update_deployment_command_test.rb

@@ -3,45 +3,31 @@ require 'test_helper'
 class UpdateDeploymentCommandTest < Test::Unit::TestCase
   should_require_login
 
-  context "pre-execution checks" do
-
-    setup do
-      @mock_client = mock("Client")
-      @command = EPC::Command::UpdateDeploymentCommand.new(@mock_client)
-    end
-
-
-    should "require either instance-count or uris" do
-      @command.options[:instances] = nil
-      @command.options[:uris] = nil
-
-      assert_raise EPC::Error::FatalError do
-        assert_equal(@command.execute(1, 1), 1)
-      end
-    end
-
-  end
 
   context "execution" do
     setup do
       @mock_client = mock("Client")
       @command = EPC::Command::UpdateDeploymentCommand.new(@mock_client)
+      @command.object_id = 1
+      @command.object_type = "Deployment"
+      @command.target_id = 1
+      @command.target_type = "Project"
       @command.options[:instances] = 3
       @command.options[:uris] = "new-uri.instance-host.com"
     end
 
-    should "do the request to core" do
-      @command.expects(:get_deployed_project_id).with(1, :id, 1).returns(1)
+    should "fail on bad status" do
+      @command.expects(:get_deployed_project_id).with(1, 1).returns(1)
       @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/1/deployed_projects/1", {:instances => 3, :uris => ['new-uri.instance-host.com']}).returns([404, {:message => "Not Found"}, {}])
       @command.expects(:say).with("Request failed with: [Not Found]").at_least_once
-      assert_equal(@command.execute(1,"Project:1"), 404)
+      assert_equal(@command.execute([]), 404)
     end
 
     should "should do the request to core" do
-      @command.expects(:get_deployed_project_id).with(1, :id, 1).returns(1)
+      @command.expects(:get_deployed_project_id).with(1, 1).returns(1)
       @mock_client.expects(:put).with(EPC::Config::DEPLOYMENTS_PATH + "/1/deployed_projects/1", {:instances => 3, :uris => ['new-uri.instance-host.com']}).returns([200, {}, {}])
       @command.expects(:say).with("Deployment updated")
-      assert_equal(@command.execute(1,"Project:1"), 200)
+      assert_equal(@command.execute([]), 200)
     end
   end
 
@@ -54,18 +40,18 @@ class UpdateDeploymentCommandTest < Test::Unit::TestCase
     should "fail if can't retrieve deployments" do
       assert_raise EPC::Error::FatalError do
         @mock_client.expects(:get).returns([500, {:message => "System exception"}, {}])
-        @command.send(:get_deployed_project_id, 1, :name, "FirstProject")
+        @command.send(:get_deployed_project_id, 1, 1)
       end
     end
 
     should "return nil if response from server was blank" do
       @mock_client.expects(:get).returns([200, {}, {}])
-      assert_equal @command.send(:get_deployed_project_id, 1, :name, "FirstProject"), nil
+      assert_equal @command.send(:get_deployed_project_id, 1, 1), nil
     end
 
     should "return the id when it finds one" do
       @mock_client.expects(:get).returns([200, {:solution => {:projects => [{:id => 1, :name => "FirstProject", :deployed_project_id => 3}]}}, {}])
-      assert_equal @command.send(:get_deployed_project_id, 1, :name, "FirstProject"), 3
+      assert_equal @command.send(:get_deployed_project_id, 1, 1), 3
     end
   end