fozzie 0.0.2 → 0.0.3

data/fozzie.gemspec

@@ -16,12 +16,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_dependency 'statsd'
-  s.add_dependency 'bson_ext'
-  
+
+  s.add_dependency 'statsd-ruby'
   s.add_development_dependency 'rake'
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "simplecov"
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'simplecov'
 end

data/lib/core_ext/hash.rb

@@ -3,7 +3,7 @@ class Hash
   # Return self as symbolized keys hash
   def symbolize_keys
     self.dup.inject({}) do |hsh, (k,v)|
-      hsh[k.to_sym] = (v.respond_to?(:symbolize_keys) ? v.symbolize_keys : v)
+      hsh[k.to_s.to_sym] = (v.respond_to?(:symbolize_keys) ? v.symbolize_keys : v)
       hsh
     end
   end

data/lib/fozzie/classes.rb

@@ -3,31 +3,47 @@ require 'statsd'
 module Fozzie
   module Classes
 
-    class AbstractFozzie < Statsd::Client
+    class AbstractFozzie < Statsd
       attr_reader :prefix
 
       def initialize(host, port, prefix = nil)
-        @prefix = prefix
+        @namespace = prefix unless prefix.nil?
         super host, port
       end
 
-      def time_for(data, &block)
-        tick = Time.now.usec
-        block.call
-        tock = Time.now.usec
-        timing(data, (tock - tick))
+      def time_to_do(stat, sample_rate=1, &block); time_for(stat, sample_rate, &block); end
+      def time_for(stat, sample_rate=1, &block)
+        begin
+          time(stat, sample_rate, &block)
+        rescue => exc
+          yield block
+        end
+      end
+
+      def committed; commit; end
+      def commit
+        event :commit
+      end
+
+      def build; built; end
+      def built
+        event :build
+      end
+
+      def deploy; deployed; end
+      def deployed
+        event :deploy
       end
 
       private
 
-      # Overload the send_stats method to automicatially prefix the data bucket string
-      def send_stats(data, sample_rate = 1)
-        super "#{@prefix}#{data}", sample_rate
+      def event(type)
+        timing "event.#{type.to_s}", Time.now.usec
       end
 
     end
 
-    NAMESPACES = %w{Stats S}
+    NAMESPACES = %w{Stats S Statistics Warehouse}
 
     def self.included(klass)
       host, port, prefix = Fozzie.c.host, Fozzie.c.port, Fozzie.c.data_prefix

data/lib/fozzie/configuration.rb

@@ -13,10 +13,10 @@ module Fozzie
 
       self
     end
-    
+
     def data_prefix
-      s = "%s." % env
-      s = appname << ".#{s}" unless appname.nil? || appname.empty?
+      s = env
+      s = [appname, s].join('.').strip unless appname.nil? || appname.empty?
       s
     end
 
@@ -36,10 +36,10 @@ module Fozzie
     # Default configuration settings
     # @return [Hash]
     def self.default_configuration
-      { 
-        :host        => '127.0.0.1', 
-        :port        => 8125, 
-        :config_path => '', 
+      {
+        :host        => '127.0.0.1',
+        :port        => 8125,
+        :config_path => '',
         :env         => (ENV['RAILS_ENV'] || 'development'),
         :appname     => ''
       }.dup
@@ -52,7 +52,8 @@ module Fozzie
     def config_from_yaml(args)
       fp = full_config_path(args[:config_path])
       return {} unless File.exists?(fp)
-      YAML.load(File.open(fp))[args[:env]].symbolize_keys
+      cnf = YAML.load(File.open(fp))[args[:env]]
+      (cnf.kind_of?(Hash)) ? cnf.symbolize_keys : {}
     end
 
   end

data/lib/fozzie/version.rb

@@ -1,3 +1,3 @@
 module Fozzie
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/fozzie/configuration_spec.rb

@@ -15,7 +15,7 @@ describe Fozzie::Configuration do
     c.host.should == '1.1.1.1'
     c.port.should == 9876
     c.appname.should == 'fozzie'
-    c.data_prefix.should == 'fozzie.test.'
+    c.data_prefix.should == 'fozzie.test'
   end
 
   it "defaults env" do
@@ -23,12 +23,16 @@ describe Fozzie::Configuration do
   end
   
   it "creates a data prefix" do
-    subject.data_prefix.should == 'development.'
+    subject.data_prefix.should == 'development'
   end
   
   it "creates a data prefix with appname when set" do
     subject.appname = 'astoria'
-    subject.data_prefix.should == 'astoria.development.'
+    subject.data_prefix.should == 'astoria.development'
+  end
+  
+  it "handles missing configuration namespace" do
+    proc { Fozzie::Configuration.new({:env => 'blbala', :config_path => 'spec/'}) }.should_not raise_error
   end
 
 end

data/spec/lib/fozzie_spec.rb

@@ -23,7 +23,8 @@ describe Fozzie do
       kl.should respond_to(:increment)
       kl.should respond_to(:decrement)
       kl.should respond_to(:timing)
-      kl.should respond_to(:update_counter)
+      kl.should respond_to(:count)
+      kl.should respond_to(:time)
     end
   end
 
@@ -34,13 +35,38 @@ describe Fozzie do
     end
   end
 
-  it "assigns prefix when passed" do
-    Fozzie::AbstractFozzie.new(1,2, 'a').prefix.should == 'a'
+  it "assigns namespace when passed" do
+    Fozzie::AbstractFozzie.new(1,2, 'a').namespace.should == 'a'
   end
 
   it "times a given block" do
-    Stats.expects(:timing).with() {|b, val| b == 'data.bin' && (100..1200).include?(val) }
+    Stats.expects(:timing).with() {|b, val, timing| b == 'data.bin' && (1000..1200).include?(val) }.twice
     Stats.time_for('data.bin') { sleep 1 }
+    Stats.time_to_do('data.bin') { sleep 1 }
+  end
+
+  it "registers a commit" do
+    Stats.expects(:timing).with('event.commit', anything).twice
+    Stats.commit
+    Stats.committed
+  end
+
+  it "registers a build" do
+    Stats.expects(:timing).with('event.build', anything).twice
+    Stats.build
+    Stats.built
+  end
+
+  it "registers a deploy" do
+    Stats.expects(:timing).with('event.deploy', anything).twice
+    Stats.deploy
+    Stats.deployed
+  end
+  
+  it "ignores exception and yields block" do
+    Stats.stubs(:time).raises(ArgumentError)
+    proc { Stats.time_for('data.bin') { sleep 1 } }.should_not raise_error
+    proc { Stats.time_to_do('data.bin') { sleep 1 } }.should_not raise_error
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fozzie
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: statsd
-  requirement: &70188658675780 !ruby/object:Gem::Requirement
+  name: statsd-ruby
+  requirement: &70261680612280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188658675780
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70188658675220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70188658675220
+  version_requirements: *70261680612280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70188658674600 !ruby/object:Gem::Requirement
+  requirement: &70261680611680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188658674600
+  version_requirements: *70261680611680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70188658674020 !ruby/object:Gem::Requirement
+  requirement: &70261680610860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188658674020
+  version_requirements: *70261680610860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70188658648740 !ruby/object:Gem::Requirement
+  requirement: &70261680609720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188658648740
+  version_requirements: *70261680609720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70188658648100 !ruby/object:Gem::Requirement
+  requirement: &70261680608580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188658648100
+  version_requirements: *70261680608580
 description: Gem allows statistics gathering from Ruby and Ruby on Rails applications
   to Statsd
 email:
@@ -119,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3087295047866477868
+      hash: 4014469359470497890
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3087295047866477868
+      hash: 4014469359470497890
 requirements: []
 rubyforge_project: fozzie
 rubygems_version: 1.8.10