stackprof-remote 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adb710dcc98464b5073a812b28eeb56a95f8637
-  data.tar.gz: 4671dc6195123b846e273cb3020fe4cc916d3078
+  metadata.gz: 0e025e9b063b4823e5d05bed0ed3aae1d472a871
+  data.tar.gz: beb4078dc48598e97b286dede4ab883bb970eeb3
 SHA512:
-  metadata.gz: 37e34b29c0a4833156e34de92fbaefd2ba4ba299520b9ca0fa688c6864d92edb4b94f96807e40a31cf2cf50cc19b72a7325834143904b67f9c93133a5da4b330
-  data.tar.gz: 7e591a46655308923e664c4c87ec9b54c546b6f9ac371634d4b6048f64a5cf0ec26ac03db31763adfcc73a7686a228dc517c55c8856007e7cd6dbc396a73c0dd
+  metadata.gz: dcd209a05434b05d042c1ca16aadce354b618ee17617998e0b31e6fb470ebd5d750d1d86a7c35db243cdce4c519864d14d29cf552a25c111c2d55dcb41f1e448
+  data.tar.gz: 219ef3134ebf6d54d15626b0d537e59f1dad16447ef4001b2aa99e912b6b7c30e6d75691ef84a90254101d251586fe58ec98b85fc81344403cd76bbafb6587fb

data/Gemfile

@@ -2,14 +2,13 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "rbtrace", "~>0.4.3"
-gem "stackprof", "~>0.2.6"
-gem "pry"
+gem "rbtrace", "~>0.4.4"
+gem "stackprof", "~>0.2.7"
+gem "pry", "~>0.10.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"

data/Gemfile.lock

@@ -1,12 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
     addressable (2.3.6)
     builder (3.2.2)
     coderay (1.1.0)
@@ -27,7 +21,6 @@ GEM
       oauth2
     hashie (3.0.0)
     highline (1.6.21)
-    i18n (0.6.9)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -41,7 +34,6 @@ GEM
     jwt (1.0.0)
     method_source (0.8.2)
     mini_portile (0.6.0)
-    minitest (5.3.4)
     msgpack (0.5.8)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -60,29 +52,21 @@ GEM
       slop (~> 3.4)
     rack (1.5.2)
     rake (10.3.2)
-    rbtrace (0.4.3)
+    rbtrace (0.4.4)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.6.1)
-      activesupport (>= 3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.5.0)
-    stackprof (0.2.6)
+    stackprof (0.2.7)
     thread_safe (0.3.4)
     trollop (2.0)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -90,9 +74,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
-  pry
-  rbtrace (~> 0.4.3)
+  pry (~> 0.10.0)
+  rbtrace (~> 0.4.4)
   rdoc (~> 3.12)
-  shoulda
   simplecov
-  stackprof (~> 0.2.6)
+  stackprof (~> 0.2.7)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/stackprof/remote/client.rb

@@ -39,10 +39,17 @@ module StackProf
       end
 
       def fetch_results
-        @results = Net::HTTP.get(host, "/__stackprof__/stop")
-        puts "[#{host}] Results: #{@results.bytesize / 1024}kb"
-        if !@results
-          raise "Could not retreive results"
+        response = Net::HTTP.get_response(host, "/__stackprof__/stop")
+        if response.code == '200'
+          @results = response.body
+          if !@results
+            raise "Could not retreive results"
+          end
+          puts "[#{host}] Results: #{@results.bytesize / 1024}kb"
+        else
+          puts "[#{host}] Returned a #{response.code} response"
+          puts response.body
+          raise "Bad Response"
         end
       end
 

data/lib/stackprof/remote/middleware.rb

@@ -24,7 +24,7 @@ module StackProf
 
       def initialize(app, options = {})
         @app       = app
-        self.class.logger   = options.delete(:logger) || Logger.new(STDOUT)
+        self.class.logger   = options[:logger] || Logger.new(STDOUT)
         self.class.options  = options
         logger.info "[stackprof] Stackprof Middleware enabled"
       end
@@ -77,11 +77,11 @@ module StackProf
         if results = marshaled_results
           FileUtils.mkdir_p(base_path)
           filename = "stackprof-#{Process.pid}-#{Time.now.to_i}.dump"
-          path     = File.expand_path(File.join(base_path, filename))
+          path     = File.join(base_path, filename)
           File.open(path, 'wb') do |f|
             f.write results
           end
-          path
+          File.readable?(path) ? path : nil
         end
       end
     end

data/lib/stackprof/remote/process_report_collector.rb

@@ -46,16 +46,28 @@ module StackProf
 
       def marshaled_results
         if @saved_files
+          logger.debug "[stackprof] Saved Files #{@saved_files.inspect}"
           saved_data = @saved_files.collect {|f|
-            Marshal.load(File.read(f))
-          }
+            f = f.gsub(/"/,'') # RBTrace returns double quoted strings
+            if File.readable?(f)
+               Marshal.load(File.read(f))
+            else
+              logger.error "[stackprof] File #{f} not readable by process #{Process.pid}"
+            end
+          }.compact
           Marshal.dump(saved_data)
         end
       end
 
       def self.report_from_marshaled_results(marshaled_data)
         data = Marshal.load(marshaled_data)
-        report = data.inject(nil) {|sum, d| sum ? StackProf::Report.new(d) + sum : StackProf::Report.new(d) }
+        if data.is_a?(Array)
+          data.compact.inject(nil) do |sum, d|
+            sum ? StackProf::Report.new(d) + sum : StackProf::Report.new(d)
+          end
+        else
+          StackProf::Report.new(d)
+        end
       end
 
       private

data/stackprof-remote.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stackprof-remote 0.0.3 ruby lib
+# stub: stackprof-remote 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "stackprof-remote"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Aaron Quint"]
-  s.date = "2014-06-13"
+  s.date = "2014-06-17"
   s.description = "stackprof-remote consists of a middleware for easy creation and retreival of\n                       stackprof sampling profiler dumps from a remote machine, and a wrapper around\n                       pry (stackprof-cli) to create an interactive session for navigating stackprof\n                       dumps."
   s.email = "aaron@quirkey.com"
   s.executables = ["stackprof-cli", "stackprof-remote"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/stackprof/remote/process_report_collector.rb",
     "stackprof-remote.gemspec",
     "test/helper.rb",
+    "test/test.dump",
     "test/test_stackprof-remote.rb"
   ]
   s.homepage = "http://github.com/quirkey/stackprof-remote"
@@ -47,29 +48,26 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rbtrace>, ["~> 0.4.3"])
-      s.add_runtime_dependency(%q<stackprof>, ["~> 0.2.6"])
-      s.add_runtime_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<rbtrace>, ["~> 0.4.4"])
+      s.add_runtime_dependency(%q<stackprof>, ["~> 0.2.7"])
+      s.add_runtime_dependency(%q<pry>, ["~> 0.10.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<rbtrace>, ["~> 0.4.3"])
-      s.add_dependency(%q<stackprof>, ["~> 0.2.6"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rbtrace>, ["~> 0.4.4"])
+      s.add_dependency(%q<stackprof>, ["~> 0.2.7"])
+      s.add_dependency(%q<pry>, ["~> 0.10.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rbtrace>, ["~> 0.4.3"])
-    s.add_dependency(%q<stackprof>, ["~> 0.2.6"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rbtrace>, ["~> 0.4.4"])
+    s.add_dependency(%q<stackprof>, ["~> 0.2.7"])
+    s.add_dependency(%q<pry>, ["~> 0.10.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])

data/test/helper.rb

@@ -23,12 +23,9 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
+
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'stackprof-remote'
-
-class Test::Unit::TestCase
-end

data/test/test_stackprof-remote.rb

@@ -1,7 +1,18 @@
 require 'helper'
 
-class TestStackprofRemote < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+class TestStackProfRemote < MiniTest::Unit::TestCase
+
+  def test_should_load_a_marshaled_dump
+    report = StackProf::Remote::ProcessReportCollector.report_from_marshaled_results(File.read('./test/test.dump'))
+    assert report
+    assert_kind_of StackProf::Report, report
+  end
+
+  def test_should_print_text
+    report = StackProf::Remote::ProcessReportCollector.report_from_marshaled_results(File.read('./test/test.dump'))
+    str = StringIO.new
+    assert report.print_text(false, 10, str)
+    assert_match(/ActiveSupport/, str.string)
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackprof-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtrace
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +138,7 @@ files:
 - lib/stackprof/remote/process_report_collector.rb
 - stackprof-remote.gemspec
 - test/helper.rb
+- test/test.dump
 - test/test_stackprof-remote.rb
 homepage: http://github.com/quirkey/stackprof-remote
 licenses: