vault-tools 0.3.8 → 0.3.9

data/lib/vault-tools.rb

@@ -26,11 +26,20 @@ module Vault
     ENV['TZ'] = 'UTC'
   end
 
+  def self.hack_time_class
+    $stderr.puts "Modifying Time#to_s to use #iso8601"
+    # use send to call private method
+    Time.send(:define_method, :to_s) do
+      self.iso8601
+    end
+  end
+
   # all in one go
   def self.setup
     self.require
     self.load_path
     self.set_timezones
+    self.hack_time_class
   end
 end
 

data/lib/vault-tools/log.rb

@@ -5,7 +5,7 @@ module Vault
     # @param name [String] The name of the metric.
     def self.count(name)
       name = "#{Config.app_name}.#{name}" if Config.app_name
-      log(measure: name)
+      log("count##{name}" => 1)
     end
 
     # Log an HTTP status code.  Two log metrics are written each time this
@@ -36,8 +36,8 @@ module Vault
         name.gsub(/\/:\w+/, '').           # Remove param names from path.
              gsub("/", "_").               # Replace slash with underscore.
              gsub(/[^A-Za-z0-9\-\_]/, ''). # Only keep subset of chars.
-             slice(1..-1).
-             tap { |name| log(measure: name, val: duration) }
+             slice(1..-1).                 # Strip the leading underscore.
+             tap { |name| log("measure##{name}" => "#{duration}ms") }
       end
     end
 

data/lib/vault-tools/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Tools
-    VERSION = '0.3.8'
+    VERSION = '0.3.9'
   end
 end

data/test/log_test.rb

@@ -6,7 +6,7 @@ class LogTest < Vault::TestCase
   def test_count
     set_env('APP_NAME', nil)
     Vault::Log.count('countable')
-    assert_match(/measure=countable/, Scrolls.stream.string)
+    assert_match(/count#countable=1/, Scrolls.stream.string)
   end
 
   # Vault::Log.count emits a metric that represents a countable event.  If an
@@ -15,7 +15,7 @@ class LogTest < Vault::TestCase
   def test_count_with_app_name
     set_env('APP_NAME', 'vault_app')
     Vault::Log.count('countable')
-    assert_match(/measure=vault_app.countable/, Scrolls.stream.string)
+    assert_match(/count#vault_app.countable=1/, Scrolls.stream.string)
   end
 
   # Vault::Log.count_status emits metrics to measure HTTP responses.  The
@@ -23,8 +23,8 @@ class LogTest < Vault::TestCase
   def test_count_status
     set_env('APP_NAME', nil)
     Vault::Log.count_status(201)
-    assert_match(/measure=http_201/, Scrolls.stream.string)
-    assert_match(/measure=http_2xx/, Scrolls.stream.string)
+    assert_match(/count#http_201=1/, Scrolls.stream.string)
+    assert_match(/count#http_2xx=1/, Scrolls.stream.string)
   end
 
   # Vault::Log.count_status emits metrics to measure HTTP responses.  If an
@@ -33,30 +33,27 @@ class LogTest < Vault::TestCase
   def test_count_status_with_app_name
     set_env('APP_NAME', 'vault_app')
     Vault::Log.count_status(201)
-    assert_match(/measure=vault_app.http_201/, Scrolls.stream.string)
-    assert_match(/measure=vault_app.http_2xx/, Scrolls.stream.string)
+    assert_match(/count#vault_app.http_201=1/, Scrolls.stream.string)
+    assert_match(/count#vault_app.http_2xx=1/, Scrolls.stream.string)
   end
 
   # Vault::Log.time emits a metric to measure the duration of an HTTP request.
   # It converts slashes to underscores.
   def test_time_replaces_slash_with_underscore
     Vault::Log.time('/some/web/path', 123.4)
-    assert_match(/measure=some_web_path val=123.400/, Scrolls.stream.string)
-    assert_match(/val=123.4/, Scrolls.stream.string)
+    assert_match(/measure#some_web_path=123.4ms/, Scrolls.stream.string)
   end
 
   # Vault::Log.time removes parameters.
   def test_time_removes_parameters
     Vault::Log.time('/some/:web/path', 123.4)
-    assert_match(/measure=some_path val=123.400/, Scrolls.stream.string)
-    assert_match(/val=123.4/, Scrolls.stream.string)
+    assert_match(/measure#some_path=123.4ms/, Scrolls.stream.string)
   end
 
   # Vault::Log.time removes non-alphanumeric characters.
   def test_time_removes_non_alphanumeric_characters
     Vault::Log.time('/some/web+path', 123.4)
-    assert_match(/measure=some_webpath val=123.400/, Scrolls.stream.string)
-    assert_match(/val=123.4/, Scrolls.stream.string)
+    assert_match(/measure#some_webpath=123.4ms/, Scrolls.stream.string)
   end
 
   # Vault::Log.time is a no-op if a nil name is provided.

data/test/time_test.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class TimeTest < Vault::TestCase
+
+  # We're always using UTC time
+  def test_now_is_utc
+    local = Time.local(2012,1,1)
+    utc   = Time.utc(2012,1,1)
+    assert_equal(utc, local)
+  end
+
+  # Default time format is iso8601
+  def test_to_s_is_iso8601
+    t = Time.utc(2012,1,1)
+    assert_equal(t.to_s, t.iso8601)
+  end
+end

data/test/web_test.rb

@@ -42,8 +42,8 @@ class WebTest < Vault::TestCase
   # requests.
   def test_head_status_check
     head '/'
-    assert_match(/measure=http_200/, Scrolls.stream.string)
-    assert_match(/measure=http_2xx/, Scrolls.stream.string)
+    assert_match(/count#http_200=1/, Scrolls.stream.string)
+    assert_match(/count#http_2xx=1/, Scrolls.stream.string)
     assert_equal(200, last_response.status)
   end
 
@@ -51,8 +51,8 @@ class WebTest < Vault::TestCase
   # response body.
   def test_get_health_check
     get '/health'
-    assert_match(/measure=http_200/, Scrolls.stream.string)
-    assert_match(/measure=http_2xx/, Scrolls.stream.string)
+    assert_match(/count#http_200=1/, Scrolls.stream.string)
+    assert_match(/count#http_2xx=1/, Scrolls.stream.string)
     assert_equal(200, last_response.status)
     assert_equal('OK', last_response.body)
   end
@@ -61,8 +61,8 @@ class WebTest < Vault::TestCase
   # match a known resource.
   def test_head_with_unknown_endpoint
     head '/unknown'
-    assert_match(/measure=http_404/, Scrolls.stream.string)
-    assert_match(/measure=http_4xx/, Scrolls.stream.string)
+    assert_match(/count#http_404=1/, Scrolls.stream.string)
+    assert_match(/count#http_4xx=1/, Scrolls.stream.string)
     assert_equal(404, last_response.status)
   end
 
@@ -70,8 +70,8 @@ class WebTest < Vault::TestCase
   # traceback is also written to the response body to ease debugging.
   def test_error_logs_500
     get '/boom'
-    assert_match(/measure=http_500/, Scrolls.stream.string)
-    assert_match(/measure=http_5xx/, Scrolls.stream.string)
+    assert_match(/count#http_500=1/, Scrolls.stream.string)
+    assert_match(/count#http_5xx=1/, Scrolls.stream.string)
     assert_match(/^RuntimeError: An expected error occurred.$/m,
                  last_response.body)
     assert_equal(500, last_response.status)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls
@@ -130,7 +130,7 @@ files:
 - test/log_test.rb
 - test/pipeline_test.rb
 - test/product_test.rb
-- test/test_spec.rb
+- test/time_test.rb
 - test/user_test.rb
 - test/web_test.rb
 - vault-tools.gemspec
@@ -146,15 +146,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4182790357412636502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4182790357412636502
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Test classes, base web classes, and helpers - oh my!

data/test/test_spec.rb

@@ -1,7 +0,0 @@
-class TestSpec < MiniTest::Unit::TestCase
-
-  def test_default_spec_class_is_vault_spec
-    assert_equal Vault::Spec, MiniTest::Spec.spec_type('')
-  end
-
-end