mojombo-god 0.7.14 → 0.7.15

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.15 / 2009-08-19
+  * Minor Enhancements
+    * Support SSL Campfire connections [github.com/eric]
+    * Allow wildcards in -c configuration file option
+
 == 0.7.14 / 2009-08-10
   * Minor Enhancements
     * Only store log lines when a client wishes to see them

data/Rakefile

@@ -5,6 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "god"
+    gem.rubyforge_project = "god"
     gem.summary = 'Like monit, only awesome'
     gem.description = "God is an easy to configure, easy to extend monitoring framework written in Ruby."
     gem.email = "tom@mojombo.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 7
-:patch: 14
 :major: 0
+:minor: 7
+:patch: 15

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.14"
+  s.version = "0.7.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-19}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}
@@ -164,6 +164,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://god.rubyforge.org/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{god}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Like monit, only awesome}
   s.test_files = [

data/lib/god/cli/run.rb

@@ -58,7 +58,7 @@ module God
         end
         
         if @options[:config]
-          unless File.exist?(@options[:config])
+          if !@options[:config].include?('*') && !File.exist?(@options[:config])
             abort "File not found: #{@options[:config]}"
           end
           
@@ -151,8 +151,12 @@ module God
             abort "No files could be loaded"
           end
         else
-          unless load_god_file(File.expand_path(config))
-            abort "File could not be loaded"
+          files = Dir.glob(config)
+          abort "No files could be loaded" if files.empty?
+          files.each do |f|
+            unless load_god_file(File.expand_path(config))
+              abort "File '#{config}' could not be loaded"
+            end
           end
         end
       end

data/lib/god/contacts/campfire.rb

@@ -39,7 +39,8 @@ module God
       self.server_settings = {:subdomain => '',
                               :user_name => '',
                               :password => '',
-                              :room => ''}
+                              :room => '',
+                              :ssl => false}
 
       self.format = lambda do |message, host|
         <<-EOF
@@ -70,7 +71,7 @@ module God
         unless @room
           applog(nil,:debug, "initializing campfire connection using credentials: #{Campfire.server_settings.inspect}")
 
-          campfire = Tinder::Campfire.new Campfire.server_settings[:subdomain] 
+          campfire = Tinder::Campfire.new Campfire.server_settings[:subdomain], :ssl => Campfire.server_settings[:ssl]
           campfire.login Campfire.server_settings[:user_name], Campfire.server_settings[:password]
           @room = campfire.find_room_by_name(Campfire.server_settings[:room])
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-god
 version: !ruby/object:Gem::Version 
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: god
 dependencies: []
 
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: god
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3