buildmeister 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/buildmeister

@@ -3,15 +3,14 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/buildmeister")
 
 begin
-  command = ARGV.shift
-  args    = ARGV.dup
-  ARGV.clear
-  
-  Buildmeister::Base.new(*args).send command
+  bm = Buildmeister::Base.new(*ARGV.dup)
+  bm.go!
 rescue Interrupt => i
-  Buildmeister::Notifier.post("Buildmeister Shut Down", "Goodbye!")
-  puts "\rThank you for using Buildmeister!"
-rescue Exception => e
+  if bm.command == 'notify'
+    Buildmeister::Notifier.post("Buildmeister Shut Down", "Goodbye!")
+    puts "\rThank you for using Buildmeister!"
+  end
+rescue StandardError => e
   Buildmeister::Notifier.post("Buildmeister Error: #{e.class}", e.message)
   puts "Quitting Buildmeister due to error: #{e.message}"
   puts e.backtrace

data/lib/buildmeister/base.rb

@@ -7,10 +7,9 @@ module Buildmeister
     
     RETRY_COUNT = 5
     
-    attr_accessor :projects, :notification_interval, :args
+    attr_accessor :projects, :notification_interval, :command
     
     def initialize(*args)
-      self.args = args
       @options  = {:mode => :verbose}
             
       OptionParser.new do |opts|
@@ -31,6 +30,16 @@ module Buildmeister
         opts.on('-p', '--project PROJECT', 'Use Project') do |p|
           @options[:project] = p
         end
+        
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+        
+        if args.empty?
+          puts opts
+          exit
+        end
       end.parse!(args)
       
       # Lighthouse setup
@@ -53,10 +62,17 @@ module Buildmeister
       end
       
       self.notification_interval = @config['notification_interval']
+      
+      # Did we pass in a command?
+      self.command = args.first      
+    end
+    
+    def go!
+      send command if command
     end
     
     def changed?
-      projects.any? &:changed?
+      projects.any?(&:changed?)
     end
     
     def title
@@ -144,7 +160,7 @@ module Buildmeister
     end
     
     def refresh!
-      projects.each &:refresh!
+      projects.each(&:refresh!)
     end
     
     def self.load_config

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Leigh Caplan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -07:00
+date: 2010-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency