hammer_cli_katello 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDlhYzMxN2Q0NGM4ZGVhNjE0MjM1ZjRiNzFlY2Q2ZDFhZDhkM2JmYQ==
+    NDg1YWQ5ZjNjNDBhZWEzNjYzYmNhYjEzNmUxYmM4MTQ2MmExODhmMA==
   data.tar.gz: !binary |-
-    NWJmOGUzN2UyODNiZmRiYmE4MTMzZTdmMjE5Yjc1Yzk2YmZjMjU4MQ==
+    NTQ0ZGIxYTVlODUzNjk2ZTMzNTViY2M2ZWFiNjYxODE0YmUwZjdhZg==
 SHA512:
   metadata.gz: !binary |-
-    YzIxODRkM2M3Mjg0YmU4MjU2NWM1N2NjMzA5MTliYjUxZGZmMzBjYmE1ODRk
-    MjU1OWRkNzBjOWFmODdlOTE5ZjUwZWRjYjFhNjE2ZWMxYTk5NmJkNzFjNDdk
-    MWMyNjVlNGZhZWI4OTQyMGIzMGFjNzUyODljNzU1N2YxNWI4Y2Q=
+    MTRlM2I3NDkyMThjMjI4YjljN2Q5MGYwZjlkZDBlMDc5YjgzY2UxMDQ3NTMy
+    MGQ4MDAyOGJiNDFkOGJkYWU1MzBkYjI3OWQ1MmQ3ODAzZDZkYTljYmM2MjM3
+    ZDI0MTE1NWExMGY4N2IwOGQ0ZjI1NjZiYzEwMTA5M2ZlMDMyOTg=
   data.tar.gz: !binary |-
-    NjgxYWM3ZTNiODE2NjUwNmQ5NTkyNGFmYjU4NzUwYTFjYzI2ZGUzYTBiNTdi
-    ZThjZWUwZTk5MDZjZGRlNjUwZWEzOGExNjVhNjdlZDBjYjMxYzQwNGQ5NDYz
-    YzQwYWUzNDhjNmUwZGFjNWRkMTkzMWE0MGI0Y2JjMGY2NDkwMTI=
+    NTY4YjYxZjAxNzdlMzA3YzU1Nzk2ZGYyOTdlYzBiY2MyMTMwOTk5YWFkZDli
+    MzI1OTRlN2Q5MzMzMjVjOWQxNDJkODc3YmE2NjhjYjZjMDA4ZDJhYzI1MDVj
+    YmUwNDhmY2I3ODYxMjExNmZmNjU5ODFiOGY3NzUzOTExY2I4MTk=

data/lib/hammer_cli_katello/content_host_errata.rb

@@ -4,6 +4,7 @@ module HammerCLIKatello
     desc "Manage errata on your content hosts"
 
     class ApplyCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
       resource :system_errata, :apply
       command_name "apply"
       success_message _("Errata applied successfully")

data/lib/hammer_cli_katello/content_view.rb

@@ -191,6 +191,7 @@ module HammerCLIKatello
 
     class RemoveContentViewVersionCommand < HammerCLIKatello::RemoveAssociatedCommand
       command_name 'remove-version'
+      desc _('Remove a version of a content view')
 
       def association_name(plural = false)
         plural ? "components" : "component"

data/lib/hammer_cli_katello/content_view_version.rb

@@ -78,6 +78,13 @@ module HammerCLIKatello
              _("Name of the target environment"), :attribute_name => :option_to_environment_name
       option "--to-lifecycle-environment-id", "TO_ENVIRONMENT_ID",
              _("Id of the target environment"), :attribute_name => :option_to_environment_id
+      option "--from-lifecycle-environment", "FROM_ENVIRONMENT_ID",
+             _("Environment name from where to promote its version from (if version is unknown)"),
+             :attribute_name => :option_from_environment_name
+      option "--from-lifecycle-environment-id", "FROM_ENVIRONMENT_ID",
+             _(["Id of the environment from where to promote its version ",
+                "from (if version is unknown)"].join),
+               :attribute_name => :option_from_environment_id
 
       def environment_search_options
         {

data/lib/hammer_cli_katello/id_resolver.rb

@@ -61,6 +61,7 @@ module HammerCLIKatello
       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")
+      from_environment_id = HammerCLI.option_accessor_name("from_environment_id")
 
       return options[key_id] if options[key_id]
 
@@ -82,7 +83,19 @@ module HammerCLIKatello
         # content_view is not always required.
       end
 
-      find_resource(:content_view_versions, options)['id']
+      results = find_resources(:content_view_versions, options)
+      options[from_environment_id] ||= from_lifecycle_environment_id(options)
+
+      if results.size > 1 && options[from_environment_id]
+        results_in_from_environment = results.select do  |version|
+          member_of_environment_ids = version['environments'].map { |env| env['id'].to_s }
+          member_of_environment_ids.include? options[from_environment_id].to_s
+        end
+        results_in_from_environment
+          .sort { |a, b| a['version'].to_f <=> b['version'].to_f }.last['id']
+      else
+        pick_result(results, @api.resource(:content_view_versions))['id']
+      end
     end
 
     def create_repositories_search_options(options)
@@ -127,5 +140,19 @@ module HammerCLIKatello
     alias_method :create_search_options_without_katello_api, :create_search_options
     alias_method :create_search_options, :create_search_options_with_katello_api
 
+    private
+
+    def from_lifecycle_environment_id(options)
+      environment_id = HammerCLI.option_accessor_name("environment_id")
+      environment_name = HammerCLI.option_accessor_name("environment_name")
+      from_environment_id = HammerCLI.option_accessor_name("from_environment_id")
+      from_environment_name = HammerCLI.option_accessor_name("from_environment_name")
+      return nil if options[from_environment_id].nil? && options[from_environment_name].nil?
+      search_options = options.dup.tap do |opts|
+        opts[environment_name] = opts[from_environment_name]
+        opts[environment_id] = opts[from_environment_id]
+      end
+      lifecycle_environment_id(scoped_options("environment", search_options))
+    end
   end
 end

data/lib/hammer_cli_katello/sync_plan.rb

@@ -9,6 +9,7 @@ module HammerCLIKatello
         field :name, _("Name")
         field :sync_date, _("Start Date"), Fields::Date
         field :interval, _("Interval")
+        field :enabled, _("Enabled"), Fields::Boolean
       end
 
       build_options

data/lib/hammer_cli_katello/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Adam Price
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -34,7 +34,7 @@ dependencies:
         version: 0.1.3
     - - <
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: 0.1.3
     - - <
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -292,3 +292,4 @@ signing_key:
 specification_version: 4
 summary: Katello commands for Hammer
 test_files: []
+has_rdoc: