bixby-common 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab49bbeea61a049b16a3052cf226339fe4ac645a
-  data.tar.gz: 80ed512df18cbce6fe9f90e57fab0f1a315de3f1
+  metadata.gz: 35c3c23073295651e3c85e8e1c6e874890cd0cf2
+  data.tar.gz: 82f4b7036f6ac6b98162dd7c77aed1fec5a66841
 SHA512:
-  metadata.gz: 59e70fb49c063504490f264c1a7cd50db08a2b3da32795150faf4d9458b8f8d36a6fa710bf90a029214129218b79ce57beb2dcb35e13bb250afc9d21b72c2593
-  data.tar.gz: 45766f490d69f003c228f37a88357d1941b3ebbc3c3ce16894fd545702b8f05ddca9e4e03ed5ccdf712b2f6b5530d5ab0e7623788ed912747aa73e0b2da2e3f4
+  metadata.gz: 2bbfc1cdbda553922468d37fbc7ad96a3ab709dd1634efcdb972b5e22abda26c8105ff54944be50f1f0c3d40aaaa8547ad5e80d71003dc8ecaeb471b6b2e2387
+  data.tar.gz: d7b1596b8a5cac4d7ab3bf1bc6078ec5bb9a9ad2cf5b825bdbb09c2bed3632d7b472b83176e6d5ac9ae545e82bce43ad4c057d241175cf14b28efa9ed98a855a

data/Gemfile

@@ -8,6 +8,10 @@ gem "logging"
 gem "api-auth", :git => "https://github.com/chetan/api_auth.git", :branch => "bixby"
 
 group :development do
+
+  # for some tests
+  gem "mixlib-shellout"
+
   gem "yard", "~> 0.8"
   gem "bundler", "~> 1.1"
   gem "jeweler", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"

data/Gemfile.lock

@@ -31,12 +31,10 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: 7d069b2d7e46fcbecd7a52966fda7d2d1945e2c9
+  revision: b60ce3e2cc47746142f0eba0cff5bcf3b550a88c
   specs:
     test_guard (0.2.1)
       awesome_print
-      debugger
-      debugger-pry
       growl
       listen
       simplecov
@@ -54,19 +52,9 @@ GEM
     builder (3.2.2)
     coderay (1.0.9)
     colorize (0.5.8)
-    columnize (0.3.6)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     curb (0.8.4)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-pry (0.1.1)
-      debugger (~> 1)
-      pry (>= 0.9.9)
-    debugger-ruby_core_source (1.2.3)
     eventmachine (1.0.3)
     eventmachine (1.0.3-java)
     faraday (0.8.8)
@@ -99,7 +87,7 @@ GEM
     json (1.8.0-java)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    listen (1.3.0)
+    listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
@@ -110,9 +98,10 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.2)
     minitest (4.7.5)
+    mixlib-shellout (1.2.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -139,7 +128,7 @@ GEM
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
@@ -184,6 +173,7 @@ DEPENDENCIES
   json
   logging
   minitest (~> 4.0)
+  mixlib-shellout
   mocha
   multi_json
   oj

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/bixby-common.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: bixby-common 0.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-09-10"
+  s.date = "2013-09-13"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.extra_rdoc_files = [
@@ -48,27 +49,35 @@ Gem::Specification.new do |s|
     "lib/bixby-common/util/log/logger.rb",
     "lib/bixby-common/websocket/api_channel.rb",
     "lib/bixby-common/websocket/async_response.rb",
-    "lib/bixby-common/websocket/client.rb",
     "lib/bixby-common/websocket/message.rb",
     "lib/bixby-common/websocket/request.rb",
     "lib/bixby-common/websocket/response.rb",
+    "test/api/http_channel_test.rb",
+    "test/base.rb",
     "test/bixby_common_test.rb",
     "test/command_response_test.rb",
     "test/command_spec_test.rb",
     "test/helper.rb",
+    "test/side_effect.rb",
     "test/support/repo/vendor/test_bundle/bin/cat",
     "test/support/repo/vendor/test_bundle/bin/cat.json",
     "test/support/repo/vendor/test_bundle/bin/echo",
     "test/support/repo/vendor/test_bundle/digest",
     "test/support/repo/vendor/test_bundle/manifest.json",
+    "test/test_handler.rb",
+    "test/util/crypto_util_test.rb",
     "test/util/http_client_test.rb",
     "test/util/jsonify_test.rb",
-    "test/util/log_test.rb"
+    "test/util/log_test.rb",
+    "test/websocket/api_channel_test.rb",
+    "test/websocket/async_response_test.rb",
+    "test/websocket/request_test.rb",
+    "test/websocket/response_test.rb"
   ]
   s.homepage = "http://github.com/chetan/bixby-common"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.1.0"
   s.summary = "Bixby Common"
 
   if s.respond_to? :specification_version then
@@ -80,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httpi>, [">= 0"])
       s.add_runtime_dependency(%q<logging>, [">= 0"])
       s.add_runtime_dependency(%q<api-auth>, [">= 0"])
+      s.add_development_dependency(%q<mixlib-shellout>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -106,6 +116,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httpi>, [">= 0"])
       s.add_dependency(%q<logging>, [">= 0"])
       s.add_dependency(%q<api-auth>, [">= 0"])
+      s.add_dependency(%q<mixlib-shellout>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
       s.add_dependency(%q<bundler>, ["~> 1.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -133,6 +144,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httpi>, [">= 0"])
     s.add_dependency(%q<logging>, [">= 0"])
     s.add_dependency(%q<api-auth>, [">= 0"])
+    s.add_dependency(%q<mixlib-shellout>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
     s.add_dependency(%q<bundler>, ["~> 1.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/bixby-common.rb

@@ -17,7 +17,6 @@ module Bixby
   module WebSocket
     autoload :APIChannel, "bixby-common/websocket/api_channel"
     autoload :AsyncResponse, "bixby-common/websocket/async_response"
-    autoload :Client, "bixby-common/websocket/client"
     autoload :Message, "bixby-common/websocket/message"
     autoload :Request, "bixby-common/websocket/request"
     autoload :Response, "bixby-common/websocket/response"

data/lib/bixby-common/api/json_request.rb

@@ -36,5 +36,14 @@ class JsonRequest
     MultiJson.dump(self)
   end
 
+  # Test if this object is equal to some other object
+  #
+  # @param [JsonRequest] other
+  #
+  # @return [Boolean]
+  def ==(other)
+    operation == other.operation && params == other.params
+  end
+
 end # JsonRequest
 end # Bixby

data/lib/bixby-common/api/rpc_handler.rb

@@ -2,6 +2,9 @@
 module Bixby
   class RpcHandler
 
+    def initialize(*args)
+    end
+
     # Handle a request
     #
     # @param [JsonRequest] request

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

@@ -66,13 +66,30 @@ module Bixby
         return data.read
       end
 
+      # Generate a new 2048-bit RSA keypair
+      #
+      # @return [OpenSSL::PKey::RSA]
+      def generate_keypair
+        OpenSSL::PKey::RSA.generate(2048)
+      end
+
+      # Generate a new access key
+      #
+      # @return [String]
+      # :nocov:
       def generate_access_key
         Digest.hexencode(Digest::MD5.new.digest(OpenSSL::Random.random_bytes(512)))
       end
+      # :nocov:
 
+      # Generate a new secret key
+      #
+      # @return [String]
+      # :nocov:
       def generate_secret_key
         Digest.hexencode(Digest::SHA2.new(512).digest(OpenSSL::Random.random_bytes(512)))
       end
+      # :nocov:
 
 
       private

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

@@ -2,8 +2,10 @@
 module Bixby
   module Debug
 
+    # :nocov:
+
     # Simple helper for use in to_s methods
-    def self.pretty_str(str) # :nocov:
+    def self.pretty_str(str)
       if str.nil? then
         "nil"
       elsif str.empty? then
@@ -13,7 +15,7 @@ module Bixby
       else
         '"' + str + '"'
       end
-    end # :nocov:
+    end
 
     # Pretty print a hash
     #
@@ -41,5 +43,7 @@ module Bixby
       str.gsub(/\n/, "\n#{indent}")
     end
 
+    # :nocov:
+
   end # Debug
 end # Bixby

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

@@ -22,9 +22,11 @@ module HttpClient
   #
   # @param [String] url
   # @return [Object] Result of calling JSON.parse() on the response body
+  # :nocov:
   def http_get_json(url)
     MultiJson.load(http_get(url))
   end
+  # :nocov:
 
   # Execute an HTTP POST request to the given URL
   #
@@ -41,9 +43,11 @@ module HttpClient
   # @param [String] url
   # @param [Hash] data  Key/Value pairs to POST
   # @return [Object] Result of calling JSON.parse() on the response body
+  # :nocov:
   def http_post_json(url, data)
     MultiJson.load(http_post(url, data))
   end
+  # :nocov:
 
   # Execute an HTTP post request and save the response body
   #

data/lib/bixby-common/util/log/logger.rb

@@ -3,6 +3,7 @@
 
 module Logging
   class Logger
+    # :nocov:
 
     # Override to pass trace flag from parent to child
     def initialize( name )
@@ -16,6 +17,7 @@ module Logging
       _setup(name, :parent => parent, :trace => parent.trace)
     end
 
+    # :nocov:
   end
 end
 

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

@@ -1,6 +1,8 @@
 
 require "bixby-common/websocket/async_response"
+
 require "api-auth"
+require "eventmachine"
 
 module Bixby
   module WebSocket

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

@@ -32,8 +32,8 @@ module Bixby
       # @param [Object] obj       result of request, usually a JsonResponse
       def response=(obj)
         @mutex.synchronize {
-          @completed = true
           @response = obj
+          @completed = true
           @cond.signal
         }
 

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

@@ -9,10 +9,7 @@ module Bixby
       def initialize(id=nil, type="rpc", headers=nil)
         @id = id || SecureRandom.uuid
         @type = type
-        @hash = { :type => @type, :id => @id }
-
-        headers ||= {}
-        @headers = @hash[:headers] = headers
+        @headers = headers || {}
       end
 
       def self.from_wire(body)
@@ -39,7 +36,12 @@ module Bixby
       end
 
       def to_wire
-        @body
+        hash = { :type    => @type,
+                 :id      => @id,
+                 :headers => @headers,
+                 :data    => @body }
+
+        MultiJson.dump(hash)
       end
 
       # Convert object to String, useful for debugging

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

@@ -10,8 +10,7 @@ module Bixby
         end
         super(id, type, headers)
 
-        @hash[:data] = json_request.to_wire
-        @body = MultiJson.dump(@hash)
+        @body = json_request.to_wire
       end
 
       def json_request

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

@@ -10,8 +10,7 @@ module Bixby
         end
         super(id, "rpc_result", headers)
 
-        @hash[:data] = json_response.to_wire
-        @body = MultiJson.dump(@hash)
+        @body = json_response.to_wire
       end
 
       def json_response

data/test/api/http_channel_test.rb

@@ -0,0 +1,65 @@
+
+require 'helper'
+
+module Bixby
+module Test
+module API
+class TestHttpChannel < TestCase
+
+  def test_exec
+    url = "http://google.com/"
+
+    json_req = JsonRequest.new("exec", {"foo" => "bar"})
+    signed_json_req = SignedJsonRequest.new(json_req, "foo", "bar")
+
+    # setup response stub
+    cr = CommandResponse.new(:status => 0, :stdout => "foobar", :stderr => "")
+    json_res = JsonResponse.new("success", nil, cr.to_hash)
+    res_mock = mock()
+    res_mock.expects(:body).once.returns(json_res.to_wire)
+    HTTPI.expects(:post).with{ |r| r.kind_of?(HTTPI::Request) && r.url.to_s == url }.returns(res_mock)
+
+    chan = HttpChannel.new(url)
+    res = chan.execute(signed_json_req)
+
+    # req should have been modified
+    assert_includes signed_json_req.headers, "Content-Type"
+    assert_equal "application/json", signed_json_req.headers["Content-Type"]
+
+    assert res
+    assert_kind_of JsonResponse, res
+    assert res.success?
+
+    cr = CommandResponse.from_json_response(res)
+    assert cr
+    assert_equal 0, cr.status
+    assert_equal "foobar", cr.stdout
+    assert_equal "", cr.stderr
+  end
+
+  def test_exec_download
+    url = "http://google.com/"
+
+    json_req = JsonRequest.new("exec", {"foo" => "bar"})
+    signed_json_req = SignedJsonRequest.new(json_req, "foo", "bar")
+
+    # setup response stub
+    HTTPI.expects(:post).with{ |r| r.kind_of?(HTTPI::Request) && r.url.to_s == url }
+
+    chan = HttpChannel.new(url)
+    res = chan.execute_download(signed_json_req) do
+    end
+
+    # req should have been modified
+    assert_includes signed_json_req.headers, "Content-Type"
+    assert_equal "application/json", signed_json_req.headers["Content-Type"]
+
+    assert res
+    assert_kind_of JsonResponse, res
+    assert res.success?
+  end
+
+end
+end
+end
+end

data/test/base.rb

@@ -0,0 +1,16 @@
+
+module Bixby
+  module Test
+    class TestCase < MiniTest::Unit::TestCase
+
+      def setup
+        ENV["BIXBY_HOME"] = File.join(File.expand_path(File.dirname(__FILE__)), "support")
+      end
+
+      def teardown
+        EM.stop_event_loop if EM.reactor_running?
+      end
+
+    end
+  end
+end

data/test/command_response_test.rb

@@ -1,10 +1,11 @@
 
 require 'helper'
+require 'mixlib/shellout'
 
 module Bixby
 module Test
 
-class TestCommandResponse < MiniTest::Unit::TestCase
+class TestCommandResponse < TestCase
 
   def test_from_json_response
     res = JsonResponse.new("fail", "unknown")
@@ -30,6 +31,36 @@ class TestCommandResponse < MiniTest::Unit::TestCase
     assert_nil cr.stderr
   end
 
+  def test_to_json_response
+    cr = CommandResponse.new(:status => 50, :stdout => "foobar", :stderr => "baz")
+    js = cr.to_json_response
+
+    assert js
+    assert_kind_of JsonResponse, js
+
+    refute js.success?
+    assert js.fail?
+
+    assert_nil js.message
+    assert js.data
+
+    assert_equal 50, js.data[:status]
+    assert_equal "foobar", js.data[:stdout]
+    assert_equal "baz", js.data[:stderr]
+  end
+
+  def test_from_shellout
+    cmd = Mixlib::ShellOut.new("uname")
+    cmd.run_command
+
+    cr = CommandResponse.new(cmd)
+    assert cr
+
+    assert_equal 0, cr.status
+    assert cr.stdout =~ /^Darwin|Linux$/
+    assert_empty cr.stderr
+  end
+
   def test_status
     cr = CommandResponse.new
     cr.status = 0

data/test/command_spec_test.rb

@@ -5,10 +5,10 @@ require 'helper'
 module Bixby
 module Test
 
-class TestCommandSpec < MiniTest::Unit::TestCase
+class TestCommandSpec < TestCase
 
   def setup
-    ENV["BIXBY_HOME"] = File.join(File.expand_path(File.dirname(__FILE__)), "support")
+    super
     h = { :repo => "vendor", :bundle => "test_bundle", 'command' => "echo", :foobar => "baz" }
     @c = CommandSpec.new(h)
     @expected_digest = "2bb6900420c87d5a7cbd8acc9dd1978593670f4e31bfa9218bb9c7c31d4472dd"

data/test/helper.rb

@@ -29,6 +29,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bixby-common'
 
+require "base"
+require "test_handler"
+require "side_effect"
+
 Dir.glob(File.dirname(__FILE__) + "/../lib/**/*.rb").each{ |f| require f }
 
 MiniTest::Unit.autorun

data/test/side_effect.rb

@@ -0,0 +1,15 @@
+
+module Bixby
+  module Test
+
+    class SideEffect
+      def initialize(&block)
+        @block = block
+      end
+      def perform
+        @block.call
+      end
+    end
+
+  end
+end

data/test/test_handler.rb

@@ -0,0 +1,7 @@
+
+module Bixby
+  module Test
+    class TestHandler < Bixby::RpcHandler
+    end
+  end
+end

data/test/util/crypto_util_test.rb

@@ -0,0 +1,34 @@
+
+require 'helper'
+
+module Bixby
+module Test
+
+class TestCryptoUtil < TestCase
+
+  def test_crypto_cycle
+
+    key1 = CryptoUtil.generate_keypair
+    key2 = CryptoUtil.generate_keypair
+
+    data = {"foo" => "bar"}
+    uuid = "123456"
+
+    encrypted = CryptoUtil.encrypt(MultiJson.dump(data), uuid, key1, key2)
+    assert encrypted
+    encrypted_io = StringIO.new(encrypted)
+    assert_equal uuid, encrypted_io.readline.strip
+
+    decrypted = CryptoUtil.decrypt(encrypted_io, key1, key2)
+    assert decrypted
+    data_out = MultiJson.load(decrypted)
+    assert data_out
+    assert_kind_of Hash, data_out
+    assert_equal "bar", data_out["foo"]
+  end
+
+
+end # TestCryptoUtil
+
+end # Test
+end # Bixby

data/test/util/http_client_test.rb

@@ -4,11 +4,12 @@ require 'helper'
 module Bixby
 module Test
 
-class TestHttpClient < MiniTest::Unit::TestCase
+class TestHttpClient < TestCase
 
   include WebMock::API
 
   def teardown
+    super
     WebMock.reset!
   end
 

data/test/util/log_test.rb

@@ -4,7 +4,7 @@ require 'helper'
 module Bixby
 module Test
 
-class TestLog < MiniTest::Unit::TestCase
+class TestLog < TestCase
 
   def test_setup_logger
     ENV["BIXBY_DEBUG"] = "1"
@@ -20,6 +20,29 @@ class TestLog < MiniTest::Unit::TestCase
     assert_equal 1, Logging::Logger.root.level # info
   end
 
+  def test_filtering_layout
+
+    filter = Bixby::Log::FilteringLayout.new
+
+    f = "foo"
+    assert_equal "foo", filter.format_obj(f)
+    assert filter.format_obj(nil) =~ /NilClass/
+    assert filter.format_obj(3) =~ /Fixnum.*3/
+
+    begin
+      raise "foo"
+    rescue => ex
+      assert filter.format_obj(ex) =~ /turn/
+
+      # filter out all turn lines
+      filter.set_filter do |ex|
+        ex.backtrace.reject{ |s| s =~ /turn/ }
+      end
+      refute filter.format_obj(ex) =~ /turn/
+
+    end
+  end
+
 end # TestLog
 
 end # Test

data/test/websocket/api_channel_test.rb

@@ -0,0 +1,100 @@
+
+require 'helper'
+
+module Bixby
+
+
+  module WebSocket
+    class APIChannel
+      def responses
+        @responses
+      end
+    end
+  end
+
+
+module Test
+module WebSocket
+class TestAPIChannel < TestCase
+
+  attr_reader :api_chan, :ws
+
+  def setup
+    @em_thread = Thread.new { EM.run{} }
+    @ws = mock()
+    @api_chan = Bixby::WebSocket::APIChannel.new(ws, TestHandler)
+  end
+
+  def test_open
+    refute api_chan.connected?
+    api_chan.open(nil)
+    assert api_chan.connected?
+  end
+
+
+  def test_exec
+    # test executing a request on the channel
+    json_req = JsonRequest.new("exec", {:foo => "bar"})
+    ws.expects(:send).once().add_side_effect(SideEffect.new{ api_chan.responses.values.first.response = "hi" })
+    assert_equal "hi", api_chan.execute(json_req)
+  end
+
+  def test_message_request
+    # test receiving a request on the channel
+    json_req = JsonRequest.new("exec", {"foo" => "bar"})
+    signed_json_req = SignedJsonRequest.new(json_req, "foo", "bar")
+    req = Bixby::WebSocket::Request.new(signed_json_req)
+
+    cr = CommandResponse.new(:status => 0, :stdout => "foobar", :stderr => "")
+    json_res = JsonResponse.new("success", nil, cr.to_hash)
+
+    event = mock()
+    event.expects(:data).once.returns(req.to_wire)
+    TestHandler.any_instance.expects(:handle).with{ |r| r == json_req }.returns(json_res)
+    ws.expects(:send).once.with { |str|
+      res = Bixby::WebSocket::Message.from_wire(str)
+      !res.nil? && res.json_response.to_wire == json_res.to_wire
+    }
+    api_chan.message(event)
+  end
+
+  def test_message_response
+    # test receiving a response on the channel
+    cr = CommandResponse.new(:status => 0, :stdout => "foobar", :stderr => "")
+    json_res = JsonResponse.new("success", nil, cr.to_hash)
+    res = Bixby::WebSocket::Response.new(json_res, "1234")
+
+    event = mock()
+    event.expects(:data).once.returns(res.to_wire)
+    api_chan.responses["1234"] = Bixby::WebSocket::AsyncResponse.new("1234")
+    api_chan.message(event)
+    ret = api_chan.fetch_response("1234")
+    assert ret
+    assert_kind_of JsonResponse, ret
+    assert_equal json_res.to_wire, ret.to_wire
+  end
+
+  def test_message_connect
+    # test receiving a connect request on the channel
+    json_req = JsonRequest.new("", {})
+    signed_json_req = SignedJsonRequest.new(json_req, "foo", "bar")
+    req = Bixby::WebSocket::Request.new(signed_json_req, nil, "connect")
+
+    event = mock()
+    event.expects(:data).once.returns(req.to_wire)
+    TestHandler.any_instance.expects(:connect).with(json_req, api_chan)
+    api_chan.message(event)
+  end
+
+  def test_close
+    # close
+    api_chan.open(nil)
+    TestHandler.any_instance.expects(:disconnect).with(api_chan).once()
+    api_chan.close(nil)
+
+  end
+
+end
+end
+end
+end

data/test/websocket/async_response_test.rb

@@ -0,0 +1,43 @@
+
+require 'helper'
+
+module Bixby
+module Test
+module WebSocket
+class TestAsyncResponse < TestCase
+
+  def test_block
+
+    sync_response = nil
+    cb_response = nil
+
+    res = Bixby::WebSocket::AsyncResponse.new("1234") do |r|
+      cb_response = r
+    end
+
+    assert res
+    assert_equal "1234", res.id
+    refute res.completed?
+
+    # start a thread waiting on the response to be writ ten
+    t = Thread.new {
+      sync_response = res.response
+    }
+    assert t.alive?
+
+    # small sleep here, otherwise execution will continue too quickly, before the thread starts
+    assert_nil t.join(0.001)
+
+    # now write it, thread should complete & callback will fire
+    res.response = "hi"
+
+    t.join
+    refute t.alive?
+    assert_equal "hi", cb_response
+    assert_equal "hi", sync_response
+  end
+
+end
+end
+end
+end

data/test/websocket/request_test.rb

@@ -0,0 +1,65 @@
+
+require 'helper'
+
+module Bixby
+module Test
+module WebSocket
+class TestRequest < TestCase
+
+  def test_init
+    json_req = JsonRequest.new("exec", {:foo => "bar"})
+    req = Bixby::WebSocket::Request.new(json_req)
+
+    assert req
+    assert req.headers
+    assert_empty req.headers
+
+    h = MultiJson.load(req.to_wire)
+    test_common_props(h)
+    assert_empty h["headers"]
+  end
+
+  def test_signed
+    json_req = JsonRequest.new("exec", {:foo => "bar"})
+    signed_json_req = SignedJsonRequest.new(json_req, "foo", "bar")
+    req = Bixby::WebSocket::Request.new(signed_json_req)
+
+    assert req
+    h = MultiJson.load(req.to_wire)
+    test_common_props(h)
+    refute_empty h["headers"]
+
+    assert_includes h["headers"], "Content-MD5"
+    assert_includes h["headers"], "Date"
+    assert_includes h["headers"], "Authorization"
+    assert h["headers"]["Authorization"] =~ /^APIAuth foo:/
+  end
+
+  def test_json_req
+    json_req = JsonRequest.new("exec", {"foo" => "bar"})
+    req = Bixby::WebSocket::Request.new(json_req)
+
+    assert req.json_request
+    assert_equal json_req, req.json_request
+    assert_equal json_req, Bixby::WebSocket::Message.from_wire(req.to_wire).json_request
+  end
+
+
+  private
+
+  def test_common_props(h)
+    assert h
+    assert_equal "rpc", h["type"]
+    assert h["id"]
+
+    d = MultiJson.load(h["data"])
+    assert_equal "exec", d["operation"]
+    refute_empty d["params"]
+    assert_equal "bar", d["params"]["foo"]
+    h
+  end
+
+end
+end
+end
+end

data/test/websocket/response_test.rb

@@ -0,0 +1,45 @@
+
+require 'helper'
+
+module Bixby
+module Test
+module WebSocket
+class TestResponse < TestCase
+
+  def test_init
+    cr = CommandResponse.new(:status => 0, :stdout => "foobar", :stderr => "")
+    json_res = JsonResponse.new("success", nil, cr.to_hash)
+    res = Bixby::WebSocket::Response.new(json_res, "1234")
+
+    assert res
+    assert res.headers
+    assert_empty res.headers
+
+    h = MultiJson.load(res.to_wire)
+    assert h
+    assert_equal "rpc_result", h["type"]
+    assert_equal "1234", h["id"]
+
+    d = MultiJson.load(h["data"])
+    assert_equal "success", d["status"]
+    refute d["message"]
+    refute d["code"]
+    assert_equal 0, d["data"]["status"]
+    assert_equal "foobar", d["data"]["stdout"]
+    assert_equal "", d["data"]["stderr"]
+  end
+
+  def test_json_res
+    cr = CommandResponse.new("status" => 0, "stdout" => "foobar", "stderr" => "")
+    json_res = JsonResponse.new("success", nil, cr.to_hash)
+    res = Bixby::WebSocket::Response.new(json_res, "1234")
+
+    assert res.json_response
+    assert_equal json_res.to_wire, res.json_response.to_wire
+    assert_equal json_res.to_wire, Bixby::WebSocket::Message.from_wire(res.to_wire).json_response.to_wire
+  end
+
+end
+end
+end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -399,22 +413,30 @@ files:
 - lib/bixby-common/util/log/logger.rb
 - lib/bixby-common/websocket/api_channel.rb
 - lib/bixby-common/websocket/async_response.rb
-- lib/bixby-common/websocket/client.rb
 - lib/bixby-common/websocket/message.rb
 - lib/bixby-common/websocket/request.rb
 - lib/bixby-common/websocket/response.rb
+- test/api/http_channel_test.rb
+- test/base.rb
 - test/bixby_common_test.rb
 - test/command_response_test.rb
 - test/command_spec_test.rb
 - test/helper.rb
+- test/side_effect.rb
 - test/support/repo/vendor/test_bundle/bin/cat
 - test/support/repo/vendor/test_bundle/bin/cat.json
 - test/support/repo/vendor/test_bundle/bin/echo
 - test/support/repo/vendor/test_bundle/digest
 - test/support/repo/vendor/test_bundle/manifest.json
+- test/test_handler.rb
+- test/util/crypto_util_test.rb
 - test/util/http_client_test.rb
 - test/util/jsonify_test.rb
 - test/util/log_test.rb
+- test/websocket/api_channel_test.rb
+- test/websocket/async_response_test.rb
+- test/websocket/request_test.rb
+- test/websocket/response_test.rb
 homepage: http://github.com/chetan/bixby-common
 licenses:
 - MIT
@@ -435,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Bixby Common

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

@@ -1,125 +0,0 @@
-
-require 'faye/websocket'
-require 'eventmachine'
-
-module Bixby
-  module WebSocket
-
-    # WebSocket Client
-    class Client
-
-      include Bixby::Log
-
-      attr_reader :ws, :api
-
-      def initialize(url, handler)
-        @url = url
-        @handler = handler
-        @tries = 0
-        @exiting = false
-      end
-
-      # Start the Client thread
-      #
-      # NOTE: This call never returns!
-      def start
-
-        @exiting = false
-
-        Kernel.trap("EXIT") do
-          @exiting = true
-        end
-
-        logger.debug "connecting to #{@url}"
-        EM.run {
-          connect()
-        }
-      end
-
-      def stop
-        @exiting = true
-        EM.stop_event_loop
-      end
-
-
-      private
-
-      # Connect to the WebSocket endpoint given by @url. Will attempt to keep
-      # the connection open forever, reconnecting as needed.
-      def connect
-
-        @ws = Faye::WebSocket::Client.new(@url, nil, :ping => 60)
-        @api = Bixby::WebSocket::APIChannel.new(@ws, @handler)
-
-        ws.on :open do |e|
-          begin
-            logger.info "connected to manager at #{@url}"
-            api.open(e)
-            @tries = 0
-
-            # send a connection request
-            id = SecureRandom.uuid
-            json_req = JsonRequest.new("", "")
-            signed_req = SignedJsonRequest.new(json_req, Bixby.agent.access_key, Bixby.agent.secret_key)
-            connect_req = Request.new(signed_req, id, "connect")
-            EM.next_tick {
-              ws.send(connect_req.to_wire)
-            }
-
-          rescue Exception => ex
-            logger.error ex
-          end
-        end
-
-        ws.on :message do |e|
-          begin
-            api.message(e)
-          rescue Exception => ex
-            logger.error ex
-          end
-        end
-
-        ws.on :close do |e|
-          begin
-            if api.connected? then
-              logger.info "lost connection to manager"
-            else
-              logger.debug "failed to connect"
-            end
-            api.close(e)
-            backoff()
-            connect()
-          rescue Exception => ex
-            logger.error ex
-          end
-        end
-      end
-
-      # Delay reconnection by a slowly increasing interval
-      def backoff
-
-        if @exiting or not EM.reactor_running? then
-          # shutting down, don't try to reconnect
-          return
-        end
-
-        @tries += 1
-        if @tries == 1 then
-          logger.debug "retrying immediately"
-        elsif @tries == 2 then
-          logger.debug "retrying every 1 sec"
-          sleep 1
-        elsif @tries <= 30 then
-          sleep 1
-        elsif @tries == 31 then
-          logger.debug "retrying every 5 sec"
-          sleep 5
-        else
-          sleep 5
-        end
-      end
-
-    end
-
-  end
-end