logstream 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 7733c436237beeea2f4209b81ea8881ca3ae9f54
-  metadata.gz: 0cbaedb3f433566f0acd608d0ff8f603ca3b04ed
 SHA512: 
-  data.tar.gz: 9105340c5ed3125164d618f3d5c1df4e3a156cd182ec1c57ef72f5315bc9bca98244a98a835abaca18f5e2c4fd509d073ffc8e2faa08c9c6f8b4d1d60ef20ce9
-  metadata.gz: a9b1e85f263b64e7a907a9efbe0ed8172d1a106a4410593ce01942592a85ad60c4f06b13e26beee40cb865fa7ff093ca3d02f336d8b6023bc04ebb759647e06c
+  metadata.gz: 06c96a47aee89d924f5236187952a721411150a2d67595ed17200d2a3b8ee4d8ed8cc27f6a9e922826d9bb56f7172f328701e9eb59559b4bc4924045703ee8c6
+  data.tar.gz: 19059ff9cdf5d49145ae07b0089e22eff70828cea9065f11565c500901b69cadecdecc087d193de6959ddbe43d07fbcfa14662bba9583a850f9ed37a39617545
+SHA1: 
+  metadata.gz: 276541c6845b82c0fda50665669b246facd4a22e
+  data.tar.gz: d3ecbd6440b5c74c44e80a5583e7f35c5559107e

data/README.md

@@ -10,7 +10,7 @@ supports streaming a variety of log sources:
 * Varnish cache logs
 
 This repository contains a client-side library and CLI. Acquia Cloud provides
-<a href="https://docs.acquia.com/cloud/configure/logging">a browser-based
+<a href="https://docs.acquia.com/cloud/configure/logging/stream">a browser-based
 UI</a> as well.
 
 ## Quick start

data/bin/logstream

@@ -6,6 +6,7 @@ require 'json'
 require 'thor'
 require 'logstream/client'
 
+# @todo: Yeah, this is terrible. Replace it with a real Cloud API gem.
 class QuickCloudAPI
   class Error < StandardError; end
 
@@ -41,8 +42,8 @@ class LogTailorCLI < Thor
   desc "tail SITE ENV", "Stream log information for the specified site environment."
   method_option(:types, :type => :array, :aliases => '-t',
                 :desc => "Only display listed log types",
-                :default => %w(apache-access php-error drupal-watchdog),
-                :banner => "apache-access apache-error php-error drupal-request drupal-watchdog bal-access"
+                :default => %w(apache-request php-error drupal-watchdog varnish-request),
+                :banner => "apache-request apache-error php-error drupal-request drupal-watchdog varnish-request"
                 )
   method_option(:show, :type => :array, :aliases => '-s',
                 :desc => "Fow rows containing the column, only show them if the column matches the regexp.",
@@ -59,6 +60,7 @@ class LogTailorCLI < Thor
                 )
   method_option(:color, :type => :boolean, :default => true, :desc => 'Turn on or off colorized lines.')
   method_option(:endpoint, :type => :string, :desc => 'The Cloud API URL to connect to.')
+  method_option(:debug, :type => :boolean, :default => false, :desc => 'Turn on debugging.')
   def tail(site, env)
     begin
       shows = Hash[options[:show].map { |s| s.split('=') }.map { |k,v| [k, Regexp.new(v)] }] rescue {}
@@ -68,9 +70,11 @@ class LogTailorCLI < Thor
         info = QuickCloudAPI.get("/sites/#{site}/envs/#{env}/logstream", { :endpoint => options[:endpoint] })
         logstream = Logstream::Client.new({ 
                                             :columns => options[:columns],
+                                            :types => options[:types],
                                             :shows => shows,
                                             :hides => hides,
                                             :no_color => !options[:color],
+                                            :debug => options[:debug],
                                           })
         logstream.run(info['url'], info['msg'])
       rescue QuickCloudAPI::Error => e

data/lib/logstream/client.rb

@@ -54,7 +54,7 @@ module Logstream
             ws.close
             EM.stop
           when 'available'
-            send_msg(ws, { 'cmd' => 'enable', 'type' => msg['type'], 'server' => msg['server'] })
+            send_msg(ws, { 'cmd' => 'enable', 'type' => msg['type'], 'server' => msg['server'] }) if @opts[:types].include?(msg['type'])
           when 'line'
             next unless msg.all? { |k,v| @opts[:shows][k].nil? || v =~ shows[k] }
             next if msg.any? { |k,v| @opts[:hides][k] && v =~ hides[k] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logstream
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Barry Jaspan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-11 00:00:00 Z
+date: 2014-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faye-websocket