logs-cf-plugin 0.0.34.pre → 0.0.35.pre

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjQ5NjYzNWRmZjhiZGRjZjRiZWU5Y2MyODczMzI4MTNlODE5YTM3Mg==
+  data.tar.gz: !binary |-
+    YjMyMDNhMWY2ZWE1NDZmOTFlM2U0OGQ2M2FkNWI2MzA3YjhmZDgwNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmFmOTgzNWU0MjhkOGUwNTRlZWFhZWMxYmFmMmRjMDBkNTFmNDM0Zjg4NmJm
+    YjEyMDkyZjIxYjZhMTU1OGY3YmFmZjJmNWVlYjAzZDEwYzA2YmIwOWJiNTFj
+    NDJkZGNjYzY2OTJmYTIzMDVjYjRhZmJiNGJhM2VmOWM4YWE1ODc=
+  data.tar.gz: !binary |-
+    YjEwMDYyZDdkY2M5MGQ3NzNmZWFhMDM5OTQxZDlhYjJjMTNlNTk2M2RmZjA2
+    MmNmM2MwMThmNGI1YzM0NjExNGMwNDc2OGE2OWNhZmYwYjQ4ODliZWRjNzUw
+    MTZlM2E0ZmRjNGNkNzc4OTRiNmY3ODAwMWI2MGJlMTY1MTQzMTU=

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

@@ -1,21 +1,29 @@
 module LogsCfPlugin
   class LogTarget
-    def initialize(app_id)
-      @app_id = app_id
+    def initialize(app)
+      @app = app
     end
 
     def valid?
-      !@app_id.nil?
+      !app_id.nil?
     end
 
     def query_params
-      {app: @app_id}
+      {app: app_id}
+    end
+
+    def app_id
+      @app.try(:guid)
+    end
+
+    def app_name
+      @app.try(:name)
     end
 
     private
 
     def target
-      :app if @app_id
+      :app if app_id
     end
   end
 end

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

@@ -11,11 +11,11 @@ module LogsCfPlugin
       @use_ssl = use_ssl
     end
 
-    def listen(query_params)
+    def listen(log_target)
       if use_ssl
-        websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(query_params)}"
+        websocket_address = "wss://#{loggregator_host}:4443/tail/?#{hash_to_query(log_target.query_params)}"
       else
-        websocket_address = "ws://#{loggregator_host}/tail/?#{hash_to_query(query_params)}"
+        websocket_address = "ws://#{loggregator_host}/tail/?#{hash_to_query(log_target.query_params)}"
       end
 
       output.puts "websocket_address: #{websocket_address}" if trace
@@ -33,7 +33,7 @@ module LogsCfPlugin
         ws.on :message do |event|
           begin
             received_message = LogMessage.decode(event.data.pack("C*"))
-            write(output, received_message)
+            write(log_target, 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
@@ -63,9 +63,9 @@ module LogsCfPlugin
       }
     end
 
-    def dump_messages(query_params)
+    def dump_messages(log_target)
       prefix = use_ssl ? 'https' : 'http'
-      uri = URI.parse("#{prefix}://#{loggregator_host}/dump/?#{hash_to_query(query_params)}")
+      uri = URI.parse("#{prefix}://#{loggregator_host}/dump/?#{hash_to_query(log_target.query_params)}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = use_ssl
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -106,7 +106,7 @@ module LogsCfPlugin
       end
 
       messages.each do |m|
-        write(output, m)
+        write(log_target, 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

@@ -2,8 +2,8 @@ require "cf/cli"
 
 module MessageWriter
   include CF::Interactive
-  def write(output, message)
-    msg = [message.app_id, message.source_type_name, message.source_id, message.message_type_name, message.message].join(" ")
+  def write(log_target, output, message)
+    msg = [log_target.app_name, message.source_type_name, 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

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

@@ -20,9 +20,9 @@ module LogsCfPlugin
 
     def logs
       client.current_organization.name # resolve org name so CC will validate AuthToken
-      app_id = input[:app].try(:guid)
 
-      log_target = LogTarget.new(app_id)
+
+      log_target = LogTarget.new(input[:app])
 
       unless log_target.valid?
         Mothership::Help.command_help(@@commands[:logs])
@@ -32,9 +32,9 @@ module LogsCfPlugin
       loggregator_client = LoggregatorClient.new(loggregator_host, client.token.auth_header, STDOUT, input[:trace], use_ssl)
 
       if input[:recent]
-        loggregator_client.dump_messages(log_target.query_params)
+        loggregator_client.dump_messages(log_target)
       else
-        loggregator_client.listen(log_target.query_params)
+        loggregator_client.listen(log_target)
       end
     end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.34.pre
-  prerelease: 7
+  version: 0.0.35.pre
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: loggregator_messages
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,27 +81,26 @@ 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: 1.8.25
+rubygems_version: 2.0.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CF Logs
 test_files: []