hammer_cli_katello 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e70cdfe9705efe7c645d5c95b7bd868480152a
-  data.tar.gz: e36b268db05c3c29a0beee9da45377a1ec0e5d5b
+  metadata.gz: 98af7a9663fc4e98bb4519596d20565e4951c8a4
+  data.tar.gz: e2a4f407aebb23efacc835290a789a7634f8943a
 SHA512:
-  metadata.gz: ee5a6423610a125a4cb5f6342cd6ee1566fdd1079abc75eeeaa7b61bc4c06f1597687d9f737ec7da6ae7359e33666a56ee3ed3b8ed3ebcc71c2c333fe507d88f
-  data.tar.gz: 9308563e7d90a57bc6a34301fc6c10e230e90a480167fb7facd9c19358c9c076378e9d79067c5e93a5b69a24d8f149ee01ce9a41a89a1a6285baef40d3300cb0
+  metadata.gz: 4f783366272ba4a129d5979559d06eb325ac2c04342106c0d91298aac355f724c02917be172544c070ffcffdb65d9a6f8a14b223759ed56cce2f26a113246d65
+  data.tar.gz: 59e264ec16c2249a2642372751f87c01398a40d3d38eb14bf270946fcc30e1c717bdf181cf89d362558ae86c3ca5494cda8a10995b1a52670f9ac97818966af0

data/lib/hammer_cli_katello/associating_commands.rb

@@ -65,23 +65,23 @@ module HammerCLIKatello
 
     end
 
-    module ContentHost
+    module Host
       extend HammerCLIForeman::AssociatingCommands::CommandExtension
 
-      class AddContentHostCommand < HammerCLIKatello::AddAssociatedCommand
-        command_name 'add-content-host'
-        associated_resource :systems
+      class AddHostCommand < HammerCLIKatello::AddAssociatedCommand
+        command_name 'add-host'
+        associated_resource :hosts
 
-        success_message _("The content host has been added")
-        failure_message _("Could not add content host")
+        success_message _("The host has been added")
+        failure_message _("Could not add host")
       end
 
-      class RemoveContentHostCommand < HammerCLIKatello::RemoveAssociatedCommand
-        command_name 'remove-content-host'
-        associated_resource :systems
+      class RemoveHostCommand < HammerCLIKatello::RemoveAssociatedCommand
+        command_name 'remove-host'
+        associated_resource :hosts
 
-        success_message _("The content host has been removed")
-        failure_message _("Could not remove content host")
+        success_message _("The host has been removed")
+        failure_message _("Could not remove host")
       end
 
     end

data/lib/hammer_cli_katello/content_host.rb

@@ -1,5 +1,3 @@
-require 'hammer_cli_katello/content_host_errata'
-
 module HammerCLIKatello
 
   class ContentHostCommand < HammerCLI::AbstractCommand
@@ -154,10 +152,6 @@ module HammerCLIKatello
     end
 
     autoload_subcommands
-
-    subcommand "errata",
-               HammerCLIKatello::ContentHostErrata.desc,
-               HammerCLIKatello::ContentHostErrata
   end
 
 end

data/lib/hammer_cli_katello/content_view_version.rb

@@ -182,6 +182,16 @@ module HammerCLIKatello
       end
     end
 
+    class ExportCommand < HammerCLIKatello::Command
+      action :export
+      command_name "export"
+
+      success_message _("Export complete")
+      failure_message _("Could not export")
+
+      build_options
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/host.rb

@@ -1,8 +1,12 @@
 require 'hammer_cli_foreman/host'
+require 'hammer_cli_katello/host_errata'
 require 'hammer_cli_katello/host_package'
 require 'hammer_cli_katello/host_package_group'
 
 module HammerCLIKatello
+  HammerCLIForeman::Host.subcommand "errata",
+                                    HammerCLIKatello::HostErrata.desc,
+                                    HammerCLIKatello::HostErrata
 
   HammerCLIForeman::Host.subcommand "package",
                                     HammerCLIKatello::HostPackage.desc,

data/lib/hammer_cli_katello/host_collection.rb

@@ -7,21 +7,21 @@ module HammerCLIKatello
       def self.included(base)
         base.option("--host-collection-ids",
           "HOST_COLLECTION_IDS",
-          _("Array of content host ids to replace the content hosts in host collection"),
+          _("Array of host ids to replace the hosts in host collection"),
           :format => HammerCLI::Options::Normalizers::List.new)
       end
 
       def request_params
         params = super
-        params['system_uuids'] = option_system_ids unless option_system_ids.nil?
-        params.delete('system_ids') if params.keys.include? 'system_ids'
+        params['host_ids'] = option_host_ids unless option_host_ids.nil?
+        params.delete('host_ids') if params.keys.include? 'host_ids'
         params
       end
     end
 
     module LimitFieldDataExtension
       def extend_data(data)
-        data['_limit'] = data['unlimited_content_hosts'] ? 'None' : data['max_content_hosts']
+        data['_limit'] = data['unlimited_hosts'] ? 'None' : data['max_hosts']
         data
       end
     end
@@ -45,15 +45,15 @@ module HammerCLIKatello
       resource :host_collections, :create
       def request_params
         super.tap do |params|
-          if params['max_content_hosts'] && params['unlimited_content_hosts'].nil?
-            params['unlimited_content_hosts'] = false
+          if params['max_hosts'] && params['unlimited_hosts'].nil?
+            params['unlimited_hosts'] = false
           end
         end
       end
 
       success_message _("Host collection created")
       failure_message _("Could not create the host collection")
-      build_options :without => [:system_uuids]
+      build_options :without => [:host_ids]
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -61,18 +61,18 @@ module HammerCLIKatello
       resource :host_collections, :show
 
       output ListCommand.output_definition do
-        field :total_content_hosts, _("Total Content Hosts")
+        field :total_hosts, _("Total Hosts")
       end
 
       build_options
     end
 
-    class ContentHostsCommand < HammerCLIKatello::ListCommand
-      resource :host_collections, :systems
-      command_name "content-hosts"
+    class HostsCommand < HammerCLIKatello::ListCommand
+      resource :host_collections, :hosts
+      command_name "hosts"
 
       output do
-        field :uuid, _("ID")
+        field :id, _("ID")
         field :name, _("Name")
       end
 
@@ -100,7 +100,7 @@ module HammerCLIKatello
       success_message _("Host collection updated")
       failure_message _("Could not update the the host collection")
 
-      build_options :without => [:system_uuids]
+      build_options :without => [:host_ids]
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -112,22 +112,22 @@ module HammerCLIKatello
       build_options
     end
 
-    class AddContentHostCommand < HammerCLIKatello::SingleResourceCommand
-      command_name 'add-content-host'
-      action :add_systems
+    class AddHostCommand < HammerCLIKatello::SingleResourceCommand
+      command_name 'add-host'
+      action :add_hosts
 
-      success_message _("The content host(s) has been added")
-      failure_message _("Could not add content host(s)")
+      success_message _("The host(s) has been added")
+      failure_message _("Could not add host(s)")
 
       build_options
     end
 
-    class RemoveContentHostCommand < HammerCLIKatello::SingleResourceCommand
-      command_name 'remove-content-host'
-      action :remove_systems
+    class RemoveHostCommand < HammerCLIKatello::SingleResourceCommand
+      command_name 'remove-host'
+      action :remove_hosts
 
-      success_message _("The content host(s) has been removed")
-      failure_message _("Could not remove content host(s)")
+      success_message _("The host(s) has been removed")
+      failure_message _("Could not remove host(s)")
 
       build_options
     end

data/lib/hammer_cli_katello/{content_host_errata.rb → host_errata.rb}

@@ -1,11 +1,11 @@
 module HammerCLIKatello
-  class ContentHostErrata < HammerCLIKatello::Command
+  class HostErrata < HammerCLIKatello::Command
 
-    desc "Manage errata on your content hosts"
+    desc "Manage errata on your hosts"
 
     class ApplyCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
-      resource :system_errata, :apply
+      resource :host_errata, :apply
       command_name "apply"
       success_message _("Errata applied successfully")
       failure_message _("Could not apply errata")
@@ -14,7 +14,7 @@ module HammerCLIKatello
     end
 
     class ListCommand < HammerCLIKatello::ListCommand
-      resource :system_errata, :index
+      resource :host_errata, :index
       command_name "list"
 
       output do
@@ -29,7 +29,7 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-      resource :system_errata, :show
+      resource :host_errata, :show
       command_name "info"
 
       output do

data/lib/hammer_cli_katello/repository.rb

@@ -33,6 +33,7 @@ module HammerCLIKatello
         field :url, _("URL")
         field :_publish_via_http, _("Publish Via HTTP")
         field :full_path, _("Published At")
+        field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :container_repository_name, _("Container Repository Name"),
@@ -65,7 +66,7 @@ module HammerCLIKatello
           field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
           field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
           field :puppet_total, _("Puppet Modules"), Fields::Field, :hide_blank => true
-          field :docker_image_total, _("Docker Images"), Fields::Field, :hide_blank => true
+          field :docker_manifest_total, _("Docker Manifests"), Fields::Field, :hide_blank => true
           field :docker_tag_total, _("Docker Tags"), Fields::Field, :hide_blank => true
         end
       end
@@ -100,7 +101,7 @@ module HammerCLIKatello
           data["package_group_total"]  =  content_counts["package_group"]
           data["errata_total"]  =  content_counts["erratum"]
         when "docker"
-          data["docker_image_total"] = content_counts["docker_image"]
+          data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
         when "puppet"
           data["puppet_total"] = content_counts["puppet_module"]
@@ -274,19 +275,31 @@ module HammerCLIKatello
       command_name "remove-content"
 
       option ["--content-ids"], "CONTENT_IDS",
-        _("Comma separated list of package/puppet module/docker image ids"),
+        _("package IDs, puppet module IDs, and/or docker manifest IDs"),
         :format => HammerCLI::Options::Normalizers::List.new, :required => true
 
       def request_params
-        super.tap do |opts|
-          opts[:uuids] = option_content_ids
+        super.tap do |params|
+          params[:ids] = option_content_ids
+          params[:uuids] = option_content_ids
         end
       end
 
       success_message _("Repository content removed")
       failure_message _("Could not remove content")
 
-      build_options :without => ["uuids"]
+      # ``uuids`` is deprecated
+      build_options :without => %w(uuids ids)
+    end
+
+    class ExportCommand < HammerCLIKatello::Command
+      resource :repositories, :export
+      command_name "export"
+
+      success_message _("Exported repository")
+      failure_message _("Could not export repository")
+
+      build_options
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('0.0.20')
+    @version ||= Gem::Version.new('0.0.21')
   end
 end

metadata

@@ -1,29 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Adam Price
+- Adam Ruzicka
 - Brad Buckingham
 - Bryan Kearney
+- Chris Duryee
+- Christine Fouant
+- Daniel Lobato García
 - David Davis
 - Dustin Tsang
+- Eric D. Helms
 - Ivan Nečas
 - Jason L Connor
 - Jason Montleon
+- John Mitsch
 - Justin Sherrill
 - Martin Bačovský
 - Michaux Kelley
 - Og Maciel
 - Partha Aji
+- Pavel Moravec
+- Roman Plevka
+- Stephen Benjamin
 - Tomas Strachota
 - Tom McKay
 - Walden Raines
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -222,7 +231,6 @@ files:
 - lib/hammer_cli_katello/capsule.rb
 - lib/hammer_cli_katello/commands.rb
 - lib/hammer_cli_katello/content_host.rb
-- lib/hammer_cli_katello/content_host_errata.rb
 - lib/hammer_cli_katello/content_view.rb
 - lib/hammer_cli_katello/content_view_puppet_module.rb
 - lib/hammer_cli_katello/content_view_version.rb
@@ -236,6 +244,7 @@ files:
 - lib/hammer_cli_katello/host_collection_erratum.rb
 - lib/hammer_cli_katello/host_collection_package.rb
 - lib/hammer_cli_katello/host_collection_package_group.rb
+- lib/hammer_cli_katello/host_errata.rb
 - lib/hammer_cli_katello/host_package.rb
 - lib/hammer_cli_katello/host_package_group.rb
 - lib/hammer_cli_katello/i18n.rb
@@ -292,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer