corn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 1286a1c4fa1681980a80beb37f953ef73fdd9bbd
-  data.tar.gz: 102e0c92b4f5deddc98e29d9e525b7865b1d9743
-SHA512:
-  metadata.gz: cc856cd5c679a58da2f584ca1d1d66ab1beb59d1be9025db2e7f7d34c3590bc23307208aa59b3d609de53e4ab39042de52643993d10b8f137bc113df51cc39cb
-  data.tar.gz: e0ca9ab344dd596b379ff480c8920a932a2fa8d1954b0d5eabbb6243ed7c97b5abe08cf9a5f4c184b9e39c0a534ff5ccc03e0efdeda79b1e061c12b131f91f71
+--- 
+SHA1: 
+  metadata.gz: f6cfee2778ad98d567976a0bb9b6027da9e24472
+  data.tar.gz: ae18162e7ab186da5bd0e3d78db2cb594b06c96f
+SHA512: 
+  metadata.gz: b5cdd75cd5d47dac34bef34913c96635e4a4fb56ca26839d7b8a40985fd5fed062735be6e446ff8c96d2dbc3cd72f8f677ef023c0d3562633cca17089a23dc4a
+  data.tar.gz: d05aa533388a37465368baa15fa8a87495bd2c1f94b651d44261a04ff9fb1f88efa7ac874dd6c9a3f65ff345633eae25b836134abe70d90595f6a568386ce392

data/lib/corn.rb

@@ -1,79 +1,48 @@
-require 'net/http'
-require 'net/https'
-require 'logger'
-require 'csv'
-
-require 'corn/report'
+require 'sampling_prof'
 
 module Corn
   module_function
 
   def host
-    ENV['CORN_HOST'] || raise('No environment vairable CORN_HOST defined')
+    ENV['CORN_HOST']
   end
 
   def client_id
-    ENV['CORN_CLIENT_ID'] || raise('No environment vairable CORN_CLIENT_ID defined')
+    ENV['CORN_CLIENT_ID']
   end
 
   def configured?
-    !!ENV['CORN_CLIENT_ID']
-  end
-
-  def logger
-    @logger ||= Logger.new(STDOUT)
-  end
-
-  def create_report(name)
-    Thread.current[report_key] = Report.new(name)
+    !!(host && client_id)
   end
 
-  def report(label=nil, &block)
-    if label
-      self.report.record(label, &block)
-    else
-      Thread.current[report_key]
+  def create_prof(period, output)
+    SamplingProf.new(period).tap do |prof|
+      prof.output_file = output if output
     end
   end
 
-  def submit
-    return if self.report.nil? || self.report.empty?
-    log_error do
-      data = {
-        'client_id' => client_id,
-        'report[name]' => self.report.name,
-        'report[records]' => self.report.to_csv
-      }
-      http_post(File.join(host, 'benchmarks'), data)
-    end
+  def start(output=nil, period=0.1)
+    @prof ||= create_prof(period, output)
+    @prof.start
   end
 
-  def http_post(url, data)
-    uri = URI(url)
-    Net::HTTP.start(uri.host, uri.port) do |http|
-      http.use_ssl = uri.scheme == 'https'
-      req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data(data)
-      res = http.request req
-      case res
-      when Net::HTTPSuccess, Net::HTTPRedirection
-        # OK
-      else
-        res.error!
+  def submit(name)
+    @prof.stop
+    if configured?
+      o = `curl -F data=@#{@prof.output_file} -F client_id=#{client_id} -F name=#{name} #{submit_url}`
+      if $?.exitstatus != 0
+        log("Submit report error: \n#{o}")
       end
+    else
+      log("No CORN_CLIENT_ID configured, profiling data is not submitted")
     end
   end
 
-  def log_error(&block)
-    yield
-  rescue Exception => e
-    logger.debug do
-      "Report error: #{e.message}:\n#{e.backtrace.join("\n")}"
-    end
+  def submit_url
+    File.join(host, 'profile_data')
   end
 
-  def report_key
-    '__corn_report__'
+  def log(msg)
+    $stderr.puts msg
   end
-
 end

metadata

@@ -1,48 +1,68 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: corn
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  version: 0.1.1
 platform: ruby
-authors:
-- Xiao Li
+authors: 
+  - Xiao Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
-dependencies: []
+
+date: 2014-02-08 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: sampling_prof
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "0.0"
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.0.2
+    type: :development
+    version_requirements: *id001
 description: |
-  Corn provides simple api for collecting benchmark reports and submits reports to Corn Server.
-email:
-- swing1979@gmail.com
+  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.
+
+email: 
+  - swing1979@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- README.md
-- lib/corn.rb
-- lib/corn/report.rb
+
+files: 
+  - README.md
+  - lib/corn.rb
 homepage: https://github.com/xli/corn
-licenses:
-- MIT
+licenses: 
+  - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
-summary: Corn is a simple benchmark report tool.
+summary: Corn submits profiling data to Corn server.
 test_files: []
+

data/lib/corn/report.rb

@@ -1,84 +0,0 @@
-require 'csv'
-
-module Corn
-  class Report
-
-    class RecordNotStartError < StandardError
-    end
-
-    class Record
-      attr_reader :data
-
-      def initialize(label, parent=nil)
-        @label = label
-        @parent = parent
-        @data = []
-        @start = Time.now
-      end
-
-      def push(label)
-        Record.new(label, self)
-      end
-
-      def pop
-        return if @parent.nil?
-        @parent.record(@label, @start, Time.now - @start)
-        @data.each { |d| @parent.record(*d) }
-        @parent
-      end
-
-      def record(label, start, time)
-        @data << [record_label(label), start, time]
-      end
-
-      private
-      def record_label(label)
-        [@label, label].compact.join('.').to_sym
-      end
-    end
-
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-      @record = Record.new(nil)
-    end
-
-    def record(label, &block)
-      record_start(label)
-      yield
-    ensure
-      record_end
-    end
-
-    def record_start(label)
-      @record = @record.push(label)
-    end
-
-    def record_end
-      @record = @record.pop || raise(RecordNotStartError)
-    end
-
-    def empty?
-      to_a.empty?
-    end
-
-    def to_a
-      @record.data
-    end
-
-    def to_csv
-      if RUBY_VERSION =~ /1.8/
-        buf = ''
-        self.to_a.each do |r|
-          CSV.generate_row(r, r.size, buf)
-        end
-        buf
-      else
-        CSV.generate do |csv|
-          self.to_a.each { |r| csv << r }
-        end
-      end
-    end
-  end
-end