metriks-middleware 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDQ0YWZjMmFlYjM0ZjU4ZTBmMTVhMmNkNGMzYTk3MmY2MDMxZWJiMg==
+  data.tar.gz: !binary |-
+    YmEwMWZkNjhjYjIxOWUyYzE3ZTdhZGMwZDQzNjFjOTY5NjZlZTUzYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjE1NTEyZGEyNjMxMDk4MGJmZmZhZWFmZTU2YzcwMzNlZTc2ZDUyYzdiODhh
+    NTJlZmFmMWFmNTEyYzlhNmQyMjZiNzEyZTM4ODBkYjlmMmJiYjMwZjRkM2Mx
+    NGU2NTE1MmNhOGEzMWJmMGU2YzVjMDU5NGY3N2E0ZDRjNDMwMDM=
+  data.tar.gz: !binary |-
+    NDMwMWFmZWY4NmNiZmY5OTYyN2FkZGRjMmE4MzZmNjU2YTVmZjIyM2Q4ZDA5
+    NjgwMWZhNDZmMTBlODkzOGFlMmViNGI5MjFmMGUxODhkZGYyZWZmMWQ1YWY0
+    NjViZGZiYzFkMDkxNDg4NTU1ZDRjMzg5NzQ1MjM0YmU4YzExN2Q=

data/Rakefile

@@ -1,54 +1,3 @@
-require 'rubygems'
-require 'rake'
-require 'date'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def lib_path
-  "lib/#{ name.gsub('-', '/') }.rb"
-end
-
-def version
-  line = File.read(lib_path)[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*ERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-task :default => :test
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -56,106 +5,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  p "irb -rubygems -r ./#{lib_path}"
-  sh "irb -rubygems -r ./#{lib_path}"
-end
-
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-desc "Build #{gem_file} into the pkg directory"
-task :build => [:gemspec, :update_bundle] do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-desc "Generate #{gemspec_file}"
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end
-
-desc "Update #{name} in bundle"
-task :update_bundle => :validate do
-  `bundle update #{name}`
-  puts "Bundled #{name} version #{version}"
-end
-
-desc "Validate #{gemspec_file}"
-task :validate do
-  libfiles = Dir['lib/*'] + Dir['lib/*/*'] - [lib_path, File.dirname(lib_path)]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{lib_path}` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end
+task :default => :test

data/lib/metriks/middleware.rb

@@ -2,17 +2,14 @@ require 'metriks'
 
 module Metriks
   class Middleware
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
 
     REQUEST_DELAY              = 'request_delay'
-    HEROKU_DYNOS_IN_USE        = 'heroku.dynos_in_use'
     ERROR_RESPONSE             = 'responses.error'
     NOT_FOUND_RESPONSE         = 'responses.not_found'
     NOT_MODIFIED_RESPONSE      = 'responses.not_modified'
     CONTENT_LENGTH             = 'responses.content_length'
-
     REQUEST_START_HEADER       = 'HTTP_X_REQUEST_START'
-    HEROKU_DYNOS_IN_USE_HEADER = 'HTTP_X_HEROKU_DYNOS_IN_USE'
 
     def initialize(app)
       @app = app
@@ -21,7 +18,6 @@ module Metriks
     def call(env)
       time_response(env) do
         record_request_delay env
-        record_heroku_dynos_in_use env
         record_response env
         call_downstream env
       end
@@ -44,12 +40,6 @@ module Metriks
       Metriks.histogram(REQUEST_DELAY).update(delay)
     end
 
-    def record_heroku_dynos_in_use(env)
-      dynos = env[HEROKU_DYNOS_IN_USE_HEADER]
-      return unless dynos
-      Metriks.histogram(HEROKU_DYNOS_IN_USE).update(dynos.to_i)
-    end
-
     def record_response(env)
       original_callback = env['async.callback']
       env['async.callback'] = lambda do |(status, headers, body)|

data/metriks-middleware.gemspec

@@ -1,73 +1,36 @@
-## This is the rakegem gemspec template. Make sure you read and understand
-## all of the comments. Some sections require modification, and others can
-## be deleted if you don't need them. Once you understand the contents of
-## this file, feel free to delete any comments that begin with two hash marks.
-## You can find comprehensive Gem::Specification documentation, at
-## http://docs.rubygems.org/read/chapter/20
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
+lib = "metriks-middleware"
+lib_file = File.expand_path("../lib/metriks/middleware.rb", __FILE__)
+File.read(lib_file) =~ /\bVERSION\s*=\s*["'](.+?)["']/
+version = $1
 
-  ## Leave these as is they will be modified for you by the rake gemspec task.
-  ## If your rubyforge_project name is different, then edit it and comment out
-  ## the sub! line in the Rakefile
-  s.name              = 'metriks-middleware'
-  s.version           = '2.0.0'
-  s.date              = '2013-02-22'
+Gem::Specification.new do |spec|
+  spec.specification_version = 2 if spec.respond_to? :specification_version=
+  spec.required_rubygems_version = '>= 1.3.6'
 
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
-  s.summary     = "Rack middleware for metriks"
-  s.description = "Rack middleware to track throughput and response time with metriks."
+  spec.name    = lib
+  spec.version = version
 
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
-  s.authors  = ["Larry Marburger"]
-  s.email    = 'larry@marburger.cc'
-  s.homepage = 'https://github.com/lmarburger/metriks-middleware'
+  spec.summary     = "Rack middleware for metriks"
+  spec.description = "Rack middleware to track throughput and response time with metriks."
 
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
-  s.require_paths = %w[lib]
+  spec.authors  = ["Larry Marburger"]
+  spec.email    = 'larry@marburger.cc'
+  spec.homepage = 'https://github.com/lmarburger/metriks-middleware'
+  spec.licenses = ['MIT']
 
-  ## Specify any RDoc options here. You'll want to add your README and
-  ## LICENSE files to the extra_rdoc_files list.
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md LICENSE]
+  spec.add_dependency 'metriks', '~> 0.9.9'
+  spec.add_development_dependency 'mocha', '~> 0.11.4'
+  spec.add_development_dependency 'rake', '>= 0.9'
 
-  ## List your runtime dependencies here. Runtime dependencies are those
-  ## that are needed for an end user to actually USE your code.
-  s.add_dependency 'metriks', '~> 0.9.9'
+  spec.files = %w(Gemfile LICENSE README.md Rakefile)
+  spec.files << "#{lib}.gemspec"
+  spec.files += Dir.glob("lib/**/*.rb")
+  spec.files += Dir.glob("test/**/*.rb")
+  spec.files += Dir.glob("script/*")
 
-  ## List your development dependencies here. Development dependencies are
-  ## those that are only needed during development
-  s.add_development_dependency 'mocha', '~> 0.11.4'
-  s.add_development_dependency 'rake', '>= 0.9'
+  dev_null    = File.exist?('/dev/null') ? '/dev/null' : 'NUL'
+  git_files   = `git ls-files -z 2>#{dev_null}`
+  spec.files &= git_files.split("\0") if $?.success?
 
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
-  # = MANIFEST =
-  s.files = %w[
-    Gemfile
-    LICENSE
-    README.md
-    Rakefile
-    example/Gemfile
-    example/Gemfile.lock
-    example/Procfile
-    example/config.ru
-    lib/metriks/middleware.rb
-    metriks-middleware.gemspec
-    test/async_app_test.rb
-    test/sync_app_test.rb
-    test/test_helper.rb
-  ]
-  # = MANIFEST =
-
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
+  spec.test_files = Dir.glob("test/**/*.rb")
 end

data/script/package

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Usage: script/gem
+# Updates the gemspec and builds a new gem in the pkg directory.
+
+mkdir -p pkg
+gem build *.gemspec
+mv *.gem pkg

data/script/release

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Usage: script/release
+# Build the package, tag a commit, push it to origin, and then release the
+# package publicly.
+
+# set -e
+
+version="$(script/package | grep Version: | awk '{print $2}')"
+[ -n "$version" ] || exit 1
+
+git commit -a -m "Release $version"
+git tag "v$version"
+git push origin
+git push origin "v$version"
+gem push pkg/*-${version}.gem

data/test/async_app_test.rb

@@ -167,19 +167,4 @@ class AsyncAppTest < Test::Unit::TestCase
     delay = Metriks.histogram('request_delay').mean
     assert_equal 0, delay
   end
-
-  def test_omits_heroku_dynos_in_use
-    Metriks::Middleware.new(@downstream).call(@env)
-
-    used = Metriks.histogram('heroku.dynos_in_use').mean
-    assert_equal 0, used
-  end
-
-  def test_records_heroku_dynos_in_use
-    @env.merge! 'HTTP_X_HEROKU_DYNOS_IN_USE' => '42'
-    Metriks::Middleware.new(@downstream).call(@env)
-
-    dynos = Metriks.histogram('heroku.dynos_in_use').mean
-    assert_equal 42, dynos
-  end
 end

data/test/sync_app_test.rb

@@ -106,19 +106,4 @@ class SyncAppTest < Test::Unit::TestCase
     delay = Metriks.histogram('request_delay').mean
     assert_equal 0, delay
   end
-
-  def test_omits_heroku_dynos_in_use
-    Metriks::Middleware.new(@downstream).call(@env)
-
-    used = Metriks.histogram('heroku.dynos_in_use').mean
-    assert_equal 0, used
-  end
-
-  def test_records_heroku_dynos_in_use
-    @env.merge! 'HTTP_X_HEROKU_DYNOS_IN_USE' => '42'
-    Metriks::Middleware.new(@downstream).call(@env)
-
-    dynos = Metriks.histogram('heroku.dynos_in_use').mean
-    assert_equal 42, dynos
-  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: metriks-middleware
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,51 +56,44 @@ description: Rack middleware to track throughput and response time with metriks.
 email: larry@marburger.cc
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
+extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- example/Gemfile
-- example/Gemfile.lock
-- example/Procfile
-- example/config.ru
-- lib/metriks/middleware.rb
 - metriks-middleware.gemspec
+- lib/metriks/middleware.rb
 - test/async_app_test.rb
 - test/sync_app_test.rb
 - test/test_helper.rb
+- script/package
+- script/release
 homepage: https://github.com/lmarburger/metriks-middleware
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1952576612337173392
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 2
 summary: Rack middleware for metriks
 test_files:
 - test/async_app_test.rb
 - test/sync_app_test.rb
+- test/test_helper.rb

data/example/Gemfile

@@ -1,6 +0,0 @@
-source :rubygems
-
-gem 'metriks-middleware'
-gem 'thin'
-
-gem 'foreman', group: 'development'

data/example/Gemfile.lock

@@ -1,30 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    atomic (1.0.1)
-    avl_tree (1.1.3)
-    daemons (1.1.8)
-    eventmachine (0.12.10)
-    foreman (0.49.0)
-      thor (>= 0.13.6)
-    hitimes (1.1.1)
-    metriks (0.9.9.1)
-      atomic (~> 1.0)
-      avl_tree (~> 1.1.2)
-      hitimes (~> 1.1)
-    metriks-middleware (1.1.0)
-      metriks (~> 0.9.9)
-    rack (1.4.1)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.15.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  foreman
-  metriks-middleware
-  thin

data/example/Procfile

@@ -1 +0,0 @@
-web: bundle exec thin start -p $PORT

data/example/config.ru

@@ -1,40 +0,0 @@
-$: << 'lib'
-require 'metriks/middleware'
-require 'metriks/reporter/logger'
-require 'pp'
-
-$stdout.sync = true
-Thread.abort_on_exception = true
-
-Metriks::Reporter::Logger.new(logger: Logger.new($stdout), interval: 5).start
-use Metriks::Middleware
-
-run(->(env) do
-  case env['PATH_INFO']
-  when '/sync'
-    [200, {'Content-Type' => 'text/plain'}, ['sync!']]
-
-  when '/sync-error'
-    [500, {'Content-Type' => 'text/plain'}, ['sync error!']]
-
-  when '/async'
-    Thread.new do
-      sleep 1
-      env['async.callback'].call([200, {'Content-Type' => 'text/plain'}, ['async!']])
-    end
-    [-1, {}, []]
-
-  when '/async-error'
-    Thread.new do
-      sleep 1
-      env['async.callback'].call([500, {'Content-Type' => 'text/plain'}, ['async error!']])
-    end
-    [-1, {}, []]
-
-  else
-    world = env.keys.sort.each_with_object({}) {|key, world|
-      world[key] = env[key]
-    }
-    [200, {'Content-Type' => 'text/plain'}, [world.pretty_inspect]]
-  end
-end)