pagoda 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf5df5a892dae6f2ab3422cd715a3e3dce31821
-  data.tar.gz: eb90b58aa1084ea3e5a640dbc00d4d208cdfcf00
+  metadata.gz: b82fbafabb8913d4b309f98147a55e3e92429845
+  data.tar.gz: 0af5c92fb2d6c0e2fe0e187a4732b0daf7cabc42
 SHA512:
-  metadata.gz: afa8eb59341f072e6f998b7fe0bbfe9a7ae9f30ce6c1d42a09c73cd3bed90d16e7b0ad6fa5fc78e9fe9bf0775bcd74a3e0f2f8768d5bcf026e3050a23e590e0f
-  data.tar.gz: 2d58c7d5fbe50277938bc50ebd0a7ee27ccb4ad5f0acb631533cc0799cf297de6da1f577a88add8a7577de09899dd974172536fb922c140a5fd251897e3243d3
+  metadata.gz: 0c98df4a9e79fea3407038412b118bd77476d0307c25a133bf4b97b868c9ae16acbc0e10a2c6c334d3632d3109eaa4d6751c9d4e03ae43f23dad9f5abdb1aa4e
+  data.tar.gz: 2e7a3493cd6f28eeca0d7ad3d1be955e37a05562db3f3024cd1f4e1a0635cdd93712010da81ce2a3fdd83746763acfaf2f3af5e893cd930414ba8cb2199da78f

data/lib/pagoda/cli/helpers/log.rb

@@ -1,8 +1,7 @@
-require 'faye/websocket'
-require "msgpack"
+require 'websocket-client-simple'
+# require "msgpack"
 require 'json'
 require 'pp'
-require 'eventmachine'
 require "base64"
 
 module Pagoda::Command
@@ -28,59 +27,41 @@ module Pagoda::Command
       
       app_id = client.app_info(app)[:id]
       if options[:live]
-        EM.run do
-          STDOUT.sync = true
-          # socket = WebSocket::EventMachine::Client.connect(:uri => "wss://#{user}:#{password}@live.pagodabox.com/stormpack/websocket/pagodabox?protocol=1&client=ruby&version=1.0.0&batch=false&adapter=msgpack&flash=false")
-          socket = Faye::WebSocket::Client.new("wss://live.pagodabox.com/stormpack/websocket/pagodabox?protocol=1&client=ruby&version=1.0.0&batch=false&adapter=msgpack&flash=false&authorization=Basic%20#{Base64.encode64("#{user}:#{password}").chop.gsub(/\=/, '%3D')}")
-
-          # puts "Connecting to #{socket.inspect}"
-
-          # socket.onopen do
-          #   puts "Connected"
-          #   socket.send({"event"=>"stormpack:subscribe","data"=>{"channel"=>"app-log-#{app_id}"}}.to_msgpack, :type => :binary)
-          # end
-          socket.onopen = lambda do |event|
-            # puts 'connection open'
-            socket.send({"event"=>"stormpack:subscribe","data"=>{"channel"=>"app-log-#{app_id}"}}.to_msgpack.bytes.to_a)
-            # puts "listening to app: #{app}"
-            puts "Now tailing your live stream"
-            puts "press 'ctrl+c to exit"
-            puts "----------------------------"
-          end
-
-          # socket.onmessage do |msg, type|
-          #   puts "Received message: #{msg}"
-          # end
-          socket.onmessage = lambda do |event|
-            # p [:message, MessagePack.unpack(event.data.pack("c*"))]
-            data = MessagePack.unpack(event.data.pack("c*"))
-            if data['keypath']
-              colorize "[#{Time.at(data['data']['time'].to_i / 1000000) rescue Time.now}] #{(data['data']['log'].split(':').first rescue '')} : ", (data['data']['log'].split(':').first rescue 'str'), false
-              puts data['data']['log'].to_s.split(':')[1..-1].join(":").strip
-            # else
-            #   puts data
-            end
+        STDOUT.sync = true
+        socket = WebSocket::Client::Simple.connect("wss://live.pagodabox.com/stormpack/websocket/pagodabox?protocol=1&client=ruby&version=1.0.0&batch=false&adapter=json&flash=false&authorization=Basic%20#{Base64.encode64("#{user}:#{password}").chop.gsub(/\=/, '%3D')}")
+
+        socket.on :open do
+          socket.send({"event"=>"stormpack:subscribe","data"=>{"channel"=>"app-log-#{app_id}"}}.to_json, {:type => :binary})
+          puts "Now tailing your live stream"
+          puts "press 'ctrl+c to exit"
+          puts "----------------------------"
+        end        
+
+        socket.on :message do |msg|
+          data = JSON.parse(msg.to_s)
+          if (data['keypath'] rescue false)
+            @cla ||= Pagoda::Command::Log.new(nil, nil, nil)
+            @cla.colorize "[#{Time.at(data['data']['time'].to_i / 1000000) rescue Time.now}] #{(data['data']['log'].split(':').first rescue '')} : ", (data['data']['log'].split(':').first rescue 'str'), false
+            puts data['data']['log'].to_s.split(':')[1..-1].join(":").strip
           end
+        end
 
-          # socket.onclose do
-          #   puts "Disconnected"
-          # end
-          socket.onclose = lambda do |event|
-            # puts 'Server connection closed'
-            EM.stop
-          end
+        socket.on :close do |e|
+          p e
+          exit 1
+        end
 
-          [:INT, :TERM].each do |sig|
-            Signal.trap(sig) do
-              STDOUT.sync = false
-              # socket.close 1000, 'Going away'
-              puts "Log closing."
-              puts "----------------------------"
-              puts
-              socket.close
-            end
+        [:INT, :TERM].each do |sig|
+          Signal.trap(sig) do
+            STDOUT.sync = false
+            # socket.close 1000, 'Going away'
+            puts "Log closing."
+            puts "----------------------------"
+            puts
+            exit 1
           end
         end
+        sleep
       else
         count = (options[:count] || 100).to_i
 

data/lib/pagoda/cli/version.rb

@@ -1,5 +1,5 @@
 module Pagoda
   module CLI
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/pagoda.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "pagoda-tunnel"
   gem.add_dependency "rest-client"
   gem.add_dependency "gli", '~> 2.0.0'
-  gem.add_dependency 'faye-websocket'
-  gem.add_dependency 'msgpack'
-  gem.add_dependency 'eventmachine'
+  gem.add_dependency "websocket-client-simple"
+  # gem.add_dependency 'msgpack'
+  # gem.add_dependency 'eventmachine'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pagoda
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Lyon Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -95,35 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='