loggregator_messages 0.0.5.pre → 0.1.0.pre

data/lib/loggregator_messages/log_message_extender.rb

@@ -1,14 +1,16 @@
 class LogMessage
   def message_type_name
-    {MessageType::OUT => 'STDOUT', MessageType::ERR => 'STDERR'}[message_type]
+    {MessageType::OUT => "STDOUT", MessageType::ERR => "STDERR"}[message_type]
   end
 
-  def source_type_name
-    {SourceType::CLOUD_CONTROLLER => 'CF[CC]',
-     SourceType::ROUTER => 'CF[Router]',
-     SourceType::UAA => 'CF[UAA]',
-     SourceType::DEA => 'CF[DEA]',
-     SourceType::WARDEN_CONTAINER => 'App',}[source_type]
+  def source_name(id = nil)
+    id_string = id ? "/#{id}" : ""
+
+    {SourceType::CLOUD_CONTROLLER => "CF[CC#{id_string}]",
+     SourceType::ROUTER => "CF[Router#{id_string}]",
+     SourceType::UAA => "CF[UAA#{id_string}]",
+     SourceType::DEA => "CF[DEA#{id_string}]",
+     SourceType::WARDEN_CONTAINER => "App#{id_string}",}[source_type]
   end
 
   def time=(time)

data/loggregator_messages.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "loggregator_messages"
-  spec.version       = '0.0.5.pre'
+  spec.version       = '0.1.0.pre'
   spec.authors       = ["Pivotal"]
   spec.email         = ["cf-eng@pivotallabs.com"]
   spec.description   = "Library for all of the protocol buffer messages."

data/spec/log_message_extender_spec.rb

@@ -28,7 +28,7 @@ describe LogMessage do
     end
   end
 
-  describe "#source_type_name" do
+  describe "#source_name" do
     it "returns CloudController for type == 1" do
       msg = LogMessage.new(
           {
@@ -38,7 +38,8 @@ describe LogMessage do
               :source_type => 1
           })
 
-      expect(msg.source_type_name).to eq("CF[CC]")
+      expect(msg.source_name).to eq("CF[CC]")
+      expect(msg.source_name(1)).to eq("CF[CC/1]")
     end
 
     it "returns Router for type == 2" do
@@ -50,7 +51,8 @@ describe LogMessage do
               :source_type => 2
           })
 
-      expect(msg.source_type_name).to eq("CF[Router]")
+      expect(msg.source_name).to eq("CF[Router]")
+      expect(msg.source_name(2)).to eq("CF[Router/2]")
     end
     it "returns UAA for type == 3" do
       msg = LogMessage.new(
@@ -61,7 +63,8 @@ describe LogMessage do
               :source_type => 3
           })
 
-      expect(msg.source_type_name).to eq("CF[UAA]")
+      expect(msg.source_name).to eq("CF[UAA]")
+      expect(msg.source_name("3.1")).to eq("CF[UAA/3.1]")
     end
     it "returns DEA for type == 4" do
       msg = LogMessage.new(
@@ -72,7 +75,8 @@ describe LogMessage do
               :source_type => 4
           })
 
-      expect(msg.source_type_name).to eq("CF[DEA]")
+      expect(msg.source_name).to eq("CF[DEA]")
+      expect(msg.source_name("4")).to eq("CF[DEA/4]")
     end
     it "returns WardenContainer for type == 5" do
       msg = LogMessage.new(
@@ -83,7 +87,8 @@ describe LogMessage do
               :source_type => 5
           })
 
-      expect(msg.source_type_name).to eq("App")
+      expect(msg.source_name).to eq("App")
+      expect(msg.source_name("my-id-1")).to eq("App/my-id-1")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggregator_messages
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre
+  version: 0.1.0.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake