bixby-common 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39054170ed94e55cc974daac3898201a2fe14e0d
-  data.tar.gz: 4c7a6620976a1ca301468fa0b551adf60882855b
+  metadata.gz: 1935ac4b0aed266b6110771d3cef887840b0d9e2
+  data.tar.gz: 8068985903a36686952e551c742a77f1b5075be7
 SHA512:
-  metadata.gz: 84cd88d7c9475996325333466a1e8b7a720d3c247d895db729fc5bece1300166b42242b19888b15fdb693fa3f474dd156376537fcf774aaad6445ac7106f733b
-  data.tar.gz: 08c5799164a9d47049d5b077232d9ca7cc8155d957f9c7405476dbd3847dd3f40a35e92d1621f5206268cbcd904ae1fbf50112fb2bd87b301d24ed6eb7be7174
+  metadata.gz: 4e220383c3f2547177d5ae5c7aa4a11beb5c0148caf5daef1e83c4c484db91807b0e3d3f9ece26ae2ec57f38015fd8cd0e142538fafa98c7102136fb59ac1a72
+  data.tar.gz: d07c585cd54983f237f74795c97d5ab316535b25e160338d0f2ce00cb186b32ecc691eac884c3843b498c93d508c261b856a45aec8c5d276612467bbf1318b3d

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+script: "bundle exec micron test/"
+after_script: "rake coveralls"
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+
+branches:
+  only:
+    - master

data/Gemfile

@@ -27,6 +27,7 @@ group :development do
   gem "test_guard", :git => "https://github.com/chetan/test_guard.git"
   gem "easycov", :github => "chetan/easycov"
   gem "micron", :github => "chetan/micron"
+  gem "coveralls", :require => false
 
   gem 'rb-inotify', :require => false
   gem 'rb-fsevent', :require => false

data/Gemfile.lock

@@ -1,14 +1,16 @@
 GIT
   remote: git://github.com/chetan/easycov.git
-  revision: 875b981d5cded29263e07a3410845dc56a5dfa30
+  revision: a4093b140a0adfbaea1c9b55c42a5c7629317025
   specs:
-    easycov (0.2.0)
+    easycov (0.3.1)
       multi_json
       simplecov
+      simplecov-console
+      simplecov-html
 
 GIT
   remote: git://github.com/chetan/micron.git
-  revision: 14442584d89b503d6691ac15e0dba38b207b100a
+  revision: 95399129ce8908484ed92a0de3a7e0ce83d99d2b
   specs:
     micron (0.1.0)
       colorize
@@ -48,7 +50,7 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: 9c2fdd4ba874d8593ad4d70c0f2dd6b141061fed
+  revision: 6e184096f7713cefe6eab3d250b18d214e09a1ca
   specs:
     test_guard (0.2.1)
       awesome_print
@@ -65,8 +67,16 @@ GEM
     awesome_print (1.2.0)
     bouncy-castle-java (1.5.0147)
     builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     coderay (1.0.9)
     colorize (0.6.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     curb (0.8.5)
@@ -104,20 +114,21 @@ GEM
     json (1.8.0-java)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    listen (1.3.1)
+    listen (2.0.0)
+      celluloid (>= 0.15.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     little-plugger (1.1.3)
     logging (1.8.1)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.3.6)
     metaclass (0.0.1)
     method_source (0.8.2)
+    mime-types (1.25)
     mixlib-shellout (1.2.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
+    multi_json (1.8.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -146,14 +157,14 @@ GEM
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
     rdoc (4.0.1)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rubyntlm (0.3.4)
     safe_yaml (0.9.7)
     semver2 (3.3.2)
-    simplecov-console (0.1.1)
+    simplecov-console (0.1.3)
       colorize
       hirb
       simplecov
@@ -161,6 +172,11 @@ GEM
     slop (3.4.6)
     spoon (0.0.4)
       ffi
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    timers (1.1.0)
+    tins (0.11.0)
     webmock (1.14.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -175,6 +191,7 @@ PLATFORMS
 DEPENDENCIES
   api-auth!
   bundler (~> 1.1)
+  coveralls
   curb
   easycov!
   faye-websocket

data/Rakefile

@@ -30,5 +30,18 @@ Micron::Rake.new do |task|
 end
 task :default => :test
 
+# for displaying coverage
+require "easycov/rake"
+
+# for reporting to coveralls
+require "coveralls"
+desc "Report coverage to coveralls"
+task :coveralls do
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  if File.exists? File.join(EasyCov.path, ".resultset.json") then
+    SimpleCov::ResultMerger.merged_result.format!
+  end
+end
+
 require 'yard'
 YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/bixby-common.gemspec

@@ -2,22 +2,24 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.4.6 ruby lib
+# stub: bixby-common 0.4.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-10-03"
+  s.date = "2013-10-08"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.extra_rdoc_files = [
     "LICENSE"
   ]
   s.files = [
+    ".coveralls.yml",
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -101,6 +103,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<test_guard>, [">= 0"])
       s.add_development_dependency(%q<easycov>, [">= 0"])
       s.add_development_dependency(%q<micron>, [">= 0"])
+      s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<rb-inotify>, [">= 0"])
       s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_development_dependency(%q<rb-fchange>, [">= 0"])
@@ -127,6 +130,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<test_guard>, [">= 0"])
       s.add_dependency(%q<easycov>, [">= 0"])
       s.add_dependency(%q<micron>, [">= 0"])
+      s.add_dependency(%q<coveralls>, [">= 0"])
       s.add_dependency(%q<rb-inotify>, [">= 0"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_dependency(%q<rb-fchange>, [">= 0"])
@@ -154,6 +158,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<test_guard>, [">= 0"])
     s.add_dependency(%q<easycov>, [">= 0"])
     s.add_dependency(%q<micron>, [">= 0"])
+    s.add_dependency(%q<coveralls>, [">= 0"])
     s.add_dependency(%q<rb-inotify>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])
     s.add_dependency(%q<rb-fchange>, [">= 0"])

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

@@ -1,4 +1,6 @@
 
+require "logging"
+
 module Bixby
   module Log
 

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

@@ -1,6 +1,8 @@
 
 # Patch Logging::Logger so that :trace becomes an inherited flag
 
+require "logging"
+
 module Logging
   class Logger
     # :nocov:

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

@@ -41,8 +41,12 @@ module Bixby
       def execute_async(json_request, &block)
         logger.debug { "execute_async:\n#{json_request.to_s}" }
 
-        request = Request.new(json_request)
-        id = request.id
+        if json_request.kind_of? Request then
+          id, request = json_request.id, json_request
+        else
+          request = Request.new(json_request)
+          id = request.id
+        end
         @responses[id] = AsyncResponse.new(id, &block)
 
         EM.next_tick {
@@ -108,7 +112,12 @@ module Bixby
           @responses[req.id].response = res
 
         elsif req.type == "connect" then
-          @handler.new(req).connect(req.json_request, self)
+          ret = @handler.new(req).connect(req.json_request, self)
+          if ret.kind_of? JsonResponse then
+            ws.send(Response.new(ret, req.id).to_wire)
+          else
+            ws.send(Response.new(JsonResponse.new("success"), req.id).to_wire)
+          end
 
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -248,6 +248,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +381,9 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
+- .coveralls.yml
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE