deputy 0.1.47 → 0.1.48

data/Readme.md

@@ -21,3 +21,6 @@ Usage
     deputy Cronjob.ran
     deputy Cronjob.users_found 123
     Cron: xxx 2>&1 ; deputy Cron.success $?
+
+### Run plugins by hand for debugging
+    deputy --run-plugins --no-wait

data/VERSION

@@ -1 +1 @@
-0.1.47
+0.1.48

data/bin/deputy

@@ -20,20 +20,23 @@ BANNER
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on('-v', '--version','Show Version'){ puts Deputy::VERSION; exit}
   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
-    puts Time.now.strftime("%Y-%m-%d %H:%M:%S")
-    Deputy.run_plugins
-    exit
+    options[:run_plugins] = true
   end
   opts.on('--host x', 'Use this host, when reporting') do |host|
     options[:host] = host
   end
 end.parse!
-  
-metric, value = ARGV[0..1]
-if metric.to_s.empty?
-  puts "Usage instructions: deputy --help"
-  exit
-end
 
-Deputy.send_report metric, (value || Deputy::DEFAULT_VALUE), options
+if options[:run_plugins]
+  puts Time.now.strftime("%Y-%m-%d %H:%M:%S")
+  Deputy.run_plugins options
+else
+  metric, value = ARGV[0..1]
+  if metric.to_s.empty?
+    puts "Usage instructions: deputy --help"
+    exit
+  end
+  Deputy.send_report metric, (value || Deputy::DEFAULT_VALUE), options
+end

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.47"
+  s.version = "0.1.48"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-04-11}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]

data/lib/deputy.rb

@@ -99,8 +99,8 @@ module Deputy
     end
   end
 
-  def self.run_plugins
-    sleep_random_interval
+  def self.run_plugins(options={})
+    sleep_random_interval unless options[:no_wait]
 
     content = get("/plugins.rb")
 
@@ -202,4 +202,4 @@ module Deputy
     auth = [$1, $2].compact
     auth.empty? ? nil : auth
   end
-end
+end

data/spec/deputy_spec.rb

@@ -33,6 +33,7 @@ end
 
 describe Deputy do
   before do
+    srand(Time.now.to_f * 100000) # fixes rand in klass() not being random
     Socket.stub!(:gethostname).and_return 'my_host'
   end
 
@@ -161,7 +162,6 @@ describe Deputy do
     end
 
     it "sleeps a random interval if given in config" do
-      pending "somehow makes the next test fail wtf!"
       Socket.stub!(:gethostname).and_return 'foo'
       Deputy.stub!(:config).and_return('max_random_start_delay' => 30)
       Deputy.stub!(:send_report)
@@ -171,6 +171,15 @@ describe Deputy do
       }.should raise_error("OK")
     end
 
+    it "does not sleeps no_wait given" do
+      FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => '')
+      FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=OK&hostname=my_host", :body => 'OK')
+      Socket.stub!(:gethostname).and_return 'foo'
+      Deputy.stub!(:send_report)
+      Deputy.should_not_receive(:sleep)
+      Deputy.run_plugins
+    end
+
     it "fails with nice backtrace" do
       FakeWeb.register_uri(:get, "http://sheri.ff/plugins.rb", :body => klass('FooBar', :code => 'raise'))
       FakeWeb.register_uri(:get, "http://sheri.ff/notify?group=Deputies.finished&value=Error&hostname=my_host", :body => 'OK')
@@ -234,4 +243,4 @@ describe Deputy do
       url.should == 'http://foo'
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deputy
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 123
   prerelease: 
   segments: 
   - 0
   - 1
-  - 47
-  version: 0.1.47
+  - 48
+  version: 0.1.48
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: deputy
 dependencies: 
 - !ruby/object:Gem::Dependency