microphite 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODAzYWUzYjZkMDA2NjhmNjkxOGYwYTRmZTEwMGQwMDkyZTU3ZGNmZA==
+  data.tar.gz: !binary |-
+    NDJkY2NlNDViYzk0ODZlM2MyZDQwODYwZmYwN2FhOGEwYTM2OTYwOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2U2Zjk4ZjlmNzMyNWM1ZDM0YjZlYWQxZDU1ODI5MTc0N2FjZjdhOGY1OGFi
+    MGE0Yzg1NTI0ZmUxZDU4ZDAwOTgwZDZlNDEzYTkwNTJlMzUyZjQ2MGU0MTE0
+    ZTJlYWM2ZGUwNmFlMmExMjQwODFhNTJhYzc5NTUxNjA1MzY4ODg=
+  data.tar.gz: !binary |-
+    OGZlZWY2OGUxNzJmMGZjY2I3MzU4ZTM1NmUyNDUwNTgzYzc4ZTgxMmFmOWVk
+    MTQyMDZkNjkwYmQ2ZTM2M2YzODRiYzAyZDVjMTFjZDc0OWYyNjQ0Y2RjNjAx
+    OGMwNjExODNiMjIwMDM3YTVkZDViZGQyZjVmNmJmZjk2YjQ2Mjc=

data/.gitignore

@@ -11,3 +11,6 @@
 /.ruby-gemset
 /.ruby-version
 /Gemfile.lock
+
+# Packaged gems 
+/pkg

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Microphite CHANGELOG
 ====================
 
+v0.5.1
+------
+- Simplify Client::Base and work-around jruby weirdness in test suite
+
 v0.5.0
 ------
 - Initial public release.

data/lib/microphite/client/base.rb

@@ -21,8 +21,8 @@ module Microphite
 
         # Shared state
         @status           = :running
-        @gather_stack     = []
-        @write_stack      = []
+        @gather_queue     = Queue.new
+        @write_queue      = Queue.new
 
         # Worker state
         @accumulating     = {}
@@ -45,11 +45,11 @@ module Microphite
       end
 
       def write(metrics)
-        push(@write_stack, metrics.clone)
+        push(@write_queue, metrics.clone)
       end
 
       def gather(metrics)
-        push(@gather_stack, metrics.clone)
+        push(@gather_queue, metrics.clone)
       end
 
       def prefix(prefix, &block)
@@ -106,11 +106,8 @@ module Microphite
       def worker_loop
         loop do
           wrap_errors do
-            writes = nil
-            gathers = nil
-
             @lock.synchronize do
-              if @write_stack.empty? and @gather_stack.empty?
+              if @write_queue.empty? and @gather_queue.empty?
                 case @status
                   when :running
                     wait_time = @next_flush - now
@@ -132,37 +129,32 @@ module Microphite
                     Thread.exit
                 end
               end
-
-              # Swap existing stacks with new ones
-              writes, @write_stack = @write_stack, []
-              gathers, @gather_stack = @gather_stack, []
             end
 
-            unwind(writes).each { |m| write_metric m }
-            unwind(gathers).each { |m| accumulate m }
+            unwind(@write_queue).each { |m| write_metric m }
+            unwind(@gather_queue).each { |m| accumulate m }
             flush_accumulating if should_flush?
           end
         end
       end
 
-      def push(stack, value)
-        timestamp = now
-        pushed = false
+      def push(queue, value)
         @lock.synchronize do
-          if stack.length <= @limit and @status == :running
-            stack << timestamp << value
-            pushed = true
+          if queue.length <= @limit and @status == :running
+            queue.push [now, value]
             @worker_event.signal
+            true
+          else
+            false
           end
         end
-        pushed
       end
 
-      def unwind(stack)
+      def unwind(queue)
         metrics = []
-        until stack.empty?
-          value = stack.pop
-          timestamp = stack.pop
+        until queue.empty?
+          tuple = queue.pop
+          timestamp, value = tuple[0], tuple[1]
           wrap_errors do
             case value
               when Hash

data/lib/microphite/version.rb

@@ -1,3 +1,3 @@
 module Microphite
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/support/single_serve_helper.rb

@@ -46,35 +46,40 @@ module Helpers
 
     def tcp_loop
       client_socket = @socket.accept
-      read_fully client_socket
-      @bytes
-    end
-
-    def udp_loop
-      read_fully @socket
-      @bytes
-    end
-
-    def read_fully(socket)
       loop do
-        readable = select([socket])[0]
+        readable = select([client_socket])[0]
         if readable.empty?
-          return
+          break
         else
           begin
             buffer = ''
-            socket.readpartial(4096, buffer)
+            client_socket.readpartial(4096, buffer)
             @bytes << buffer
-            if @bytes.end_with? CLOSE_MAGIC
-              @bytes.chomp! CLOSE_MAGIC
-              return
-            end
           rescue EOFError
             @bytes << buffer
             return
           end
         end
       end
+      @bytes
     end
+
+    def udp_loop
+      client_socket = @socket
+      loop do
+        readable = select([client_socket])[0]
+        if readable.empty?
+          break
+        else
+          @bytes << client_socket.recvfrom_nonblock(4096)[0]
+          if @bytes.end_with? CLOSE_MAGIC
+            @bytes.chomp! CLOSE_MAGIC
+            break
+          end
+        end
+      end
+      @bytes
+    end
+
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microphite
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Bob
@@ -13,37 +12,37 @@ cert_chain: []
 date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: !binary |-
+          MA==
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+  name: rake
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: !binary |-
+          MA==
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+  name: rspec
+  type: :development
+  prerelease: false
 description: A blazing fast, thread-safe graphite client
 email:
 - bob@bz-technology.com
@@ -77,33 +76,28 @@ files:
 - tasks/test.rake
 homepage: https://github.com/bz-technology/microphite
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 800344433168954481
+      version: !binary |-
+        MA==
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 800344433168954481
+      version: !binary |-
+        MA==
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A blazing fast, thread-safe graphite client
 test_files:
 - spec/client/noop_spec.rb