pagoda 0.6.2 → 0.7.0

checksums.yaml

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

data/Gemfile.lock

@@ -1,24 +1,30 @@
 PATH
   remote: .
   specs:
-    pagoda (0.6.0)
-      gli
+    pagoda (0.7.0)
+      eventmachine
+      faye-websocket
+      gli (~> 2.0.0)
+      msgpack
       pagoda-client
       pagoda-tunnel
       rest-client
-      socketio-client
 
 GEM
   remote: http://rubygems.org/
   specs:
     coderay (0.9.8)
     diff-lcs (1.1.3)
+    eventmachine (1.0.3)
+    faye-websocket (0.4.6)
+      eventmachine (>= 0.12.0)
     gli (2.0.0)
-    json_pure (1.7.4)
+    json_pure (1.8.0)
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
-    mime-types (1.19)
-    pagoda-client (0.1.8)
+    mime-types (1.23)
+    msgpack (0.5.4)
+    pagoda-client (0.2.2)
       json_pure
       rest-client
     pagoda-tunnel (0.1.3)
@@ -42,8 +48,6 @@ GEM
       sexp_processor (~> 3.0)
     sexp_processor (3.0.7)
     slop (2.1.0)
-    socketio-client (0.0.3)
-      rest-client
 
 PLATFORMS
   ruby

data/bin/pagoda

@@ -66,9 +66,9 @@ post do |global,command,options,args|
 end
 
 on_error do |exception|
-  if exception.class == RestClient::Unauthorized
-    Pagoda::Command::Base.error "Username or Password is invald"
-  elsif exception.class == RestClient::ResourceNotFound
+  # if exception.class == RestClient::Unauthorized
+  #   Pagoda::Command::Base.error "Username or Password is invald"
+  if exception.class == RestClient::ResourceNotFound
     Pagoda::Command::Base.error "It appears we cant find your 'resource', please try again later"
   elsif exception.class == RestClient::InternalServerError
     Pagoda::Command::Base.error "It appears pagodabox is having some trouble, please try again later"

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

@@ -2,9 +2,12 @@ desc 'Real time log to your pagodabox application'
 arg_name 'Component name'
 command :log do |c|
 
-  c.desc 'Component name you want to connect to'
-  c.arg_name 'COMPONENT_NAME'
-  c.flag [:c, :component]
+  c.desc "Live stream"
+  c.switch [:live]
+
+  c.desc 'Number of log lines to retrieve'
+  c.arg_name 'COUNT'
+  c.flag [:c, :count]
 
   c.desc 'App name'
   c.arg_name 'APP_NAME'

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

@@ -1,11 +1,16 @@
-require 'socketIO'
+require 'faye/websocket'
+require "msgpack"
+require 'json'
+require 'pp'
+require 'eventmachine'
+require "base64"
 
 module Pagoda::Command
   class Log < Base
 
     COLORS = [
-      'light_red',
       'light_green',
+      'light_red',
       'light_yellow',
       'light_blue',
       'light_magenta',
@@ -20,76 +25,97 @@ module Pagoda::Command
       ]
 
     def run
-      user_input = options[:component] || args.first
-
-      if user_input =~ /^(web\d*)|(db\d*)|(cache\d*)|(worker\d*)$/
-        comps = user_input
-      else
-        comps = nil
-      end
-
-
-      auth_hash = {user: user, pass: password, app: app}
-      auth_hash['comps'] = [comps] unless comps == nil
-      message_block = ->(hash) { colorize hash[0]['message'], hash[0]['name'] }
-      error_block = ->(hash) { error hash[0]['message'] }
-
-      @client = SocketIO.connect("http://logvac.pagodabox.com", sync: true) do
-
-        before_start do
-          on_event('auth_challenge') do
-            emit('authenticate', auth_hash)
-          end
-
-          on_event('authenticated') do
-            puts "Successfully Authenticated"
+      
+      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
 
-          on_event('error', &error_block)
-
-          on_event('subscribed') do |hash|
-            if hash[0]['success']
-              puts "successfully subscribed to #{hash[0]['comp']}"
-            else
-              puts "failed to subscribe to #{hash[0]['comp']}"
+          # 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
           end
 
-          on_event('unsubscribed') do |hash|
-            puts "#{hash[0]['success'] ? 'successfully unsubscribed from' : 'failed to unsubscribe from' } #{hash[0]['comp']}"
+          # socket.onclose do
+          #   puts "Disconnected"
+          # end
+          socket.onclose = lambda do |event|
+            # puts 'Server connection closed'
+            EM.stop
           end
 
-          on_event('log', &message_block)
-
-          on_disconnect do
-            puts "Disconnected"
-            exit 0
+          [: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
           end
-
         end
-
-      end
-
-      [:INT, :TERM].each do |sig|
-        Signal.trap(sig) do
-          @client.disconnect
-          puts "Log Closed."
-          puts "-----------------------------------------------"
-          puts
-          exit
+      else
+        count = (options[:count] || 100).to_i
+
+        log = []
+        last_time_stamp = Time.now.to_i * 100_000_000
+        while log.length < count
+          # puts "****"
+          # puts "#{app}?start=#{last_time_stamp + 1}&stop=#{Time.now.to_i * 1000000}"
+          # puts "****"
+
+          r = JSON.parse(RestClient.get("https://#{user}:#{password}@logvac.pagodabox.com/logs/apps/#{app_id}?limit=#{count - log.length}&start=#{last_time_stamp -  1}&stop=#{0}"))
+          if r == []
+            break
+          else
+            last_time_stamp = r.last['time']
+            log = log + r
+          end
+          print " loading... (#{log.length} of #{count})                 \r"
+        end
+        puts
+        log.reverse.each do |line|
+          colorize("[#{Time.at(line['time'].to_i / 1000000)}] #{line['log'].split(':').first} : ", line['log'].split(':').first, false)
+          puts line['log'].split(':')[1..-1].join(":").strip
         end
       end
 
-      loop { sleep 1000 }
 
     end
 
-    def colorize message, name
+    def colorize message, name, newline = true
       @hash ||= {}
       if color = @hash[name]
-        puts message.send(color)
+        newline ? (puts message.send(color)) : (print message.send(color))
       else
-        puts message.send(@hash[name] = next_color)
+        newline ? (puts message.send(@hash[name] = next_color)) : (print message.send(@hash[name] = next_color))
         # retry  
       end
     end

data/lib/pagoda/cli/version.rb

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

data/pagoda.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
 
-  gem.add_dependency 'socketio-client'
   gem.add_dependency "pagoda-client"
   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'
 end

metadata

@@ -1,128 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: pagoda
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Lyon Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !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_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: socketio-client
+  name: pagoda-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pagoda-client
+  name: pagoda-tunnel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pagoda-tunnel
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  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'
 description: Pagoda Box User facing interface to improve workflow with Pagoda Box
 email:
 - lyon@pagodabox.com
@@ -162,7 +175,6 @@ files:
 - lib/pagoda/cli/helpers/tunnel.rb
 - lib/pagoda/cli/override.rb
 - lib/pagoda/cli/version.rb
-- newpagoda-0.5.0.gem
 - pagoda.gemspec
 - pagoda.rdoc
 - spec/lib/helper_spec.rb
@@ -173,27 +185,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://www.pagodabox.com
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pagoda Box CLI
 test_files:
 - spec/lib/helper_spec.rb
@@ -202,3 +213,4 @@ test_files:
 - spec/lib/helpers/key_spec.rb
 - spec/lib/helpers/tunnel_spec.rb
 - spec/spec_helper.rb
+has_rdoc: