simple_metrics 0.3.6 → 0.4.0

data/spec/spec_helper.rb

@@ -5,6 +5,6 @@ RSpec.configure do |config|
 end
 
 SimpleMetrics.logger = Logger.new('/dev/null')
-SimpleMetrics.configure do |config|
-  config.db = { :host => 'localhost', :prefix => 'test', :options => {} }
-end
+SimpleMetrics.db_config = { :host => 'localhost', :prefix => 'test' }
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70211252366540 !ruby/object:Gem::Requirement
+  requirement: &70302462447680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211252366540
+  version_requirements: *70302462447680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70211252365800 !ruby/object:Gem::Requirement
+  requirement: &70302462446940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211252365800
+  version_requirements: *70302462446940
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70211252365360 !ruby/object:Gem::Requirement
+  requirement: &70302462446200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211252365360
-- !ruby/object:Gem::Dependency
-  name: shotgun
-  requirement: &70211252364740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70211252364740
+  version_requirements: *70302462446200
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70211252380520 !ruby/object:Gem::Requirement
+  requirement: &70302462445460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211252380520
+  version_requirements: *70302462445460
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70211252380000 !ruby/object:Gem::Requirement
+  requirement: &70302462444740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211252380000
+  version_requirements: *70302462444740
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70211252379280 !ruby/object:Gem::Requirement
+  requirement: &70302462444200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +76,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70211252379280
+  version_requirements: *70302462444200
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70211252378520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70211252378520
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70211252377940 !ruby/object:Gem::Requirement
+  requirement: &70302462443660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,129 +87,39 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70211252377940
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70211252377400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70211252377400
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: &70211252376600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70211252376600
-- !ruby/object:Gem::Dependency
-  name: vegas
-  requirement: &70211252375960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70211252375960
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70211252375460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70211252375460
+  version_requirements: *70302462443660
 description: SimpleMetrics
 email:
 - fdietz@gmail.com
 executables:
 - populate
+- simple_metrics_client
 - simple_metrics_server
-- simple_metrics_web
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
-- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - bin/populate
+- bin/simple_metrics_client
 - bin/simple_metrics_server
-- bin/simple_metrics_web
-- config.ru
-- default_config.yml
 - example/increment.rb
 - lib/simple_metrics.rb
-- lib/simple_metrics/app.rb
 - lib/simple_metrics/bucket.rb
-- lib/simple_metrics/configuration.rb
+- lib/simple_metrics/client.rb
 - lib/simple_metrics/data_point.rb
-- lib/simple_metrics/data_point/base.rb
-- lib/simple_metrics/data_point/counter.rb
-- lib/simple_metrics/data_point/event.rb
-- lib/simple_metrics/data_point/gauge.rb
-- lib/simple_metrics/data_point/timing.rb
-- lib/simple_metrics/data_point_repository.rb
 - lib/simple_metrics/functions.rb
 - lib/simple_metrics/graph.rb
-- lib/simple_metrics/importer.rb
-- lib/simple_metrics/metric.rb
-- lib/simple_metrics/metric_repository.rb
-- lib/simple_metrics/public/css/bootstrap-responsive.min.css
-- lib/simple_metrics/public/css/bootstrap.min.css
-- lib/simple_metrics/public/css/graph.css
-- lib/simple_metrics/public/css/rickshaw.min.css
-- lib/simple_metrics/public/img/glyphicons-halflings-white.png
-- lib/simple_metrics/public/img/glyphicons-halflings.png
-- lib/simple_metrics/public/js/app.js
-- lib/simple_metrics/public/js/collections/graph.js
-- lib/simple_metrics/public/js/collections/metric.js
-- lib/simple_metrics/public/js/helpers.js
-- lib/simple_metrics/public/js/lib/backbone-0.9.2.min.js
-- lib/simple_metrics/public/js/lib/bootstrap.min.js
-- lib/simple_metrics/public/js/lib/d3.v2.min.js
-- lib/simple_metrics/public/js/lib/handlebars-1.0.0.beta.6.js
-- lib/simple_metrics/public/js/lib/jquery-1.7.1.min.js
-- lib/simple_metrics/public/js/lib/moment.min.js
-- lib/simple_metrics/public/js/lib/rickshaw.min.js
-- lib/simple_metrics/public/js/lib/underscore-1.3.1.min.js
-- lib/simple_metrics/public/js/models/graph.js
-- lib/simple_metrics/public/js/models/metric.js
-- lib/simple_metrics/public/js/router.js
-- lib/simple_metrics/public/js/views/app.js
-- lib/simple_metrics/public/js/views/dashboard.js
-- lib/simple_metrics/public/js/views/graph.js
-- lib/simple_metrics/public/js/views/metric.js
-- lib/simple_metrics/public/js/views/metrics.js
-- lib/simple_metrics/repository.rb
-- lib/simple_metrics/udp_server.rb
+- lib/simple_metrics/mongo.rb
+- lib/simple_metrics/server.rb
 - lib/simple_metrics/version.rb
-- lib/simple_metrics/views/graph.erb
-- lib/simple_metrics/views/index.erb
-- lib/simple_metrics/views/layout.erb
-- lib/simple_metrics/views/show.erb
 - simple_metrics.gemspec
 - spec/bucket_spec.rb
-- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
-- spec/importer_spec.rb
-- spec/metric_repository_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -247,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3369843487740317274
+      hash: -520904601544402240
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,18 +144,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3369843487740317274
+      hash: -520904601544402240
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: SimpleMetrics
 test_files:
 - spec/bucket_spec.rb
-- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
-- spec/importer_spec.rb
-- spec/metric_repository_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,3 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3

data/bin/simple_metrics_web

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require "rubygems"
-require 'vegas'
-require "simple_metrics"
-
-Vegas::Runner.new(SimpleMetrics::App, 'simple_metrics_web') do |runner, opts, app|
-  # add more options here
-end

data/config.ru

@@ -1,6 +0,0 @@
-$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
-
-require "rubygems"
-require "simple_metrics"
-
-run SimpleMetrics::App.new

data/default_config.yml

@@ -1,34 +0,0 @@
-server:
-  host: 'localhost'
-  port: 8125
-  flush_interval: 10
-
-db:
-  host: 'localhost'
-  port: 27017
-  prefix: 'development'
-  options:
-    pool_size: 5
-    timeout: 5
-
-web:
-  host: 'localhost'
-  port: 5678
-
-buckets: 
-    - name: 'stats_per_10s'
-      seconds: 10
-      capped: true
-      size: 180_000 # 6*30 = 180 (30 min ttl), 180 * 100 = 18.000 (100 data points), 18.000 * 10 (bytes each) = 180.000
-    - name: 'stats_per_1min'
-      seconds: 60
-      capped: true
-      size: 120_000 # 60*3 = 180 (3h ttl), 120 * 100 = 18.000 (100 data points), 18.000 * 10 (bytes each) = 180.000
-    - name: 'stats_per_10min'
-      seconds: 600
-      size: 0 
-      capped: false
-    - name: 'stats_per_day'
-      seconds: 86400 # 600*6*24
-      size: 0 
-      capped: false

data/lib/simple_metrics/app.rb

@@ -1,52 +0,0 @@
-require "sinatra"
-require "erubis"
-require "json"
-
-if defined? Encoding
-  Encoding.default_external = Encoding::UTF_8
-end
-
-module SimpleMetrics
-  class App < Sinatra::Base
-
-    set :views, ::File.expand_path('../views', __FILE__)  
-    set :public_folder, File.expand_path('../public', __FILE__)
-
-    helpers do
-    end
-
-    get "/api/metrics" do
-      content_type :json
-      metrics = SimpleMetrics::MetricRepository.find_all
-      metrics.inject([]) { |result, m| result << m.attributes }.to_json
-    end
-
-    get "/api/metrics/:name" do
-      content_type :json
-      metric = SimpleMetrics::MetricRepository.find_one_by_name(params[:name])
-      metric.attributes.to_json
-    end
-
-    get "/api/graph" do
-      content_type :json
-      from    = (params[:from]  || Time.now).to_i
-      time    = params[:time]   || 'minute'
-      targets = params[:targets]
-      data_points = prepare_data_points(from, time, *targets)
-      data_points.to_json
-    end
-
-    get "/*" do
-      erb :index
-    end
-
-    private
-
-    def prepare_data_points(from, time, *targets)
-      bucket = SimpleMetrics::Bucket.for_time(time)
-      to = from - SimpleMetrics::Graph.time_range(time)
-      SimpleMetrics::Graph.query_all(bucket, to, from, *targets)
-    end
-
-  end
-end

data/lib/simple_metrics/configuration.rb

@@ -1,97 +0,0 @@
-require 'yaml'
-
-module SimpleMetrics
-  class Configuration
-
-    attr_reader :config
-
-    def initialize(hash = {}, &block)
-      @config = load_defaults.merge(symbolize_keys(hash))  
-    end
-
-    def configure(hash = {}, &block)
-      yield self if block_given?
-      self
-    end
-
-    def db
-      @db ||= config.fetch(:db)
-    end
-
-    def db=(db)
-      @db = db
-    end
-
-    def buckets
-      @buckets ||= begin
-        tmp = config.fetch(:buckets)
-        tmp.map { |b| symbolize_keys(b)}
-      end
-    end
-
-    def buckets=(buckets)
-      @buckets = buckets
-    end
-
-    def server
-      @server ||= config.fetch(:server)
-    end
-
-    def server=(server)
-      @server = server
-    end
-
-    def web
-      @web ||= config.fetch(:web)
-    end
-
-    def web=(web)
-      @web = web
-    end
-
-    private
-
-    def load_defaults
-      @config = symbolize_keys(load_config)
-    rescue Errno::ENOENT # not found error
-      logger.info "Creating initial config file: #{config_file}"
-      FileUtils.cp(default_config_file, config_file)
-      @config = load_config
-    end
-
-    def config_file
-      File.expand_path('~/.simple_metrics.conf')
-    end
-
-    def default_config_file
-      File.expand_path('../../../default_config.yml', __FILE__)
-    end
-
-    def load_config
-      YAML.load_file(config_file)  
-    rescue ArgumentError => e
-      logger.error "Error parsing config file: #{e}"
-    rescue IOError => e
-      logger.error "Error reading config file: #{e}"
-    end
-
-    def symbolize_keys(hash)
-      hash.inject({}){|result, (key, value)|
-        new_key = case key
-                  when String then key.to_sym
-                  else key
-                  end
-        new_value = case value
-                    when Hash then symbolize_keys(value)
-                    else value
-                    end
-        result[new_key] = new_value
-        result
-      }
-    end
-
-    def logger
-      SimpleMetrics.logger
-    end
-  end
-end