bellows 1.0.11 → 1.0.12

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Mon May 17 2012 Dan Prince <dprince@redhat.com> - 1.0.12
+  - Ordering fix to ensure job types are displayed in Gerrit comments 
+    in the same order they are listed in the config file.
+
 * Mon May 7 2012 Dan Prince <dprince@redhat.com> - 1.0.11
   - The comment task now uses Gerrit 'verified' to report results.
     It votes with -1 and +1 based on SmokeStack results.

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/lib/bellows/smoke_stack.rb

@@ -121,7 +121,9 @@ module Bellows
     #returns true if jobs all passed (green) or all failed results are approved
     def self.complete?(job_datas)
       approved = true
-      job_datas.each_pair do |job_type, job_data|
+      job_datas.each do |arr|
+        job_type = arr[0]
+        job_data = arr[1]
         if job_data.nil? or (job_data['status'] == 'Failed' and (job_data['approved_by'].nil? and not job_type['auto_approved']))
           approved = false
         end

data/lib/bellows/tasks.rb

@@ -139,17 +139,19 @@ module Bellows
             if jobs_for_rev.count > 0 then
 
               job_types = Bellows::SmokeStack.job_types
-              job_datas = {}
+              job_datas = []
               job_types.each do |job_type|
                 job_data=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, job_type['name'])
-                job_datas.store(job_type, job_data)
+                job_datas << [job_type, job_data]
               end
 
               if Bellows::SmokeStack.complete?(job_datas) then
                 puts "Commenting ... " + desc if not options[:quiet]
                 message = "SmokeStack Results (patch set #{patchset_num}):\n"
                 verify_vote = 1
-                job_datas.each_pair do |job_type, job_data|
+                job_datas.each do |arr|
+                    job_type = arr[0]
+                    job_data = arr[1]
                     message += "\t#{job_type['description']} #{job_data['status']}:#{job_data['msg']} http://smokestack.openstack.org/?go=/jobs/#{job_data['id']}\n"
                     verify_vote = -1 if job_data['status'] == 'Failed'
                 end
@@ -158,7 +160,7 @@ module Bellows
                 puts out if not options[:quiet] and not test
                 file.write revision + "\n" if not test
               end
-
+              
             end
 
           end

data/test/test_task.rb

@@ -24,6 +24,9 @@ class TaskTest < Test::Unit::TestCase
 
   def test_comment
 
+    sample_config = fixture('config.yaml')
+    Bellows::Util.stubs(:load_configs).returns(YAML::load(sample_config))
+
     jobs_data = fixture('jobs.json')
     Bellows::SmokeStack.stubs(:jobs).returns(JSON.parse(jobs_data))
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellows
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000Z
+date: 2012-05-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17251620 !ruby/object:Gem::Requirement
+  requirement: &5858420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17251620
+  version_requirements: *5858420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17191940 !ruby/object:Gem::Requirement
+  requirement: &5857160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *17191940
+  version_requirements: *5857160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17190120 !ruby/object:Gem::Requirement
+  requirement: &5855760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.14.6
   type: :development
   prerelease: false
-  version_requirements: *17190120
+  version_requirements: *5855760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17188240 !ruby/object:Gem::Requirement
+  requirement: &5854600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *17188240
+  version_requirements: *5854600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17186340 !ruby/object:Gem::Requirement
+  requirement: &5853540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *17186340
+  version_requirements: *5853540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17167400 !ruby/object:Gem::Requirement
+  requirement: &5852140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17167400
+  version_requirements: *5852140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17164440 !ruby/object:Gem::Requirement
+  requirement: &5824800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17164440
+  version_requirements: *5824800
 description: CLI to drive SmokeStack test creation and maintenance based on Gerrit
   reviews.
 email: dan.prince@rackspace.com
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3288239817883980822
+      hash: 2565287707468473955
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: