god 0.11.0 → 0.12.0

data/Announce.txt

@@ -52,7 +52,7 @@ EXAMPLE
 The easiest way to understand how god will make your life better is by looking at a sample config file. The following configuration file is what I use at gravatar.com to keep the mongrels running:
 
 # run with:  god -c /path/to/gravatar.god
-# 
+#
 # This is the actual config file used to keep the mongrels of
 # gravatar.com running.
 
@@ -61,7 +61,7 @@ RAILS_ROOT = "/Users/tom/dev/gravatar2"
 %w{8200 8201 8202}.each do |port|
   God.watch do |w|
     w.name = "gravatar2-mongrel-#{port}"
-    w.interval = 30.seconds # default      
+    w.interval = 30.seconds # default
     w.start = "mongrel_rails start -c #{RAILS_ROOT} -p #{port} \
       -P #{RAILS_ROOT}/log/mongrel.#{port}.pid  -d"
     w.stop = "mongrel_rails stop -P #{RAILS_ROOT}/log/mongrel.#{port}.pid"
@@ -69,7 +69,7 @@ RAILS_ROOT = "/Users/tom/dev/gravatar2"
     w.start_grace = 10.seconds
     w.restart_grace = 10.seconds
     w.pid_file = File.join(RAILS_ROOT, "log/mongrel.#{port}.pid")
-    
+
     w.behavior(:clean_pid_file)
 
     w.start_if do |start|
@@ -78,19 +78,19 @@ RAILS_ROOT = "/Users/tom/dev/gravatar2"
         c.running = false
       end
     end
-    
+
     w.restart_if do |restart|
       restart.condition(:memory_usage) do |c|
         c.above = 150.megabytes
         c.times = [3, 5] # 3 out of 5 intervals
       end
-    
+
       restart.condition(:cpu_usage) do |c|
         c.above = 50.percent
         c.times = 5
       end
     end
-    
+
     # lifecycle
     w.lifecycle do |on|
       on.condition(:flapping) do |c|

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/History.txt

@@ -1,3 +1,20 @@
+== 0.12.0
+  * Minor Enhancements
+    * Add umask support
+    * Add socket response condition (#25)
+    * Don't require tests run as sudo under non-linux systems (#15)
+    * Add Bundler support
+    * Add keepalive simple conditional setups (#71)
+    * Better load command to act upon removed watches (#70)
+    * Add support for ssl in http_response_code condition (#36)
+    * New documentation at http://godrb.com
+  * Bug Fixes
+    * Use IO.print instead of IO.puts for thread safety (#35)
+    * Fix Slashproc poller for commands with spaces (#31)
+    * Various segfault and kernel panic fixes
+    * Fix SMTP Auth documentation (#29)
+    * Fix a bunch of tests that were failing on Ruby 1.9
+
 == 0.11.0 / 2010-07-01
   * Major Changes
     * Rewrite notification system to be more consistent and flexible.
@@ -119,7 +136,7 @@
   * Major Enhancements
     * Enable sending of arbitrary signals to a task or group via `god signal`
   * Bug Fixes
-    * setup logging *after* loading a given config file when daemonized. 
+    * setup logging *after* loading a given config file when daemonized.
       enables logging to the 'God.log_file' specified in a config file. [github.com/jnewland]
   * New Conditions
     * FileMtime < PollCondition - trigger on file mtime durations [github.com/jwilkins]
@@ -274,7 +291,7 @@
 
 * Minor Enhancement
   * Allow extra args to pass through to config file
-  
+
 == 0.5.1 / 2007-10-08
 
 * Bug Fixes

data/{README.txt → LICENSE}

@@ -1,40 +1,3 @@
-god
-    by Tom Preston-Werner
-       Kevin Clark (kqueue/netlink support)
-       
-    http://god.rubyforge.org
-
-== DESCRIPTION:
-  
-God is an easy to configure, easy to extend monitoring framework written 
-in Ruby.
-
-Keeping your server processes and tasks running should be a simple part of 
-your deployment process. God aims to be the simplest, most powerful 
-monitoring application available.
-
-== DOCUMENTATION:
-
-See online documentation at http://god.rubyforge.org
-
-== COMMUNITY:
-
-Sign up for the god mailing list at http://groups.google.com/group/god-rb
-
-== INSTALL:
-
-  $ sudo gem install god
-  
-== CONTRIBUTE:
-
-Latest code is available at http://github.com/mojombo/god
-
-The 'master' branch can be cloned with:
-
-  $ git clone git://github.com/mojombo/god.git
-
-== LICENSE:
-
 (The MIT License)
 
 Copyright (c) 2007 Tom Preston-Werner

data/README.md

@@ -0,0 +1,31 @@
+God: The Ruby Framework for Process Management
+==============================================
+
+* Authors: Tom Preston-Werner, Kevin Clark, Eric Lindval
+* Website: http://godrb.com
+
+Description
+-----------
+
+God is an easy to configure, easy to extend monitoring framework written in
+Ruby.
+
+Keeping your server processes and tasks running should be a simple part of
+your deployment process. God aims to be the simplest, most powerful monitoring
+application available.
+
+Documentation
+-------------
+
+See in-repo documentation at `REPO_ROOT/doc`.
+See online documentation at http://godrb.com.
+
+Community
+---------
+
+Sign up for the god mailing list at http://groups.google.com/group/god-rb
+
+License
+-------
+
+See LICENSE file.

data/Rakefile

@@ -1,32 +1,41 @@
 require 'rubygems'
 require 'rake'
+require 'rdoc/task'
 require 'date'
 
-#############################################################################
-#
-# The name of the package
-#
-#############################################################################
-
-NAME = 'god'
-
 #############################################################################
 #
 # Helper functions
 #
 #############################################################################
 
-def source_version
-  line = File.read("lib/#{NAME}.rb")[/^\s*VERSION\s*=\s*.*/]
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
 def gemspec_file
-  "#{NAME}.gemspec"
+  "#{name}.gemspec"
 end
 
 def gem_file
-  "#{NAME}-#{source_version}.gem"
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
 #############################################################################
@@ -44,7 +53,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc "Generate and open coverage stats via rcov"
+desc "Generate RCov test coverage and open in your browser"
 task :coverage do
   require 'rcov'
   sh "rm -fr coverage"
@@ -52,17 +61,17 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{NAME} #{source_version}"
+  rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/#{NAME}.rb"
+  sh "irb -rubygems -r ./lib/#{name}.rb"
 end
 
 #############################################################################
@@ -72,7 +81,7 @@ end
 #############################################################################
 
 desc "Upload site to Rubyforge"
-task :site do
+task :site_old do
   sh "scp -r site/* mojombo@god.rubyforge.org:/var/www/gforge-projects/god"
 end
 
@@ -81,44 +90,89 @@ task :site_edge do
   sh "scp -r site/* mojombo@god.rubyforge.org:/var/www/gforge-projects/god/edge"
 end
 
+desc "Generate the new-style site"
+task :site do
+  # Generate the dynamic parts of the site.
+  puts "Generating dynamic..."
+  require 'gollum'
+  wiki = Gollum::Wiki.new('.', :base_path => '/doc')
+  html = wiki.page('god', 'HEAD').formatted_data.gsub("\342\200\231", "'")
+  template = File.read('./site/index.template.html')
+  index = template.sub("{{ content }}", html)
+  File.open('./site/index.html', 'w') do |f|
+    f.write(index)
+  end
+
+  puts "Done. Opening in browser..."
+  sh "open site/index.html"
+end
+
+desc "Generate the new-style site"
+task :site_release do
+  # Ensure the gh-pages dir exists so we can generate into it.
+  puts "Checking for gh-pages dir..."
+  unless File.exist?("./gh-pages")
+    puts "No gh-pages directory found. Run the following commands first:"
+    puts "  `git clone git@github.com:mojombo/god gh-pages"
+    puts "  `cd gh-pages"
+    puts "  `git checkout gh-pages`"
+    exit(1)
+  end
+
+  # Copy the rest of the site over.
+  puts "Copying static..."
+  sh "cp -R site/* gh-pages/"
+
+  # Commit the changes
+  sha = `git log`.match(/[a-z0-9]{40}/)[0]
+  sh "cd gh-pages && git add . && git commit -m 'Updating to #{sha}.' && git push"
+  puts 'Done.'
+end
 #############################################################################
 #
 # Packaging tasks
 #
 #############################################################################
 
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'up to #{source_version}'"
-  sh "git tag v#{source_version}"
-  sh "git push origin master --tags"
-  sh "gem push pkg/#{NAME}-#{source_version}.gem"
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
 end
 
+desc "Build #{gem_file} into the pkg directory"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
 end
 
-task :gemspec => :validate do
+desc "Generate #{gemspec_file}"
+task :gemspec do
   # read spec file and split out manifest section
   spec = File.read(gemspec_file)
   head, manifest, tail = spec.split("  # = MANIFEST =\n")
 
-  # replace version and date
-  head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
-  head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
 
   # determine file list from git ls-files
   files = `git ls-files`.
     split("\n").
     sort.
     reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(examples|ideas|init|site)/ }.
+    reject { |file| file =~ /^(rdoc|pkg|examples|ideas|init|site)/ }.
     map { |file| "    #{file}" }.
     join("\n")
 
@@ -128,15 +182,3 @@ task :gemspec => :validate do
   File.open(gemspec_file, 'w') { |io| io.write(spec) }
   puts "Updated #{gemspec_file}"
 end
-
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{NAME}.rb", "lib/#{NAME}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{NAME}.rb` file and `#{NAME}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end

data/bin/god

@@ -20,13 +20,13 @@ begin
   Usage:
     Starting:
       god [-c <config file>] [-p <port> | -b] [-P <file>] [-l <file>] [-D]
-      
+
     Querying:
       god <command> <argument> [-p <port>]
       god <command> [-p <port>]
       god -v
       god -V (must be run as root to be accurate on Linux)
-      
+
     Commands:
       start <task or group name>         start task or group
       restart <task or group name>       restart task or group
@@ -34,77 +34,77 @@ begin
       monitor <task or group name>       monitor task or group
       unmonitor <task or group name>     unmonitor task or group
       remove <task or group name>        remove task or group from god
-      load <file>                        load a config into a running god
+      load <file> [action]               load a config into a running god
       log <task name>                    show realtime log for given task
       status [task or group name]        show status
       signal <task or group name> <sig>  signal all matching tasks
       quit                               stop god
       terminate                          stop god and all tasks
       check                              run self diagnostic
-      
+
     Options:
   EOF
-  
+
     opts.on("-cCONFIG", "--config-file CONFIG", "Configuration file") do |x|
       options[:config] = x
     end
-    
+
     opts.on("-pPORT", "--port PORT", "Communications port (default 17165)") do |x|
       options[:port] = x
     end
-    
+
     opts.on("-b", "--auto-bind", "Auto-bind to an unused port number") do
       options[:port] = "0"
     end
-    
+
     opts.on("-PFILE", "--pid FILE", "Where to write the PID file") do |x|
       options[:pid] = x
     end
-    
+
     opts.on("-lFILE", "--log FILE", "Where to write the log file") do |x|
       options[:log] = x
     end
-    
+
     opts.on("-D", "--no-daemonize", "Don't daemonize") do
       options[:daemonize] = false
     end
-    
+
     opts.on("-v", "--version", "Print the version number and exit") do
       options[:version] = true
     end
-    
+
     opts.on("-V", "Print extended version and build information") do
       options[:info] = true
     end
-    
+
     opts.on("--log-level LEVEL", "Log level [debug|info|warn|error|fatal]") do |x|
       options[:log_level] = x.to_sym
     end
-    
+
     opts.on("--no-syslog", "Disable output to syslog") do
       options[:syslog] = false
     end
-    
+
     opts.on("--attach PID", "Quit god when the attached process dies") do |x|
       options[:attach] = x
     end
-    
+
     opts.on("--no-events", "Disable the event system") do
       options[:events] = false
     end
-    
+
     opts.on("--bleakhouse", "Enable bleakhouse profiling") do
       options[:bleakhouse] = true
     end
   end
-  
+
   opts.parse!
-  
+
   # validate
   if options[:log_level] && ![:debug, :info, :warn, :error, :fatal].include?(options[:log_level])
     abort("Invalid log level '#{options[:log_level]}'")
   end
-  
+
   # dispatch
   if !options[:config] && options[:version]
     require 'god'
@@ -129,4 +129,4 @@ rescue Exception => e
     puts e.message
     puts e.backtrace.join("\n")
   end
-end
+end