hammer_cli_katello 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmZhZjI1MGUyYzAwMzM1ZDIwOGE2ZjJiMDQwYzRlZTRmODVhMDdlMw==
-  data.tar.gz: !binary |-
-    NGExMzhlODg3YWZlZDBjMzM5ZTE1ZTQzMzI2ODliYTdkMzNiM2NmNA==
+SHA1:
+  metadata.gz: d07011f57a995242f064fdac0ed256fe65bcd413
+  data.tar.gz: 8136089de18f21b788c95ca25dad367a9ebfe9a1
 SHA512:
-  metadata.gz: !binary |-
-    N2IxMjg0ODcxODkyMjkzMGVjZmY0NDU2M2Q1NTAwNjRjNDhlODQzYWYzODYy
-    MDdjMTNhNTM4OTM3MmNiNGVhYWI5ZWU1MWVlM2E1YzYxMjkzNTQ3ZDkwMGQ1
-    OGFhZWZkZGRmZjljZjZiY2NiYWVjMTBlNWM3MmNkMzYwNDI4NmM=
-  data.tar.gz: !binary |-
-    NTU5ZWQ5Zjg5MDc3MTg2NDc3YjhlMGM2ZjI1ODU2NWE5N2FjYzU5ZThjY2U3
-    N2MzYTQwNDk3Y2M0ZjU1ODI1MjNhYzY0Y2QxYmMyMTU5OGE4ZTg5ZDhmN2Vi
-    YzRhZDE5Y2FmZmNiMzUxM2FlZmNlNmFjODMwZmI5MDg3NGNlZTg=
+  metadata.gz: 7f1573edfc3351222bb5b4ea64c364f92d74610482086ded8bf9257b43231660b98d5f879de03483412462e06a9c6ed1111fbb9916ab105f1845eac64e333215
+  data.tar.gz: bf837632f9b091396796916d9adda4ecb44fb69ba44b8e63bd7389be1b3a82cf9d15320fd61b9e69fd9575661bea2562805d43c326a45cbe9deb94d0ff0b4998

data/lib/hammer_cli_katello/content_view_version.rb

@@ -18,7 +18,9 @@ module HammerCLIKatello
         version
       end
 
-      build_options
+      build_options do |o|
+        o.expand(:all).including(:organizations)
+      end
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -55,7 +57,7 @@ module HammerCLIKatello
       end
 
       build_options do |o|
-        o.expand(:all).including(:environments)
+        o.expand(:all).including(:environments, :content_views, :organizations)
       end
     end
 
@@ -110,7 +112,7 @@ module HammerCLIKatello
       failure_message _("Could not delete the content view")
 
       build_options do |o|
-        o.expand(:all).including(:environments)
+        o.expand(:all).including(:environments, :content_views, :organizations)
       end
     end
 
@@ -130,10 +132,10 @@ module HammerCLIKatello
         :format => HammerCLI::Options::Normalizers::List.new
       )
 
-      option('--id',
-        'ID',
-        _("ID of a content view version to incrementally update"),
-        :required => true
+      option('--content-host-ids',
+        'CONTENT_HOST_IDS',
+        _("IDs of content hosts to update"),
+        :format => HammerCLI::Options::Normalizers::List.new
       )
 
       def request_params
@@ -157,13 +159,20 @@ module HammerCLIKatello
           add_content[key] = value if options.key?(HammerCLI.option_accessor_name(key))
         end
 
+        if option_content_host_ids
+          params['update_systems'] = {'included' => {'ids' => option_content_host_ids}}
+        end
+
         params['add_content'] = add_content
 
         params.delete('id')
         params
       end
 
-      build_options
+      build_options do |opt|
+        opt.expand(:all)
+        opt.without(:content_view_version_environments, :ids)
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/host_collection.rb

@@ -19,13 +19,21 @@ module HammerCLIKatello
       end
     end
 
+    module LimitFieldDataExtension
+      def extend_data(data)
+        data['_limit'] = data['unlimited_content_hosts'] ? 'None' : data['max_content_hosts']
+        data
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
+      include LimitFieldDataExtension
       resource :host_collections, :index
 
       output do
         field :id, _("ID")
         field :name, _("Name")
-        field :max_content_hosts, _("Limit")
+        field :_limit, _("Limit")
         field :description, _("Description")
       end
 
@@ -49,11 +57,11 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include LimitFieldDataExtension
       resource :host_collections, :show
 
       output ListCommand.output_definition do
         field :total_content_hosts, _("Total Content Hosts")
-        field :max_content_hosts, _("Max Content Hosts")
       end
 
       build_options

data/lib/hammer_cli_katello/puppet_module.rb

@@ -11,7 +11,9 @@ module HammerCLIKatello
         field :version, _("Version")
       end
 
-      build_options
+      build_options do |o|
+        o.expand(:all).including(:organizations, :content_views)
+      end
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -42,7 +44,9 @@ module HammerCLIKatello
         end
       end
 
-      build_options
+      build_options do |o|
+        o.expand(:all).including(:organizations)
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/repository.rb

@@ -180,9 +180,9 @@ module HammerCLIKatello
           fullpath = ::File.expand_path(path)
 
           if File.directory?(fullpath)
-            Dir["#{fullpath}/*"].map { |file| ::File.new(file, 'rb') }
+            Dir["#{fullpath}/*"]
           else
-            [::File.new(fullpath, 'rb')]
+            [fullpath]
           end
         end
       end
@@ -193,7 +193,9 @@ module HammerCLIKatello
 
       def execute
         @failure = false
-        option_content.each { |file| upload_file(file) }
+        option_content.each do |file_path|
+          File.open(file_path, 'rb') { |file| upload_file file }
+        end
 
         @failure ? HammerCLI::EX_DATAERR : HammerCLI::EX_OK
       end

data/lib/hammer_cli_katello/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Adam Price
@@ -23,96 +23,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-07 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.3.0
   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.3.0
 - !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 +133,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 +203,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
@@ -276,17 +276,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.5
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer