katello-foreman-engine 0.0.11 → 0.0.12

data/katello-foreman-engine.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "katello-foreman-engine"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.authors = ["Katello"]
   s.date = "2013-04-19"

data/lib/katello_foreman_engine/actions/changeset_promote.rb

@@ -20,6 +20,8 @@ module KatelloForemanEngine
       end
 
       def plan(changeset)
+        # demotion is handed by DistributionUnpublish action
+        return unless changeset.is_a? PromotionChangeset
         changeset.affected_repos.each do |repo|
           repo = repo.get_clone(changeset.environment)
           plan_action(RepositoryChange, repo)

data/lib/katello_foreman_engine/actions/repository_change.rb

@@ -20,10 +20,7 @@ module KatelloForemanEngine
       end
 
       def plan(repo)
-        if repo.distributions.empty?
-          # no distributions, no instalation media
-          plan_action(DistributionUnpublish, repo)
-        elsif(repo.unprotected)
+        if distribution = bootable_distribution(repo)
           repo_info = {
             'pulp_id' => repo.pulp_id,
             'uri' => repo.uri,
@@ -37,15 +34,26 @@ module KatelloForemanEngine
             repo_info['content_view_label'] = repo.content_view.label
           end
 
-          # Foreman's installation media don't distinguish between
-          # different variants. Using just a first one.
-          distribution = repo.distributions.first
           plan_action(DistributionPublish,
                       { 'repo' => repo_info,
                         'family' => distribution.family,
                         'variant' => distribution.variant,
                         'arch' => distribution.arch,
                         'version' => distribution.version })
+        else
+          plan_action(DistributionUnpublish, repo)
+        end
+      end
+
+      def bootable_distribution(repo)
+        return unless repo.unprotected
+        # not every distribution from Pulp represents a bottable
+        # repo. Determine based on the files in there.
+        return repo.distributions.find do |distribution|
+          distribution.files.any? do |file|
+            file[:relativepath].include?("vmlinuz") ||
+                file[:relativepath].include?("pxeboot")
+          end
         end
       end
 

data/test/lib/actions/repository_change_test.rb

@@ -9,7 +9,8 @@ module KatelloForemanEngine
                                   :distributions => [stub('family'  => 'Family',
                                                           'variant' => 'Variant',
                                                           'arch'    => 'Arch',
-                                                          'version' => 'Version')],
+                                                          'version' => 'Version',
+                                                          'files'  => [{:relativepath => 'images/pxeboot/vmlinuz'}])],
                                   :pulp_id => 'pulp_id',
                                   :uri     => 'https://example.com/repo/uri',
                                   :label   => 'label',
@@ -36,7 +37,7 @@ module KatelloForemanEngine
       end
 
       test "plans repository unpublish if no distros found for the repo" do
-        repo = stub(:distributions => [])
+        repo = stub(:unprotected => true, :distributions => [])
         action_class, arg = planned_actions(RepositoryChange, {}, repo).first
         assert_equal DistributionUnpublish, action_class
         assert_equal repo, arg

metadata

@@ -1,54 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: katello-foreman-engine
-version: !ruby/object:Gem::Version
-  version: 0.0.11
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 12
+  version: 0.0.12
 platform: ruby
-authors:
+authors: 
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-19 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: foreman_api
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dynflow
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dynflow
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Foreman specific parts in Katello
 email: katello-devel@redhat.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - katello-foreman-engine.gemspec
 - LICENSE
@@ -82,30 +88,39 @@ files:
 - test/lib/actions/env_destroy_test.rb
 - test/lib/actions/distribution_publish_test.rb
 - test/lib/bindings_test.rb
+has_rdoc: true
 homepage: http://github.com/katello/katello-foreman-engine
-licenses:
+licenses: 
 - GPL-2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Foreman specific parts of Katello
 test_files: []
-has_rdoc: 
+