hammer_cli_katello 0.0.7 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZlM2QzZWY4MTVmYjA3N2QwMTZkNTUwODJhNWYxOGQ5MWY4ZDgzZg==
+    NThiOTU1NWE2NGRkODNjYTVhYWYyNTc4YjUwMGFlYjMxMGY1NjI0MA==
   data.tar.gz: !binary |-
-    MjE0OTM2ZDg2ZjY1NGYzZjE3NWNmZjY3NDM2MjBiZWVjNWFmMjE3NQ==
+    NmM1YjJhZDEwZDYzNmZmNDEzYzA1Y2M2OWRjMzg2ZTkyYmUyNGU5MQ==
 SHA512:
   metadata.gz: !binary |-
-    YzI4OTE0MGY4Nzg1NGRiMDc3NjczYmFmMWIwY2RlZDJmYjA1OGQyZjEyZGJh
-    YjFmYmJhMTUyYzhmODNjMjc1OWNjNjM2NDg5OWI4MmQ5NGRiYTcyNWQwOTFk
-    NTQ0YjdjZThmOTA3NWRiNDI5YmI1OGUzODA4MzM0YzQ2OWMyY2Q=
+    MjQ1MzAwZTc1Y2Y3NGFlZjdlODM3ZTJiODc4MTgxNzllMzJjZjBiZjUyYTli
+    NjBiYzg1ZmQ5MzUzZmM2ZjU1YjMzMmRiNzljZGQ5Y2E4NTFhZjE2YjNjNmE4
+    ODE2YTIzNTg2YWM0MDk5NWRhZjNmN2FmNDZiZTQ3NDIwOTVlOTM=
   data.tar.gz: !binary |-
-    ZWFjNmEzZjUzMTYyZGEyMzI0MjZlZGUxNWExOGRiYzNkM2I0Njg2ZGE0NzQw
-    YjA2NWJjYTQxYWMyMjQwYWYyY2Y5ZGE3OWI3NGM1YzYxZmRjMWJhOWE2OWFk
-    YWI4OTM5YmMwYWMwNThhNDZlMTczNTkxNGM1YjBjNDAyM2ZjMGI=
+    NTM1MjQwMTllMDIzMGI4ZmNkYzc4Yjc3OWU5ZWI4MjA5NDQzOTQ5MDUxNjYz
+    NDNlODI1NDk5MDRjMmVhZGU5YzM1NDc5MzE3MWY2NDU3NzZiNTU0YWE5Mjkz
+    MzlhODgxMDI1ZDZhMTJmMWM0NGY4YTU4MGJlMGNkZDdjZDkxYTQ=

data/lib/hammer_cli_katello.rb

@@ -117,8 +117,4 @@ module HammerCLIKatello
                                          'hammer_cli_katello/erratum'
   )
 
-  HammerCLI::MainCommand.lazy_subcommand("docker", _("Manipulate docker content"),
-                                         'HammerCLIKatello::DockerCommand',
-                                         'hammer_cli_katello/docker'
-  )
 end

data/lib/hammer_cli_katello/activation_key.rb

@@ -52,6 +52,7 @@ module HammerCLIKatello
         field :id, _("ID")
         field :description, _("Description")
         field :format_limit, _("Content Host Limit")
+        field :auto_attach, _("Auto Attach")
         from :environment do
           field :name, _("Lifecycle Environment")
         end

data/lib/hammer_cli_katello/content_host.rb

@@ -20,7 +20,7 @@ module HammerCLIKatello
         field :uuid, _("ID")
         field :name, _("Name")
         from :errata_counts do
-          field :total, _("Available Errata")
+          field :total, _("Installable Errata")
         end
       end
 
@@ -45,7 +45,7 @@ module HammerCLIKatello
           field :name, _("Content View")
         end
         field :entitlementStatus, _("Entitlement Status")
-        field :releaseVer, _("Release Version")
+        field :release_ver, _("Release Version")
         field :autoheal, _("Autoheal")
         from :errata_counts do
           field :security, _("Security Errata")
@@ -113,6 +113,42 @@ module HammerCLIKatello
       build_options
     end
 
+    class AvailableIncrementalUpdates < HammerCLIKatello::ListCommand
+      resource :systems_bulk_actions, :available_incremental_updates
+      command_name 'available-incremental-updates'
+
+      option("--id", "ID", _("ID of a content host"))
+
+      def extend_data(data)
+        data['environments'] = data['environments'].map { |env| env['name'] }.join(',')
+        data
+      end
+
+      output do
+        from :content_view_version do
+          from :content_view do
+            field :name, _("Name")
+          end
+          field :version, _("Version")
+        end
+
+        field :environments, _("Environments")
+      end
+
+      def request_params
+        params = super
+        params.delete('exclude')
+        params.delete('ids')
+
+        params[:ids] = params[:id]
+        params.delete('id')
+
+        params
+      end
+
+      build_options :without => [:id]
+    end
+
     autoload_subcommands
 
     subcommand "package",

data/lib/hammer_cli_katello/content_host_errata.rb

@@ -21,7 +21,7 @@ module HammerCLIKatello
         field :errata_id, _("Erratum ID")
         field :type, _("Type")
         field :title, _("Title")
-        field :available, _("Available")
+        field :available, _("Installable")
       end
 
       build_options

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -29,11 +29,8 @@ module HammerCLIKatello
     class CreateCommand < HammerCLIKatello::CreateCommand
       command_name "add"
 
-      option "--id", "ID", _("id of the puppet module to associate")
-
-      def request_params
-        super.tap { |params| params['uuid'] = params.delete('id') if params['id'] }
-      end
+      option "--id", "ID", _("id of the puppet module to associate"),
+        :attribute_name => "option_uuid"
 
       success_message _("Puppet module added to content view")
       failure_message _("Could not add the puppet module")

data/lib/hammer_cli_katello/content_view_version.rb

@@ -72,10 +72,6 @@ module HammerCLIKatello
              :flag,
              _("force content view promotion and bypass lifecycle environment restriction")
 
-      option "--from-lifecycle-environment", "FROM_ENVIRONMENT",
-             _("Name of the source environment"), :attribute_name => :option_environment_name
-      option "--from-lifecycle-environment-id", "FROM_ENVIRONMENT_ID",
-             _("Id of the source environment"), :attribute_name => :option_environment_id
       option "--to-lifecycle-environment", "TO_ENVIRONMENT",
              _("Name of the target environment"), :attribute_name => :option_to_environment_name
       option "--to-lifecycle-environment-id", "TO_ENVIRONMENT_ID",
@@ -99,7 +95,7 @@ module HammerCLIKatello
       end
 
       build_options do |o|
-        o.expand(:all).except(:environments)
+        o.expand(:all).except(:environments).including(:content_views, :organizations)
         o.without(:environment_id)
       end
     end
@@ -118,6 +114,51 @@ module HammerCLIKatello
       end
     end
 
+    class IncrementalUpdate < HammerCLIKatello::Command
+      include HammerCLIForemanTasks::Async
+
+      action :incremental_update
+      command_name "incremental-update"
+
+      success_message _("Incremental update is being performed with task %{id}")
+      failure_message _("An error occurred incrementally updating the content view")
+
+      option('--environment-ids',
+        'ENVIRONMENTS',
+        _("list of environment IDs to update the content view version in"),
+        :required => true,
+        :format => HammerCLI::Options::Normalizers::List.new
+      )
+
+      option('--id',
+        'ID',
+        _("ID of a content view version to incrementally update"),
+        :required => true
+      )
+
+      def request_params
+        params = super
+
+        params[:content_view_version_environments] = [
+          {
+            :environment_ids => option_environment_ids,
+            :content_view_version_id => params['id']
+          }
+        ]
+
+        if params['update_systems']['included'].key?('ids')
+          params['update_systems'].delete('excluded')
+        else
+          params.delete('update_systems')
+        end
+
+        params.delete('id')
+        params
+      end
+
+      build_options
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/host_collection_erratum.rb

@@ -10,7 +10,7 @@ module HammerCLIKatello
 
       option('--errata',
         'ERRATA',
-        _("comma-separated list of errata to install"),
+        _("List of Errata to install"),
         :required => true,
         :format => HammerCLI::Options::Normalizers::List.new)
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -26,7 +26,6 @@ module HammerCLIKatello
         s("author", _("Puppet module's author to search by")),
         s("uuid", _("Puppet module's UUID to search by"))
       ],
-      :content_view =>         [s_name(_("Content view name"))],
       :content_view_version => [s("version", _("Content view version number"))]
     }
 
@@ -61,6 +60,7 @@ module HammerCLIKatello
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_environment_id = HammerCLI.option_accessor_name("environment_id")
+      key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
 
       return options[key_id] if options[key_id]
 
@@ -72,6 +72,16 @@ module HammerCLIKatello
         # Intentionally suppressing the exception,
         # environment is not always required.
       end
+
+      begin
+        options[key_content_view_id] ||= content_view_id(
+          scoped_options("content_view", options)
+        )
+      rescue HammerCLIForeman::MissingSeachOptions # rubocop:disable HandleExceptions
+        # Intentionally suppressing the exception,
+        # content_view is not always required.
+      end
+
       find_resource(:content_view_versions, options)['id']
     end
 
@@ -87,9 +97,12 @@ module HammerCLIKatello
 
     def create_content_view_versions_search_options(options)
       environment_id = options[HammerCLI.option_accessor_name("environment_id")]
+      content_view_id = options[HammerCLI.option_accessor_name("content_view_id")]
       version = options[HammerCLI.option_accessor_name("version")]
 
       search_options = {}
+
+      search_options['content_view_id'] = content_view_id if content_view_id
       search_options['environment_id'] = environment_id if environment_id
       search_options['version'] = version if version
       search_options

data/lib/hammer_cli_katello/repository.rb

@@ -33,6 +33,10 @@ module HammerCLIKatello
         field :url, _("URL")
         field :_publish_via_http, _("Publish Via HTTP")
         field :full_path, _("Published At")
+        field :docker_upstream_name, _("Upstream Repository Name"),
+              Fields::Field, :hide_blank => true
+        field :container_repository_name, _("Container Repository Name"),
+              Fields::Field, :hide_blank => true
 
         label _("Product") do
           from :product do
@@ -61,28 +65,35 @@ 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_tag_total, _("Docker Tags"), Fields::Field, :hide_blank => true
         end
       end
 
-      def send_request
-        super.tap do |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"])
-          setup_content_counts(data)
+      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_content_counts(data) if data["content_counts"]
+        data
       end
 
       def setup_content_counts(data)
-        if data["content_type"] == "yum"
-          if data["content_counts"]
-            data["package_total"]  =  data["content_counts"]["rpm"]
-            data["package_group_total"]  =  data["content_counts"]["package_group"]
-            data["errata_total"]  =  data["content_counts"]["erratum"]
-          end
-          data["gpg_key_name"] = data["gpg_key"]["name"] if data["gpg_key"]
-        else
-          data["puppet_total"] = data["content_counts"]["puppet_module"] if data["content_counts"]
+        content_counts = data["content_counts"]
+        case data["content_type"]
+        when "yum"
+          data["package_total"]  =  content_counts["rpm"]
+          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_tag_total"] = content_counts["docker_tag"]
+        when "puppet"
+          data["puppet_total"] = content_counts["puppet_module"]
         end
       end
 

data/lib/hammer_cli_katello/repository_set.rb

@@ -44,6 +44,7 @@ module HammerCLIKatello
           field :basearch, _("Arch")
           field :releasever, _("Release")
         end
+        field :registry_name, _("Registry Name")
         field :enabled, _("Enabled"), Fields::Boolean
       end
 

data/lib/hammer_cli_katello/sync_plan.rb

@@ -28,15 +28,13 @@ module HammerCLIKatello
     class CreateCommand < HammerCLIKatello::CreateCommand
 
       option "--interval", "INTERVAL", _("how often synchronization should run"),
-             :default => 'none',
              :format => HammerCLI::Options::Normalizers::Enum.new(
-                %w(none hourly daily weekly)
+                %w(hourly daily weekly)
               )
 
       option "--sync-date", "SYNC_DATE",
              _("start date and time of the synchronization defaults to now"),
-             :format => HammerCLI::Options::Normalizers::DateTime.new,
-             :default => DateTime.now.strftime("%F %T")
+             :format => HammerCLI::Options::Normalizers::DateTime.new
 
       success_message _("Sync plan created")
       failure_message _("Could not create the sync plan")
@@ -48,7 +46,7 @@ module HammerCLIKatello
 
       option "--interval", "INTERVAL", _("how often synchronization should run"),
              :format => HammerCLI::Options::Normalizers::Enum.new(
-                %w(none hourly daily weekly)
+                %w(hourly daily weekly)
               )
       option "--sync-date", "SYNC_DATE", _("start date and time of the synchronization"),
              :format => HammerCLI::Options::Normalizers::DateTime.new

data/lib/hammer_cli_katello/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Adam Price
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -67,6 +67,20 @@ dependencies:
     - - ! '>='
       - !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
@@ -213,9 +227,6 @@ files:
 - lib/hammer_cli_katello/content_view.rb
 - lib/hammer_cli_katello/content_view_puppet_module.rb
 - lib/hammer_cli_katello/content_view_version.rb
-- lib/hammer_cli_katello/docker.rb
-- lib/hammer_cli_katello/docker_image.rb
-- lib/hammer_cli_katello/docker_tag.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/exception_handler.rb
 - lib/hammer_cli_katello/filter.rb
@@ -269,9 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
 test_files: []
-has_rdoc: 

data/lib/hammer_cli_katello/docker.rb

@@ -1,13 +0,0 @@
-require 'hammer_cli_katello/docker_image'
-require 'hammer_cli_katello/docker_tag'
-
-module HammerCLIKatello
-  class DockerCommand < HammerCLIKatello::Command
-    subcommand 'image',
-               HammerCLIKatello::DockerImageCommand.desc,
-               HammerCLIKatello::DockerImageCommand
-    subcommand 'tag',
-               HammerCLIKatello::DockerTagCommand.desc,
-               HammerCLIKatello::DockerTagCommand
-  end
-end

data/lib/hammer_cli_katello/docker_image.rb

@@ -1,36 +0,0 @@
-module HammerCLIKatello
-  class DockerImageCommand < HammerCLIKatello::Command
-    resource :docker_images
-    command_name 'image'
-    desc 'Manage docker images'
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      output do
-        field :id, _("ID")
-        field :image_id, _("Image ID")
-        field :size, _("Size")
-      end
-
-      build_options do |o|
-        o.expand.including(:products, :organizations, :content_views)
-      end
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :image_id, _("Image ID")
-        field :size, _("Size")
-
-        collection :tags, _("Tags") do
-          field :repository_id, _("Repository ID")
-          field :tag, _("Tag")
-        end
-      end
-
-      build_options
-    end
-
-    autoload_subcommands
-  end
-end

data/lib/hammer_cli_katello/docker_tag.rb

@@ -1,35 +0,0 @@
-module HammerCLIKatello
-  class DockerTagCommand < HammerCLIKatello::Command
-    resource :docker_tags
-    command_name 'tag'
-    desc 'Manage docker tags'
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      output do
-        field :id, _("ID")
-        field :tag, _("Tag")
-        field :repository_id, _("Repository ID")
-      end
-
-      build_options do |o|
-        o.expand.including(:products, :organizations, :content_views)
-      end
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :tag, _("Tag")
-        field :repository_id, _("Repository ID")
-
-        from :image do
-          field :id, _("Docker Image ID")
-        end
-      end
-
-      build_options
-    end
-
-    autoload_subcommands
-  end
-end