tools-cf-plugin 2.1.1 → 2.2.0

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

@@ -44,9 +44,6 @@ 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/version.rb

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

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

@@ -3,17 +3,18 @@ require "nats/client"
 
 module CFTools
   class Watch < CF::App::Base
-    def precondition
-      check_target
-    end
+    def precondition; end
 
     REPLY_PREFIX = "`- reply to "
     COLUMN_WIDTH = 30
 
     desc "Watch messages going over NATS relevant to an application"
     group :admin
-    input :app, :argument => :optional, :from_given => by_name(:app),
+    input :app, :argument => :optional, :from_given => by_name(:apps),
           :desc => "Application to watch"
+    input :subjects, :aliases => %w[-s --subject],
+          :from_given => proc { |s| s.split(",") },
+          :desc => "NATS subject to subscribe to"
     input :host, :alias => "-h", :default => "127.0.0.1",
           :desc => "NATS server address"
     input :port, :alias => "-P", :default => 4222, :type => :integer,
@@ -23,11 +24,12 @@ module CFTools
     input :password, :alias => "-p", :default => "nats",
           :desc => "NATS server password"
     def watch
-      app = input[:app]
+      app = get_app(input[:app])
       host = input[:host]
       port = input[:port]
       user = input[:user]
       pass = input[:password]
+      subjects = input[:subjects] || [">"]
 
       @requests = {}
       @seen_apps = {}
@@ -35,7 +37,7 @@ module CFTools
 
       $stdout.sync = true
 
-      watching_nats("nats://#{user}:#{pass}@#{host}:#{port}") do |msg, reply, sub|
+      watching_nats("nats://#{user}:#{pass}@#{host}:#{port}", subjects) do |msg, reply, sub|
         begin
           if @requests.include?(sub)
             process_response(sub, reply, msg, app)
@@ -65,7 +67,7 @@ module CFTools
     def process_message(sub, reply, msg, app)
       register_request(sub, reply) if reply
 
-      payload = JSON.parse(msg) # rescue msg
+      payload = JSON.parse(msg) rescue msg
 
       case sub
       when "dea.advertise"
@@ -81,7 +83,6 @@ module CFTools
       when "router.start"
         sub, payload = pretty_router_start(sub, payload)
       when "router.register"
-        return if !app && payload.has_key?("dea")
         sub, payload = pretty_register(sub, payload)
       when "router.unregister"
         sub, payload = pretty_unregister(sub, payload)
@@ -101,8 +102,10 @@ module CFTools
         sub, payload = pretty_healthmanager_health(sub, payload)
       when "dea.shutdown"
         sub, payload = pretty_dea_shutdown(sub, payload)
-      when /^cloudcontrollers\.hm\.requests\.\w+$/
-        sub, payload = process_cloudcontrollers_hm_request(payload)
+      when "health.start"
+        sub, payload = pretty_health_start(sub, payload)
+      when "health.stop"
+        sub, payload = pretty_health_stop(sub, payload)
       when /^([^.]+)\.announce$/
         sub, payload = pretty_service_announcement(sub, payload)
       when "vcap.component.announce"
@@ -168,13 +171,13 @@ module CFTools
       [ c(sub, :bad),
         [ "app: #{pretty_app(payload["droplet"])}",
           "reason: #{payload["reason"]}",
-          "index: #{payload["index"]}"
+          "index: #{payload["index"]}",
+          "version: #{pretty_version(payload["version"])}"
         ].join(", ")
       ]
     end
 
     def pretty_heartbeat(sub, payload, app)
-
       dea, _ = payload["dea"].split("-", 2)
 
       states = Hash.new(0)
@@ -233,7 +236,8 @@ module CFTools
         [ "app: #{pretty_app(payload["droplet"])}",
           "dea: #{dea}",
           "index: #{payload["index"]}",
-          "uris: #{list(payload["uris"])}"
+          "version: #{pretty_version(payload["version"])}",
+          "uris: #{list(Array(payload["uris"]))}"
         ].join(", ")
       ]
     end
@@ -241,6 +245,10 @@ module CFTools
     def pretty_stop(sub, payload)
       message = ["app: #{pretty_app(payload["droplet"])}"]
 
+      if (version = payload["version"])
+        message << "version: #{pretty_version(version)}"
+      end
+
       if (indices = payload["indices"])
         message << "scaling down indices: #{indices.join(", ")}"
       elsif (instances = payload["instances"])
@@ -261,10 +269,14 @@ module CFTools
     end
 
     def pretty_find_droplet(sub, payload)
-      states = payload["states"].collect { |s| c(s.downcase, state_color(s))}
+      states = (payload["states"] || []).collect do |s|
+        c(s.downcase, state_color(s))
+      end
+
       [ d(sub),
         [ "app: #{pretty_app(payload["droplet"])}",
-          "querying states: #{states.join(", ")}"
+          "version: #{pretty_version(payload["version"])}",
+          "querying states: #{list(states)}"
         ].join(", ")
       ]
     end
@@ -273,20 +285,25 @@ module CFTools
       dea, _ = payload["dea"].split("-", 2)
       index = payload["index"]
       state = payload["state"]
-      time = Time.at(payload["state_timestamp"])
+      version = payload["version"]
+      since = Time.at(payload["state_timestamp"])
       [ sub,
         [ "dea: #{dea}",
           "index: #{index}",
           "state: #{c(state.downcase, state_color(state))}",
-          "since: #{time}"
+          "version: #{pretty_version(version)}",
+          "since: #{since}"
         ].join(", ")
       ]
     end
 
     def pretty_healthmanager_status(sub, payload)
       state = payload["state"]
+      version = payload["version"]
+
       [ d(sub),
         [ "app: #{pretty_app(payload["droplet"])}",
+          "version: #{pretty_version(version)}",
           "querying states: #{c(state.downcase, state_color(state))}"
         ].join(", ")
       ]
@@ -297,13 +314,17 @@ module CFTools
     end
 
     def pretty_healthmanager_health(sub, payload)
-      apps = payload["droplets"].collect { |d| pretty_app(d["droplet"]) }
+      apps = payload["droplets"].collect do |d|
+        "#{pretty_app(d["droplet"])} (#{pretty_version(d["version"])})"
+      end
+
       [d(sub), "querying health for: #{list(apps)}"]
     end
 
     def pretty_healthmanager_health_response(sub, payload)
       [ sub,
         [ "app: #{pretty_app(payload["droplet"])}",
+          "version: #{pretty_version(payload["version"])}",
           "healthy: #{payload["healthy"]}"
         ].join(", ")
       ]
@@ -323,25 +344,23 @@ module CFTools
       [c(sub, :error), "dea: #{dea}, apps: #{list(apps)}"]
     end
 
-    def process_cloudcontrollers_hm_request(payload)
-      last_updated = Time.at(payload["last_updated"])
-
-      op = payload["op"]
-
-      message = [
-        "app: #{pretty_app(payload["droplet"])}",
-        "operation: #{pretty_hm_op(op)}",
-        "app last updated: #{last_updated}"
+    def pretty_health_start(sub, payload)
+      [ c(sub, :good),
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "version: #{pretty_version(payload["version"])}",
+          "indices: #{list(payload["indices"])}",
+          "running: #{pretty_running_counts(payload["running"])}"
+        ].join(", ")
       ]
+    end
 
-      case op
-      when "STOP"
-        message << "instances: #{list(payload["instances"])}"
-      when "START"
-        message << "indices: #{list(payload["indices"])}"
-      end
-
-      [c("hm.request", :warning), message.join(", ")]
+    def pretty_health_stop(sub, payload)
+      [ c(sub, :bad),
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "instances: #{pretty_instance_breakdown(payload["instances"])}",
+          "running: #{pretty_running_counts(payload["running"])}"
+        ].join(", ")
+      ]
     end
 
     def pretty_service_announcement(sub, payload)
@@ -398,18 +417,25 @@ module CFTools
       [d(sub), message.join(", ")]
     end
 
-    def pretty_hm_op(op)
-      case op
-      when "STOP"
-        c("stop", :bad)
-      when "START"
-        c("start", :good)
-      else
-        op
-      end
+    def pretty_running_counts(running)
+      running.collect do |ver, num|
+        "#{num} x #{pretty_version(ver)}"
+      end.join(", ")
+    end
+
+    def pretty_instance_breakdown(instances)
+      instances.collect do |inst, ver|
+        "#{inst} (#{pretty_version(ver)})"
+      end.join(", ")
+    end
+
+    def pretty_version(guid)
+      guid.split("-").first
     end
 
     def pretty_app(guid)
+      return guid unless client
+
       existing_app =
         if @seen_apps.key?(guid)
           @seen_apps[guid]
@@ -419,22 +445,45 @@ 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
         d("unknown (#{guid})")
       end
+    rescue CFoundry::TargetRefused, CFoundry::InvalidAuthToken
+      guid
     end
 
-    def watching_nats(uri, &blk)
+    def watching_nats(uri, subjects, &blk)
       NATS.start(:uri => uri) do
-        NATS.subscribe(">", &blk)
+        subjects.each do |subject|
+          NATS.subscribe(subject, &blk)
+        end
       end
     end
 
     def register_request(sub, reply)
       @requests[reply] = [sub, @request_ticker += 1]
     end
+
+    def get_app(apps)
+      return unless apps
+
+      if apps.empty?
+        fail "Unknown app '#{input.given[:app]}'."
+      elsif apps.size == 1
+        apps.first
+      else
+        disambiguate_app(apps)
+      end
+    end
+
+    def disambiguate_app(apps)
+      ask("Which application?", :choices => apps,
+          :display => proc do |a|
+            "#{a.name} (#{a.space.organization.name}/#{a.space.name})"
+          end)
+    end
   end
 end

data/spec/watch_spec.rb

@@ -33,6 +33,21 @@ describe CFTools::Watch do
     cf %W[watch]
   end
 
+  context "when a subject is given" do
+    it "subscribes to the given subject on NATS" do
+      expect(NATS).to receive(:subscribe).with("some.subject")
+      cf %W[watch --subject some.subject]
+    end
+
+    context "when multiple subjects are given" do
+      it "subscribes to all of them on NATS" do
+        expect(NATS).to receive(:subscribe).with("some.subject")
+        expect(NATS).to receive(:subscribe).with("some.other.subject")
+        cf %W[watch --subjects some.subject,some.other.subject]
+      end
+    end
+  end
+
   context "when no application is given" do
     around { |example| Timecop.freeze(&example) }
 
@@ -104,6 +119,25 @@ describe CFTools::Watch do
       end
     end
 
+    context "and multiple apps with the sane name are found" do
+      let!(:org1) { fake :organization, :name => "org1" }
+      let!(:org2) { fake :organization, :name => "org2" }
+      let!(:space1) { fake :space, :name => "space1", :organization => org1 }
+      let!(:space2) { fake :space, :name => "space2", :organization => org2 }
+      let!(:app1) { fake :app, :name => "myapp", :guid => "myappguid", :space => space1 }
+      let!(:app2) { fake :app, :name => "myapp", :guid => "myappguid", :space => space2 }
+
+      let(:client) { fake_client :apps => [app1, app2] }
+
+      it "asks to disambiguate" do
+        should_ask("Which application?", hash_including(:choices => [app1, app2])) do |_, opts|
+          expect(opts[:display].call(app1)).to eq("myapp (org1/space1)")
+        end
+
+        cf %W[watch myapp]
+      end
+    end
+
     context "and a message containing the app's GUID is seen" do
       around { |example| Timecop.freeze(&example) }
 
@@ -146,7 +180,7 @@ PAYLOAD
     it "pretty-prints the message body" do
       cf %W[watch]
 
-      expect(output).to say("app: myapp, reason: STOPPED, index: 0")
+      expect(output).to say("app: myapp, reason: STOPPED, index: 0, version: aaca113b")
     end
   end
 
@@ -172,7 +206,7 @@ PAYLOAD
       "state": "CRASHED",
       "index": 1,
       "instance": "some other app instance",
-      "version": "5c0e0e10-8384-4a35-915e-872fe91ffb95",
+      "version": "deadbeef-8384-4a35-915e-872fe91ffb95",
       "droplet": "#{app.guid}",
       "cc_partition": "default"
     },
@@ -453,10 +487,42 @@ PAYLOAD
       expect(output).to say("dea.42.start")
     end
 
-    it "prints the uris, host, and port" do
+    it "prints the app, dea, index, version, and uris" do
       cf %W[watch]
 
-      expect(output).to say("app: myapp, dea: 42, index: 2, uris: myapp.com")
+      expect(output).to say("app: myapp, dea: 42, index: 2, version: ce1da6af, uris: myapp.com")
+    end
+
+    context "when a single uri is given as a string" do
+      let(:payload) { <<PAYLOAD }
+{
+  "index": 2,
+  "debug": null,
+  "console": true,
+  "env": [],
+  "cc_partition": "default",
+  "limits": {
+    "fds": 16384,
+    "disk": 1024,
+    "mem": 128
+  },
+  "services": [],
+  "droplet": "#{app.guid}",
+  "name": "hello-sinatra",
+  "uris": "myapp.com",
+  "prod": false,
+  "sha1": "9c8f36ee81b535a7d9b4efcd9d629e8cf8a2645f",
+  "executableFile": "deprecated",
+  "executableUri": "https://a1-cf-app-com-cc-droplets.s3.amazonaws.com/ac/cf/accf1078-e7e1-439a-bd32-77296390c406?AWSAccessKeyId=AKIAIMGCF7E5F6M5RV3A&Signature=1lyIotK3cZ2VUyK3H8YrlT82B8c%3D&Expires=1369259081",
+  "version": "ce1da6af-59b1-4fea-9e39-64c19440a671"
+}
+PAYLOAD
+
+      it "prints the app, dea, index, version, and uris" do
+        cf %W[watch]
+
+        expect(output).to say("app: myapp, dea: 42, index: 2, version: ce1da6af, uris: myapp.com")
+      end
     end
   end
 
@@ -497,7 +563,7 @@ PAYLOAD
       it "prints that it's scaling down, and the affected indices" do
         cf %W[watch]
 
-        expect(output).to say("app: myapp, scaling down indices: 1, 2")
+        expect(output).to say("app: myapp, version: ce1da6af, scaling down indices: 1, 2")
       end
     end
 
@@ -568,6 +634,8 @@ PAYLOAD
 }
 PAYLOAD
 
+    let(:state_timestamp) { "1369262704.3337305" }
+
     let(:response_payload) { <<PAYLOAD }
 {
   "console_port": 61016,
@@ -579,11 +647,11 @@ PAYLOAD
   ],
   "dea": "1-c0d2928b36c524153cdc8cfb51d80f75",
   "droplet": "#{app.guid}",
-  "version": "c75b3e45-0cf4-403d-a54d-1c0970dca50d",
+  "version": "878318bf-0cf4-403d-a54d-1c0970dca50d",
   "instance": "7cc4f4fe64c7a0fbfaacf71e9e222a35",
   "index": 0,
   "state": "RUNNING",
-  "state_timestamp": 1369262704.3337305,
+  "state_timestamp": #{state_timestamp},
   "file_uri": "http://10.10.17.1:12345/instances"
 }
 PAYLOAD
@@ -591,7 +659,22 @@ PAYLOAD
     it "prints the states being queried" do
       cf %W[watch]
 
-      expect(output).to say("app: myapp, querying states: starting, running")
+      expect(output).to say("app: myapp, version: 878318bf, querying states: starting, running")
+    end
+
+    context "when there are no states being queried" do
+      let(:payload) { <<PAYLOAD }
+{
+  "version": "878318bf-64a0-4055-b79b-46871292ceb8",
+  "droplet": "#{app.guid}"
+}
+PAYLOAD
+
+      it "prints them as 'none'" do
+        cf %W[watch]
+
+        expect(output).to say("app: myapp, version: 878318bf, querying states: none")
+      end
     end
 
     context "and we see the response" do
@@ -604,7 +687,7 @@ PAYLOAD
       it "pretty-prints the response" do
         cf %W[watch]
 
-        expect(output).to say("reply to dea.find.droplet (1)\tdea: 1, index: 0, state: running, since: 2013-05-22 15:45:04 -0700")
+        expect(output).to say("reply to dea.find.droplet (1)\tdea: 1, index: 0, state: running, version: 878318bf, since: #{Time.at(state_timestamp.to_f)}")
       end
     end
   end
@@ -632,7 +715,7 @@ PAYLOAD
     it "prints the states being queried" do
       cf %W[watch]
 
-      expect(output).to say("app: myapp, querying states: flapping")
+      expect(output).to say("app: myapp, version: 50512eed, querying states: flapping")
     end
 
     context "and we see the response" do
@@ -661,11 +744,11 @@ PAYLOAD
 {
   "droplets": [
     {
-      "version": "some-version",
+      "version": "deadbeef-foo",
       "droplet": "#{app.guid}"
     },
     {
-      "version": "some-other-version",
+      "version": "beefdead-foo",
       "droplet": "#{other_app.guid}"
     }
   ]
@@ -675,7 +758,7 @@ PAYLOAD
     let(:response_payload) { <<PAYLOAD }
 {
   "healthy": 2,
-  "version": "some-version",
+  "version": "deadbeef-foo",
   "droplet": "#{app.guid}"
 }
 PAYLOAD
@@ -683,7 +766,7 @@ PAYLOAD
     let(:other_response_payload) { <<PAYLOAD }
 {
   "healthy": 3,
-  "version": "some-version",
+  "version": "beefdead-foo",
   "droplet": "#{other_app.guid}"
 }
 PAYLOAD
@@ -693,7 +776,7 @@ PAYLOAD
     it "prints the apps whose health being queried" do
       cf %W[watch]
 
-      expect(output).to say("querying health for: myapp, otherapp")
+      expect(output).to say("querying health for: myapp (deadbeef), otherapp (beefdead)")
     end
 
     context "and we see the response" do
@@ -707,8 +790,8 @@ PAYLOAD
       it "pretty-prints the response" do
         cf %W[watch]
 
-        expect(output).to say("reply to healthmanager.health (1)\tapp: myapp, healthy: 2")
-        expect(output).to say("reply to healthmanager.health (1)\tapp: otherapp, healthy: 3")
+        expect(output).to say("reply to healthmanager.health (1)\tapp: myapp, version: deadbeef, healthy: 2")
+        expect(output).to say("reply to healthmanager.health (1)\tapp: otherapp, version: beefdead, healthy: 3")
       end
     end
   end
@@ -760,58 +843,60 @@ PAYLOAD
     end
   end
 
-  context "when a message is seen with subject cloudcontrollers.hm.requests.*" do
-    let(:subject) { "cloudcontrollers.hm.requests.default" }
+  context "when a message is seen with subject health.start" do
+    let(:subject) { "health.start" }
 
     let(:last_updated) { Time.now }
 
-    context "and it is a STOP operation" do
-      let(:payload) { <<PAYLOAD }
+    let(:payload) { <<PAYLOAD }
 {
-  "instances": [
-    "some-instance",
-    "some-other-instance"
+  "indices": [
+    1,
+    3
   ],
+  "running": {
+    "deadbeef-version": 1,
+    "beefdead-version": 2
+  },
+  "version": "deadbeef-foo",
   "last_updated": #{last_updated.to_i},
-  "op": "STOP",
   "droplet": "#{app.guid}"
 }
 PAYLOAD
 
-      it "trims the subject" do
-        cf %W[watch]
+    it "prints the operation, last updated timestamp, and instances" do
+      cf %W[watch]
 
-        expect(output).to say(/\s+hm\.request\s+/)
-      end
+      expect(output).to say(
+        "app: myapp, version: deadbeef, indices: 1, 3, running: 1 x deadbeef, 2 x beefdead")
+    end
+  end
 
-      it "prints the operation, last updated timestamp, and instances" do
-        cf %W[watch]
+  context "when a message is seen with subject health.stop" do
+    let(:subject) { "health.stop" }
 
-        expect(output).to say(
-          "app: myapp, operation: stop, app last updated: #{last_updated}, instances: some-instance, some-other-instance")
-      end
-    end
+    let(:last_updated) { Time.now }
 
-    context "and it is a START operation" do
-      let(:payload) { <<PAYLOAD }
+    let(:payload) { <<PAYLOAD }
 {
-  "indices": [
-    1,
-    3
-  ],
-  "version": "some-version",
+  "instances": {
+    "some-instance": "deadbeef-version",
+    "some-other-instance": "beefdead-version"
+  },
+  "running": {
+    "deadbeef-version": 1,
+    "beefdead-version": 2
+  },
   "last_updated": #{last_updated.to_i},
-  "op": "START",
   "droplet": "#{app.guid}"
 }
 PAYLOAD
 
-      it "prints the operation, last updated timestamp, and instances" do
-        cf %W[watch]
+    it "prints the operation, last updated timestamp, and instances" do
+      cf %W[watch]
 
-        expect(output).to say(
-          "app: myapp, operation: start, app last updated: #{last_updated}, indices: 1, 3")
-      end
+      expect(output).to say(
+        "app: myapp, instances: some-instance (deadbeef), some-other-instance (beefdead), running: 1 x deadbeef, 2 x beefdead")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tools-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -271,29 +271,29 @@ extensions: []
 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
+- lib/tools-cf-plugin/version.rb
+- lib/tools-cf-plugin/tunnel/watch-logs.rb
 - lib/tools-cf-plugin/tunnel/log_entry.rb
-- lib/tools-cf-plugin/tunnel/multi_line_stream.rb
-- lib/tools-cf-plugin/tunnel/stream_location.rb
 - lib/tools-cf-plugin/tunnel/tunnel-nats.rb
-- lib/tools-cf-plugin/tunnel/watch-logs.rb
-- lib/tools-cf-plugin/version.rb
+- lib/tools-cf-plugin/tunnel/stream_location.rb
+- lib/tools-cf-plugin/tunnel/base.rb
+- lib/tools-cf-plugin/tunnel/multi_line_stream.rb
 - lib/tools-cf-plugin/watch.rb
-- spec/dea-ads_spec.rb
-- spec/dea-apps_spec.rb
+- lib/tools-cf-plugin/dea-apps.rb
+- lib/tools-cf-plugin/shell.rb
+- lib/tools-cf-plugin/dea-ads.rb
 - spec/shell_spec.rb
+- spec/watch_spec.rb
 - spec/spec_helper.rb
-- spec/tunnel/base_spec.rb
+- spec/dea-apps_spec.rb
+- spec/dea-ads_spec.rb
 - spec/tunnel/log_entry_spec.rb
-- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/watch-logs_spec.rb
+- spec/tunnel/base_spec.rb
 - spec/tunnel/stream_location_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
 - spec/tunnel/tunnel-nats_spec.rb
-- spec/tunnel/watch-logs_spec.rb
-- spec/watch_spec.rb
 homepage: http://github.com/cloudfoundry/tools-cf-plugin
 licenses: []
 post_install_message: 
@@ -319,15 +319,14 @@ signing_key:
 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/watch_spec.rb
 - spec/spec_helper.rb
-- spec/tunnel/base_spec.rb
+- spec/dea-apps_spec.rb
+- spec/dea-ads_spec.rb
 - spec/tunnel/log_entry_spec.rb
-- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/watch-logs_spec.rb
+- spec/tunnel/base_spec.rb
 - spec/tunnel/stream_location_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
 - spec/tunnel/tunnel-nats_spec.rb
-- spec/tunnel/watch-logs_spec.rb
-- spec/watch_spec.rb
-has_rdoc: