makesure 0.0.5 → 0.0.6

data/README.rdoc

@@ -1,6 +1,6 @@
-= makesure
+= Makesure
 
-Description goes here.
+Makesure is a set of tools to define, verify and monitor systems in a unix environment. It allows you to schedule commands that constitue a system via cron (and monitors the execution of those commands), it gives you a way to verify the state of a system (and alerts you when there are problems), and it provides a simple mechanism for collecting statistics about that system.
 
 == Contributing to makesure
  

data/bin/makesure

@@ -6,6 +6,7 @@ require 'makesure'
 require 'optparse'
 
 cron_path = '/etc/cron.d/makesure.cron'
+rvm       = false
 
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: makesure [options] COMMAND"
@@ -17,6 +18,10 @@ parser = OptionParser.new do |opts|
     cron_path = path
   end
 
+  opts.on("-r", "--[no-]rvm", "Whether or not Makesure should wrap the commands in its cron file for use with RVM") do |r|
+    rvm = r
+  end
+
   opts.on("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -28,7 +33,7 @@ parser = OptionParser.new do |opts|
   opts.separator "  update  Updates cron with commands scheduled by your system definitions"
 end
 
-parser.parse!
+parser.parse!(ARGV)
 
 case ARGV[0]
 when 'init'
@@ -71,7 +76,7 @@ FILE
   end
 when 'update'
   Makesure.load_system_defs
-  Makesure::Cron.new(:cron_path => cron_path)
+  Makesure::Cron.new(:cron_path => cron_path, :rvm => rvm)
 else
   puts parser.help
 end

data/lib/makesure/cron.rb

@@ -5,13 +5,14 @@ module Makesure
     # specify a file (or directory containing files) to load system specifications from
     def initialize(opts = {})
       opts = {
-        :cron_path => "/etc/cron.d/makesure.cron"
+        :cron_path => "/etc/cron.d/makesure.cron",
+        :rvm       => false
       }.merge(opts)
       
       Makesure.log "updating '#{opts[:cron_path]}'"
       
       cron_file = File.expand_path(opts[:cron_path])
-      crontab = build_crontab_output
+      crontab = build_crontab_output(opts)
       Makesure.debug "#{cron_file}:\n#{crontab}"
       
       File.open(cron_file, "w") do |f|
@@ -19,7 +20,7 @@ module Makesure
       end
     end
 
-    def build_crontab_output
+    def build_crontab_output(opts)
       chdir = Makesure.chdir || File.dirname(Makesure.makesurefile)
       crontab = ""
       crontab << "# Autogenerated by makesure: you probably don't want to edit this file\n\n"
@@ -35,14 +36,29 @@ module Makesure
           crontab << "#{c.cron}\t"
           crontab << "#{uid} " if uid
           crontab << "cd #{chdir} && "
-          crontab << "makesure-runner run #{c.command.inspect}\n"
+
+          cmd = "makesure-runner run #{c.command.inspect}"
+          crontab << if (opts[:rvm])
+            "/bin/bash -l -c '#{cmd}'"
+          else
+            cmd
+          end
+          crontab << "\n"
         end
+
         crontab << "# Verification\n"
         s.verifies.each do |v|
           crontab << "#{v.cron}\t"
           crontab << "#{uid} " if uid
           crontab << "cd #{chdir} && "
-          crontab << "makesure-runner verify #{s.name} #{v.name}\n"
+
+          cmd = "makesure-runner verify #{s.name} #{v.name}"
+          crontab << if (opts[:rvm])
+            "/bin/bash -l -c '#{cmd}'"
+          else
+            cmd
+          end
+          crontab << "\n"
         end
         # TODO summarizes
       end

data/lib/makesure/version.rb

@@ -2,7 +2,7 @@ module Makesure
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/makesure.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{makesure}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Waller"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-05-05}
   s.description = %q{Makesure is a set of tools to define, verify and monitor systems in a unix environment. It allows you to schedule commands that constitue a system via cron (and monitors the execution of those commands), it gives you a way to verify the state of a system (and alerts you when there are problems), and it provides a simple mechanism for collecting statistics about that system.}
   s.email = %q{eric@seatgeek.com}
   s.executables = ["makesure", "makesure-runner"]
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/seatgeek/makesure}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Continuous (Production) Verification: Define and Monitor Systems in Ruby}
   s.test_files = [
     "test/helper.rb",
@@ -51,7 +51,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: makesure
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors: 
 - Eric Waller
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,9 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   prerelease: false
@@ -38,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -51,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -66,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -81,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -94,9 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   prerelease: false
@@ -147,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 611779293
+      hash: -1531056845273534742
       segments: 
       - 0
       version: "0"
@@ -156,13 +134,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: "Continuous (Production) Verification: Define and Monitor Systems in Ruby"