deputy 0.1.56 → 0.1.57

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "_site"]
+	path = _site
+	url = git@github.com:dawanda/deputy.git

data/Readme.md

@@ -4,7 +4,10 @@ Report values to [Sheriff](https://github.com/dawanda/sheriff) or run plugins fr
 
     sudo gem install deputy
 
+# Configuration
+
 Put into `~/.deputy.yml` or `/etc/deputy.yml`
+
     sheriff_url: http://sheriff.mydomain.com
     # overwrite defaults if needed
     max_random_start_delay: 30
@@ -12,8 +15,13 @@ Put into `~/.deputy.yml` or `/etc/deputy.yml`
     silent_on_errors: true
 
 Basic auth login can be added to the url:
+
     sheriff_url: http://username:password@sheriff.mydomain.com
 
+Disable Deputy for local use:
+
+    disabled: true
+
 Add deputy to cron with `deputy --install-cron` (logs to /tmp/deputy.log)
 
 # Usage

data/VERSION

@@ -1 +1 @@
-0.1.56
+0.1.57

data/bin/deputy

@@ -19,6 +19,7 @@ BANNER
 
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ puts Deputy::VERSION; exit}
+  opts.on('-vv', '--verbose','Verbose Mode'){ options[:verbose] = true }
   opts.on('--install-cron','Install crontask'){ Deputy.install_cron; exit}
   opts.on('--no-wait','Do not wait before executing plugins'){ options[:no_wait] = true }
   opts.on('--run-plugins','Run all plugins for this minute (belongs into crontask)') do

data/deputy.gemspec

@@ -4,16 +4,16 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{deputy}
-  s.version = "0.1.56"
+  s.name = "deputy"
+  s.version = "0.1.57"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-07-15}
-  s.default_executable = %q{deputy}
-  s.email = %q{mirko@dawanda.com}
+  s.date = "2012-11-05"
+  s.email = "mirko@dawanda.com"
   s.executables = ["deputy"]
   s.files = [
+    ".gitmodules",
     "Gemfile",
     "Gemfile.lock",
     "Rakefile",
@@ -25,17 +25,16 @@ Gem::Specification.new do |s|
     "spec/deputy_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/dawanda/deputy}
+  s.homepage = "http://github.com/dawanda/deputy"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Report to the sheriff}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Report to the sheriff"
   s.test_files = [
     "spec/deputy_spec.rb",
     "spec/spec_helper.rb"
   ]
 
   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

data/lib/deputy.rb

@@ -8,7 +8,7 @@ def eval_and_fetch_constants(x)
   begin
     eval(x)
   rescue Exception => e
-    raise e unless Deputy.config['silent_on_errors'] 
+    raise e unless Deputy.config['silent_on_errors']
   end
   new = (Module.constants.map{|c| c.to_s} - old)
   new = new.select{|c| c.to_s =~ /^TEMP/ } # do not fetch required libs, just user-defined
@@ -108,7 +108,7 @@ module Deputy
     start_time = Time.now.to_i
     sleep_random_interval unless options[:no_wait]
 
-    content = get("/plugins.rb")
+    content = get("/plugins.rb", options)
 
     exceptions = []
     Scout.plugins(content).each do |interval, plugin|
@@ -146,14 +146,22 @@ module Deputy
     url = "http://#{url}" unless url =~ %r{://}
     options[:http_basic_authentication] = extract_auth_from_url!(url)
     url = add_host_to_url(url, options.delete(:host))
+    puts "getting #{url} with options: #{options.inspect}" if options[:verbose]
 
-    Timeout.timeout(config['timeout']||10) do
-      open(url, options).read
+    http_options = {}
+    http_options[:http_basic_authentication] = options[:http_basic_authentication] if options[:http_basic_authentication]
+
+    res = Timeout.timeout(config['timeout']||10) do
+      open(url, http_options).read
     end
+    puts "result: #{res.inspect}" if options[:verbose]
+    res
   rescue Exception => e
     e.message << url.to_s
-    unless config['silent_on_errors'] 
+    unless config['silent_on_errors']
       raise e
+    else
+      puts "caught error: #{e.message} with #{e.backtrace}"
     end
   end
 
@@ -163,10 +171,11 @@ module Deputy
 
   def self.config
     home = File.expand_path('~')
-    ["#{home}/.deputy.yml", '/etc/deputy.yml'].each do |file|
+    possible_config_files = ["#{home}/.deputy.yml", '/etc/deputy.yml']
+    possible_config_files.each do |file|
       return YAML.load(File.read(file)) if File.exist?(file)
     end
-    raise "No deputy.yml found in /etc or #{home}"
+    raise "No configuration file found in " + possible_config_files.join('or') + "\nSee http://github.com/dawanda/deputy for more documentation"
   end
 
   def self.minutes_to_wait(start_time, interval)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 107
-  prerelease: false
+  hash: 105
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 56
-  version: 0.1.56
+  - 57
+  version: 0.1.57
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +02:00
-default_executable: deputy
+date: 2012-11-05 00:00:00 Z
 dependencies: []
 
 description: 
@@ -28,6 +27,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitmodules
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -38,7 +38,6 @@ files:
 - lib/deputy.rb
 - spec/deputy_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/dawanda/deputy
 licenses: []
 
@@ -68,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Report to the sheriff