tremolo 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32a54e2c56f4c0dc08262bed5ff4b8bf74ad037d
-  data.tar.gz: 5781e18979cf200095c21a4a6abca08473055917
+  metadata.gz: 8cd301464b545211094d14f81fb7f5fabae6ee2b
+  data.tar.gz: 3f00b4c4eef1277501e6ba5107c4a87a0a7ae07c
 SHA512:
-  metadata.gz: 59cd090fc5980557f1dec2608bac50d2f9bafae025e811dbee903fb7ab944ef3f9c9375e378023ea98df9bee9799cff0581a1c932ebc95a128478a756bd3a9f5
-  data.tar.gz: d3936ce56375039d9a769fd6cd1b1bf440a2b49eba236a4140c763d000a9d08a47649e68b8b49c7ce8c282ddaf2cf5745292752a4e5fe3ad0bd9c23130978bec
+  metadata.gz: bfb314678ffd0ac4ce31be0cb679c6153f02ef1bed74665a7870bfaa0a02bc585e2b0138d8d6d807f1905db0277e014dab2a71913a6b03c00da6ea043e18ba69
+  data.tar.gz: 0eb35699d48509e6d2d363b87683d50d7c6591ee1193cf76cb3c6a6dc1070aa770fbe510e7446d3bcf7c50d53072cd2e30e80a16daf45d18569186b38eb1954c

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.2

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.1.0
+  - 2.2.2
+script: bundle exec rake
+notifications:
+  webhooks:
+    urls:
+      - "https://pitaleerb.slack.com/services/hooks/travis?token=wNtbVP9B3j1npZkLzK4bpq8Q"
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Tremolo 0.1.0 ##
+
+*   Wireline compatibility with Influxdb 0.9 series
+*   Update celluloid to 0.17.2+
+
+    *Tony Pitale*
+
 ## Tremolo 0.0.4 ##
 
 *   Make Tremolo::Tracker a Celluloid actor so that it can be supervised if desired

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

data/lib/tremolo/data_point.rb

@@ -1,28 +1,27 @@
 module Tremolo
   class DataPoint
-    def self.from_hash(series_name, h)
-      new(series_name, h.reduce(:merge).keys, h)
-    end
-
-    attr_accessor :series_name, :columns
+    attr_accessor :series_name, :data, :time
 
-    def initialize(series_name, columns, data)
+    def initialize(series_name, data, time=nil)
       self.series_name = series_name
-      self.columns = columns.sort
+      self.data = data
+      self.time = time.nil? ? nil : time.to_i
+    end
+
+    def values
+      @data.map {|h| h.map {|k,v| "#{k}=#{cast(v)}" }.join(',')}
+    end
 
-      @data = data
+    def cast(value)
+      value
     end
 
-    def points
-      @points ||= @data.map {|h| h.values_at(*columns) }
+    def line
+      @line ||= lambda {|values| [series_name, values, time].compact.join(' ')}
     end
 
-    def as_json
-      [{
-        name: series_name,
-        columns: columns,
-        points: points
-      }]
+    def lines
+      values.map {|v| line.call(v)}.join("\n")
     end
   end
 end

data/lib/tremolo/sender.rb

@@ -17,7 +17,7 @@ module Tremolo
 
     private
     def prepare(series_name, data)
-      JSON.generate(DataPoint.from_hash(series_name, data).as_json)
+      DataPoint.new(series_name, data).lines
     end
   end
 end

data/lib/tremolo/version.rb

@@ -1,3 +1,3 @@
 module Tremolo
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/tremolo.rb

@@ -1,6 +1,9 @@
 require "tremolo/version"
 
 require "json"
+require "celluloid"
+Celluloid.boot
+
 require "celluloid/io"
 
 module Tremolo
@@ -16,7 +19,7 @@ module Tremolo
     if host.nil? || port.nil?
       NoopTracker.new(host, port, options)
     else
-      Tracker.supervise_as as.to_sym, host, port, options
+      Celluloid.supervise type: Tracker, as: as.to_sym, args: [host, port, options]
       Celluloid::Actor[as.to_sym]
     end
   end

data/spec/lib/tremolo/series_spec.rb

@@ -14,37 +14,37 @@ describe Tremolo::Series do
   it 'sends point data formatted for InfluxDB', :celluloid => true do
     series.write_point({value: 111, associated_id: 81102})
 
-    json = '[{"name":"accounts.created","columns":["associated_id","value"],"points":[[81102,111]]}]'
+    line = 'accounts.created value=111,associated_id=81102'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'sends single point with value 1', :celluloid => true do
     series.increment
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[1]]}]'
+    line = 'accounts.created value=1'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'sends single point with value -1', :celluloid => true do
     series.decrement
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[-1]]}]'
+    line = 'accounts.created value=-1'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'tracks timing value for ms', :celluloid => true do
     series.timing(89)
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[89]]}]'
+    line = 'accounts.created value=89'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'tracks block timing value for ms', :celluloid => true do
@@ -60,10 +60,10 @@ describe Tremolo::Series do
       'returning another thing'
     end
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[1050]]}]'
+    line = 'accounts.created value=1050'
 
     sleep 0.1
     expect(returned).to eq('returning another thing')
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 end

data/spec/lib/tremolo/tracker_spec.rb

@@ -13,38 +13,37 @@ describe Tremolo::Tracker do
   it 'sends point data formatted for InfluxDB', :celluloid => true do
     tracker.write_point('accounts.created', {value: 111, associated_id: 81102})
 
-    json = '[{"name":"accounts.created","columns":["associated_id","value"],"points":[[81102,111]]}]'
-
+    line = 'accounts.created value=111,associated_id=81102'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'sends single point with value 1', :celluloid => true do
     tracker.increment('accounts.created')
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[1]]}]'
+    line = 'accounts.created value=1'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'sends single point with value -1', :celluloid => true do
     tracker.decrement('accounts.created')
 
-    json = '[{"name":"accounts.created","columns":["value"],"points":[[-1]]}]'
+    line = 'accounts.created value=-1'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'tracks timing value for ms', :celluloid => true do
     tracker.timing('timing.accounts.created', 89)
 
-    json = '[{"name":"timing.accounts.created","columns":["value"],"points":[[89]]}]'
+    line = 'timing.accounts.created value=89'
 
     sleep 0.1
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   it 'tracks block timing value for ms', :celluloid => true do
@@ -60,11 +59,11 @@ describe Tremolo::Tracker do
       'returning a thing'
     end
 
-    json = '[{"name":"timing.accounts.created","columns":["value"],"points":[[1014]]}]'
+    line = 'timing.accounts.created value=1014'
 
     sleep 0.1
     expect(returned).to eq('returning a thing')
-    expect(socket).to have_received(:send).with(json, 0)
+    expect(socket).to have_received(:send).with(line, 0)
   end
 
   context "with a namespace" do
@@ -73,10 +72,10 @@ describe Tremolo::Tracker do
     it 'tracks timing value for ms', :celluloid => true do
       tracker.timing('timing.accounts.created', 14)
 
-      json = '[{"name":"alf.timing.accounts.created","columns":["value"],"points":[[14]]}]'
+      line = 'alf.timing.accounts.created value=14'
 
       sleep 0.1
-      expect(socket).to have_received(:send).with(json, 0)
+      expect(socket).to have_received(:send).with(line, 0)
     end
   end
 end

data/tremolo.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "celluloid-io", ">= 0.16.0.pre2"
+  spec.add_dependency "celluloid-io", ">= 0.17.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tremolo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre2
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre2
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: InfluxDB UDP Tracker built on Celluloid::IO