rack-perftools_profiler 0.6.0 → 0.6.1

data/README.md

@@ -10,7 +10,7 @@ Gemfile:
 
     gem 'rack-perftools_profiler', :require => 'rack/perftools_profiler'
 
-config/environment.rb:
+config/application.rb:
 
     config.middleware.use ::Rack::PerftoolsProfiler, :default_printer => 'gif', :bundler => true
 

data/lib/rack/perftools_profiler/profiler.rb

@@ -98,29 +98,8 @@ module Rack::PerftoolsProfiler
     end
 
     def data(options = {})
-      printer = (options.fetch('printer') {@printer}).to_sym
-      ignore = options.fetch('ignore') { nil }
-      focus = options.fetch('focus') { nil }
-      nodecount = options.fetch('nodecount') { nil }
-      nodefraction = options.fetch('nodefraction') { nil }
       if ::File.exists?(PROFILING_DATA_FILE)
-        args = ["--#{printer}"]
-        args << "--ignore=#{ignore}" if ignore
-        args << "--focus=#{focus}" if focus
-        args << "--nodecount=#{nodecount}" if nodecount
-        args << "--nodefraction=#{nodefraction}" if nodefraction
-        args << PROFILING_DATA_FILE
-        cmd = ["pprof.rb"] + args
-        cmd = ["bundle", "exec"] + cmd if @bundler
-
-        stdout, stderr, status = Dir.chdir(@gemfile_dir) { run(*cmd) }
-        if status!=0
-          raise ProfilingError.new("Running the command '#{cmd.join(" ")}' exited with status #{status}", stderr)
-        elsif stdout.length == 0 && stderr.length > 0
-          raise ProfilingError.new("Running the command '#{cmd.join(" ")}' failed to generate a file", stderr)
-        else
-          [printer, stdout]
-        end
+        data_from_file(options)
       else
         [:none, nil]
       end
@@ -128,6 +107,39 @@ module Rack::PerftoolsProfiler
 
     private
 
+    def data_from_file(options)
+      printer = options.fetch('printer') {@printer}.to_sym
+
+      command_array = build_command(printer, options)
+      stdout, stderr, status = Dir.chdir(@gemfile_dir) { run(*command_array) }
+
+      full_command = command_array.join(" ")
+      if status!=0
+        raise ProfilingError.new("Running the command '#{full_command}' exited with status #{status}", stderr)
+      elsif stdout.length == 0 && stderr.length > 0
+        raise ProfilingError.new("Running the command '#{full_command}' failed to generate a file", stderr)
+      else
+        [printer, stdout]
+      end
+    end
+
+    def build_command(printer, options)
+      ignore       = options.fetch('ignore') { nil }
+      focus        = options.fetch('focus') { nil }
+      nodecount    = options.fetch('nodecount') { nil }
+      nodefraction = options.fetch('nodefraction') { nil }
+
+      args = ["--#{printer}"]
+      args << "--ignore=#{ignore}" if ignore
+      args << "--focus=#{focus}" if focus
+      args << "--nodecount=#{nodecount}" if nodecount
+      args << "--nodefraction=#{nodefraction}" if nodefraction
+      args << PROFILING_DATA_FILE
+      cmd = ["pprof.rb"] + args
+      cmd = ["bundle", "exec"] + cmd if @bundler
+      cmd
+    end
+
     def run(*command)
       out = err = ""
       pid = nil

data/lib/rack/perftools_profiler/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module PerftoolsProfiler
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/rack-perftools_profiler.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency             'perftools.rb', '~> 2.0.0'
+  s.add_dependency             'perftools.rb', '~> 2.0.1'
   s.add_dependency             'rack',         '~> 1.0'
   s.add_dependency             'open4',        '~> 1.0'
   s.add_development_dependency 'rack',         '~> 1.1'

data/test/single_request_profiling_test.rb

@@ -224,17 +224,20 @@ class SingleRequestProfilingTest < Test::Unit::TestCase
   context 'when using the text printer' do
 
     should 'return profiling data' do
-      _, _, body = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'text').call(@profiled_request_env)
+      status, _, body = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'text').call(@profiled_request_env)
+      assert_ok status, body
       assert_match(/Total: \d+ samples/, RackResponseBody.new(body).to_s)
     end
 
     should 'have Content-Type text/plain' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@app, :default_printer => 'text').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@app, :default_printer => 'text').call(@profiled_request_env)
+      assert_ok status, body
       assert_equal "text/plain", headers['Content-Type']
     end
 
     should 'have Content-Length' do
-      _, headers, _ = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'text').call(@profiled_request_env)
+      status, headers, body = Rack::PerftoolsProfiler.new(@slow_app, :default_printer => 'text').call(@profiled_request_env)
+      assert_ok status, body
       assert (headers.fetch('Content-Length').to_i > 500)
     end
 

data/test/test_helper.rb

@@ -20,7 +20,7 @@ end
 ITERATIONS = case RUBY_VERSION
                # Ruby 1.9.x is so fast that we need to add extra iterations
                # to get profiling data
-             when /1\.9\../
+             when /1\.9\../, /2\.0\../
                350_000
              else
                35_000

metadata

@@ -1,140 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-perftools_profiler
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Ben Brinckerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-26 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: perftools.rb
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 10
-        version: "2.10"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Middleware for profiling Rack-compatible apps using perftools.rb
-email: 
+email:
 - ben@bbrinck.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -161,41 +156,31 @@ files:
 - test/rack-perftools-profiler_test.rb
 - test/single_request_profiling_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/bhb/rack-perftools_profiler
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rack-perftools_profiler
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Middleware for profiling Rack-compatible apps using perftools.rb
-test_files: 
+test_files:
 - test/multiple_request_profiling_test.rb
 - test/rack-perftools-profiler_test.rb
 - test/single_request_profiling_test.rb