tools-cf-plugin 2.0.0 → 2.1.0

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

@@ -48,7 +48,7 @@ module CFTools
 
           [ c(idx, :name),
             list(attrs["stacks"]),
-            diff(attrs, prev) { |x| x["app_id_to_count"].values.inject(&:+) },
+            diff(attrs, prev) { |x| x["app_id_to_count"].values.inject(0, &:+) },
             diff(attrs, prev, :pretty_memory, :pretty_memory_diff) do |x|
               x["available_memory"]
             end

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

@@ -20,7 +20,16 @@ module CFTools
 
         locations.each do |(name, index), locs|
           Thread.new do
-            stream_location(name, index, locs, entries)
+            begin
+              stream_location(name, index, locs, entries)
+            rescue => e
+              entries << LogEntry.new(
+                "#{name}/#{index}",
+                c("failed: #{e.class}: #{e}", :error),
+                :stdout)
+
+              retry
+            end
           end
         end
 

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

@@ -30,6 +30,8 @@ module CFTools::Tunnel
 
       director = connected_director(director_host, gateway)
 
+      line "Director: #{director.director_uri}"
+
       manifest =
         with_progress("Downloading deployment manifest") do
           current_deployment_manifest(director)
@@ -46,6 +48,8 @@ module CFTools::Tunnel
         login_as_admin(manifest)
       end
 
+      line "NATS connection: nats://#{nats["user"]}:#{nats["password"]}@127.0.0.1:#{nport}"
+
       execute(
         command,
         args + %W[

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

@@ -16,11 +16,12 @@ module CFTools::Tunnel
 
     desc "Stream logs from the jobs of a deployment"
     input :director, :argument => :required, :desc => "BOSH director address"
-    input :gateway, :argument => :optional, 
-          :default => proc { "vcap@#{input[:director]}" },
+    input :components, :argument => :splat, :desc => "Which components to log"
+    input :gateway, :default => proc { "vcap@#{input[:director]}" },
           :desc => "SSH connection string (default: vcap@director)"
     def watch_logs
       director_host = input[:director]
+      components = input[:components]
       gateway = input[:gateway]
 
       director = connected_director(director_host, gateway)
@@ -32,7 +33,7 @@ module CFTools::Tunnel
 
       locations =
         with_progress("Finding logs for #{c(deployment["name"], :name)}") do
-          locs = stream_locations(director, deployment["name"])
+          locs = stream_locations(director, deployment["name"], components)
 
           if locs.empty?
             fail "No locations found."
@@ -69,16 +70,19 @@ module CFTools::Tunnel
       ].join("  ")
     end
 
-    def stream_locations(director, deployment)
+    def stream_locations(director, deployment, components)
       locations = Hash.new { |h, k| h[k] = [] }
 
+      logs = LOGS.dup
+      logs.select! { |l, _| components.include?(l) } unless components.empty?
+
       director.fetch_vm_state(deployment, :use_cache => false).each do |vm|
         name = vm["job_name"]
         index = vm["index"]
-        next unless LOGS.key?(name)
+        next unless logs.key?(name)
 
         vm["ips"].each do |ip|
-          LOGS[name].each do |file|
+          logs[name].each do |file|
             locations[[name, index]] << StreamLocation.new(file, "#{name}/#{index}")
           end
         end

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

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

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

@@ -138,7 +138,11 @@ module CFTools
       payload = JSON.parse(msg)
       dea, _ = payload["id"].split("-", 2)
       [ d(sub),
-        "dea: #{dea}, stacks: #{list(payload["stacks"])}, available mem: #{human_mb(payload["available_memory"])}, apps: #{pretty_app_count(payload["app_id_to_count"])}"
+        [ "dea: #{dea}",
+          "stacks: #{list(payload["stacks"])}",
+          "available mem: #{human_mb(payload["available_memory"])}",
+          "apps: #{pretty_app_count(payload["app_id_to_count"] || [])}"
+        ].join(", ")
       ]
     end
 
@@ -146,7 +150,10 @@ module CFTools
       payload = JSON.parse(msg)
       dea, _ = payload["id"].split("-", 2)
       [ d(sub),
-        "dea: #{dea}, stacks: #{list(payload["stacks"])}, available mem: #{human_mb(payload["available_memory"])}"
+        [ "dea: #{dea}",
+          "stacks: #{list(payload["stacks"])}",
+          "available mem: #{human_mb(payload["available_memory"])}"
+        ].join(", ")
       ]
     end
 
@@ -157,7 +164,10 @@ module CFTools
     def pretty_exited(sub, msg)
       payload = JSON.parse(msg)
       [ c(sub, :bad),
-        "app: #{pretty_app(payload["droplet"])}, reason: #{payload["reason"]}, index: #{payload["index"]}"
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "reason: #{payload["reason"]}",
+          "index: #{payload["index"]}"
+        ].join(", ")
       ]
     end
 
@@ -187,44 +197,57 @@ module CFTools
     def pretty_register(sub, msg)
       payload = JSON.parse(msg)
 
+      message = []
+
       if (dea_id = payload["dea"])
         dea, _ = dea_id.split("-", 2)
-        message = "app: #{pretty_app(payload["app"])}, dea: #{dea}, "
-      else
-        message = ""
+        message += ["app: #{pretty_app(payload["app"])}", "dea: #{dea}"]
       end
 
-      message << "uris: #{list(payload["uris"])}, host: #{payload["host"]}, port: #{payload["port"]}"
+      message += [
+        "uris: #{list(payload["uris"])}",
+        "host: #{payload["host"]}",
+        "port: #{payload["port"]}"
+      ]
 
-      [c(sub, :neutral), message]
+      [c(sub, :neutral), message.join(", ")]
     end
 
     def pretty_unregister(sub, msg)
       payload = JSON.parse(msg)
 
+      message = []
+
       if (dea_id = payload["dea"])
         dea, _ = dea_id.split("-", 2)
-        message = "app: #{pretty_app(payload["app"])}, dea: #{dea}, "
-      else
-        message = ""
+        message += ["app: #{pretty_app(payload["app"])}", "dea: #{dea}"]
       end
 
-      message << "uris: #{list(payload["uris"])}, host: #{payload["host"]}, port: #{payload["port"]}"
+      message += [
+        "uris: #{list(payload["uris"])}",
+        "host: #{payload["host"]}",
+        "port: #{payload["port"]}"
+      ]
 
-      [c(sub, :warning), message]
+      [c(sub, :warning), message.join(", ")]
     end
 
     def pretty_start(sub, msg, dea)
       payload = JSON.parse(msg)
       [ c("dea.#{dea}.start", :good),
-        "app: #{pretty_app(payload["droplet"])}, dea: #{dea}, index: #{payload["index"]}, uris: #{list(payload["uris"])}"
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "dea: #{dea}",
+          "index: #{payload["index"]}",
+          "uris: #{list(payload["uris"])}"
+        ].join(", ")
       ]
     end
 
     def pretty_stop(sub, msg)
       payload = JSON.parse(msg)
 
-      message = "app: #{pretty_app(payload["droplet"])}, "
+      message = ["app: #{pretty_app(payload["droplet"])}"]
+
       if (indices = payload["indices"])
         message << "scaling down indices: #{indices.join(", ")}"
       elsif (instances = payload["instances"])
@@ -233,18 +256,26 @@ module CFTools
         message << "stopping application"
       end
 
-      [c(sub, :warning), message]
+      [c(sub, :warning), message.join(", ")]
     end
 
     def pretty_dea_update(sub, msg)
       payload = JSON.parse(msg)
-      [d(sub), "app: #{pretty_app(payload["droplet"])}, uris: #{payload["uris"].join(", ")}"]
+      [ d(sub),
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "uris: #{list(payload["uris"])}"
+        ].join(", ")
+      ]
     end
 
     def pretty_find_droplet(sub, msg)
       payload = JSON.parse(msg)
       states = payload["states"].collect { |s| c(s.downcase, state_color(s))}
-      [d(sub), "app: #{pretty_app(payload["droplet"])}, querying states: #{states.join(", ")}"]
+      [ d(sub),
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "querying states: #{states.join(", ")}"
+        ].join(", ")
+      ]
     end
 
     def pretty_find_droplet_response(sub, msg)
@@ -254,14 +285,22 @@ module CFTools
       state = payload["state"]
       time = Time.at(payload["state_timestamp"])
       [ sub,
-        "dea: #{dea}, index: #{index}, state: #{c(state.downcase, state_color(state))}, since: #{time}"
+        [ "dea: #{dea}",
+          "index: #{index}",
+          "state: #{c(state.downcase, state_color(state))}",
+          "since: #{time}"
+        ].join(", ")
       ]
     end
 
     def pretty_healthmanager_status(sub, msg)
       payload = JSON.parse(msg)
       state = payload["state"]
-      [d(sub), "app: #{pretty_app(payload["droplet"])}, querying states: #{c(state.downcase, state_color(state))}"]
+      [ d(sub),
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "querying states: #{c(state.downcase, state_color(state))}"
+        ].join(", ")
+      ]
     end
 
     def pretty_healthmanager_status_response(sub, msg)
@@ -277,7 +316,11 @@ module CFTools
 
     def pretty_healthmanager_health_response(sub, msg)
       payload = JSON.parse(msg)
-      [sub, "app: #{pretty_app(payload["droplet"])}, healthy: #{payload["healthy"]}"]
+      [ sub,
+        [ "app: #{pretty_app(payload["droplet"])}",
+          "healthy: #{payload["healthy"]}"
+        ].join(", ")
+      ]
     end
 
     def pretty_updated(sub, msg)
@@ -303,7 +346,11 @@ module CFTools
 
       op = payload["op"]
 
-      message = "app: #{pretty_app(payload["droplet"])}, operation: #{pretty_hm_op(op)}, app last updated: #{last_updated}, "
+      message = [
+        "app: #{pretty_app(payload["droplet"])}",
+        "operation: #{pretty_hm_op(op)}",
+        "app last updated: #{last_updated}"
+      ]
 
       case op
       when "STOP"
@@ -312,7 +359,7 @@ module CFTools
         message << "indices: #{list(payload["indices"])}"
       end
 
-      [c("hm.request", :warning), message]
+      [c("hm.request", :warning), message.join(", ")]
     end
 
     def pretty_service_announcement(sub, msg)
@@ -324,7 +371,13 @@ module CFTools
       c_avail = payload["available_capacity"]
       s_versions = payload["supported_versions"]
 
-      [d(sub), "id: #{id}, plan: #{plan}, supported versions: #{list(s_versions)}, capacity: (available: #{c_avail}, max: #{c_max}, unit: #{c_unit})"]
+      [ d(sub),
+        [ "id: #{id}",
+          "plan: #{plan}",
+          "supported versions: #{list(s_versions)}",
+          "capacity: (available: #{c_avail}, max: #{c_max}, unit: #{c_unit})"
+        ].join(", ")
+      ]
     end
 
     def pretty_component_announcement(sub, msg)
@@ -334,7 +387,13 @@ module CFTools
       uuid = payload["uuid"]
       time = payload["start"]
 
-      [d(sub), "type: #{type}, index: #{index}, uuid: #{uuid}, start time: #{time}"]
+      [ d(sub),
+        [ "type: #{type}",
+          "index: #{index}",
+          "uuid: #{uuid}",
+          "start time: #{time}"
+        ].join(", ")
+      ]
     end
 
     def pretty_component_discover(sub, msg)
@@ -346,12 +405,18 @@ module CFTools
       type = payload["type"]
       index = payload["index"]
       host = payload["host"]
+      user, pass = payload["credentials"]
       uptime = payload["uptime"]
 
-      message = "type: #{type}, index: #{index}, host: #{host}"
-      message << ", uptime: #{uptime}" if uptime
+      message = [
+        "type: #{type}",
+        "index: #{index}",
+        "uri: #{user}:#{pass}@#{host}"
+      ]
+
+      message << "uptime: #{uptime}" if uptime
 
-      [d(sub), message]
+      [d(sub), message.join(", ")]
     end
 
     def pretty_hm_op(op)

data/spec/dea-ads_spec.rb

@@ -6,25 +6,25 @@ describe CFTools::DEAAds do
   before { stub_client }
 
   before do
-    stub(NATS).start.yields
-    stub(NATS).subscribe
-    stub(EM).add_periodic_timer.yields
+    NATS.stub(:start).and_yield
+    NATS.stub(:subscribe)
+    EM.stub(:add_periodic_timer).and_yield
   end
 
   it "subscribes to dea.advertise" do
-    mock(NATS).subscribe("dea.advertise")
+    expect(NATS).to receive(:subscribe).with("dea.advertise")
     cf %W[dea-ads]
   end
 
   it "refreshes every 3 seconds" do
-    mock(EM).add_periodic_timer(3).yields
-    mock.instance_of(described_class).render_table
+    expect(EM).to receive(:add_periodic_timer).with(3).and_yield
+    expect_any_instance_of(described_class).to receive(:render_table)
     cf %W[dea-ads]
   end
 
   context "when no NATS server info is specified" do
     it "connects on nats:nats@127.0.0.1:4222" do
-      mock(NATS).start(hash_including(
+      expect(NATS).to receive(:start).with(hash_including(
         :uri => "nats://nats:nats@127.0.0.1:4222"))
 
       cf %W[dea-ads]
@@ -33,7 +33,7 @@ describe CFTools::DEAAds do
 
   context "when NATS server info is specified" do
     it "connects to the given location using the given credentials" do
-      mock(NATS).start(hash_including(
+      expect(NATS).to receive(:start).with(hash_including(
         :uri => "nats://someuser:somepass@example.com:4242"))
 
       cf %W[dea-ads -h example.com -P 4242 -u someuser -p somepass]
@@ -64,7 +64,7 @@ describe CFTools::DEAAds do
 PAYLOAD
 
     before do
-      stub(NATS).subscribe.yields(advertise)
+      NATS.stub(:subscribe).and_yield(advertise)
     end
 
     it "prints its entry in the table" do
@@ -72,12 +72,28 @@ PAYLOAD
       expect(output).to say(/^2\s+lucid64, lucid86\s+6\s+1\.2G$/)
     end
 
+    context "and it has no apps" do
+      let(:advertise) { <<PAYLOAD }
+{
+  "app_id_to_count": {},
+  "available_memory": 1256,
+  "stacks": [
+    "lucid64"
+  ],
+  "prod": false,
+  "id": "2-1d0cf3bcd994d9f2c5ea22b9b624d77b"
+}
+PAYLOAD
+
+      it "prints 0 as the droplet count" do
+        cf %W[dea-ads]
+        expect(output).to say(/^2\s+lucid64\s+0\s+1\.2G$/)
+      end
+    end
+
     context "and another advertise is seen" do
       before do
-        stub(NATS).subscribe do |_, blk|
-          blk.call(advertise)
-          blk.call(other_advertise)
-        end
+        NATS.stub(:subscribe).and_yield(advertise).and_yield(other_advertise)
       end
 
       context "from a different DEA" do

data/spec/shell_spec.rb

@@ -6,10 +6,10 @@ describe CFTools::Shell do
   before { stub_client }
 
   it "starts a pry session with :quiet" do
-    binding = stub
+    binding = double
 
-    mock.instance_of(described_class).binding { binding }
-    mock(binding).pry :quiet => true
+    expect_any_instance_of(described_class).to receive(:binding).and_return(binding)
+    expect(binding).to receive(:pry).with(:quiet => true)
 
     cf %w[shell]
   end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require "#{SPEC_ROOT}/../lib/tools-cf-plugin/plugin"
 
 RSpec.configure do |c|
   c.include Fake::FakeMethods
-  c.mock_with :rr
 
   c.include FakeHomeDir
   c.include CliHelper

data/spec/tunnel/base_spec.rb

@@ -2,14 +2,12 @@ require "spec_helper"
 
 module CFTools::Tunnel
   describe Base do
-    before do
-      stub(subject).input { { :quiet => true } }
-    end
+    before { subject.stub(:input => {:quiet => true}) }
 
     describe "#director" do
       context "when the given director is accessible" do
         before do
-          stub(subject).address_reachable?("some-director.com", 25555) { true }
+          subject.stub(:address_reachable?).with("some-director.com", 25555).and_return(true)
         end
 
         it "returns the given director" do
@@ -21,11 +19,11 @@ module CFTools::Tunnel
 
       context "when the given director is inaccessible" do
         before do
-          stub(subject).address_reachable?("some-director.com", 25555) { false }
+          subject.stub(:address_reachable?).with("some-director.com", 25555).and_return(false)
         end
 
         it "opens a tunnel through the gateway" do
-          mock(subject).tunnel_to("some-director.com", 25555, "user@some-gateway") do
+          expect(subject).to receive(:tunnel_to).with("some-director.com", 25555, "user@some-gateway") do
             1234
           end
 
@@ -37,63 +35,61 @@ module CFTools::Tunnel
     end
 
     describe "#login_to_director" do
-      let(:director) { stub }
+      let(:director) { double }
 
       before do
-        stub(director).user = anything
-        stub(director).password = anything
-        stub(director).authenticated? { true }
+        director.stub(:user=)
+        director.stub(:password=)
+        director.stub(:authenticated? => true)
       end
 
       it "assigns the given user/pass on the director" do
-        mock(director).user = "user"
-        mock(director).password = "pass"
+        expect(director).to receive(:user=).with("user")
+        expect(director).to receive(:password=).with("pass")
         subject.login_to_director(director, "user", "pass")
       end
 
       it "returns true iff director.authenticated?" do
-        mock(director).authenticated? { true }
+        expect(director).to receive(:authenticated?).and_return(true)
         expect(subject.login_to_director(director, "user", "pass")).to be_true
       end
 
       it "returns false iff !director.authenticated?" do
-        mock(director).authenticated? { false }
+        expect(director).to receive(:authenticated?).and_return(false)
         expect(subject.login_to_director(director, "user", "pass")).to be_false
       end
     end
 
     describe "#tunnel_to" do
-      let(:gateway) { stub }
+      let(:gateway) { double }
 
-      before do
-        stub(gateway).open
-      end
+      before { gateway.stub(:open) }
 
       it "creates a gateway using the given user/host" do
-        mock(Net::SSH::Gateway).new("ghost", "guser") { gateway }
+        expect(Net::SSH::Gateway).to receive(:new).with("ghost", "guser") { gateway }
         subject.tunnel_to("1.2.3.4", 1234, "guser@ghost")
       end
 
       it "opens a local tunnel and returns its port" do
-        stub(Net::SSH::Gateway).new("ghost", "guser") { gateway }
-        mock(gateway).open("1.2.3.4", 1234) { 5678 }
+        Net::SSH::Gateway.stub(:new).with("ghost", "guser") { gateway }
+        expect(gateway).to receive(:open).with("1.2.3.4", 1234) { 5678 }
         expect(subject.tunnel_to("1.2.3.4", 1234, "guser@ghost")).to eq(5678)
       end
     end
 
     describe "#authenticate_with_director" do
-      let(:director) { stub }
+      let(:director) { double }
 
       def self.it_asks_interactively
         it "asks for the credentials interactively" do
           if saved_credentials
-            mock(subject).login_to_director(director, "user", "pass") { false }.ordered
+            expect(subject).to receive(:login_to_director).with(director, "user", "pass").and_return(false).ordered
           end
 
-          mock_ask("Director Username") { "fizz" }.ordered
-          mock_ask("Director Password", anything) { "buzz" }.ordered
+          should_ask("Director Username") { "fizz" }
+          should_ask("Director Password", anything) { "buzz" }
 
-          mock(subject).login_to_director(director, "fizz", "buzz") { true }.ordered
+          expect(subject).to receive(:login_to_director).with(director, "fizz", "buzz").and_return(true).ordered
 
           subject.authenticate_with_director(director, "foo", saved_credentials)
         end
@@ -101,13 +97,13 @@ module CFTools::Tunnel
         context "when the interactive user/pass is valid" do
           it "returns true" do
             if saved_credentials
-              mock(subject).login_to_director(director, "user", "pass") { false }.ordered
+              expect(subject).to receive(:login_to_director).with(director, "user", "pass").and_return(false).ordered
             end
 
-            mock_ask("Director Username") { "fizz" }.ordered
-            mock_ask("Director Password", anything) { "buzz" }.ordered
+            should_ask("Director Username") { "fizz" }
+            should_ask("Director Password", anything) { "buzz" }
 
-            mock(subject).login_to_director(director, "fizz", "buzz") { true }.ordered
+            expect(subject).to receive(:login_to_director).with(director, "fizz", "buzz").and_return(true).ordered
 
             expect(
               subject.authenticate_with_director(director, "foo", saved_credentials)
@@ -116,15 +112,15 @@ module CFTools::Tunnel
 
           it "saves them to the bosh config" do
             if saved_credentials
-              mock(subject).login_to_director(director, "user", "pass") { false }.ordered
+              expect(subject).to receive(:login_to_director).with(director, "user", "pass").and_return(false).ordered
             end
 
-            mock_ask("Director Username") { "fizz" }.ordered
-            mock_ask("Director Password", anything) { "buzz" }.ordered
+            should_ask("Director Username") { "fizz" }
+            should_ask("Director Password", anything) { "buzz" }
 
-            mock(subject).login_to_director(director, "fizz", "buzz") { true }.ordered
+            expect(subject).to receive(:login_to_director).with(director, "fizz", "buzz").and_return(true).ordered
 
-            mock(subject).save_auth("foo", "username" => "fizz", "password" => "buzz")
+            expect(subject).to receive(:save_auth).with("foo", "username" => "fizz", "password" => "buzz")
 
             subject.authenticate_with_director(director, "foo", saved_credentials)
           end
@@ -133,18 +129,18 @@ module CFTools::Tunnel
         context "when the interactive user/pass is invalid" do
           it "asks again" do
             if saved_credentials
-              mock(subject).login_to_director(director, "user", "pass") { false }.ordered
+              expect(subject).to receive(:login_to_director).with(director, "user", "pass").and_return(false).ordered
             end
 
-            mock_ask("Director Username") { "fizz" }.ordered
-            mock_ask("Director Password", anything) { "buzz" }.ordered
+            should_ask("Director Username") { "fizz" }
+            should_ask("Director Password", anything) { "buzz" }
 
-            mock(subject).login_to_director(director, "fizz", "buzz") { false }.ordered
+            expect(subject).to receive(:login_to_director).with(director, "fizz", "buzz").and_return(false).ordered
 
-            mock_ask("Director Username") { "a" }.ordered
-            mock_ask("Director Password", anything) { "b" }.ordered
+            should_ask("Director Username") { "a" }
+            should_ask("Director Password", anything) { "b" }
 
-            mock(subject).login_to_director(director, "a", "b") { true }.ordered
+            expect(subject).to receive(:login_to_director).with(director, "a", "b").and_return(true).ordered
 
             subject.authenticate_with_director(director, "foo", saved_credentials)
           end
@@ -156,7 +152,7 @@ module CFTools::Tunnel
 
         context "and they are valid" do
           it "returns true" do
-            mock(subject).login_to_director(director, "user", "pass") { true }
+            expect(subject).to receive(:login_to_director).with(director, "user", "pass").and_return(true)
 
             expect(
               subject.authenticate_with_director(