hammer_cli_katello 0.0.3 → 0.0.4

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -1,83 +1,101 @@
 module HammerCLIKatello
 
-  class LifecycleEnvironmentCommand < HammerCLI::AbstractCommand
-
-    class ListCommand < HammerCLIForeman::ListCommand
-      resource KatelloApi::Resources::Environment, :index
+  class LifecycleEnvironmentCommand < HammerCLIKatello::Command
+    resource :lifecycle_environments
 
+    class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, "ID"
-        field :name, "Name"
+        field :id, _("ID")
+        field :name, _("Name")
+        from :prior do
+          field :name, _("Prior")
+        end
       end
 
-      apipie_options
+      build_options
     end
 
-    class InfoCommand < HammerCLIForeman::InfoCommand
-      resource KatelloApi::Resources::Environment, :show
-
-      identifiers :id
+    class PathsCommand < HammerCLIKatello::ListCommand
+      action :paths
+      command_name "paths"
 
       output do
-        field :id, "ID"
-        field :name, "Name"
-        field :label, "Label"
-        field :description, "Description"
-        from :organization do
-          field :name, "Organization"
-        end
-        field :library, "Library"
-        field :prior, "Prior Lifecycle Environment"
+        field :pretty_path, _("Lifecycle Path")
       end
 
-      def request_params
-        super.merge(method_options)
+      def extend_data(data)
+        route = []
+        data["path"].each { |step| route << step["environment"]["name"] }
+
+        data[:pretty_path] = route.join(" >> ")
+        data
       end
 
-      apipie_options
+      build_options
     end
 
-    class CreateCommand < HammerCLIForeman::CreateCommand
-      resource KatelloApi::Resources::Environment, :create
-      success_message "Environment created"
-      failure_message "Could not create environment"
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :label, _("Label")
+        field :description, _("Description")
+        from :organization do
+          field :name, _("Organization")
+        end
+        field :library, _("Library")
+        from :prior do
+          field :name, _("Prior Lifecycle Environment")
+        end
+      end
 
-      apipie_options
+      build_options
     end
 
-    class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message "Environment updated"
-      failure_message "Could not update environment"
-      resource KatelloApi::Resources::Environment, :update
-
-      identifiers :id
+    class CreateCommand < HammerCLIKatello::CreateCommand
+      success_message _("Environment created")
+      failure_message _("Could not create environment")
 
       def request_params
-        super.merge(method_options)
+        params = super
+        params["prior"] = resolver.lifecycle_environment_id(
+          HammerCLI.option_accessor_name("name") => params["prior"],
+          HammerCLI.option_accessor_name("organization_id") => params["organization_id"]
+        )
+        params
       end
 
-      apipie_options
+      build_options
     end
 
-    class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message "Environment deleted"
-      failure_message "Could not delete environment"
-      resource KatelloApi::Resources::Environment, :destroy
-
-      identifiers :id
+    class UpdateCommand < HammerCLIKatello::UpdateCommand
+      success_message _("Environment updated")
+      failure_message _("Could not update environment")
 
       def request_params
-        super.merge(method_options)
+        params = super
+        params["prior"] = resolver.lifecycle_environment_id(
+          HammerCLI.option_accessor_name("name") => params["prior"],
+          HammerCLI.option_accessor_name("organization_id") => params["organization_id"]
+        )
+        params
       end
 
-      apipie_options
+      build_options
+    end
+
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      success_message _("Environment deleted")
+      failure_message _("Could not delete environment")
+
+      build_options
     end
 
     autoload_subcommands
   end
 
   cmd_name = "lifecycle-environment"
-  cmd_desc = "manipulate lifecycle_environments on the server"
+  cmd_desc = _("manipulate lifecycle_environments on the server")
   cmd_cls  = HammerCLIKatello::LifecycleEnvironmentCommand
   HammerCLI::MainCommand.subcommand(cmd_name, cmd_desc, cmd_cls)
 end

data/lib/hammer_cli_katello/organization.rb

@@ -3,52 +3,56 @@ module HammerCLIKatello
   class Organization < HammerCLIForeman::Organization
 
     class ListCommand < HammerCLIForeman::Organization::ListCommand
-      resource KatelloApi::Resources::Organization, "index"
+      include HammerCLIKatello::ResolverCommons
+      resource :organizations, :index
 
       output do
-        field :label, "Label"
-        field :description, "Description"
+        field :label, _("Label")
+        field :description, _("Description")
       end
 
-      apipie_options
+      build_options
     end
 
     class InfoCommand < HammerCLIForeman::Organization::InfoCommand
-      resource KatelloApi::Resources::Organization, "show"
+      include HammerCLIKatello::ResolverCommons
+      resource :organizations, :show
 
       output do
-        field :label, "Label"
-        field :description, "Description"
+        field :label, _("Label")
+        field :description, _("Description")
+        field :redhat_repository_url, _("Red Hat Repository URL")
       end
 
-      apipie_options
+      build_options
     end
 
     class UpdateCommand < HammerCLIForeman::Organization::UpdateCommand
-      resource KatelloApi::Resources::Organization, "update"
+      include HammerCLIKatello::ResolverCommons
+      resource :organizations, :update
 
-      success_message "Organization updated"
-      failure_message "Could not update the organization"
+      success_message _("Organization updated")
+      failure_message _("Could not update the organization")
 
-      apipie_options
+      build_options
     end
 
-    class CreateCommand < HammerCLIForeman::CreateCommand
-      resource KatelloApi::Resources::Organization, "create"
+    class CreateCommand < HammerCLIKatello::CreateCommand
+      resource :organizations, :create
 
-      success_message "Organization created"
-      failure_message "Could not create the organization"
+      success_message _("Organization created")
+      failure_message _("Could not create the organization")
 
-      apipie_options
+      build_options
     end
 
-    class DeleteCommand < HammerCLIForeman::DeleteCommand
-      resource KatelloApi::Resources::Organization, "destroy"
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      resource :organizations, :destroy
 
-      success_message "Organization deleted"
-      failure_message "Could not delete the organization"
+      success_message _("Organization deleted")
+      failure_message _("Could not delete the organization")
 
-      apipie_options
+      build_options
     end
 
     autoload_subcommands
@@ -56,5 +60,5 @@ module HammerCLIKatello
 
 end
 
-HammerCLI::MainCommand.subcommand! 'organization', "Manipulate organizations",
+HammerCLI::MainCommand.subcommand! 'organization', _("Manipulate organizations"),
                                    HammerCLIKatello::Organization

data/lib/hammer_cli_katello/ping.rb

@@ -1,51 +1,51 @@
 module HammerCLIKatello
 
-  class PingCommand < HammerCLI::Apipie::ReadCommand
+  class PingCommand < HammerCLIKatello::Command
 
-    resource KatelloApi::Resources::Ping, :index
+    resource :ping, :index
 
     output do
       from "services" do
 
         label "candlepin" do
           from "candlepin" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
         label "candlepin_auth" do
           from "candlepin_auth" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
         label "pulp" do
           from "pulp" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
         label "pulp_auth" do
           from "pulp_auth" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
         label "elasticsearch" do
           from "elasticsearch" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
         label "katello_jobs" do
           from "katello_jobs" do
-            field "status", "Status"
-            field "_response", "Server Response"
+            field "status", _("Status")
+            field "_response", _("Server Response")
           end
         end
 
@@ -53,15 +53,12 @@ module HammerCLIKatello
     end # output do
 
     def execute
-      d = retrieve_data
-      if HammerCLI::Settings.get(:log_api_calls)
-        logger.debug "Retrieved data: " + d.ai(:raw => true)
-      end
+      d = send_request
       print_data d
-      d['status'] != "FAIL" ? HammerCLI::EX_OK : 1
+      d['status'] != _("FAIL") ? HammerCLI::EX_OK : 1
     end
 
-    def retrieve_data
+    def send_request
       super.tap do |data|
         data['services'].each do |name, service|
           service['_response'] = get_server_response(service)
@@ -73,15 +70,15 @@ module HammerCLIKatello
 
     def get_server_response(service_hash)
       if service_hash['duration_ms']
-        "Duration: #{service_hash['duration_ms']}ms"
+        _("Duration: %sms") % service_hash['duration_ms']
       else
-        "Message: #{service_hash['message']}"
+        _("Message: %s") % service_hash['message']
       end
     end
 
   end # class PingCommand
 
-  HammerCLI::MainCommand.subcommand("ping", "get the status of the server",
+  HammerCLI::MainCommand.subcommand("ping", _("get the status of the server"),
                                     HammerCLIKatello::PingCommand)
 
 end # module HammerCLIKatello

data/lib/hammer_cli_katello/product.rb

@@ -1,111 +1,118 @@
 module HammerCLIKatello
 
-  class Product < HammerCLI::Apipie::Command
-    resource KatelloApi::Resources::Product
+  class Product < HammerCLIKatello::Command
+    resource :products
 
-    class ListCommand < HammerCLIForeman::ListCommand
+    class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, "Product ID"
-        field :name, "Name"
+        field :id, _("ID")
+        field :name, _("Name")
 
-        from :provider do
-          field :name, "Provider"
+        from :organization do
+          field :name, _("Organization")
         end
 
-        from :organization do
-          field :name, "Organization"
+        field :repository_count, _("Repositories")
+
+        from :sync_status do
+          field :state, _("Sync State")
         end
 
-        field :repository_count, "Repositories"
       end
 
-      apipie_options
+      build_options
     end
 
-    class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message "Product created"
-      failure_message "Could not create the product"
+    class CreateCommand < HammerCLIKatello::CreateCommand
+      success_message _("Product created")
+      failure_message _("Could not create the product")
 
-      apipie_options
+      build_options
     end
 
-    class InfoCommand < HammerCLIForeman::InfoCommand
-      output do
-        field :id, "Product ID"
-        field :name, "Name"
-        field :label, "Label"
-        field :description, "Description"
+    class InfoCommand < HammerCLIKatello::InfoCommand
 
-        field :sync_plan_id, "Sync Plan ID"
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :label, _("Label")
+        field :description, _("Description")
 
-        from :gpg_key do
-          field :id, "GPG Key ID"
-          field :name, "GPG Key"
+        from :sync_status do
+          field :state, _("Sync State")
         end
 
-        from :provider do
-          field :name, "Provider"
+        field :sync_plan_id, _("Sync Plan ID")
+
+        label _("GPG") do
+          from :gpg_key do
+            field :id, _("GPG Key ID")
+            field :name, _("GPG Key")
+          end
         end
 
         from :organization do
-          field :name, "Organization"
+          field :name, _("Organization")
         end
 
-        field :readonly, "Readonly"
+        field :readonly, _("Readonly")
 
         from :permissions do
-          field :deletable, "Deletable"
+          field :deletable, _("Deletable")
+        end
+
+        collection :product_content, _("Content") do
+          from :content do
+            field :name, _("Repo Name")
+            field :contentUrl, _("URL")
+          end
         end
       end
 
-      apipie_options
+      build_options
     end
 
-    class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message "Product updated"
-      failure_message "Could not update the product"
+    class UpdateCommand < HammerCLIKatello::UpdateCommand
+      success_message _("Product updated")
+      failure_message _("Could not update the product")
 
-      apipie_options
+      build_options
     end
 
-    class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message "Product destroyed"
-      failure_message "Could not destroy the product"
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      success_message _("Product destroyed")
+      failure_message _("Could not destroy the product")
 
-      apipie_options
+      build_options
     end
 
-    class SetSyncPlanCommand < HammerCLIForeman::UpdateCommand
-      identifiers :id, :sync_plan_id
+    class SetSyncPlanCommand < HammerCLIKatello::UpdateCommand
+      desc _("Assign sync plan to product.")
+      command_name "set-sync-plan"
 
-      desc "Assign sync plan to product."
-      command_name "set_sync_plan"
+      success_message _("Synchronization plan assigned.")
+      failure_message _("Could not assign synchronization plan.")
 
-      success_message "Synchronization plan assigned."
-      failure_message "Could not assign synchronization plan."
+      resource :products, :update
 
-      resource KatelloApi::Resources::Product, "update"
-
-      apipie_options :without => declared_identifiers.keys +
-        [:name, :label, :provider_id, :description, :gpg_key_id]
-      option "--sync_plan_id", "SYNC_PLAN_ID", "plan numeric identifier",
+      build_options :without => [:name, :label, :provider_id, :description, :gpg_key_id]
+      # TODO: set to --sync-plan-id
+      option "--sync_plan_id", "SYNC_PLAN_ID", _("plan numeric identifier"),
              :attribute_name => :option_sync_plan_id, :required => true
     end
 
-    class RemoveSyncPlanCommand < HammerCLIForeman::UpdateCommand
-      identifiers :id, :sync_plan_id
-
-      desc "Delete assignment sync plan and product."
-      command_name "remove_sync_plan"
+    class RemoveSyncPlanCommand < HammerCLIKatello::UpdateCommand
+      desc _("Delete assignment sync plan and product.")
+      command_name "remove-sync-plan"
 
-      success_message "Synchronization plan removed."
-      failure_message "Could not remove synchronization plan."
+      success_message _("Synchronization plan removed.")
+      failure_message _("Could not remove synchronization plan.")
 
-      resource KatelloApi::Resources::Product, "update"
+      resource :products, :update
 
-      apipie_options :without => [:name, :label, :provider_id, :description,
-                                  :gpg_key_id, :sync_plan_id]
-      option "--sync_plan_id", "SYNC_PLAN_ID", "plan numeric identifier",
+      build_options :without => [:name, :label, :provider_id, :description,
+                                 :gpg_key_id, :sync_plan_id]
+      option "--sync_plan_id", "SYNC_PLAN_ID", _("plan numeric identifier"),
              :attribute_name => :option_sync_plan_id, :required => true
     end
 
@@ -113,5 +120,5 @@ module HammerCLIKatello
   end
 end
 
-HammerCLI::MainCommand.subcommand "product", "Manipulate products.",
+HammerCLI::MainCommand.subcommand "product", _("Manipulate products."),
                                   HammerCLIKatello::Product