bellows 1.0.8 → 1.0.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Fri Dec 23 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.9
+  - Update the 'comment' task so that only an approved set of results generates
+    a gerrit comment. Successful result sets are automatically approved.
+  - Remove debug statement in commit task.
+
 * Mon Dec 12 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.8
   - Update 'comment' task to display msg for test failures.
 

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/bellows.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bellows}
-  s.version = "1.0.3"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]
-  s.date = %q{2011-11-01}
+  s.date = %q{2011-12-23}
   s.default_executable = %q{bellows}
   s.description = %q{CLI to drive SmokeStack test creation and maintenance based on Gerrit reviews.}
   s.email = %q{dan.prince@rackspace.com}
@@ -34,7 +34,11 @@ Gem::Specification.new do |s|
     "lib/bellows/smoke_stack.rb",
     "lib/bellows/tasks.rb",
     "lib/bellows/util.rb",
+    "test/fixtures/gerrit.json",
+    "test/fixtures/jobs.json",
+    "test/fixtures/nova_smoke_tests.json",
     "test/helper.rb",
+    "test/test_task.rb",
     "test/test_util.rb"
   ]
   s.homepage = %q{http://github.com/dprince/bellows}
@@ -52,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_development_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.9"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
     else
@@ -59,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.9"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
     end
@@ -67,6 +73,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.9"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
   end

data/lib/bellows/smoke_stack.rb

@@ -108,5 +108,16 @@ module Bellows
 
     end
 
+    #returns true if jobs all passed (green) or all failed results are approved
+    def self.approved?(job_datas)
+      approved = true
+      job_datas.each do |data|
+        if data.nil? or data['status'] == 'Failed' and data['approved_by'].nil?
+          approved = false
+        end
+      end
+      approved
+    end
+
   end
 end

data/lib/bellows/tasks.rb

@@ -140,9 +140,7 @@ module Bellows
               unit=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_unit_tester')
               libvirt=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_vpc')
               xenserver=Bellows::SmokeStack.job_data_for_type(jobs_for_rev, 'job_xen_hybrid')
-              if unit and libvirt and xenserver then
-puts unit.inspect
-
+              if Bellows::SmokeStack.approved?([unit, libvirt, xenserver]) then
                 puts "Commenting ... " + desc if not options[:quiet]
                 message = "SmokeStack Results (patch set #{patchset_num}):\n"
                 message += "\tUnit #{unit['status']}:#{unit['msg']} http://smokestack.openstack.org/?go=/jobs/#{unit['id']}\n"
@@ -150,7 +148,7 @@ puts unit.inspect
                 message += "\tXenServer #{xenserver['status']}:#{xenserver['msg']} http://smokestack.openstack.org/?go=/jobs/#{xenserver['id']}"
 puts message
                 out = Bellows::Gerrit.comment(review['currentPatchSet']['revision'], message) if not test
-                puts out if not options[:quiet]
+                puts out if not options[:quiet] and not test
                 file.write revision + "\n" if not test
               end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bellows
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 -05:00
+date: 2011-12-23 00:00:00 -05:00
 default_executable: bellows
 dependencies: 
 - !ruby/object:Gem::Dependency