hammer_cli_katello 0.0.4 → 0.0.5

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -3,6 +3,19 @@ module HammerCLIKatello
   class LifecycleEnvironmentCommand < HammerCLIKatello::Command
     resource :lifecycle_environments
 
+    module PriorIdResolvable
+      def request_params
+        params = super
+        if params["prior"]
+          params["prior"] = resolver.lifecycle_environment_id(
+            HammerCLI.option_accessor_name("name") => params["prior"],
+            HammerCLI.option_accessor_name("organization_id") => params["organization_id"]
+          )
+        end
+        params
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       output do
         field :id, _("ID")
@@ -20,14 +33,11 @@ module HammerCLIKatello
       command_name "paths"
 
       output do
-        field :pretty_path, _("Lifecycle Path")
+        field :_pretty_path, _("Lifecycle Path")
       end
 
       def extend_data(data)
-        route = []
-        data["path"].each { |step| route << step["environment"]["name"] }
-
-        data[:pretty_path] = route.join(" >> ")
+        data["_pretty_path"] = data["environments"].map { |env| env["name"] }.join(" >> ")
         data
       end
 
@@ -53,34 +63,20 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include PriorIdResolvable
+
       success_message _("Environment created")
       failure_message _("Could not create environment")
 
-      def request_params
-        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
-
       build_options
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include PriorIdResolvable
+
       success_message _("Environment updated")
       failure_message _("Could not update environment")
 
-      def request_params
-        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
-
       build_options
     end
 
@@ -94,8 +90,4 @@ module HammerCLIKatello
     autoload_subcommands
   end
 
-  cmd_name = "lifecycle-environment"
-  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/lifecycle_environment_name_resolvable.rb

@@ -0,0 +1,33 @@
+module HammerCLIKatello
+  module LifecycleEnvironmentNameResolvable
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def resource_name_mapping
+        mapping = Command.resource_name_mapping
+        mapping[:environment] = :lifecycle_environment
+        mapping
+      end
+    end
+
+    def lifecycle_environment_resolve_options(options)
+      {
+        HammerCLI.option_accessor_name("name") => options['option_environment_name'],
+        HammerCLI.option_accessor_name("id") => options['option_environment_id'],
+        HammerCLI.option_accessor_name("organization_id") => options["option_organization_id"],
+        HammerCLI.option_accessor_name("organization_name") => options["option_organization_name"]
+      }
+    end
+
+    def all_options
+      result = super.clone
+      if result['option_environment_name']
+        result['option_environment_id'] =  resolver.lifecycle_environment_id(
+                                             lifecycle_environment_resolve_options(result))
+      end
+      result
+    end
+  end
+end

data/lib/hammer_cli_katello/organization.rb

@@ -1,3 +1,5 @@
+require 'hammer_cli_foreman/organization'
+
 module HammerCLIKatello
 
   class Organization < HammerCLIForeman::Organization
@@ -46,7 +48,9 @@ module HammerCLIKatello
       build_options
     end
 
-    class DeleteCommand < HammerCLIKatello::DeleteCommand
+    class DeleteCommand < HammerCLIForeman::Organization::DeleteCommand
+      include HammerCLIKatello::ResolverCommons
+      include HammerCLIForemanTasks::Async
       resource :organizations, :destroy
 
       success_message _("Organization deleted")
@@ -59,6 +63,3 @@ module HammerCLIKatello
   end
 
 end
-
-HammerCLI::MainCommand.subcommand! 'organization', _("Manipulate organizations"),
-                                   HammerCLIKatello::Organization

data/lib/hammer_cli_katello/output/fields.rb

@@ -0,0 +1,15 @@
+require 'hammer_cli'
+
+module HammerCLIKatello
+  module Output
+    module Fields
+
+      class ChecksumFilePair < ::Fields::Field
+      end
+
+      class Dependency < ::Fields::Field
+      end
+
+    end
+  end
+end

data/lib/hammer_cli_katello/output/formatters.rb

@@ -0,0 +1,34 @@
+module HammerCLIKatello
+  module Output
+    module Formatters
+
+      class ChecksumFormatter < HammerCLI::Output::Formatters::FieldFormatter
+
+        def tags
+          [:screen]
+        end
+
+        def format(items, _ = {})
+          "%s  %s" % items.reverse
+        end
+      end
+
+      class DependencyFormatter < HammerCLI::Output::Formatters::FieldFormatter
+
+        def format(dependency, _ = {})
+          name = dependency[:name] || dependency['name']
+          version = dependency[:version_requirement] || dependency['version_requirement']
+          if version
+            "%s ( %s )" % [name, version]
+          else
+            name
+          end
+        end
+      end
+
+      HammerCLI::Output::Output.register_formatter(ChecksumFormatter.new, :ChecksumFilePair)
+      HammerCLI::Output::Output.register_formatter(DependencyFormatter.new, :Dependency)
+
+    end
+  end
+end

data/lib/hammer_cli_katello/ping.rb

@@ -42,8 +42,8 @@ module HammerCLIKatello
           end
         end
 
-        label "katello_jobs" do
-          from "katello_jobs" do
+        label "foreman_tasks" do
+          from "foreman_tasks" do
             field "status", _("Status")
             field "_response", _("Server Response")
           end
@@ -60,7 +60,7 @@ module HammerCLIKatello
 
     def send_request
       super.tap do |data|
-        data['services'].each do |name, service|
+        data['services'].each do |_, service|
           service['_response'] = get_server_response(service)
         end
       end
@@ -78,7 +78,4 @@ module HammerCLIKatello
 
   end # class PingCommand
 
-  HammerCLI::MainCommand.subcommand("ping", _("get the status of the server"),
-                                    HammerCLIKatello::PingCommand)
-
 end # module HammerCLIKatello

data/lib/hammer_cli_katello/product.rb

@@ -7,6 +7,7 @@ module HammerCLIKatello
       output do
         field :id, _("ID")
         field :name, _("Name")
+        field :description, _("Description")
 
         from :organization do
           field :name, _("Organization")
@@ -96,9 +97,6 @@ module HammerCLIKatello
       resource :products, :update
 
       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 < HammerCLIKatello::UpdateCommand
@@ -112,13 +110,12 @@ module HammerCLIKatello
 
       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
+
+      def request_params
+        super.merge("sync_plan_id" => nil)
+      end
     end
 
     autoload_subcommands
   end
 end
-
-HammerCLI::MainCommand.subcommand "product", _("Manipulate products."),
-                                  HammerCLIKatello::Product

data/lib/hammer_cli_katello/puppet_module.rb

@@ -7,8 +7,8 @@ module HammerCLIKatello
       output do
         field :id, _("ID")
         field :name, _("Name")
-        field :version, _("Version")
         field :author, _("Author")
+        field :version, _("Version")
       end
 
       build_options
@@ -26,13 +26,20 @@ module HammerCLIKatello
         field :license, _("License")
         field :project_page, _("Project Page")
         field :source, _("Source")
-        field :dependencies, _("Dependencies"), Fields::List
-        field :checksums, _("Checksums"), Fields::List
+
+        collection :dependencies, _("Dependencies"), :numbered => false do
+          field nil, nil, HammerCLIKatello::Output::Fields::Dependency
+        end
+        collection :checksums, _("File checksums"), :numbered => false do
+          field nil, nil, HammerCLIKatello::Output::Fields::ChecksumFilePair
+        end
+
         field :tag_list, _("Tag List"), Fields::List
-      end
 
-      def request_params
-        super.merge(method_options)
+        collection :repositories, _("Repositories") do
+          field :id, _("Id")
+          field :name, _("Name")
+        end
       end
 
       build_options
@@ -41,7 +48,3 @@ module HammerCLIKatello
     autoload_subcommands
   end
 end
-
-HammerCLI::MainCommand.subcommand "puppet-module",
-                                  "View Puppet Module details.",
-                                  HammerCLIKatello::PuppetModule

data/lib/hammer_cli_katello/repository.rb

@@ -7,13 +7,19 @@ module HammerCLIKatello
       output do
         field :id, _("Id")
         field :name, _("Name")
+        from :product do
+          field :name, _("Product")
+        end
         field :content_type, _("Content Type")
+        field :url, _("URL")
       end
 
       build_options
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include RepositoryScopedToProduct
+
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -94,21 +100,24 @@ module HammerCLIKatello
         sync_states[state]
       end
 
-      def request_params
-        super.merge(method_options)
+      build_options do |o|
+        o.expand.including(:products)
       end
-
-      build_options
     end
 
-    class SyncCommand < HammerCLIForemanTasks::AsyncCommand
+    class SyncCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      include RepositoryScopedToProduct
+
       action :sync
       command_name "synchronize"
 
       success_message _("Repository is being synchronized in task %{id}")
       failure_message _("Could not synchronize the repository")
 
-      build_options
+      build_options do |o|
+        o.expand.including(:products)
+      end
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
@@ -123,25 +132,117 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include RepositoryScopedToProduct
+
       success_message _("Repository updated")
       failure_message _("Could not update the repository")
 
-      build_options :without => [:unprotected]
+      build_options(:without => [:unprotected]) do |o|
+        o.expand.including(:products)
+      end
       option "--publish-via-http", "ENABLE", _("Publish Via HTTP"),
              :attribute_name => :option_unprotected,
              :format => HammerCLI::Options::Normalizers::Bool.new
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include RepositoryScopedToProduct
+
       success_message _("Repository deleted")
       failure_message _("Could not delete the Repository")
 
-      build_options
+      build_options do |o|
+        o.expand.including(:products)
+      end
+    end
+
+    class UploadContentCommand < HammerCLIKatello::InfoCommand
+      include RepositoryScopedToProduct
+
+      resource :repositories, :upload_content
+      command_name "upload-content"
+      CONTENT_CHUNK_SIZE = 4_000_000 # bytes
+
+      class BinaryPath < HammerCLI::Options::Normalizers::File
+        def format(path)
+          fullpath = ::File.expand_path(path)
+
+          if File.directory?(fullpath)
+            Dir["#{fullpath}/*"].map { |file| ::File.new(file, 'rb') }
+          else
+            [::File.new(fullpath, 'rb')]
+          end
+        end
+      end
+
+      def request_headers
+        {:content_type => 'multipart/form-data', :multipart => true}
+      end
+
+      def execute
+        @failure = false
+        option_content.each { |file| upload_file(file) }
+
+        @failure ? HammerCLI::EX_DATAERR : HammerCLI::EX_OK
+      end
+
+      def content_upload_resource
+        ::HammerCLIForeman.foreman_resource(:content_uploads)
+      end
+
+      success_message _("Repository content uploaded")
+      failure_message _("Could not upload the content")
+
+      build_options(:without => [:content]) do |o|
+        o.expand.including(:products)
+      end
+      option "--path", "PATH", _("Upload file or directory of files as content for a repository"),
+             :attribute_name => :option_content,
+             :required => true, :format => BinaryPath.new
+
+      private
+
+      def upload_file(file)
+        upload_id = create_content_upload
+        repo_id = get_identifier
+        filename = File.basename(file.path)
+
+        offset = 0
+        while (content = file.read(CONTENT_CHUNK_SIZE))
+          params = {:offset => offset,
+                    :id => upload_id,
+                    :content => content,
+                    :repository_id => repo_id
+          }
+
+          content_upload_resource.call(:update, params, request_headers)
+          offset += CONTENT_CHUNK_SIZE
+        end
+
+        import_upload_ids([upload_id])
+        print_message _("Successfully uploaded file '%s'.") % filename
+      rescue
+        @failure = true
+        print_message _("Failed to upload file '%s' to repository. Please check "\
+                        "the file and try again.") % filename
+      ensure
+        content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
+      end
+
+      def create_content_upload
+        response = content_upload_resource.call(:create, :repository_id => get_identifier)
+
+        response["upload_id"]
+      end
+
+      def import_upload_ids(ids)
+        params = {:id => get_identifier,
+                  :upload_ids => ids
+        }
+        resource.call(:import_uploads, params)
+      end
     end
 
     autoload_subcommands
   end
 end
-
-HammerCLI::MainCommand.subcommand "repository", _("Manipulate repositories"),
-                                  HammerCLIKatello::Repository