epc 1.0.2 → 1.0.3

data/lib/epc/command/{delete_user_command.rb → user/delete_user_command.rb}

@@ -1,22 +1,14 @@
 module EPC::Command
-  class DeleteUserCommand < BaseCommand
-    def execute(user = nil)
-
-      raise FatalError, "You need to specify a user id/email" if user.nil?
+  class DeleteUserCommand < DeleteCommand
+    def execute(user = nil, *args)
 
       proceed = ask_yn("Are you sure you want to delete the [#{user}] user? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      if numeric?(user)
-        user_id = user.to_i
-      else
-        user_id = get_resource_id(EPC::Config::USERS_PATH, :email, user)
-      end
-
-      raise FatalError, "User could not be determined" if user_id.blank? || user_id == 0
-
+      user_id = retrieve_identifier_for("User", user)
+      
       status, response, headers = client.delete(EPC::Config::USERS_PATH + "/#{user_id}")
 
       if status == 200

data/lib/epc/command/{list_users_command.rb → user/list_users_command.rb}

@@ -2,7 +2,7 @@ require 'time'
 module EPC::Command
   class ListUsersCommand < BaseCommand
 
-    def execute
+    def execute(target = nil)
 
       status, response, headers = client.get(EPC::Config::USERS_PATH)
 

data/lib/epc/command/{show_user_command.rb → user/show_user_command.rb}

@@ -1,23 +1,9 @@
 module EPC::Command
-  class ShowUserCommand < BaseCommand
+  class ShowUserCommand < ShowCommand
     
-    def execute(user = nil)
-      if user.nil?
-        say("You need to specify a user id/email")
-        say(EPC::Help::COMMAND_USAGES[:show_user])
-        return 1
-      end
-
-      if numeric?(user)
-        user_id = user.to_i
-      else
-        user_id = get_resource_id(EPC::Config::USERS_PATH, :email, user)
-      end
+    def execute(user = nil, *args)
 
-      if user_id.nil? || user_id == 0
-        say("User could not be found")
-        return 1
-      end
+      user_id = retrieve_identifier_for("User", user)
 
       status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{user_id}?include=user_groups")
 

data/lib/epc/command/{update_user_command.rb → user/update_user_command.rb}

@@ -1,9 +1,9 @@
 module EPC::Command
   class UpdateUserCommand < BaseCommand
 
-    def execute(user = nil)
+    required_options :email, :password, :mode => :any?, :message => "You must specify the attribute to be updated: email/password"
 
-      raise FatalError, "You need to specify a user id/email" if user.nil?
+    def execute(user = nil, *args)
 
       if @options[:password].present?
         if numeric?(user)
@@ -49,8 +49,6 @@ module EPC::Command
 
         return status
       end
-
-
     end
     
   end

data/lib/epc/config.rb

@@ -37,7 +37,10 @@ module EPC
     PERMISSIONS_PATH         = "#{SCOPE}/permissions"
     GRANTS_PATH              = "#{SCOPE}/grants"
     OBJECT_TYPES_PATH        = "#{SCOPE}/object_type_identifiers"
-
+    MONITORED_PATH           = "#{SCOPE}/monitored"
+    METRICS_PATH             = "#{SCOPE}/metrics"
+    INSTANCES_PATH           = "#{SCOPE}/deployed_projects"
+    PLUGINS_PATH             = "#{SCOPE}/plugins"
 
     class << self
       def target_file

data/lib/epc/help.rb

@@ -6,20 +6,20 @@ module EPC
       :login                      => 'epc login <email> [--passwd PASS]',
       :list_solutions             => 'epc list solutions',
       :create_solution            => 'epc create solution <name>',
-      :show_solution              => 'epc show solution [SOLUTION]',
-      :update_solution            => 'epc update solution [-s SOLUTION] name=value',
+      :show_solution              => 'epc show Solution:solution_identifier',
+      :update_solution            => 'epc update Solution:solution_identifier name=value',
       :delete_solution            => 'epc delete solution SOLUTION',
-      :archive_solution           => 'epc archive solution [SOLUTION]',
-      :unarchive_solution         => 'epc unarchive solution [SOLUTION]',
+      :archive_solution           => 'epc archive Solution:solution_identifier',
+      :unarchive_solution         => 'epc unarchive Solution:solution_identifier',
       :refresh_solution           => 'epc refresh solution [SOLUTION]',
-      :list_projects              => 'epc list projects [SOLUTION]',
+      :list_projects              => 'epc list projects [Solution:solution_id]',
       :create_project             => 'epc create project <name> [uri-name] <--type PROJECT_TYPE>',
-      :show_project               => 'epc show project [-s SOLUTION] <PROJECT>',
-      :update_project             => 'epc update project [-s SOLUTION] [-p PROJECT] <attribute=value>',
+      :show_project               => 'epc show Project:project_identifier',
+      :update_project             => 'epc update Project:project_identifier <attribute=value>',
       :delete_project             => 'epc delete project [-s SOLUTION] [PROJECT] [--force]',
       :attach_runtime             => 'epc attach runtime <runtime_id> [-p PROJECT] [--stage STAGE]',
       :list_servicetypes          => 'epc list service-types', 
-      :define_service             => 'epc define service <-t service_type> <service_name>', 
+      :create_servicedefinition   => 'epc create service-definition <service_name> <service_type>', 
       :undefine_service           => 'epc undefine service <SERVICE>', 
       :list_servicedefinitions    => 'epc list service-definitions',
       :create_serviceversion      => 'epc create service-version <label> <definition_name_or_id> [--up-script file] [--down-script file]',
@@ -33,11 +33,11 @@ module EPC
       :pull                       => 'epc pull [SOLUTION]',
       :build                      => 'epc build [project_name=version] [--note NOTE] [--timeout value | --nopoll]',
       :list_deploymentconfigs     => 'epc list deployment-configs [--stage STAGE] [-p PROJECT]',
-      :list_stages                => 'epc list stages',
+      :list_deploymentstages      => 'epc list stages',
       :create_deployment          => 'epc create deployment [-s SOLUTION] <stage name: development|testing|staging|production> [-p project_id:version:instances] [--replaces deployment_id]',
-      :show_deployment            => 'epc show deployment <DEPLOYMENT_ID>',
+      :show_deployment            => 'epc show Deployment:deployment_identifier',
       :submit_deployment          => 'epc submit deployment <DEPLOYMENT_ID>',
-      :list_deployments           => 'epc list deployments [-s SOLUTION] [-S STAGE] [-u DEPLOYER]',
+      :list_deployments           => 'epc list deployments [<Solution:solution_id> | <DeploymentStage:deployment_stage_id> | <User:user_id>]',
       :copy_deployment            => 'epc copy deployment <DEPLOYMENT_ID> <STAGE>',
       :approve_deployment         => 'epc approve deployment <DEPLOYMENT_ID>',
       :deny_deployment            => 'epc deny deployment <DEPLOYMENT_ID>',
@@ -46,7 +46,7 @@ module EPC
       :delete_dependency          => 'epc delete dependency [-s SOLUTION] [-p PROJECT] <DEPENDENCY_ID>',
       :create_library             => 'epc create library <name> <language> <version> <group> [-f file] [--scope runtime | compile | provided | test]',
       :list_libraries             => 'epc list libraries',
-      :delete_library             => 'epc delete library <name> <version> <group>',
+      :delete_library             => 'epc delete Library:library_identifier',
       :attach_library             => 'epc attach library [-s SOLUTION] [-p PROJECT] <name> <version> <group> [-f FILE] [--pom POM FILE]',
       :detach_library             => 'epc detach library [-s SOLUTION] [-p PROJECT] <LIBRARY>',
       :deploy                     => 'epc deploy [stage] [-d DEPLOYMENT_ID] [--timeout value | --nopoll]',
@@ -56,46 +56,55 @@ module EPC
       :logout                     => 'epc logout',
       :create_config              => 'epc create config <TargetType:TargetId> [--required] [--no_override] [--value-type TYPE] name=value',
       :list_config                => 'epc list config <TargetType:TargetType>',
+      :delete_config              => 'epc delete Config:key_identifier <TargetType:TargetId>',
       :list_projecttypes          => 'epc list project-types',
-      :show_projecttype           => 'epc show project-type <project_type_id>',
-      :update_deploymentproject   => 'epc update deployment-project <DEPLOYMENT_ID> <PROJECT> [--instances instance_count] [--uris comma_separated_uris]',
+      :show_projecttype           => 'epc show ProjectType:project_type_identifier',
+      :update_deployment          => 'epc update Deployment:deployment_identifier Project:project_identifier [--instances instance_count] [--uris comma_separated_uris]',
       :list_versions              => 'epc list versions [-s SOLUTION] PROJECT',
-      :update_config              => 'epc update config <--org | --runtime | --stage | --solution | --project | --user id> [--required] [--no_override] name=value',
-      :archive_project            => 'epc archive project [-s SOLUTION] PROJECT',
-      :unarchive_project          => 'epc unarchive project [-s SOLUTION] PROJECT',
+      :update_config              => 'epc update Config:config_identifier TargetType:TargetId [--required] [--no_override] name=value',
+      :archive_project            => 'epc archive Project:project_identifier',
+      :unarchive_project          => 'epc unarchive Project:project_identifier',
       :list_attachedlibraries     => 'epc list attached-libraries [-s SOLUTION] [PROJECT] [--json]',
       :create_group               => 'epc create group <name>',
       :delete_group               => 'epc delete group <GROUP>',
       :list_groups                => 'epc list groups',
-      :update_group               => 'epc update group <GROUP> [--add-user USER_ID] [--remove-user USER_ID]',
-      :show_group                 => 'epc show group <groupId>|<groupName>',
-      :list_roles                 => 'epc list roles [--user user_id]',
+      :update_group               => 'epc update Group:group_identifier:group_identifier [--add-user USER_ID] [--remove-user USER_ID]',
+      :show_group                 => 'epc show Group:group_identifier',
+      :list_roles                 => 'epc list roles [User:user_id]',
       :list_objectroles           => 'epc list object-roles <ObjectType:ObjectId>',
       :delete_role                => 'epc delete role',
-      :update_role                => 'epc update role <ROLE> [--add-user USER_ID] [--remove-user USER_ID]',
+      :update_role                => 'epc update Role:role_identifier [--add-user USER_ID] [--remove-user USER_ID] [--add-grant ObjectType:action:ObjectId] [--remove-grant ObjectType:action:ObjectId> [--file json]',
+      :update_objectrole          => 'epc update ObjectRole:ObjectType.ObjectID.role_identifier [--add-user USER_ID] [--remove-user USER_ID] [--add-grant ObjectType:action:ObjectId] [--remove-grant ObjectType:action:ObjectId> [--file json]',
       :create_role                => 'epc create role <name>',
       :create_objectrole          => 'epc create role <name> <ObjectType:ObjectId>',
-      :show_role                  => 'epc show role <roleId>|<roleName>',
+      :show_role                  => 'epc show Role:role_identifier [users|groups|grants]',
       :list_users                 => 'epc list users',
       :delete_user                => 'epc delete user <user_id>|<email>',
-      :show_user                  => 'epc show user <user_id>|<email>',
+      :show_user                  => 'epc show User:user_identifier',
       :create_librarylanguage     => 'epc create library-language <name>',
       :list_librarylanguages      => 'epc list library-languages',
-      :delete_librarylanguage     => 'epc delete library-language <language>',
-      :update_librarylanguage     => 'epc update library-language <language> <new-name>',
+      :delete_librarylanguage     => 'epc delete LibraryLanguage:language_identifier',
+      :update_librarylanguage     => 'epc update LibraryLanguage:language_identifier <new-name>',
       :create_libraryset          => 'epc create library-set <name> <language> [--file file]',
-      :show_libraryset            => 'epc show library-set <name>|<id> [--json]',
-      :list_librarysets           => 'epc show library-sets',
-      :update_libraryset          => 'epc update library-set name|id [--add-library id|name:version:group] [--remove-library id|name:version:group] [--file file]',
+      :show_libraryset            => 'epc show LibrarySet:libraryset_identifier [--json]',
+      :list_librarysets           => 'epc list library-sets',
+      :update_libraryset          => 'epc update LibrarySet:library-set_identifier [--add-library id|name:version:group] [--remove-library id|name:version:group] [--file file]',
       :delete_libraryset          => 'epc delete library-set name|id [-y]',
       :attach_libraryset          => 'epc attach library-set name|id [-s solution] [-p project]',
       :detach_libraryset          => 'epc detach library-set name|id [-s solution] [-p project]',
       :request_passwordchange     => 'epc request password-change <email>',
-      :update_user                => 'epc update user <user_id>|<email> [--passwd password] [--token token] [--email new_email] [--name new_name]',
-      :list_rolepermissions       => 'epc list role-permissions',
-      :update_rolepermissions     => 'epc update role-permissions <--add-grant ObjectType:action:ObjectId> <--remove-grant ObjectType:action:ObjectId> [--file json]',
+      :update_user                => 'epc update User:user_identifier [--passwd password] [--token token] [--email new_email] [--name new_name]',
+      :list_metrics               => 'epc list metrics [--target target]',
+      :show_metrics               => 'epc show metrics <id> <metric list> [--start start] [--stop stop] [--step step] [--graph]',
+      :show_instances             => 'epc show instances <deployed-project-id>',
+      :list_permissions           => 'epc list permissions',
+      :update_rolepermissions     => 'epc update role-permissions ',
       :list_permissiongroups      => 'epc list permission-groups',
-      :list_objecttypes           => 'epc list object-types'
+      :list_objecttypes           => 'epc list object-types',
+      :create_plugin              => 'epc create plugin <name> <version> <group> [--inherited] [--extensions] [--executions executions|file:path_to_executions_file] [--configuration configuration|file:path_to_configuration_file]',
+      :show_plugin                => 'epc show Plugin:Name:Version:Group',
+      :list_plugins               => 'epc list plugins',
+      :update_plugin              => 'epc update Plugin:Name:Version:Group attribute=new value'
     }
     
     def display_usage
@@ -112,7 +121,7 @@ module EPC
         say verbose_usage
         return
       end
-      key = commands.join('_').gsub("-", "").to_sym
+      key = commands.join('_').gsub("-", "").downcase.to_sym
       if COMMAND_USAGES.keys.include?(key)
         say("Usage: #{COMMAND_USAGES[key]}")
       else
@@ -184,7 +193,7 @@ Currently available epc commands are:
 
   Services
     list service-types       List available service types provided by ePaas
-    define service           Defines a service
+    create service-definition Defines a service
     undefine service         Undefines a service
     list service-definitions Lists services
     create service-version   Creates a service version from an existing
@@ -199,7 +208,7 @@ Currently available epc commands are:
     build                     Builds a previously pushed project
     show deployment           Retrieves detailed information about
                               the deployment
-    list stages               Lists available stages for deploying.
+    list deployment-stages    Lists available stages for deploying.
     create deployment         Creates a deployment for a solution
                               and the given stage
     list deployments          Lists all deployments created
@@ -283,6 +292,12 @@ Currently available epc commands are:
     logout                   Logs current user out of the target system
     
 
+  Metrics
+    list metrics             Lists available metrics
+    show instances           Lists instances of a DeployedProject
+    show metrics             Retrieves (and optionally graphs) metrics for a deployed project
+
+
   Help
     help                    Shows the usage for the command
 

data/lib/epc/runner.rb

@@ -13,7 +13,7 @@ class EPC::Runner
   def initialize(args = [])
     @args = args
     @options = Hash.new
-    @parent_commands = %w(list delete update show archive unarchive define undefine refresh approve deny bind unbind attach detach submit copy set request)
+    @parent_commands = %w(list define undefine refresh approve deny bind unbind attach detach submit copy set request)
   end
 
   def run
@@ -39,10 +39,10 @@ class EPC::Runner
           # 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.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])
           exit 1
         rescue BaseClient::HTTPException => ex
           say(ex.to_s)
@@ -114,12 +114,23 @@ class EPC::Runner
       opts.on('--remove-library LIB')      { |lib| @options[:remove_library] = lib}
       opts.on('--token TOKEN')             { |token| @options[:token] = token}
 			opts.on('--name NAME')							 { |name| @options[:name] = name}
+      opts.on('--include-inactive')	     	 { |bool| @options[:include_inactive] = true}
+      opts.on('--target TARGET')	  			 { |target| @options[:target] = target}
+      opts.on('--metrics METRICS')				 { |metrics| @options[:metrics] = metrics}
+      opts.on('--start START')	    			 { |start| @options[:start] = start}
+      opts.on('--stop STOP')			      	 { |stop| @options[:stop] = stop}
+      opts.on('--step STEP')			      	 { |step| @options[:step] = step}
+      opts.on('--graph')	      	      	 { |bool| @options[:graph] = true}
       opts.on('--add-grant grant')         { |grant| @options[:add_grant] = grant}
       opts.on('--remove-grant grant')      { |grant| @options[:remove_grant] = grant}
       opts.on('--add-group group')         { |group| @options[:add_group] = group}
       opts.on('--remove-group group')      { |group| @options[:remove_group] = group}
       opts.on('--nopoll')                  { |poll| @options[:no_poll] = true}
       opts.on('--timeout TIMEOUT')         { |timeout| @options[:timeout] = timeout}
+      opts.on('--extensions')              { |ext| @options[:extensions] = true}
+      opts.on('--inherited')               { |inherited| @options[:inherited] = true}
+      opts.on('--configuration CONFIGURATION')  { |configuration| @options[:configuration] = configuration}
+      opts.on('--executions executions')  { |executions| @options[:executions] = executions}
 
       opts.on('-p NAME') do |name|
         if @options[:project_name].nil?

data/lib/epc/version.rb

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

data/lib/epc/vertical_bar.rb

@@ -0,0 +1,40 @@
+module EPC
+
+  class VerticalBar
+
+    WIDTH = 80
+    HEIGHT = 16
+
+    def initialize(array)
+      @values = array
+    end
+
+    def print
+      content = ""
+      return result unless @values && !@values.empty?
+
+      # adjust X axis for WIDTH cols
+      if @values.length > WIDTH
+        old_values = @values
+        @values = []
+        0.upto(WIDTH - 1) {|i| @values << old_values[i * old_values.length / WIDTH]}
+      end
+      min = @values.inject {|min,ea| ea.nil? ? min : (min < ea ? min : ea)} # can't use @values.min - may contain nils
+      max = @values.inject {|max,ea| ea.nil? ? max : (max > ea ? max : ea)} # can't use @values.max - may contain nils
+      spread = [max - min, 1].max
+
+      display = Array.new(HEIGHT).collect { Array.new(WIDTH, ' ') } # initialize display with blanks
+      @values.each_with_index do |e, i|
+        if e
+          num = (e - min) * HEIGHT / spread
+          (HEIGHT - 1).downto(HEIGHT - 1 - num) {|j| display[j][i] = '^'}
+        else
+          display[HEIGHT - 1][i] = '_'
+        end
+      end
+      display.each {|ar| ar.each {|e| content << e}; content << "\n"}
+      content
+    end
+  end
+
+end

data/test/command/create_library_command_test.rb

@@ -16,7 +16,7 @@ class CreateLibraryCommandTest < Test::Unit::TestCase
     end
 
     should "determine the language id based on the name" do
-      @command.expects(:get_resource_id).with(EPC::Config::LIBRARY_LANGUAGES_PATH, :name, "ruby", :case_sensitivity => false).returns(1)
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:post).returns([201, {}, {}])
       @command.expects(:say)
 
@@ -24,7 +24,7 @@ class CreateLibraryCommandTest < Test::Unit::TestCase
     end
 
     should "fail if it can't determine the language id" do
-      @command.expects(:get_resource_id).with(EPC::Config::LIBRARY_LANGUAGES_PATH, :name, "ruby", :case_sensitivity => false).returns(nil)
+      @command.expects(:retrieve_identifier_for).returns(nil)
       assert_raise EPC::Error::InputError do
         assert_equal(@command.execute("", "lib1", "ruby", "1"), 1)
       end
@@ -32,6 +32,7 @@ class CreateLibraryCommandTest < Test::Unit::TestCase
     end
  
     should "fail if status is not 200" do
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:post).returns([404, {:message => "Not Found"}, {}])
       @command.expects(:say).with("Request failed: [Not Found]")
 
@@ -39,6 +40,7 @@ class CreateLibraryCommandTest < Test::Unit::TestCase
     end
 
     should "create a library" do
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:post).with(EPC::Config::LIBRARIES_PATH, {:name => "lib1", :language_id => 1, :library_version => "0.2", :group => "my_grp"}).
         returns([201, {:id => 1}, {}])
       @command.expects(:say).with("Created library [lib1] with ID [1]")
@@ -48,6 +50,7 @@ class CreateLibraryCommandTest < Test::Unit::TestCase
 
     context "library with a file to upload" do
       should "upload the file" do
+        @command.expects(:retrieve_identifier_for).returns(1)
         @mock_client.expects(:post).returns([201, {:id => 1, :url => "http://foo", :signature => "abc"}, {}])
         @command.expects(:say).with("Created library [lib1] with ID [1]")
         @command.expects(:sha1).with("/a/file")

data/test/command/create_libraryset_command_test.rb

@@ -30,7 +30,7 @@ class CreateLibrarysetCommandTest < Test::Unit::TestCase
     end
 
     should "retrieve the language id" do
-      @command.expects(:get_resource_id).returns(1)
+      @command.expects(:retrieve_identifier_for).returns(1)
       @mock_client.expects(:post).with(EPC::Config::LIBRARY_SETS_PATH, {:name => "rubylibs", :language_id => 1}).returns([201, {}, {}])
       @command.expects(:say)
       assert_equal(@command.execute("", "rubylibs", "ruby"), 201)

data/test/command/create_plugin_command_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class CreatePluginCommandTest < Test::Unit::TestCase
+  should_require_login
+
+  context "execute" do
+    setup do
+      @mock_client = mock("Client")
+      @command = EPC::Command::CreatePluginCommand.new(@mock_client)
+    end
+
+    should "fail if mandatory attributes not specified" do
+      assert_raise EPC::Error::FatalError do
+        @command.execute("")
+      end
+    end
+
+    should "request creation of the plugin" do
+      @mock_client.expects(:post).with(EPC::Config::PLUGINS_PATH, {:name => "plugin_name", :plugin_version => "plugin_version", :group => "group", :extensions => false, :inherited => false}).returns([200, {}, {}])
+      @command.expects(:say).with("Plugin [plugin_name] created.")
+      @command.execute("", "plugin_name", "plugin_version", "group")
+    end
+
+    should "report reason for request failure" do
+      @mock_client.expects(:post).with(EPC::Config::PLUGINS_PATH, {:name => "plugin_name", :plugin_version => "plugin_version", :group => "group", :extensions => false, :inherited => false}).returns([500, {:message => "System Exception"}, {}])
+      @command.expects(:say).with("Request failed: [System Exception]")
+      @command.execute("", "plugin_name", "plugin_version", "group")
+    end
+
+    context "parse_plugin_opt" do
+      should "should retrieve contents of file when option begins with 'file:'" do
+        @command.expects(:read_file).with("path_to_file").returns("contents of file")
+        assert_equal @command.send(:parse_plugin_opt, "file:path_to_file"), "contents of file"
+      end
+
+      should "should return the content of the option when no file specified" do
+        assert_equal @command.send(:parse_plugin_opt, "option"), "option"
+      end
+
+    end
+  end
+
+
+end