hammer_cli_katello 0.0.18 → 0.0.19

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDg1YWQ5ZjNjNDBhZWEzNjYzYmNhYjEzNmUxYmM4MTQ2MmExODhmMA==
-  data.tar.gz: !binary |-
-    NTQ0ZGIxYTVlODUzNjk2ZTMzNTViY2M2ZWFiNjYxODE0YmUwZjdhZg==
+SHA1:
+  metadata.gz: 7123a0103baa87b866772e66d76ddc247cd659c0
+  data.tar.gz: a9a0d569eb59f55624cfb4b5e96e0dee515325d9
 SHA512:
-  metadata.gz: !binary |-
-    MTRlM2I3NDkyMThjMjI4YjljN2Q5MGYwZjlkZDBlMDc5YjgzY2UxMDQ3NTMy
-    MGQ4MDAyOGJiNDFkOGJkYWU1MzBkYjI3OWQ1MmQ3ODAzZDZkYTljYmM2MjM3
-    ZDI0MTE1NWExMGY4N2IwOGQ0ZjI1NjZiYzEwMTA5M2ZlMDMyOTg=
-  data.tar.gz: !binary |-
-    NTY4YjYxZjAxNzdlMzA3YzU1Nzk2ZGYyOTdlYzBiY2MyMTMwOTk5YWFkZDli
-    MzI1OTRlN2Q5MzMzMjVjOWQxNDJkODc3YmE2NjhjYjZjMDA4ZDJhYzI1MDVj
-    YmUwNDhmY2I3ODYxMjExNmZmNjU5ODFiOGY3NzUzOTExY2I4MTk=
+  metadata.gz: 4a8266309a3aa8f130777e6fa3db6a9d445693e4b6a04f16a44b06f1068f08fcaa17041ac9ecd873060f731f99efb4d231fe90b1ce072443a999dfa7c7aa4a0a
+  data.tar.gz: 325876dc84fd353574a2038311c60773785fc668ebc505658fb99d18d64b046a6c62b81549cb5bfc7968c4545a011cda1877bb7fc46b932d3908ef1bb11c1811

data/lib/hammer_cli_katello/activation_key.rb

@@ -2,9 +2,6 @@ module HammerCLIKatello
 
   class ActivationKeyCommand < HammerCLIKatello::Command
     resource :activation_keys
-    class Common
-      INTEGER_FORMAT = /^-?\d+/
-    end
 
     class ListCommand < HammerCLIKatello::ListCommand
       include LifecycleEnvironmentNameResolvable
@@ -81,12 +78,10 @@ module HammerCLIKatello
       success_message _("Activation key created")
       failure_message _("Could not create the activation key")
 
-      def request_params
-        params = super
-        if params.key?('max_content_hosts') && !params['max_content_hosts'].match(Common::INTEGER_FORMAT)
-          fail ::HammerCLI::Validator::ValidationError, 'Content host limit must be an integer'
-        end
-        params
+      option "--unlimited-content-hosts", :flag, "Set content hosts max to unlimited"
+
+      validate_options do
+        all(:option_unlimited_content_hosts, :option_max_content_hosts).rejected
       end
 
       build_options
@@ -111,6 +106,10 @@ module HammerCLIKatello
       success_message _("Activation key updated")
       failure_message _("Could not update the activation key")
 
+      validate_options do
+        all(:option_unlimited_content_hosts, :option_max_content_hosts).rejected
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/capsule.rb

@@ -2,6 +2,26 @@ module HammerCLIKatello
   class Capsule < HammerCLIForeman::Command
     resource :capsules
 
+    module LifecycleEnvironmentNameResolvable
+      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
+
     class ListCommand < HammerCLIKatello::ListCommand
       action :index
 
@@ -69,32 +89,47 @@ module HammerCLIKatello
       end
 
       class AddLifecycleEnvironmentCommand < HammerCLIKatello::Command
+        include LifecycleEnvironmentNameResolvable
         resource :capsule_content, :add_lifecycle_environment
         command_name 'add-lifecycle-environment'
 
         success_message _("Lifecycle environment successfully added to the capsule")
         failure_message _("Could not add the lifecycle environment to the capsule")
 
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
         build_options
       end
 
       class RemoveLifecycleEnvironmentCommand < HammerCLIKatello::Command
+        include LifecycleEnvironmentNameResolvable
         resource :capsule_content, :remove_lifecycle_environment
         command_name 'remove-lifecycle-environment'
 
         success_message _("Lifecycle environment successfully removed from the capsule")
         failure_message _("Could not remove the lifecycle environment from the capsule")
 
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
         build_options
       end
 
       class SyncCommand < HammerCLIForemanTasks::AsyncCommand
+        include LifecycleEnvironmentNameResolvable
         resource :capsule_content, :sync
         command_name "synchronize"
 
         success_message _("Capsule content is being synchronized in task %{id}")
         failure_message _("Could not synchronize capsule content")
 
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
         build_options
       end
 

data/lib/hammer_cli_katello/content_view.rb

@@ -104,6 +104,19 @@ module HammerCLIKatello
       build_options
     end
 
+    class CopyCommand < HammerCLIKatello::CreateCommand
+      action :copy
+
+      desc _("Copy a content view")
+      command_name "copy"
+
+      option "--name", "NAME", _("New content view name"), :attribute_name => :option_name
+      build_options
+
+      success_message _("Content view copied")
+      failure_message _("Could not copy the content view")
+    end
+
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       success_message _("Content view updated")
       failure_message _("Could not update the content view")

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -8,7 +8,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :uuid, _("ID")
+        field :uuid, _("UUID")
         field :name, _("Name")
         field :author, _("Author")
         field :version, _("Version")
@@ -29,13 +29,15 @@ module HammerCLIKatello
     class CreateCommand < HammerCLIKatello::CreateCommand
       command_name "add"
 
-      option "--id", "ID", _("id of the puppet module to associate"),
-        :attribute_name => "option_uuid"
+      option "--id", "ID", _("(deprecated) id of the puppet module to associate"),
+        :attribute_name => "option_uuid",
+        :deprecated => _("This option will be removed in Katello 2.5, Use --uuid")
 
       success_message _("Puppet module added to content view")
       failure_message _("Could not add the puppet module")
 
-      build_options :without => :uuid
+      #build_options :without => :uuid
+      build_options
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand

data/lib/hammer_cli_katello/filter.rb

@@ -25,6 +25,7 @@ module HammerCLIKatello
         field :name, _("Name")
         field :type, _("Type")
         field :inclusion, _("Inclusion")
+        field :description, _("Description")
 
         collection :repositories, _("Repositories") do
           field :id, _("ID")

data/lib/hammer_cli_katello/id_resolver.rb

@@ -39,6 +39,10 @@ module HammerCLIKatello
 
   class IdResolver < HammerCLIForeman::IdResolver
 
+    def capsule_content_id(options)
+      smart_proxy_id(options)
+    end
+
     def system_id(options)
       options[HammerCLI.option_accessor_name("id")] || find_resource(:systems, options)['uuid']
     end
@@ -125,6 +129,14 @@ module HammerCLIKatello
       create_search_options_without_katello_api(options, api.resource(:organizations))
     end
 
+    def create_smart_proxies_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    end
+
+    def create_capsules_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    end
+
     def create_search_options_with_katello_api(options, resource)
       search_options = {}
       searchables(resource).each do |s|

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -9,7 +9,7 @@ module HammerCLIKatello
         base.option(
           "--prior",
           "PRIOR",
-          _("Name of the prior enviroment")
+          _("Name of the prior environment")
         )
         base.validate_options do
           any(:option_prior, :option_prior_id).required

data/lib/hammer_cli_katello/ping.rb

@@ -28,17 +28,10 @@ module HammerCLIKatello
           end
         end
 
-        label "pulp_auth" do
+        label "pulp_auth", :hide_blank => true do
           from "pulp_auth" do
-            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"), Fields::Field, :hide_blank => true
+            field "_response", _("Server Response"), Fields::Field, :hide_blank => true
           end
         end
 
@@ -71,7 +64,7 @@ module HammerCLIKatello
     def get_server_response(service_hash)
       if service_hash['duration_ms']
         _("Duration: %sms") % service_hash['duration_ms']
-      else
+      elsif service_hash['message']
         _("Message: %s") % service_hash['message']
       end
     end

data/lib/hammer_cli_katello/puppet_module.rb

@@ -12,7 +12,7 @@ module HammerCLIKatello
       end
 
       build_options do |o|
-        o.expand(:all).including(:organizations, :content_views)
+        o.expand(:all).including(:organizations, :products, :content_views)
       end
     end
 

data/lib/hammer_cli_katello/repository.rb

@@ -54,7 +54,7 @@ module HammerCLIKatello
 
         label _("Sync") do
           field :_sync_state, _("Status")
-          field :last_sync, _("Last Sync Date"), Fields::Date, :hide_blank => true
+          field :last_sync_words, _("Last Sync Date"), Fields::Field, :hide_blank => true
         end
 
         field :created_at, _("Created"), Fields::Date
@@ -73,15 +73,25 @@ module HammerCLIKatello
       def extend_data(data)
         data["_redhat_repo"] = data["product_type"] == "redhat" ? _("yes") : _("no")
         data["_publish_via_http"] = data["unprotected"] ? _("yes") : _("no")
-        data["_sync_state"] = get_sync_status(data["sync_state"])
+
         if data["content_type"] == "yum" && data["gpg_key"]
           data["gpg_key_name"] = data["gpg_key"]["name"]
         end
 
+        setup_sync_state(data)
         setup_content_counts(data) if data["content_counts"]
         data
       end
 
+      def setup_sync_state(data)
+        if data['last_sync']
+          data['_sync_state'] = get_sync_status(data["last_sync"]["result"])
+          data['last_sync'] = data['last_sync_words']
+        else
+          data['_sync_state'] = _("Not Synced")
+        end
+      end
+
       def setup_content_counts(data)
         content_counts = data["content_counts"]
         case data["content_type"]

data/lib/hammer_cli_katello/repository_set.rb

@@ -39,7 +39,7 @@ module HammerCLIKatello
       command_name "available-repositories"
 
       output do
-        field :repo_name, _("Name")
+        field :name, _("Name")
         from :substitutions do
           field :basearch, _("Arch")
           field :releasever, _("Release")

data/lib/hammer_cli_katello/subscription.rb

@@ -57,7 +57,7 @@ module HammerCLIKatello
              :required => true, :format => BinaryFile.new
     end
 
-    class DeleteManfiestCommand < HammerCLIKatello::Command
+    class DeleteManifestCommand < HammerCLIKatello::Command
       include HammerCLIForemanTasks::Async
 
       resource :subscriptions, :delete_manifest
@@ -71,7 +71,7 @@ module HammerCLIKatello
       end
     end
 
-    class RefreshManfiestCommand < HammerCLIKatello::Command
+    class RefreshManifestCommand < HammerCLIKatello::Command
       include HammerCLIForemanTasks::Async
 
       resource :subscriptions, :refresh_manifest

data/lib/hammer_cli_katello/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Adam Price
@@ -23,96 +23,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_bootdisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -133,56 +127,56 @@ dependencies:
   name: minitest-spec-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -203,14 +197,14 @@ dependencies:
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hammer-CLI-Katello is a plugin for Hammer to provide connectivity to
@@ -277,17 +271,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer