hammer_cli_katello 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5559307a7e9a2174ef030c6c92ad8c2d9a2c9e63e7e3c55799fe43cf864661a3
-  data.tar.gz: 3d32b7c76563f4c6e77d863bd005cc9ee6f13d53553287660783061606f87d39
+  metadata.gz: '087997f9ecd956e28e1a16af8a0a9b7d58c8545a21823983a4262455440a4450'
+  data.tar.gz: 24f3198cbecc8efe78ab7307deef8ae037acb150b1fdbbb663f1187e37b0b255
 SHA512:
-  metadata.gz: 5e9c68ab0111cf95ed634eb7e71b472183405fd4a7985b4bf80193d84e1f55053b61a4fa88620f7f2f46846990002acf5173f280dcfe41ed1c4d57dd9722d646
-  data.tar.gz: 5c3e8fd0886c574ef7fc896f1b36392ce53f1401c5d9e623b56de5c697ba5a44e797c601dd5fb2b55a96fe742d016e42200a94f316db1b0c2c566e883ee80aa0
+  metadata.gz: 11f48385ad699c7ffec842e06f80614892d533a5f3aada8a320fbdade7054e31205893e42ce7711eb365f680e0e8166fae6d605251f9ebabd91420e4330e3ea6
+  data.tar.gz: ab4c2fe345e087af5f6bb30ca575f8273212080ab504fc5d5003e721d6f5e2264ed4d837650b4b8598dd31f61acaad08860f53d41ba5d29d44490651aeb0d2b9

data/lib/hammer_cli_katello/activation_key.rb

@@ -55,7 +55,7 @@ module HammerCLIKatello
         field :name, _("Name")
         field :id, _("Id")
         field :description, _("Description"), Fields::Field, :hide_blank => true
-        field :format_limit, _("Host Limit")
+        field :format_consumed, _("Host Limit")
         field :auto_attach, _("Auto Attach")
         field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
 
@@ -66,6 +66,11 @@ module HammerCLIKatello
           field :name, _("Content View")
         end
 
+        collection :hosts, _("Associated Hosts") do
+          field :id, _('Id')
+          field :name, _("Name")
+        end
+
         collection :host_collections, _("Host Collections") do
           field :id, _("Id")
           field :name, _("Name")
@@ -86,8 +91,13 @@ module HammerCLIKatello
       end
 
       def extend_data(data)
-        data["format_limit"] =
-          data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
+        limit = data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
+
+        data["format_consumed"] = _("%{consumed} of %{limit}") %
+                                  {
+                                    :consumed => data["usage_count"],
+                                    :limit => limit
+                                  }
         data
       end
 

data/lib/hammer_cli_katello/content_view_version.rb

@@ -32,8 +32,6 @@ module HammerCLIKatello
     class InfoCommand < HammerCLIKatello::InfoCommand
       include LifecycleEnvironmentNameMapping
 
-      resource :content_view_versions, :show
-
       output do
         field :id, _("Id")
         field :name, _("Name")
@@ -57,6 +55,17 @@ module HammerCLIKatello
           field :name, _("Name")
           field :label, _("Label")
         end
+
+        field :filters_applied, _("Has Applied Filters"), Fields::Boolean, hide_blank: true
+        from :applied_filters do
+          collection :applied_filters, _("Applied Filters"), hide_blank: true, hide_empty: true do
+            from :filter do
+              field :id, _("Id")
+              field :name, _("Name")
+            end
+          end
+          field :dependency_solving, _("Dependency Solving"), Fields::Field, :hide_blank => true
+        end
       end
 
       build_options do |o|

data/lib/hammer_cli_katello/organization.rb

@@ -68,6 +68,18 @@ module HammerCLIKatello
       success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
+      def request_params
+        params = super
+        # This is so Hammer doesn't say "Nothing to update" when toggling SCA.
+        # (see hammer-cli-foreman)
+        # Rails will safely ignore the extra parameter.
+        if params.key?('simple_content_access')
+          params["organization"] = params.fetch('organization', {}).merge(
+            "_simple_content_access" => params['simple_content_access'])
+        end
+        params
+      end
+
       build_options do |o|
         o.expand(:all).except(:environments)
       end

data/lib/hammer_cli_katello/repository.rb

@@ -31,6 +31,7 @@ module HammerCLIKatello
           field :name, _("Product")
         end
         field :content_type, _("Content Type")
+        field :content_label, _("Content Label")
         field :url, _("Url")
       end
 
@@ -67,6 +68,7 @@ module HammerCLIKatello
         end
         field :_redhat_repo, _("Red Hat Repository")
         field :content_type, _("Content Type")
+        field :content_label, _("Content Label")
         field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
         field :_mirroring_policy, _("Mirroring Policy"), Fields::Field, :hide_blank => true
         field :url, _("Url")
@@ -74,6 +76,7 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
+        field :metadata_expire, _("Metadata Expiration"), Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :docker_tags_whitelist, _("Container Image Tags Filter"),

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -57,8 +57,9 @@ module HammerCLIKatello
     def create_lifecycle_environments_search_options(options, mode = nil)
       search_options = {}
       if mode != :multi
-        name = options[HammerCLI.option_accessor_name("environment_name")] ||
-               options[HammerCLI.option_accessor_name("name")]
+        name = options[HammerCLI.option_accessor_name("name")] ||
+               options[HammerCLI.option_accessor_name("environment_name")]
+
         search_options['name'] = name if name
       end
       organization_id = organization_id(scoped_options('organization', options, :single))

data/lib/hammer_cli_katello/version.rb

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