hammer_cli_katello 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI2YjgxNzYzMjZkNWU1OWRjNDk5ZTU3NGFmZDM4OTVjYjk0YjY3Yg==
+    MWU2MDg5ZTA2Y2VhYWY5Njg4YTQ2OGVlZTVjMDQ3YTYzMjJiNWZkZA==
   data.tar.gz: !binary |-
-    Y2E0ZjJjYTc4YmE0OTc4ZmM5MmYxYTY4Y2Q3OGUxOWM1NWZjYzY1Zg==
+    N2EwZTY2Njc4OTU1ZDM5NmU2ZWQxMWFmM2M5YzgxODk0NjdmYWNlMg==
 SHA512:
   metadata.gz: !binary |-
-    YTA2MmJjYWEwZjVhYzMyYzRkZjk0NjkxOWI2MmU1NDE3OTFmYjljYWI5MWE4
-    MTcxZWEwOGFjYzk4YTI4OWZlMDFkYTY0YTZmYzZkZWQyMmVlNzYwYzhkYzk0
-    ZmU3YTQyMTNlZjRjMmZmMWNkYjljZDM3MzIwMTI4ZTI5MjgwNzA=
+    MjExNDJmY2ZmMDA1MmMwN2M2ODZhN2RjYTc0MDczZmUzMGFjMmZjYjY5MTU1
+    NTM0MDlhYjk3Y2YzNzU1NWRlMzk3Y2RjZjhmZWRmMTdmN2U2NGIzODA5YzQ0
+    Njc3OWVmNWNhZjliMjdmZjBmNDI2MmNkNmE0ZDA5MjdmYjA3ZGM=
   data.tar.gz: !binary |-
-    ZWVhMmZjMzRlZjJmYjZmYWFiODY3MzEzMjIzMWMxNWRmODhlOTY3ZmI5ZmUx
-    ODkyODg3MDA5ZmNkNDQ0YjYyODAyZTY3NWRkM2I2ZThlODQ0YWRkZWQ0NzBk
-    NzBkNzIxZTJmMGRmYmZmOTA4MDRiMTMzNzkwYTRjMmM0ZDE2ZjE=
+    NGNlMDA1N2ViOTBiOGNjNzZmOGQ5OGY4YzQzY2Y5ZTc5NGIwMmUwMzhhZjk2
+    MTIwYzg5MTg5N2QwODUyNzkyNTMwZmY1NTNhOTQ5M2IzMDM2NmQ3NTBhNDk4
+    YzExMTBmMjU3OWM2YTA3ODFkZjE3ZWY0MjUwZDk3OTlhZThmMTc=

data/lib/hammer_cli_katello.rb

@@ -102,4 +102,13 @@ module HammerCLIKatello
                                          'hammer_cli_katello/capsule'
   )
 
+  HammerCLI::MainCommand.lazy_subcommand("package", _("Manipulate packages."),
+                                         'HammerCLIKatello::PackageCommand',
+                                         'hammer_cli_katello/package'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("package-group", _("Manipulate package groups"),
+                                         'HammerCLIKatello::PackageGroupCommand',
+                                         'hammer_cli_katello/package_group'
+  )
 end

data/lib/hammer_cli_katello/associating_commands.rb

@@ -2,9 +2,28 @@ module HammerCLIKatello
   module AssociatingCommands
 
     module Repository
+      module AddProductOptions
+        def dependencies
+          dependency_resolver.resource_dependencies(associated_resource,
+                                                    :only_required => false,
+                                                    :recursive => true)
+        end
+
+        def create_option_builder
+          super.tap do |option_builder|
+            products = dependencies.find { |r| r.name == :products }
+            if products
+              option_builder.builders << HammerCLIForeman::DependentSearchablesOptionBuilder.new(
+                                        products, searchables)
+            end
+          end
+        end
+      end
+
       extend HammerCLIForeman::AssociatingCommands::CommandExtension
 
       class AddRepositoryCommand < HammerCLIKatello::AddAssociatedCommand
+        extend AddProductOptions
         include RepositoryScopedToProduct
         command_name 'add-repository'
         associated_resource :repositories
@@ -14,6 +33,7 @@ module HammerCLIKatello
       end
 
       class RemoveRepositoryCommand < HammerCLIKatello::RemoveAssociatedCommand
+        extend AddProductOptions
         include RepositoryScopedToProduct
         command_name 'remove-repository'
         associated_resource :repositories

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -8,8 +8,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, _("ID")
-        field :uuid, _("UUID")
+        field :uuid, _("ID")
         field :name, _("Name")
         field :author, _("Author")
         field :version, _("Version")
@@ -30,10 +29,16 @@ 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
+
       success_message _("Puppet module added to content view")
       failure_message _("Could not add the puppet module")
 
-      build_options
+      build_options :without => :uuid
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -42,7 +47,22 @@ module HammerCLIKatello
       success_message _("Puppet module removed from content view")
       failure_message _("Couldn't remove puppet module from the content view")
 
-      build_options
+      def resolve_puppet_module_id_from_uuid(options)
+        uuid = options.delete HammerCLI.option_accessor_name("id")
+        options[HammerCLI.option_accessor_name("uuid")] = uuid
+        resolver.content_view_puppet_module_id(options)
+      end
+
+      def all_options
+        if super['option_id']
+          super.merge(HammerCLI.option_accessor_name("id") =>
+                      resolve_puppet_module_id_from_uuid(super))
+        else
+          super
+        end
+      end
+
+      build_options :without => :uuid
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/package.rb

@@ -0,0 +1,39 @@
+module HammerCLIKatello
+
+  class PackageCommand < HammerCLIKatello::Command
+    resource :packages
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      output do
+        field :id, _("ID")
+        field :filename, _("Filename")
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :arch, _("Architecture")
+        field :epoch, _("Epoch")
+        field :release, _("Release")
+        field :author, _("Author")
+        field :filename, _("Filename")
+        field :buildhost, _("Build Host")
+        field :vendor, _("Vendor")
+        field :license, _("License")
+        field :relativepath, _("Relative Path")
+        field :description, _("Description")
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/package_group.rb

@@ -0,0 +1,33 @@
+module HammerCLIKatello
+
+  class PackageGroupCommand < HammerCLIKatello::Command
+    resource :package_groups
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :description, _("Description")
+        field :default_package_names, _("Default Packages"), Fields::List
+        field :mandatory_package_names, _("Mandatory Packages"), Fields::List
+        field :conditional_package_names, _("Conditional Packages"), Fields::List
+        field :optional_package_names, _("Optional Packages"), Fields::List
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/version.rb

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

data/locale/zanata.xml

@@ -17,9 +17,8 @@
         <locale>te</locale>
         <locale>pa</locale>
         <locale>kn</locale>
-        <locale>de</locale>
-        <locale>es</locale>
-        <locale>gl</locale>
+        <locale map-from="de">de-DE</locale>
+        <locale map-from="es">es-ES</locale>
         <locale map-from="pt_BR">pt-BR</locale>
         <locale map-from="bn">bn-IN</locale>
         <locale map-from="ta">ta-IN</locale>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Adam Price
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,8 @@ files:
 - lib/hammer_cli_katello/organization.rb
 - lib/hammer_cli_katello/output/fields.rb
 - lib/hammer_cli_katello/output/formatters.rb
+- lib/hammer_cli_katello/package.rb
+- lib/hammer_cli_katello/package_group.rb
 - lib/hammer_cli_katello/ping.rb
 - lib/hammer_cli_katello/product.rb
 - lib/hammer_cli_katello/puppet_module.rb