epc 1.0.3 → 1.0.4

data/lib/epc/command/solution/update_solution_command.rb

@@ -2,14 +2,12 @@ module EPC::Command
   class UpdateSolutionCommand < BaseCommand
     UPDATABLE_ATTRIBUTES = ["name"]
 
-    def execute(solution = nil, *args)
+    def execute(args)
+      require_object
+
       path = File.expand_path(".")
       path = project_solution_path(path)
 
-      solution_id, solution_name = infer_solution_context(@options[:solution_name], path)
-
-      raise FatalError, "Solution could not be determined" if solution_id.nil?
-
       args_hash = {}
       args.each do |arg|
         key, val = arg.split("=")
@@ -31,7 +29,7 @@ module EPC::Command
 
 
       if args_hash.present?
-        status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{solution_id}", args_hash)
+        status, response, message = client.put(EPC::Config::SOLUTIONS_PATH + "/#{object_id}", args_hash)
         if status.failure?
           say("Update failed with: [#{response['message']}]")
         else

data/lib/epc/command/submit_command.rb

@@ -0,0 +1,16 @@
+module EPC::Command
+  class SubmitCommand < BaseCommand
+
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      @klass_name = "EPC::Command::Submit#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name)
+      command.include_module(object_type)
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
+    end
+
+  end
+end

data/lib/epc/command/unarchive_command.rb

@@ -1,12 +1,13 @@
 module EPC::Command
   class UnarchiveCommand < BaseCommand
 
-    def execute(object = nil)
-      @object_type, @object_id = object.split(":") rescue [nil, nil]
-      raise FatalError, "Object incorrectly specified" if @object_type.blank? 
-      klass = "EPC::Command::Unarchive#{@object_type.to_s.gsub("-","").capitalize}Command"
-      command = eval(klass).new(client, @options)
-      command.go(@object_id)
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      @klass_name = "EPC::Command::Unarchive#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name).new(client, @options)
+      command.context_params = context_params
+      command.go(params)
     end
   end
 end

data/lib/epc/command/update_command.rb

@@ -1,14 +1,15 @@
 module EPC::Command
   class UpdateCommand < BaseCommand
 
-    def execute(object = nil, *params)
-      @object_type, @object_id = object.split(":") rescue [nil, nil]
-      raise FatalError, "Object incorrectly specified" if @object_type.blank? 
-      klass = "EPC::Command::Update#{@object_type.to_s.gsub("-","").capitalize}Command" 
-      params = normalize_params(params)
-      command = eval(klass).new(client, @options)
-      check_params
-      command.go(@object_id, *params)
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args, {:skip_object_resolution => Proc.new{|type, id| type.downcase == "config" || type.downcase == "objectrole"}})
+      @klass_name = "EPC::Command::Update#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name)
+      command.include_module(object_type)
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.go(params)
     end
 
   end

data/lib/epc/command/user/create_user_command.rb

@@ -1,8 +1,7 @@
 module EPC::Command
   class CreateUserCommand < BaseCommand
-    def execute(*params)
-
-      email = params[1]
+    def execute(args = [])
+      email = args[0]
 
       raise FatalError, "You must supply an email address" if email.blank?
 

data/lib/epc/command/user/delete_user_command.rb

@@ -1,15 +1,13 @@
 module EPC::Command
   class DeleteUserCommand < DeleteCommand
-    def execute(user = nil, *args)
+    def execute(args = [])
 
-      proceed = ask_yn("Are you sure you want to delete the [#{user}] user? [Yn] ")
+      proceed = ask_yn("Are you sure you want to delete the [#{object_id}] user? [Yn] ")
       if proceed.upcase == "N"
         return 1
       end
 
-      user_id = retrieve_identifier_for("User", user)
-      
-      status, response, headers = client.delete(EPC::Config::USERS_PATH + "/#{user_id}")
+      status, response, headers = client.delete(EPC::Config::USERS_PATH + "/#{object_id}")
 
       if status == 200
         say("User deleted")

data/lib/epc/command/user/list_users_command.rb

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

data/lib/epc/command/user/show_user_command.rb

@@ -1,11 +1,9 @@
 module EPC::Command
   class ShowUserCommand < ShowCommand
     
-    def execute(user = nil, *args)
+    def execute(args = [])
 
-      user_id = retrieve_identifier_for("User", user)
-
-      status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{user_id}?include=user_groups")
+      status, response, headers = client.get(EPC::Config::USERS_PATH + "/#{object_id}?include=user_groups")
 
       if status != 200
         say("Request failed: [#{response[:message]}]")

data/lib/epc/command/user/update_user_command.rb

@@ -3,14 +3,10 @@ module EPC::Command
 
     required_options :email, :password, :mode => :any?, :message => "You must specify the attribute to be updated: email/password"
 
-    def execute(user = nil, *args)
+    def execute(args)
 
       if @options[:password].present?
-        if numeric?(user)
-          email = get_resource_attribute(EPC::Config::USERS_PATH, :email, :id, user.to_i)
-        else
-          email = user
-        end
+        email = get_resource_attribute(EPC::Config::USERS_PATH, :email, :id, object_id.to_i)
         raise FatalError, "User could not be determined" if email.blank?
 
         raise FatalError, "You need to specify the password change token with the --token option" if @options[:token].blank?
@@ -27,19 +23,12 @@ module EPC::Command
       end
 
       if @options[:email].present? || @options[:name].present?
-        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?
 
         params = {}
         params[:email] = @options[:email] if @options[:email].present?
         params[:name] = @options[:name] if @options[:name].present?
 
-        status, response, headers = client.put(EPC::Config::USERS_PATH + "/#{user_id}", params)
+        status, response, headers = client.put(EPC::Config::USERS_PATH + "/#{object_id}", params)
         
         if status.successful?
           say("User updated")

data/lib/epc/command/userproperty/list_user_properties_command.rb

@@ -0,0 +1,23 @@
+require 'time'
+module EPC::Command
+  class ListUserpropertiesCommand < BaseCommand
+
+    def execute(args = [])
+      user_id = retrieve_identifier_for("User", EPC::Config.username)
+
+      status, response, headers = client.get(EPC::Config::ENTITY_PROPERTIES_PATH + "/for/User/#{user_id}")
+
+      if status.failure?
+        say("Request failed with [#{response[:message]}]")
+      elsif response.empty?
+        say("No properties found for current user.")
+      else
+        response.each {|property| property[:created_at] = Time.parse(property[:created_at]).strftime("%m/%d/%Y %I:%M%p") rescue nil }
+        properties_table = EPC::TabularOutputter.new(response, [:id, :name, :created_at])
+        say(properties_table.print)
+      end
+      return status
+
+    end
+  end
+end

data/lib/epc/command/vote_command.rb

@@ -0,0 +1,16 @@
+module EPC::Command
+  class VoteCommand < BaseCommand
+
+    def execute(*args)
+      raise FatalError, "You need to specify the object for the command" if args.blank?
+      params = resolve_context(args)
+      @klass_name = "EPC::Command::Vote#{@object_type.to_s.gsub("-","").capitalize}Command" 
+      command = eval(@klass_name)
+      command.include_module(object_type)
+      command = command.new(client, @options)
+      command.context_params = context_params
+      command.execute(params)
+    end
+
+  end
+end

data/lib/epc/config.rb

@@ -41,6 +41,7 @@ module EPC
     METRICS_PATH             = "#{SCOPE}/metrics"
     INSTANCES_PATH           = "#{SCOPE}/deployed_projects"
     PLUGINS_PATH             = "#{SCOPE}/plugins"
+    ENTITY_PROPERTIES_PATH   = "#{SCOPE}/entity_properties"
 
     class << self
       def target_file
@@ -138,7 +139,12 @@ module EPC
       def remove_auth_token
         FileUtils.rm_f(File.expand_path(token_file))
       end
-      
+
+      def module_exists?(class_name)
+        return EPC::Command.const_defined?(class_name)
+      rescue NameError
+        return false
+      end
 
       def underscore(camel_cased_word)
         camel_cased_word.to_s.gsub(/::/, '/').

data/lib/epc/help.rb

@@ -4,7 +4,7 @@ module EPC
       :info                       => 'epc info',
       :target                     => 'epc target <url>',
       :login                      => 'epc login <email> [--passwd PASS]',
-      :list_solutions             => 'epc list solutions',
+      :list_solutions             => 'epc list solutions [--archived]',
       :create_solution            => 'epc create solution <name>',
       :show_solution              => 'epc show Solution:solution_identifier',
       :update_solution            => 'epc update Solution:solution_identifier name=value',
@@ -12,40 +12,33 @@ module EPC
       :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:solution_id]',
-      :create_project             => 'epc create project <name> [uri-name] <--type PROJECT_TYPE>',
+      :list_projects              => 'epc list projects [Solution:solution_id] [--archived]',
+      :create_project             => 'epc create project <name> [uri-name] <--type PROJECT_TYPE> <--memory MEMORY>',
       :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]',
+      :delete_project             => 'epc delete Project:project_identifier [--force]',
       :attach_runtime             => 'epc attach runtime <runtime_id> [-p PROJECT] [--stage STAGE]',
       :list_servicetypes          => 'epc list service-types', 
-      :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]',
-      :list_serviceversions       => 'epc list service-versions',
-      :delete_serviceversion      => 'epc delete service-version (<version_id>) || (<version_label> <definition_name>)',
-      :bind_service               => 'epc bind service [-s SOLUTION] [-p PROJECT] <service version>',
-      :unbind_service             => 'epc unbind service [-s SOLUTION] [-p PROJECT] <service version>',
-      :list_boundservices         => 'epc list bound-services [-s SOLUTION] <PROJECT>',
+      :create_servicedefinition   => 'epc create ServiceDefinition ServiceType:service_type_identifier <service_name>', 
+      :delete_servicedefinition   => 'epc delete ServiceDefinition:service_definition_identifier', 
+      :list_servicedefinitions    => 'epc list ServiceDefinitions',
+      :create_serviceversion      => 'epc create ServiceVersion <ServiceDefinition:service_definition_identifier> <label> [--up-script file] [--down-script file]',
+      :list_serviceversions       => 'epc list ServiceVersions',
+      :delete_serviceversion      => 'epc delete ServiceVersion:service_version_identifier',
       :create_user                => 'epc create user <email> [--name NAME]',
-      :push                       => 'epc push [PROJECT NAME] [--note NOTE] [--timeout value | --nopoll]',
+      :push                       => 'epc push [PROJECT NAME] [--note NOTE] [--timeout value | --nopoll] [--direct-deploy file]',
       :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_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]',
+      :create_deployment          => 'epc create Deployment Solution:solution_identifier <stage name: development|testing|staging|production> [-p project_id:version:instances:runtime_memory] [--replaces deployment_id]',
       :show_deployment            => 'epc show Deployment:deployment_identifier',
-      :submit_deployment          => 'epc submit deployment <DEPLOYMENT_ID>',
+      :submit_deployment          => 'epc submit Deployment:deployment_identifier',
       :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>',
-      :create_dependency          => 'epc create dependency [PROJECT] [-s SOLUTION] <--depends DEPENDENCY> <--runtime | --compile>',
-      :list_dependencies          => 'epc list dependencies [-s SOLUTION] [PROJECT]',
-      :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',
+      :approve_deployment         => 'epc approve Deployment:deployment_identifier',
+      :deny_deployment            => 'epc deny Deployment:deployment_identifier',
+      :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: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>',
@@ -55,12 +48,11 @@ module EPC
       :renew                      => 'epc renew',
       :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>',
+      :list_configs               => 'epc list config <TargetType:TargetType>',
       :delete_config              => 'epc delete Config:key_identifier <TargetType:TargetId>',
       :list_projecttypes          => 'epc list project-types',
       :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:config_identifier TargetType:TargetId [--required] [--no_override] name=value',
       :archive_project            => 'epc archive Project:project_identifier',
       :unarchive_project          => 'epc unarchive Project:project_identifier',
@@ -71,40 +63,47 @@ module EPC
       :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',
+      :list_objectroles           => 'epc list ObjectRoles <ObjectType:ObjectId>',
+      :delete_role                => 'epc delete Role',
       :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_role                => 'epc create role <name> [--file json]',
       :create_objectrole          => 'epc create role <name> <ObjectType:ObjectId>',
       :show_role                  => 'epc show Role:role_identifier [users|groups|grants]',
       :list_users                 => 'epc list users',
-      :delete_user                => 'epc delete user <user_id>|<email>',
+      :delete_user                => 'epc delete User:user_identifier',
       :show_user                  => 'epc show User:user_identifier',
-      :create_librarylanguage     => 'epc create library-language <name>',
-      :list_librarylanguages      => 'epc list library-languages',
+      :create_librarylanguage     => 'epc create LibraryLanguage <name>',
+      :list_librarylanguages      => 'epc list LibraryLanguages',
       :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]',
+      :create_libraryset          => 'epc create LibrarySet <name> <language> [--file file]',
       :show_libraryset            => 'epc show LibrarySet:libraryset_identifier [--json]',
-      :list_librarysets           => 'epc list library-sets',
+      :list_librarysets           => 'epc list LibrarySets',
       :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]',
+      :delete_libraryset          => 'epc delete LibrarySet:library_set_identifier [-y]',
       :request_passwordchange     => 'epc request password-change <email>',
       :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_permissions           => 'epc list Permissions',
+      :list_permissiongroups      => 'epc list PermissionGroups',
+      :list_objecttypes           => 'epc list ObjectTypes',
       :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'
+      :update_plugin              => 'epc update Plugin:Name:Version:Group attribute=new value',
+      :attachto_project           => 'epc attach-to Project:project_identifier [Library|LibrarySet|ServiceVersion|Dependency]:[library_identifier|library_set_identifier|service_version_identifier|dependency_identifier]',
+      :detachfrom_project         => 'epc detach-from Project:project_identifier [Library|LibrarySet|ServiceVersion|Dependency]:[library_identifier|library_set_identifier|service_version_identifier|dependency_identifier]',
+      :list_runtimetypes          => 'epc list RuntimeTypes',
+      :create_runtime             => 'epc create Runtime RuntimeType:runtime_type_identifier name target deployment_stage username password [--agility_topology id] [--agility-environment id]',
+      :update_runtime             => 'epc update Runtime:runtime_identifier attribute=new_value',
+      :delete_runtime             => 'epc delete Runtime:runtime_identifier',
+      :create_projecttype         => 'epc create ProjectType name runtime framework build-type build-packaging deployable runtime-env-types',
+      :delete_projecttype         => 'epc delete ProjectType:project_type_identifier',
+      :update_projecttype         => 'epc update ProjectType:project_type_identifier attribute=value',
+      :snapshot                   => 'epc snapshot project_id:project_version'
     }
     
     def display_usage
@@ -156,10 +155,10 @@ Currently available epc commands are:
     delete solution          Deletes the solution from the system and removes
                              local metadata files.
                              Does not remove local directories.
-    archive solution         Archives the solution. Arabeline, kschived solution do
+    archive solution         Archives the solution. Archived solutions do
                              not appear when listing solutions.
-    unarchive solution       Archives solution. 
-                             The solution will appear in solution listings.
+    unarchive solution       Unarchives solution. 
+                             The solution will appear in solutions listing.
     refresh solution         Retrieves and stores attributes for a solution.
 
     pull                     Downloads and extracts a solution skeleton
@@ -173,6 +172,8 @@ Currently available epc commands are:
     update project           Updates the specified attributes.
     delete project           Deletes the project.Removes only the
                              metadata files.
+    epc snapshot             Returns a snapshot of the project and it's associations
+                             for a given version.
                              All other files are left intact.
     epc create dependency    Creates a dependency such as parent_name_or_id will
                              depend on dependency_name_or_id.
@@ -186,9 +187,11 @@ Currently available epc commands are:
     epc list bound-services  Lists the services bound to the project
     attach runtime           Sets the runtime environment the project
                              will run on at deployment.
+    create ProjectType       Creates a project type with the given options.
     list project-types       Lists available project types.
     show project-type        Show details about a project type
-    list versions            Lists the project versions.
+    update ProjectType       Updates a project type with the given options.
+    delete ProjectType       Removes a project type from the system.
                              
 
   Services
@@ -203,8 +206,8 @@ Currently available epc commands are:
     
 
   Deployments
-    push                      Zips the project and pushes it to the 
-                              build manager repository
+    push                      Pushes project code to the repository
+                              and builds as needed
     build                     Builds a previously pushed project
     show deployment           Retrieves detailed information about
                               the deployment

data/lib/epc/modules/config.rb

@@ -0,0 +1,39 @@
+module EPC::Command
+  module Config
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+
+    module InstanceMethods
+      def extract_configuration_level(path, target)
+        config_type, config_id = target rescue [nil, nil]
+
+        if config_id.nil?
+          if EPC::Config.is_project_dir?(path)
+            config_id = EPC::Config.get_project_value(path, "id")
+            config_type = "Project"
+          elsif EPC::Config.is_solution_dir?(path)
+            config_id = EPC::Config.get_solution_value(path, "id")
+            config_type = "Solution"
+          end
+        end
+
+        return [config_type, config_id]
+      end
+
+      def parse_config_value_file(file, config_type, config_id)
+        params = []
+        params = EPC::Config.read_content_as_json(file)
+        params.each do |param|
+          if param[:configurable_type].nil? || param[:configurable_id].nil?
+            param[:configurable_type] = config_type
+            param[:configurable_id] = config_id
+          end
+        end
+        params
+      end
+    end
+  end
+end