bellows 1.0.2 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+* Thu Nov 17 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.4
+  - Explicitly set config templates and tests on sync.
+  - All --all option to sync command. Remove 'reconfig' task.
+
+* Thu Oct 27 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.3
+  - Handle empty config files gracefully.
+
 * Thu Oct 27 2011 Dan Prince <dan.prince@rackspace.com> - 1.0.2
   - Update purge task so it purges both 'merged' and 'abandoned' branches.
 

data/README.md

@@ -37,7 +37,6 @@ Available bellows tasks:
 	  bellows help [TASK]     # Describe available tasks or one specific task
 	  bellows purge PROJECT   # Purge merged reviews from SmokeStack
 	  bellows sync PROJECT    # Create tests & update refspecs for active reviews.
-	  bellows update PROJECT  # Update tests suite and configuration selections.
 
 Run bellows sync to create smokestack test configurations and update refspecs for active reviews:
 
@@ -47,9 +46,9 @@ Purge 'merged' reviews from SmokeStack:
 
 	bellows purge nova
 
-Update the selected configuration template and test suite choices for active reviews in SmokeStack (based on the selections in your .bellows.conf file):
+Sync test suite choices for active reviews in SmokeStack (based on the selections in your .bellows.conf file):
 
-	bellows update nova
+	bellows sync nova --all
 
 All commands support creating and maintaining test configs for nova, glance, and keystone.
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/bellows.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bellows}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Prince"]
-  s.date = %q{2011-10-27}
+  s.date = %q{2011-11-01}
   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}

data/bin/bellows

@@ -2,9 +2,10 @@
 
 require "rubygems"
 require "thor"
-#if not $release
-  #$:.unshift File.dirname(__FILE__) + "/../lib"
-#end
+
+# uncomment this for local testing
+# $:.unshift File.dirname(__FILE__) + "/../lib"
+
 require "bellows"
 
 Bellows::Tasks.start

data/lib/bellows/smoke_stack.rb

@@ -61,9 +61,9 @@ module Bellows
           post_data.store("#{base_name}[branch]", refspec)
           post_data.store("#{base_name}[merge_trunk]", "1")
         else
+          post_data.store("#{base_name}[merge_trunk]", "0")
           post_data.store("#{base_name}[url]", "git://github.com/openstack/#{proj}.git")
           post_data.store("#{base_name}[branch]", "master")
-          post_data.store("#{base_name}[merge_trunk]", "0")
         end
       end
 

data/lib/bellows/tasks.rb

@@ -9,12 +9,14 @@ module Bellows
 
     desc "sync PROJECT", "Create tests & update refspecs for active reviews."
     method_options :test => :boolean
+    method_options :all => :boolean
     def sync(project)
       if not ['nova', 'glance', 'keystone'].include?(project) then
         puts "ERROR: Please specify a valid project name."
         exit 1
       end
       test = options[:test]
+      all = options[:all]
       smoke_tests = Bellows::SmokeStack.get_smoke_tests(project)
       configs=Util.load_configs
       test_suite_ids = configs['test_suite_ids'].collect {|x| x.to_s }
@@ -33,7 +35,10 @@ module Bellows
           if smoke_test["#{project}_package_builder"]['branch'] != refspec then
             puts "Updating... " + desc
             puts "refspec: " + refspec
-            Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"#{project}_package_builder" => { "branch" => refspec}, "description" => desc, "status" => "Updated"}) if not test
+            Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"#{project}_package_builder" => { "branch" => refspec}, "description" => desc, "status" => "Updated", "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
+          elsif all then
+            puts "Updating (all)... " + desc
+            Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"#{project}_package_builder" => { "branch" => refspec}, "description" => desc, "test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids}) if not test
           end
         end
       end
@@ -62,27 +67,5 @@ module Bellows
       end
     end
 
-    desc "reconfig PROJECT", "Reconfigure test suite and configuration selections."
-    def reconfig(project)
-      if not ['nova', 'glance', 'keystone'].include?(project) then
-        puts "ERROR: Please specify a valid project name."
-        exit 1
-      end
-      test = options[:test]
-      smoke_tests = Bellows::SmokeStack.get_smoke_tests(project)
-      configs=Util.load_configs
-      test_suite_ids = configs['test_suite_ids'].collect {|x| x.to_s }
-      config_template_ids = configs['config_template_ids'].collect {|x| x.to_s }
-      Bellows::Gerrit.reviews(project) do |review|
-        refspec = review['currentPatchSet']['ref']
-        review_id = Bellows::Util.short_spec(refspec)
-        smoke_test = smoke_tests[review_id]
-        desc = review['owner']['name'] + ": " +review['subject']
-        if smoke_test
-          Bellows::SmokeStack.update_smoke_test(smoke_test['id'], {"test_suite_ids" => test_suite_ids, "config_template_ids" => config_template_ids, "description" => desc})
-        end
-      end
-    end
-
   end
 end

data/lib/bellows/util.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'socket'
 
 module Bellows
   module Util
@@ -21,7 +20,7 @@ module Bellows
     end
 
     if File.exists?(config_file) then
-      configs=YAML.load_file(config_file)
+      configs = YAML.load_file(config_file) || {}
       raise_if_nil_or_empty(configs, "smokestack_url")
       raise_if_nil_or_empty(configs, "smokestack_username")
       raise_if_nil_or_empty(configs, "smokestack_password")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bellows
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Dan Prince
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -04:00
+date: 2011-11-17 00:00:00 -05:00
 default_executable: bellows
 dependencies: 
 - !ruby/object:Gem::Dependency