tools-cf-plugin 2.1.0 → 2.1.1

data/lib/tools-cf-plugin/dea-apps.rb

@@ -0,0 +1,127 @@
+require "cf/cli"
+require "nats/client"
+
+module CFTools
+  class DEAApps < CF::App::Base
+    def precondition; end
+
+    desc "Show an overview of DEA advertisements over time."
+    group :admin
+    input :host, :alias => "-h", :default => "127.0.0.1",
+          :desc => "NATS server address"
+    input :port, :alias => "-P", :default => 4222, :type => :integer,
+          :desc => "NATS server port"
+    input :user, :alias => "-u", :default => "nats",
+          :desc => "NATS server user"
+    input :password, :alias => "-p", :default => "nats",
+          :desc => "NATS server password"
+    def dea_apps
+      @seen_apps = {}
+
+      host = input[:host]
+      port = input[:port]
+      user = input[:user]
+      pass = input[:password]
+
+      NATS.start(:uri => "nats://#{user}:#{pass}@#{host}:#{port}") do
+        NATS.subscribe("dea.advertise") do |msg|
+          payload = JSON.parse(msg)
+          dea_id = payload["id"]
+          advertisements[dea_id] = payload["app_id_to_count"]
+        end
+
+        EM.add_periodic_timer(3) do
+          render_table
+        end
+      end
+    end
+
+    private
+
+    def client_app(guid)
+      existing_app =
+        if @seen_apps.key?(guid)
+          @seen_apps[guid]
+        else
+          app = client.app(guid, :depth => 2)
+          app if app.exists?
+        end
+
+      @seen_apps[guid] = existing_app
+    end
+
+    def advertisements
+      @advertisements ||= {}
+    end
+
+    def render_table
+      app_counts = Hash.new(0)
+      app_deas = Hash.new { |h, k| h[k] = [] }
+
+      advertisements.each do |dea_id, counts|
+        counts.each do |app_guid, count|
+          app_counts[app_guid] += count
+          app_deas[app_guid] << dea_id
+        end
+      end
+
+      rows = app_counts.sort_by { |app_guid, count|
+        app = client_app(app_guid)
+        app ? app.memory * count : 0
+      }.reverse.collect do |app_guid, count|
+        app = client_app(app_guid)
+
+        deas = list(app_deas[app_guid].collect(&:to_i).sort)
+
+        if app
+          [
+            "#{b(deas)}",
+            "#{c(app.name, :name)}",
+            "#{app.guid}",
+            "#{c(app.space.organization.name, :name)} / #{c(app.space.name, :name)}",
+            "#{human_mb(app.memory * count)}",
+            "(#{human_mb(app.memory)} x #{count})"
+          ]
+        else
+          [
+            "#{b(deas)}",
+            c("unknown", :warning),
+            "#{app_guid}",
+            "?",
+            "?",
+            "(? x #{count})"
+          ]
+        end
+      end
+
+      table(["dea", "app_name", "app_guid", "org/space", "reserved", "math"], rows)
+    end
+
+    def human_mb(mem)
+      human_size(mem * 1024 * 1024)
+    end
+
+    def human_size(num, precision = 0)
+      abs = num.abs
+
+      sizes = %w(T G M K)
+      sizes.each.with_index do |suf, i|
+        pow = sizes.size - i
+        unit = 1024.0 ** pow
+        if abs >= unit
+          return format("%.#{precision}f%s", num / unit, suf)
+        end
+      end
+
+      format("%.#{precision}fB", num)
+    end
+
+    def list(vals)
+      if vals.empty?
+        d("none")
+      else
+        vals.join(",")
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require "tools-cf-plugin/watch"
 require "tools-cf-plugin/shell"
 require "tools-cf-plugin/dea-ads"
+require "tools-cf-plugin/dea-apps"
 require "tools-cf-plugin/tunnel/tunnel-nats"
 require "tools-cf-plugin/tunnel/watch-logs"

data/lib/tools-cf-plugin/tunnel/log_entry.rb

@@ -26,6 +26,12 @@ module CFTools
       rescue JSON::ParserError
       end
 
+      def data
+        json = JSON.parse(@line)
+        json["data"]
+      rescue JSON::ParserError
+      end
+
       def timestamp
         json = JSON.parse(@line)
 

data/lib/tools-cf-plugin/tunnel/tunnel-nats.rb

@@ -44,6 +44,9 @@ module CFTools::Tunnel
           tunnel_to(nats["address"], nats["port"], gateway) 
         end
 
+      line "port: #{nport}"
+      line "creds: #{nats}"
+
       with_progress("Logging in as admin user") do
         login_as_admin(manifest)
       end

data/lib/tools-cf-plugin/tunnel/watch-logs.rb

@@ -66,7 +66,8 @@ module CFTools::Tunnel
       [ c(entry.label.ljust(max_label_size), :name),
         entry.timestamp.strftime("%r"),
         "#{pretty_log_level(log_level)}#{level_padding}",
-        level_colored_message(entry)
+        level_colored_message(entry),
+        entry.data ? entry.data.inspect : ""
       ].join("  ")
     end
 

data/lib/tools-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module CFTools
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 end

data/lib/tools-cf-plugin/watch.rb

@@ -65,47 +65,50 @@ module CFTools
     def process_message(sub, reply, msg, app)
       register_request(sub, reply) if reply
 
+      payload = JSON.parse(msg) # rescue msg
+
       case sub
       when "dea.advertise"
         return if app
-        sub, msg = pretty_dea_advertise(sub, msg)
+        sub, payload = pretty_dea_advertise(sub, payload)
       when "staging.advertise"
         return if app
-        sub, msg = pretty_staging_advertise(sub, msg)
+        sub, payload = pretty_staging_advertise(sub, payload)
       when "droplet.exited"
-        sub, msg = pretty_exited(sub, msg)
+        sub, payload = pretty_exited(sub, payload)
       when "dea.heartbeat"
-        sub, msg = pretty_heartbeat(sub, msg, app)
+        sub, payload = pretty_heartbeat(sub, payload, app)
       when "router.start"
-        sub, msg = pretty_router_start(sub, msg)
+        sub, payload = pretty_router_start(sub, payload)
       when "router.register"
-        sub, msg = pretty_register(sub, msg)
+        return if !app && payload.has_key?("dea")
+        sub, payload = pretty_register(sub, payload)
       when "router.unregister"
-        sub, msg = pretty_unregister(sub, msg)
+        sub, payload = pretty_unregister(sub, payload)
       when /^dea\.(\d+)-.*\.start$/
-        sub, msg = pretty_start(sub, msg, $1)
+        sub, payload = pretty_start(payload, $1)
       when "dea.stop"
-        sub, msg = pretty_stop(sub, msg)
+        sub, payload = pretty_stop(sub, payload)
       when "droplet.updated"
-        sub, msg = pretty_updated(sub, msg)
+        sub, payload = pretty_updated(sub, payload)
       when "dea.update"
-        sub, msg = pretty_dea_update(sub, msg)
+        sub, payload = pretty_dea_update(sub, payload)
       when "dea.find.droplet"
-        sub, msg = pretty_find_droplet(sub, msg)
+        sub, payload = pretty_find_droplet(sub, payload)
       when "healthmanager.status"
-        sub, msg = pretty_healthmanager_status(sub, msg)
+        sub, payload = pretty_healthmanager_status(sub, payload)
       when "healthmanager.health"
-        sub, msg = pretty_healthmanager_health(sub, msg)
+        sub, payload = pretty_healthmanager_health(sub, payload)
       when "dea.shutdown"
-        sub, msg = pretty_dea_shutdown(sub, msg)
+        sub, payload = pretty_dea_shutdown(sub, payload)
       when /^cloudcontrollers\.hm\.requests\.\w+$/
-        sub, msg = process_cloudcontrollers_hm_request(sub, msg)
+        sub, payload = process_cloudcontrollers_hm_request(payload)
       when /^([^.]+)\.announce$/
-        sub, msg = pretty_service_announcement(sub, msg)
+        sub, payload = pretty_service_announcement(sub, payload)
       when "vcap.component.announce"
-        sub, msg = pretty_component_announcement(sub, msg)
+        sub, payload = pretty_component_announcement(sub, payload)
       when "vcap.component.discover"
-        sub, msg = pretty_component_discover(sub, msg)
+        sub, payload = pretty_component_discover(sub, payload)
       end
 
       if reply
@@ -114,28 +117,29 @@ module CFTools
       end
 
       sub = sub.ljust(COLUMN_WIDTH)
-      line "#{timestamp}\t#{sub}\t#{msg}"
+      line "#{timestamp}\t#{sub}\t#{payload}"
     end
 
     def process_response(sub, _, msg, _)
+      payload = JSON.parse(msg) # rescue msg
+
       sub, id = @requests[sub]
 
       case sub
       when "dea.find.droplet"
-        sub, msg = pretty_find_droplet_response(sub, msg)
+        sub, payload = pretty_find_droplet_response(sub, payload)
       when "healthmanager.status"
-        sub, msg = pretty_healthmanager_status_response(sub, msg)
+        sub, payload = pretty_healthmanager_status_response(sub, payload)
       when "healthmanager.health"
-        sub, msg = pretty_healthmanager_health_response(sub, msg)
+        sub, payload = pretty_healthmanager_health_response(sub, payload)
       when "vcap.component.discover"
-        sub, msg = pretty_component_discover_response(sub, msg)
+        sub, payload = pretty_component_discover_response(sub, payload)
       end
 
-      line "#{timestamp}\t#{REPLY_PREFIX}#{sub} (#{c(id, :error)})\t#{msg}"
+      line "#{timestamp}\t#{REPLY_PREFIX}#{sub} (#{c(id, :error)})\t#{payload}"
     end
 
-    def pretty_dea_advertise(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_dea_advertise(sub, payload)
       dea, _ = payload["id"].split("-", 2)
       [ d(sub),
         [ "dea: #{dea}",
@@ -146,8 +150,7 @@ module CFTools
       ]
     end
 
-    def pretty_staging_advertise(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_staging_advertise(sub, payload)
       dea, _ = payload["id"].split("-", 2)
       [ d(sub),
         [ "dea: #{dea}",
@@ -161,8 +164,7 @@ module CFTools
       list(counts.collect { |g, c| "#{c} x #{pretty_app(g)}" })
     end
 
-    def pretty_exited(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_exited(sub, payload)
       [ c(sub, :bad),
         [ "app: #{pretty_app(payload["droplet"])}",
           "reason: #{payload["reason"]}",
@@ -171,8 +173,7 @@ module CFTools
       ]
     end
 
-    def pretty_heartbeat(sub, msg, app)
-      payload = JSON.parse(msg)
+    def pretty_heartbeat(sub, payload, app)
 
       dea, _ = payload["dea"].split("-", 2)
 
@@ -189,14 +190,11 @@ module CFTools
       ]
     end
 
-    def pretty_router_start(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_router_start(sub, payload)
       [c(sub, :neutral), "hosts: #{list(payload["hosts"])}"]
     end
 
-    def pretty_register(sub, msg)
-      payload = JSON.parse(msg)
-
+    def pretty_register(sub, payload)
       message = []
 
       if (dea_id = payload["dea"])
@@ -213,9 +211,7 @@ module CFTools
       [c(sub, :neutral), message.join(", ")]
     end
 
-    def pretty_unregister(sub, msg)
-      payload = JSON.parse(msg)
-
+    def pretty_unregister(sub, payload)
       message = []
 
       if (dea_id = payload["dea"])
@@ -232,8 +228,7 @@ module CFTools
       [c(sub, :warning), message.join(", ")]
     end
 
-    def pretty_start(sub, msg, dea)
-      payload = JSON.parse(msg)
+    def pretty_start(payload, dea)
       [ c("dea.#{dea}.start", :good),
         [ "app: #{pretty_app(payload["droplet"])}",
           "dea: #{dea}",
@@ -243,9 +238,7 @@ module CFTools
       ]
     end
 
-    def pretty_stop(sub, msg)
-      payload = JSON.parse(msg)
-
+    def pretty_stop(sub, payload)
       message = ["app: #{pretty_app(payload["droplet"])}"]
 
       if (indices = payload["indices"])
@@ -259,8 +252,7 @@ module CFTools
       [c(sub, :warning), message.join(", ")]
     end
 
-    def pretty_dea_update(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_dea_update(sub, payload)
       [ d(sub),
         [ "app: #{pretty_app(payload["droplet"])}",
           "uris: #{list(payload["uris"])}"
@@ -268,8 +260,7 @@ module CFTools
       ]
     end
 
-    def pretty_find_droplet(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_find_droplet(sub, payload)
       states = payload["states"].collect { |s| c(s.downcase, state_color(s))}
       [ d(sub),
         [ "app: #{pretty_app(payload["droplet"])}",
@@ -278,8 +269,7 @@ module CFTools
       ]
     end
 
-    def pretty_find_droplet_response(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_find_droplet_response(sub, payload)
       dea, _ = payload["dea"].split("-", 2)
       index = payload["index"]
       state = payload["state"]
@@ -293,8 +283,7 @@ module CFTools
       ]
     end
 
-    def pretty_healthmanager_status(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_healthmanager_status(sub, payload)
       state = payload["state"]
       [ d(sub),
         [ "app: #{pretty_app(payload["droplet"])}",
@@ -303,19 +292,16 @@ module CFTools
       ]
     end
 
-    def pretty_healthmanager_status_response(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_healthmanager_status_response(sub, payload)
       [sub, "indices: #{list(payload["indices"])}"]
     end
 
-    def pretty_healthmanager_health(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_healthmanager_health(sub, payload)
       apps = payload["droplets"].collect { |d| pretty_app(d["droplet"]) }
       [d(sub), "querying health for: #{list(apps)}"]
     end
 
-    def pretty_healthmanager_health_response(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_healthmanager_health_response(sub, payload)
       [ sub,
         [ "app: #{pretty_app(payload["droplet"])}",
           "healthy: #{payload["healthy"]}"
@@ -323,14 +309,11 @@ module CFTools
       ]
     end
 
-    def pretty_updated(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_updated(sub, payload)
       [d(sub), "app: #{pretty_app(payload["droplet"])}"]
     end
 
-    def pretty_dea_shutdown(sub, msg)
-      payload = JSON.parse(msg)
-
+    def pretty_dea_shutdown(sub, payload)
       dea, _ = payload["id"].split("-", 2)
 
       apps = payload["app_id_to_count"].collect do |guid, count|
@@ -340,8 +323,7 @@ module CFTools
       [c(sub, :error), "dea: #{dea}, apps: #{list(apps)}"]
     end
 
-    def process_cloudcontrollers_hm_request(sub, msg)
-      payload = JSON.parse(msg)
+    def process_cloudcontrollers_hm_request(payload)
       last_updated = Time.at(payload["last_updated"])
 
       op = payload["op"]
@@ -362,8 +344,7 @@ module CFTools
       [c("hm.request", :warning), message.join(", ")]
     end
 
-    def pretty_service_announcement(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_service_announcement(sub, payload)
       id = payload["id"]
       plan = payload["plan"]
       c_unit = payload["capacity_unit"]
@@ -380,8 +361,7 @@ module CFTools
       ]
     end
 
-    def pretty_component_announcement(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_component_announcement(sub, payload)
       type = payload["type"]
       index = payload["index"]
       uuid = payload["uuid"]
@@ -396,12 +376,11 @@ module CFTools
       ]
     end
 
-    def pretty_component_discover(sub, msg)
-      [d(sub), msg]
+    def pretty_component_discover(sub, payload)
+      [d(sub), payload]
     end
 
-    def pretty_component_discover_response(sub, msg)
-      payload = JSON.parse(msg)
+    def pretty_component_discover_response(sub, payload)
       type = payload["type"]
       index = payload["index"]
       host = payload["host"]
@@ -440,7 +419,7 @@ module CFTools
         end
 
       if existing_app
-        @seen_apps[guid] = existing_app
+        #@seen_apps[guid] = existing_app
         c(existing_app.name, :name)
       else
         @seen_apps[guid] = nil

data/spec/dea-apps_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe CFTools::DEAApps do
+  let(:app1) { fake :app, :name => "myapp1", :guid => "myappguid-1", :memory => 128, :total_instances => 4 }
+  let(:app2) { fake :app, :name => "myapp2", :guid => "myappguid-2", :memory => 256, :total_instances => 4 }
+  let(:app3) { fake :app, :name => "myapp3", :guid => "myappguid-3", :memory => 1024, :total_instances => 4 }
+  let(:client) { fake_client :apps => [app1, app2, app3] }
+
+  before { stub_client }
+
+  before {
+    app1.stub(:exists? => true)
+    app2.stub(:exists? => true)
+    app3.stub(:exists? => true)
+  }
+
+  before do
+    NATS.stub(:start).and_yield
+    NATS.stub(:subscribe)
+    EM.stub(:add_periodic_timer).and_yield
+  end
+
+  context "When a NATS message is recieved" do
+    let(:advertise) { <<PAYLOAD }
+{
+  "app_id_to_count": {
+    "#{app1.guid}": #{app1.total_instances},
+    "#{app2.guid}": #{app2.total_instances},
+    "#{app3.guid}": #{app3.total_instances}
+  },
+  "available_memory": 1256,
+  "stacks": [
+    "lucid64",
+    "lucid86"
+  ],
+  "prod": false,
+  "id": "2-1d0cf3bcd994d9f2c5ea22b9b624d77b"
+}
+PAYLOAD
+
+    before do
+      NATS.stub(:subscribe).and_yield(advertise)
+    end
+
+    it "outputs the list of apps, memory and math" do
+      cf %W[dea-apps]
+      expect(output).to say(%r{app_name\s+app_guid\s+org/space\s+reserved\s+math})
+      expect(output).to say(%r{myapp3\s+myappguid-3\s+organization-\w+ / space-\w+\s+4G\s+\(1G\s+x\s+4\)})
+      expect(output).to say(%r{myapp2\s+myappguid-2\s+organization-\w+ / space-\w+\s+1G\s+\(256M\s+x\s+4\)})
+      expect(output).to say(%r{myapp1\s+myappguid-1\s+organization-\w+ / space-\w+\s+512M\s+\(128M\s+x\s+4\)})
+    end
+  end
+
+end

data/spec/tunnel/watch-logs_spec.rb

@@ -91,7 +91,7 @@ module CFTools::Tunnel
 
         entry2 = LogEntry.new(
           "dea_next/1",
-          %Q[{"message":"b","timestamp":#{entry2_time.to_f},"log_level":"warn"}],
+          %Q[{"message":"b","timestamp":#{entry2_time.to_f},"log_level":"warn","data":{"foo":"bar"}}],
           :stdout)
 
         entry3 = LogEntry.new(
@@ -103,9 +103,9 @@ module CFTools::Tunnel
 
         cf %W[watch-logs some-director.com]
 
-        expect(output).to say("cloud_controller/0   01:02:03 AM  info    a\n")
-        expect(output).to say("dea_next/1           01:02:04 AM  warn    b\n")
-        expect(output).to say("dea_next/0           01:02:05 AM  error   c\n")
+        expect(output).to say("cloud_controller/0   01:02:03 AM  info    a  \n")
+        expect(output).to say("dea_next/1           01:02:04 AM  warn    b  {\"foo\"=>\"bar\"}\n")
+        expect(output).to say("dea_next/0           01:02:05 AM  error   c  \n")
       end
 
       context "and components were specified" do

data/spec/watch_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe CFTools::Watch do
-  let(:app) { fake :app, :name => "myapp", :guid => "myappguid" }
+  let!(:app) { fake :app, :name => "myapp", :guid => "myappguid" }
 
   let(:client) { fake_client :apps => [app] }
 
@@ -36,12 +36,12 @@ describe CFTools::Watch do
   context "when no application is given" do
     around { |example| Timecop.freeze(&example) }
 
-    let(:messages) { [["some-message", nil, "some.subject"]] }
+    let(:messages) { [['{"some-message":"bar"}', nil, "some.subject"]] }
 
     it "prints a timestamp, message, and raw body" do
       cf %W[watch]
 
-      expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*some-message/)
+      expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*{"some-message"=>"bar"}/)
     end
   end
 
@@ -79,16 +79,16 @@ describe CFTools::Watch do
   context "when a message comes in with a reply channel, followed by a reply" do
     let(:messages) do
       [
-        ["foo", "some-reply", "some.subject"],
-        ["some-response", nil, "some-reply"]
+        ['{"foo":"bar"}', "some-reply", "some.subject"],
+        ['{"some-response":"other"}', nil, "some-reply"]
       ]
     end
 
     it "registers it in #requests" do
       cf %W[watch]
 
-      expect(output).to say(/some\.subject             \(1\)\s*foo/)
-      expect(output).to say(/`- reply to some\.subject \(1\)\s+some-response/)
+      expect(output).to say(/some\.subject             \(1\)\s*{"foo"=>"bar"}/)
+      expect(output).to say(/`- reply to some\.subject \(1\)\s+{"some-response"=>"other"}/)
     end
   end
 
@@ -107,12 +107,12 @@ describe CFTools::Watch do
     context "and a message containing the app's GUID is seen" do
       around { |example| Timecop.freeze(&example) }
 
-      let(:messages) { [["some-message-mentioning-#{app.guid}", nil, "some.subject"]] }
+      let(:messages) { [["{\"foo\":\"some-message-mentioning-#{app.guid}\"}", nil, "some.subject"]] }
 
       it "prints a timestamp, message, and raw body" do
         cf %W[watch myapp]
 
-        expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*some-message-mentioning-#{app.guid}/)
+        expect(output).to say(/#{Time.now.strftime("%r")}\s*some.subject\s*{"foo"=>"some-message-mentioning-#{app.guid}"}/)
       end
     end
 
@@ -303,8 +303,9 @@ PAYLOAD
   context "when a message is seen with subject router.register" do
     let(:subject) { "router.register" }
 
-    context "when there's an associated DEA" do
-      let(:payload) { <<PAYLOAD }
+    context "when the app flag is passed in" do
+      context "when there's an associated DEA" do
+        let(:payload) { <<PAYLOAD }
 {
   "private_instance_id": "e4a5ee2330c81fd7611eba7dbedbb499a00ae1b79f97f40a3603c8bff6fbcc6f",
   "tags": {},
@@ -319,10 +320,34 @@ PAYLOAD
 }
 PAYLOAD
 
-      it "prints the uris, host, and port" do
+        it "prints the uris, host, and port" do
+          cf %W[watch --app #{app.name}]
+
+          expect(output).to say("app: myapp, dea: 1, uris: my-app.com, my-app-2.com, host: 192.0.43.10, port: 61111")
+        end
+      end
+    end
+
+    context "when the app flag is not passed in" do
+      let(:payload) { <<PAYLOAD }
+{
+  "private_instance_id": "e4a5ee2330c81fd7611eba7dbedbb499a00ae1b79f97f40a3603c8bff6fbcc6f",
+  "tags": {},
+  "port": 61111,
+  "host": "192.0.43.10",
+  "uris": [
+    "my-app.com",
+    "my-app-2.com"
+  ],
+  "app": "some_unkown_guid",
+  "dea": "1-4b293b726167fbc895af5a7927c0973a"
+}
+PAYLOAD
+
+      it "does not print anything" do
         cf %W[watch]
 
-        expect(output).to say("app: myapp, dea: 1, uris: my-app.com, my-app-2.com, host: 192.0.43.10, port: 61111")
+        expect(output).to_not say("uris: my-app.com, my-app-2.com, host: 192.0.43.10, port: 61111")
       end
     end
 
@@ -881,8 +906,8 @@ PAYLOAD
 {
   "start": "2013-05-24 17:58:08 +0000",
   "credentials": [
-    "d34f205a31232eef040d1e39ebdd631a",
-    "701e1a68a811a1ac8c137a70db08c1a8"
+    "user",
+    "pass"
   ],
   "host": "1.2.3.4:8080",
   "uuid": "1-deadbeef",
@@ -894,7 +919,7 @@ PAYLOAD
         it "does not include it in the message" do
           cf %W[watch]
 
-          expect(output).to say("reply to vcap.component.discover (1)\ttype: login, index: 1, host: 1.2.3.4:8080")
+          expect(output).to say("reply to vcap.component.discover (1)\ttype: login, index: 1, uri: user:pass@1.2.3.4:8080")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tools-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -272,6 +272,7 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/tools-cf-plugin/dea-ads.rb
+- lib/tools-cf-plugin/dea-apps.rb
 - lib/tools-cf-plugin/plugin.rb
 - lib/tools-cf-plugin/shell.rb
 - lib/tools-cf-plugin/tunnel/base.rb
@@ -283,6 +284,7 @@ files:
 - lib/tools-cf-plugin/version.rb
 - lib/tools-cf-plugin/watch.rb
 - spec/dea-ads_spec.rb
+- spec/dea-apps_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/tunnel/base_spec.rb
@@ -318,6 +320,7 @@ specification_version: 3
 summary: Cloud Foundry tooling commands.
 test_files:
 - spec/dea-ads_spec.rb
+- spec/dea-apps_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/tunnel/base_spec.rb
@@ -327,3 +330,4 @@ test_files:
 - spec/tunnel/tunnel-nats_spec.rb
 - spec/tunnel/watch-logs_spec.rb
 - spec/watch_spec.rb
+has_rdoc: