corn 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 7fafc1677c9b23d84128267bb983baf5a9648849
-  data.tar.gz: 5e9c661177cc849c775f33d6c0cbdf14f52f21ef
+  metadata.gz: ea5e0101cf31cad4b5ec030daadb7e18bc3b4a52
+  data.tar.gz: d74e50037d0cc22b80c25e0c832bc0132d041a96
 SHA512: 
-  metadata.gz: ac8103cd228868d3133c5411762fd5a6432cc956d3f208673a713b5cfd5195368f0f2c13cd8114a786872d7eab8051529a55e080a6fe89a891b9c277e69680e6
-  data.tar.gz: 086266630498a89dbe7089b4a13c72f0befe8ac0e5e86d1d01d73969cf872072a27aadc1bfa57ca55bfd60751496df04448dfeada70a67a3e7de4f7437cf2c96
+  metadata.gz: 1b27f66407aaea5d4cc9d5402a10b7653895c4c63b6446b7e775f8ed0abfc9e3cf2b775d84d6085052018ddc4b5e4b297e512b1ca08cd83f680482f266ad04b5
+  data.tar.gz: 54fefb61535630425386803e9645d63dffd6191e9fc3a44563beac9fcb63e6d4d731f4367fdebac3d73550c9718541361c0e9a726d6321e974e1c6e7d0f13a49

data/lib/corn.rb

@@ -1,4 +1,7 @@
 require 'sampling_prof'
+require 'net/http'
+require 'net/https'
+require 'net/http/post/multipart'
 require 'corn/rack'
 
 module Corn
@@ -30,10 +33,7 @@ module Corn
   def submit(name)
     @prof.stop
     if configured?
-      o = `curl -s -F data=@#{@prof.output_file.inspect} -F client_id=#{client_id.inspect} -F name=#{name.inspect} #{submit_url}`
-      if $?.exitstatus != 0
-        log("Submit report error: \n#{o}")
-      end
+      upload(@prof.output_file, name)
     else
       log("No CORN_CLIENT_ID configured, profiling data is not submitted")
     end
@@ -46,4 +46,21 @@ module Corn
   def log(msg)
     $stderr.puts msg
   end
+
+  def upload(file, name)
+    url = URI.parse(submit_url)
+    File.open(file) do |f|
+      req = Net::HTTP::Post::Multipart.new(url.path,
+                                           "data" => UploadIO.new(f, "text/plain"),
+                                           'client_id' => client_id,
+                                           'name' => name)
+      res = Net::HTTP.start(url.host, url.port) do |http|
+        http.use_ssl = url.scheme == 'https'
+        http.request(req)
+      end
+    end
+  rescue => e
+    log("upload #{file} to #{submit_url} failed: #{e.message}")
+    log(e.backtrace.join("\n"))
+  end
 end

data/lib/corn/rack.rb

@@ -6,7 +6,7 @@ module Corn
     end
 
     def call(env)
-      if Corn.configured?
+      if Corn.configured? && env["QUERY_STRING"] =~ /corn_profiling=true/
         profile do
           @app.call(env)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: corn
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
   - Xiao Li
@@ -9,21 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-13 00:00:00 Z
+date: 2014-03-08 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: sampling_prof
+    name: multipart-post
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "0.1"
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.1.0
+            version: "2.0"
     type: :runtime
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: sampling_prof
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.1"
+    type: :runtime
+    version_requirements: *id002
 description: |
   Corn collects your application's profiling data by sampling_prof gem, and submits the result to server, so that you can merge multiple server's profiling data and do analysis together.
 
@@ -51,13 +58,13 @@ require_paths:
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - &id002 
+    - &id003 
       - ">="
       - !ruby/object:Gem::Version 
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - *id002
+    - *id003
 requirements: []
 
 rubyforge_project: