bixby-common 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01cbdbfa0c13d2e8614a46e771ef0e9e16e21308
-  data.tar.gz: 6457c2b1f50b6569dbcc6cb97d9053e63ec01b80
+  metadata.gz: 1f5f1fb87533cdcdfaba7bd9ba0532d0c6c1aed0
+  data.tar.gz: 1937a3c76c45d644396d17a9e75c6c1b38689686
 SHA512:
-  metadata.gz: 445c45438b177e91cde8c25b71f70ebc28fcff1fffa290a2247c5db3b952a3a68cb151d697dde0882684f6fe5eaeb943b9d696c44342e3a830dcd9070401b21c
-  data.tar.gz: bc88104b4157c8986d64078fa836c5acee5df142c7968474069b77d5e208ea855eed198e0b8ce93b3ea6da89b549f249a72cbba53e69822f3161c41cb15d3c51
+  metadata.gz: 4208517467da1d40ee2c706a10ef794742d173fab1bfa669a9c48dcf94466e10d078c473d7bd0165c5516b3f0ba4d12307ddb0a0e35b2391ebb9edcdbeea1e13
+  data.tar.gz: 54a5a6c786e43aede794bbd0d70aa7468aa729fd5451c4d560c4e06281d4db0616f4f887a612f40c97b067bca8c842e665433345c9e4196e0dfa3c5fc0fcd6ab

data/.travis.yml

@@ -1,4 +1,5 @@
 before_install:
+  - "gem install bundler --no-ri --no-rdoc"
   - "curl -sL https://s3.bixby.io/wad > ~/wad"
   - "chmod +x ~/wad"
 install:
@@ -8,8 +9,8 @@ after_script: "rake coveralls"
 
 language: ruby
 rvm:
-  - 2.1.1
-  - 1.9.3
+  - 2.1.5
+  - 2.2.0
 
 branches:
   only:

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 
 GIT
   remote: git://github.com/chetan/micron.git
-  revision: 0c1e9c0b9d9e052805f43485fe3454cbd25913c5
+  revision: 576f6699e2a7ff1828ce5c333cc5fa433c0be380
   specs:
     micron (0.5.1)
       ansi
@@ -56,7 +56,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
-    ansi (1.4.3)
+    ansi (1.5.0)
     awesome_print (1.6.1)
     bixby-auth (0.1.1)
     builder (3.2.2)
@@ -132,7 +132,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.11.2)
+    oj (2.11.4)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/bixby-common.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.6.0 ruby lib
+# stub: bixby-common 0.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Chetan Sarva"]
-  s.date = "2015-01-16"
+  s.date = "2015-01-23"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.extra_rdoc_files = [
@@ -77,6 +77,7 @@ Gem::Specification.new do |s|
     "test/util/http_client_test.rb",
     "test/util/jsonify_test.rb",
     "test/util/log_test.rb",
+    "test/util/signal_test.rb",
     "test/util/thread_pool_test.rb",
     "test/websocket/api_channel_test.rb",
     "test/websocket/async_response_test.rb",
@@ -85,7 +86,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/chetan/bixby-common"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Bixby Common"
 
   if s.respond_to? :specification_version then

data/lib/bixby-common/util/signal.rb

@@ -22,7 +22,9 @@ module Bixby
       Thread.new do
         while true
           sig = trap_r.readline.strip
-          block.call(sig)
+          Thread.new do
+            block.call(sig)
+          end
         end
       end
 

data/lib/bixby-common/util/thread_dump.rb

@@ -15,6 +15,10 @@ module Bixby
 
       # Prints a thread dump on ALRM signal
       # kill -ALRM <pid>
+      #
+      # You can cancel the signal trap by saving the returned Thread and killing it
+      #
+      # @return [Thread]
       def trap!
         t = Bixby::Signal.trap("SIGALRM") do
           write(LoggerIO.new(Logging.logger[ThreadDump]))
@@ -22,6 +26,7 @@ module Bixby
         t[:_name] = "dumper [ignore me]"
 
         Logging.logger[ThreadDump].info "Trapping SIGALRM: kill -ALRM #{Process.pid}"
+        return t
       end
 
       # Write thread dump to the given IO-like handle (must respond to #puts)

data/lib/bixby-common/util/thread_pool.rb

@@ -29,6 +29,7 @@ module Bixby
     end
 
     def enqueue(command, block=nil)
+      logger.debug { "enqueue new task: #{command}" }
       @input_queue.push(Task.new(command, block))
       if command == :perform then
         grow_pool
@@ -104,7 +105,7 @@ module Bixby
 
     def expand(count)
       @lock.synchronize do
-        # logger.debug "expanding by #{count} threads (from #{@size})"
+        logger.debug "expanding by #{count} threads (from #{@size})"
         count.times do
           create_worker
         end
@@ -159,7 +160,7 @@ module Bixby
 
     def create_worker
       @lock.synchronize do
-        # logger.debug "spawning new worker thread"
+        logger.debug "spawning new worker thread"
 
         exit_handler = lambda { |worker, reason|
           @lock.synchronize do
@@ -180,12 +181,14 @@ module Bixby
     # Grow the pool by one if we have more jobs than idle workers
     def grow_pool
       @lock.synchronize do
-        # logger.debug { "busy: #{num_working}; idle: #{num_idle}" }
+        logger.debug { "jobs: #{num_jobs}; busy: #{num_working}; idle: #{num_idle}" }
         if @size < @max_size && num_jobs > 0 && num_jobs > num_idle then
           space = @max_size-@size
           jobs = num_jobs-num_idle
           needed = space < jobs ? space : jobs
           expand(needed)
+        else
+          logger.debug "NOT growing the pool!"
         end
       end
 

data/lib/bixby-common/websocket/api_channel.rb

@@ -40,8 +40,6 @@ module Bixby
       #
       # @return [String] request id
       def execute_async(json_request, &block)
-        logger.debug { "execute_async:\n#{json_request.to_s}" }
-
         if json_request.kind_of? Request then
           id, request = json_request.id, json_request
         else
@@ -50,6 +48,8 @@ module Bixby
         end
         @responses[id] = AsyncResponse.new(id, &block)
 
+        logger.debug { request.type == "connect" ? "execute_async: CONNECT [#{id}]" : "execute_async: RPC [#{id}]\n#{request.to_s}" }
+
         EM.next_tick {
           ws.send(request.to_wire)
         }
@@ -108,7 +108,7 @@ module Bixby
         elsif req.type == "rpc_result" then
           # Pass the result back to the caller
           res = req.json_response
-          logger.debug { "RPC_RESULT for request id #{req.id}\n#{res}" }
+          logger.debug { "RPC_RESULT for request id [#{req.id}]\n#{res}" }
           @responses[req.id].response = res
 
         elsif req.type == "connect" then

data/test/util/signal_test.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+module Bixby
+module Test
+class TestSignal < TestCase
+
+  def test_create_signal
+
+    foo = 0
+    thread = Bixby::Signal.trap("ALRM") do
+      foo += 1
+    end
+
+    assert thread.kind_of? Thread
+    assert thread.alive?
+    assert_equal 0, foo
+
+    Process.kill("ALRM", Process.pid)
+    sleep 0.01
+    assert_equal 1, foo
+
+    Process.kill("ALRM", Process.pid)
+    sleep 0.01
+    assert_equal 2, foo
+
+    assert thread.alive?
+    thread.kill
+    thread.join
+    refute thread.alive?
+  end
+
+end
+end
+end

data/test/util/thread_pool_test.rb

@@ -15,7 +15,7 @@ class TestThreadPool < TestCase
     begin
       puts "tearing down, shutting down pool"
       @pool.shutdown
-      @pool.join(5)
+      @pool.join(0.1)
       assert_equal 0, @pool.size
     rescue Exception => ex
     end
@@ -41,20 +41,23 @@ class TestThreadPool < TestCase
     foo = []
     4.times do |i|
       @pool.perform do
+        logger.debug "running job #{i}, sleeping 10"
+        sleep 10
         foo << "thread #{i}"
       end
+      sleep 0.1
     end
     assert_equal 4, @pool.size
 
     10.times do |i|
       @pool.perform do
+        sleep 10
         foo << "thread #{i}"
       end
     end
     assert_equal 8, @pool.size
 
-    @pool.dispose
-    assert_equal 14, foo.size
+    # assert_equal 14, foo.size
   end
 
   def test_pool_shrinks_on_idle

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-auth
@@ -272,6 +272,7 @@ files:
 - test/util/http_client_test.rb
 - test/util/jsonify_test.rb
 - test/util/log_test.rb
+- test/util/signal_test.rb
 - test/util/thread_pool_test.rb
 - test/websocket/api_channel_test.rb
 - test/websocket/async_response_test.rb
@@ -297,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Bixby Common