logs-cf-plugin 0.0.26.pre → 0.0.27.pre

data/lib/logs-cf-plugin/loggregator_client.rb

@@ -2,10 +2,12 @@ require 'log_message/log_message.pb'
 require 'faye/websocket'
 require 'eventmachine'
 require 'uri'
+require 'logs-cf-plugin/message_writer'
 
 module LogsCfPlugin
   class LoggregatorClient
     include CFoundry::TraceHelpers
+    include MessageWriter
 
     def initialize(loggregator_host, user_token, output, trace)
       @output = output
@@ -31,7 +33,7 @@ module LogsCfPlugin
         ws.on :message do |event|
           begin
             received_message = LogMessage.decode(event.data.pack("C*"))
-            MessageWriter.write(output, received_message)
+            write(output, received_message)
           rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError,  Beefcake::Message::InvalidValueError
             output.puts("Error parsing data. Please ensure your gem is the latest version.")
             ws.close
@@ -102,7 +104,9 @@ module LogsCfPlugin
         output.puts(response_trace(response_hash))
       end
 
-      messages
+      messages.each do |m|
+        write(output, m)
+      end
     rescue Beefcake::Message::WrongTypeError, Beefcake::Message::RequiredFieldNotSetError, Beefcake::Message::InvalidValueError
       output.puts("Error parsing data. Please ensure your gem is the latest version.")
       []

data/lib/logs-cf-plugin/message_writer.rb

@@ -1,5 +1,10 @@
+require "cf/cli"
+
 module MessageWriter
-  def self.write(output, message)
-    output.puts([message.app_id, message.source_id, message.message_type_name, message.message].join(" "))
+  include CF::Interactive
+  def write(output, message)
+    msg = [message.app_id, message.source_id, message.message_type_name, message.message].join(" ")
+    msg = c(msg, :error) if message.message_type == LogMessage::MessageType::ERR
+    output.puts(msg)
   end
 end

data/lib/logs-cf-plugin/plugin.rb

@@ -7,6 +7,7 @@ module LogsCfPlugin
 
   class Plugin < CF::CLI
     include LoginRequirements
+    include MessageWriter
 
     desc "Tail or dump logs for CF applications or spaces"
     group :apps
@@ -34,10 +35,7 @@ module LogsCfPlugin
       loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace])
 
       if input[:recent]
-        loggregator_client.dump_messages(log_target.query_params).each do |m|
-          MessageWriter.write(STDOUT, m)
-        end
-
+        loggregator_client.dump_messages(log_target.query_params)
       else
         loggregator_client.listen(log_target.query_params)
       end
@@ -52,4 +50,4 @@ module LogsCfPlugin
       "loggregator.#{target_base}"
     end
   end
-end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.26.pre
+  version: 0.0.27.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,6 +44,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,6 +52,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,6 +60,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -75,26 +82,27 @@ files:
 homepage: http://github.com/cloudfoundry/logs-cf-plugin
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - vendor
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CF Logs
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDMyMmMxYmM5NTQ3NDRlZjZhYjRkZjc1YmZkMTc2YjAwYTNmMjU1MA==
-  data.tar.gz: !binary |-
-    YjkyZjhjNjMyOWVmMzFlMjJmZTJjZjRiMGFiYjJjNmU0YWI1MjdjOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjA4MDJhMGQ1OTEyOGQ2MDUyMmNjMTRlOGM1OTc4NGRkY2RlNjk4M2JjZmI2
-    YWJmYjE5ZWUzZTBjMjQ1NTViNzg1YTg2OTJlMjBhNzcxYTE2YjU3MzY4YzM5
-    NDhjNzc5YTQ0MTY2ZGFmZGE1ZjgzZjY5YmZjYzljZTY0ODNlYjQ=
-  data.tar.gz: !binary |-
-    NmMyMDFjNTA5NzJhNGI3N2Q4NzVkYzJmNjlmZGVmNzM5MjU5Zjk5ODE2N2Nm
-    NDM5OTlkNmMyOTM5YWRkZDg2ZDZkYzUwZGY4MDVmYzY1NzVjOGI4NDRhM2Yx
-    Y2Y1ZTgyODdlOTg1YTlmNzM4YTczOWUwZDUxZjMwMzU1NGZlNTc=