timberline 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01da0a8b72d0153c044386ba5d2a2947ceba809a
-  data.tar.gz: b56730906aa005b6107cea4f1c693362e8a1ee99
+  metadata.gz: 9b3f445273cef8a33fd4137ad6cffdb91c5af8f5
+  data.tar.gz: 049bab1a641c24643642554ee8f1c89e4fd9c78c
 SHA512:
-  metadata.gz: e997f4fc10c86d1c64f2f4a18982e1fa9a2a30042d078988c3db13b1f675f7ca5260bad1b45a9b75b055292ff5e0a8d712e0fc7fe5e9ab0804d417510d0b71a2
-  data.tar.gz: a4c464628b537811773da27a6f95828bba46566b23bd53bfec452d17497dd99a464ef8c7adb3373df1f0ee4fd1d5534e42cbc9de8fb6a3ac18b860c4be747e7e
+  metadata.gz: cb803ba88627fffc8e1af3ec9253733b584601397fd08d3701e02ace865a0887c9ac0219da754ff4539d0798f923f9c653db8d28e1711b94371f0ffb437b6bdc
+  data.tar.gz: 9d17830ab88a54d2bdde1fe6f0ea02fad125570bf36a9b03bb7aebde17c75a23e21b371df967cb010912a5769eaa66524cd405e22b20b938e8a1ba91799dd6b0

data/README.markdown

@@ -101,7 +101,7 @@ queue (more on that later). There are 3 ways to configure Timberline:
 To push a job onto the queue you'll want to make use of the `Timberline#push`
 method, like so:
 
-    Timberline.push "queue_name", data, { :other_data => some_stuff }
+    Timberline.push "queue_name", data, { other_data: some_stuff }
 
 `queue_name` is the name of the queue you want to push data onto; data is the
 data you want to push onto the queue (remember that this all gets converted to

data/Rakefile

@@ -4,4 +4,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/timberline

@@ -15,10 +15,10 @@ Usage:
 where [options] are:
 EOS
 
-  opt :daemonize, "Run the queue listener as a daemon", :default => false
-  opt :log_output, "log the output to <filename>.output (only applicable in conjunction with the daemonize option)", :default => false
+  opt :daemonize, "Run the queue listener as a daemon", default: false
+  opt :log_output, "log the output to <filename>.output (only applicable in conjunction with the daemonize option)", default: false
   opt :config, "YAML config file to set up Timberline options",
-        :type => String, :default => nil
+        type: String, default: nil
 end
 
 unless opts[:config].nil?
@@ -30,7 +30,7 @@ timberline_spec = File.read(timberline_file)
 
 if opts[:daemonize]
   puts "Entering daemon mode"
-  Daemons.daemonize({ :app_name => timberline_file, :log_output => opts[:log_output] })
+  Daemons.daemonize({ app_name: timberline_file, log_output: opts[:log_output] })
 end
 
 puts "Listening..."

data/lib/timberline/config.rb

@@ -28,7 +28,7 @@ class Timberline
     def redis_config
       config = {}
 
-      { :db => database, :host => host, :port => port, :timeout => timeout, :password => password, :logger => logger }.each do |name, value|
+      { db: database, host: host, port: port, timeout: timeout, password: password, logger: logger }.each do |name, value|
         config[name] = value unless value.nil?
       end
 

data/lib/timberline/envelope.rb

@@ -33,7 +33,7 @@ class Timberline
     private
 
     def build_envelope_hash
-      { :contents => contents }.merge(@metadata)
+      { contents: contents }.merge(@metadata)
     end
 
     def assign_var(name, value)

data/lib/timberline/queue.rb

@@ -75,8 +75,21 @@ class Timberline
 
     def average_execution_time
       successes = Timberline.redis.xmembers(attr("success_stats")).map { |item| Envelope.from_json(item)}
-      times = successes.map { |item| item.finished_processing_at.to_f - item.started_processing_at.to_f }
-      times.inject(0, :+) / times.size.to_f
+      times = successes.map do |item|
+        if item.finished_processing_at
+          item.finished_processing_at.to_f - item.started_processing_at.to_f
+        elsif item.fatal_error_at
+          item.fatal_error_at.to_f - item.started_processing_at.to_f
+        else
+          nil
+        end
+      end
+      times.reject! { |t| t.nil? }
+      if times.size == 0
+        0
+      else
+        times.inject(0, :+) / times.size.to_f
+      end
     end
 
     def add_retry_stat(item)

data/lib/timberline/version.rb

@@ -1,3 +1,3 @@
 class Timberline
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/timberline.rb

@@ -20,7 +20,7 @@ class Timberline
   def self.redis=(server)
     initialize_if_necessary
     if server.is_a? Redis
-      @redis = Redis::Namespace.new(@config.namespace, :redis => server)
+      @redis = Redis::Namespace.new(@config.namespace, redis: server)
     elsif server.is_a? Redis::Namespace
       @redis = server
     elsif server.nil?

data/spec/support/fake_rails.rb

@@ -1,12 +1,12 @@
 module SpecSupport
   module FakeRails
     def self.create_fake_env
-      fake_rails = OpenStruct.new(:root => File.join(File.dirname(File.path(__FILE__)), "..", "fake_rails"), :env => "development") 
+      fake_rails = OpenStruct.new(root: File.join(File.dirname(File.path(__FILE__)), "..", "fake_rails"), env: "development") 
       Object.send(:const_set, :Rails, fake_rails)
     end
 
     def self.create_fake_env_without_config
-      fake_rails = OpenStruct.new(:root => File.join(File.dirname(File.path(__FILE__)), "..", "gibberish"), :env => "development") 
+      fake_rails = OpenStruct.new(root: File.join(File.dirname(File.path(__FILE__)), "..", "gibberish"), env: "development") 
       Object.send(:const_set, :Rails, fake_rails)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timberline
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tommy Morgan