tools-cf-plugin 1.0.0 → 1.1.0

data/spec/watch_spec.rb

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 describe CFTools::Watch do
-  let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dir" }
-
-  stub_home_dir_with { fake_home_dir }
-
   let(:app) { fake :app, :name => "myapp", :guid => "myappguid" }
 
   let(:client) { fake_client :apps => [app] }
@@ -49,9 +45,9 @@ describe CFTools::Watch do
   end
 
   context "when no NATS server info is specified" do
-    it "connects on nats:nats@localhost:4222" do
+    it "connects on nats:nats@127.0.0.1:4222" do
       mock(NATS).start(hash_including(
-        :uri => "nats://nats:nats@localhost:4222"))
+        :uri => "nats://nats:nats@127.0.0.1:4222"))
 
       cf %W[watch]
     end
@@ -92,8 +88,8 @@ describe CFTools::Watch do
 
       cf %W[watch]
 
-      expect(output).to say("some.subject             (1)\tfoo")
-      expect(output).to say("`- reply to some.subject (1)\tsome-response")
+      expect(output).to say(/some\.subject             \(1\)\s*foo/)
+      expect(output).to say(/`- reply to some\.subject \(1\)\s+some-response/)
     end
   end
 
@@ -308,16 +304,16 @@ PAYLOAD
     context "when there's an associated DEA" 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": "#{app.guid}",
-"dea": "1-4b293b726167fbc895af5a7927c0973a"
+  "private_instance_id": "e4a5ee2330c81fd7611eba7dbedbb499a00ae1b79f97f40a3603c8bff6fbcc6f",
+  "tags": {},
+  "port": 61111,
+  "host": "192.0.43.10",
+  "uris": [
+    "my-app.com",
+    "my-app-2.com"
+  ],
+  "app": "#{app.guid}",
+  "dea": "1-4b293b726167fbc895af5a7927c0973a"
 }
 PAYLOAD
 
@@ -466,14 +462,14 @@ PAYLOAD
 
 PAYLOAD
 
-    it "prints a blank message" do
+    it "prints the app that was updated" do
       stub(NATS).subscribe(">") do |_, block|
         block.call(payload, nil, "droplet.updated")
       end
 
       cf %W[watch]
 
-      expect(output).to say("droplet.updated\tapp: myapp")
+      expect(output).to say("app: myapp")
       expect(output).to_not say("cc_partition")
     end
   end
@@ -755,8 +751,7 @@ PAYLOAD
 
         cf %W[watch]
 
-        expect(output).to say(
-          "dea: 0, apps: 1 x myapp (#{app.guid}), 2 x otherapp (#{other_app.guid})")
+        expect(output).to say("dea: 0, apps: 1 x myapp, 2 x otherapp")
       end
     end
 
@@ -774,7 +769,7 @@ PAYLOAD
         cf %W[watch]
 
         expect(output).to say(
-          "dea: 0, apps: 1 x myapp (#{app.guid}), 2 x unknown (#{other_app.guid})")
+          "dea: 0, apps: 1 x myapp, 2 x unknown (#{other_app.guid})")
       end
     end
   end
@@ -802,7 +797,7 @@ PAYLOAD
 
         cf %W[watch]
 
-        expect(output).to say("\thm.request\t")
+        expect(output).to say(/\s+hm\.request\s+/)
       end
 
       it "prints the operation, last updated timestamp, and instances" do
@@ -842,6 +837,32 @@ PAYLOAD
       end
     end
 
+    context "when a message is seen with subject vcap.component.announce" do
+      let(:payload) { <<PAYLOAD }
+{
+  "start": "2013-05-24 16:45:01 +0000",
+  "credentials": [
+    "cb68328a26f68416eabbad702c542000",
+    "0e6b5ec19df10c7ba2e7f36cdf33474e"
+  ],
+  "host": "10.10.32.10:39195",
+  "uuid": "some-uuid",
+  "index": 0,
+  "type": "QaaS-Provisioner"
+}
+PAYLOAD
+
+      it "prints the type, index, host, start time" do
+        stub(NATS).subscribe(">") do |_, block|
+          block.call(payload, nil, "vcap.component.announce")
+        end
+
+        cf %W[watch]
+
+        expect(output).to say("type: QaaS-Provisioner, index: 0, uuid: some-uuid, start time: 2013-05-24 16:45:01 +0000")
+      end
+    end
+
     context "and it is a START operation" do
       let(:payload) { <<PAYLOAD }
 {
@@ -868,4 +889,73 @@ PAYLOAD
       end
     end
   end
+
+  context "when a message is seen with subject vcap.component.discover" do
+    let(:payload) { "" }
+
+    let(:response_payload) { <<PAYLOAD }
+{
+  "uptime": "0d:23h:51m:21s",
+  "start": "2013-05-24 17:58:08 +0000",
+  "credentials": [
+    "d34f205a31232eef040d1e39ebdd631a",
+    "701e1a68a811a1ac8c137a70db08c1a8"
+  ],
+  "host": "1.2.3.4:8080",
+  "uuid": "4-deadbeef",
+  "index": 4,
+  "type": "DEA"
+}
+PAYLOAD
+
+    it "prints the states being queried" do
+      stub(NATS).subscribe(">") do |_, block|
+        block.call(payload, nil, "vcap.component.discover")
+      end
+
+      cf %W[watch]
+
+      expect(output).to say("vcap.component.discover")
+    end
+
+    context "and we see the response" do
+      it "pretty-prints the response" do
+        stub(NATS).subscribe(">") do |_, block|
+          block.call(payload, "some-inbox", "vcap.component.discover")
+          block.call(response_payload, nil, "some-inbox")
+        end
+
+        cf %W[watch]
+
+        expect(output).to say("reply to vcap.component.discover (1)\ttype: DEA, index: 4, host: 1.2.3.4:8080, uptime: 0d:23h:51m:21s")
+      end
+
+      context "and there's no uptime" do
+        let(:response_payload) { <<PAYLOAD }
+{
+  "start": "2013-05-24 17:58:08 +0000",
+  "credentials": [
+    "d34f205a31232eef040d1e39ebdd631a",
+    "701e1a68a811a1ac8c137a70db08c1a8"
+  ],
+  "host": "1.2.3.4:8080",
+  "uuid": "1-deadbeef",
+  "index": 1,
+  "type": "login"
+}
+PAYLOAD
+
+        it "does not include it in the message" do
+          stub(NATS).subscribe(">") do |_, block|
+            block.call(payload, "some-inbox", "vcap.component.discover")
+            block.call(response_payload, nil, "some-inbox")
+          end
+
+          cf %W[watch]
+
+          expect(output).to say("reply to vcap.component.discover (1)\ttype: login, index: 1, host: 1.2.3.4:8080")
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tools-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -43,6 +43,44 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bosh_cli
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0.pre.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0.pre.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +200,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,23 +208,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -212,9 +250,20 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/tools-cf-plugin/plugin.rb
+- lib/tools-cf-plugin/tunnel/base.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/watch.rb
+- lib/tools-cf-plugin/tunnel/watch_logs.rb
 - lib/tools-cf-plugin/version.rb
 - lib/tools-cf-plugin/watch.rb
 - spec/spec_helper.rb
+- spec/tunnel/base_spec.rb
+- spec/tunnel/log_entry_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/stream_location_spec.rb
+- spec/tunnel/watch_logs_spec.rb
 - spec/watch_spec.rb
 homepage: http://github.com/cloudfoundry/tools-cf-plugin
 licenses: []
@@ -242,4 +291,9 @@ specification_version: 3
 summary: Cloud Foundry tooling commands.
 test_files:
 - spec/spec_helper.rb
+- spec/tunnel/base_spec.rb
+- spec/tunnel/log_entry_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/stream_location_spec.rb
+- spec/tunnel/watch_logs_spec.rb
 - spec/watch_spec.rb