tools-cf-plugin 2.2.0 → 2.3.0

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

@@ -23,7 +23,11 @@ module CFTools
       user = input[:user]
       pass = input[:password]
 
-      NATS.start(:uri => "nats://#{user}:#{pass}@#{host}:#{port}") do
+      render_apps("nats://#{user}:#{pass}@#{host}:#{port}")
+    end
+
+    def render_apps(uri)
+      NATS.start(:uri => uri) do
         NATS.subscribe("dea.advertise") do |msg|
           payload = JSON.parse(msg)
           dea_id = payload["id"]
@@ -34,6 +38,11 @@ module CFTools
           render_table
         end
       end
+    rescue NATS::ServerError => e
+      if e.to_s =~ /slow consumer/i
+        line c("dropped by server; reconnecting...", :error)
+        retry
+      end
     end
 
     private

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

@@ -4,3 +4,4 @@ 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"
+require "tools-cf-plugin/spacetime"

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

@@ -0,0 +1,72 @@
+require "cf/cli"
+require "time"
+
+module CFTools
+  class SpaceTime < CF::CLI
+    def precondition; end
+
+    def self.io_from_input
+      proc do |name|
+        if name == "-"
+          $stdin
+        else
+          File.open(File.expand_path(name))
+        end
+      end
+    end
+
+    def self.pattern_from_input
+      proc do |pat|
+        Regexp.new(pat)
+      end
+    end
+
+    desc "Space out line entries based on their timestamps."
+    input :input, :argument => :required, :from_given => io_from_input,
+          :desc => "Input source; '-' for stdin."
+    input :pattern, :argument => :required, :from_given => pattern_from_input,
+          :desc => "Regexp matching the timestamp in each log."
+    input :scale, :type => :float, :default => 1.0,
+          :desc => "Space scaling factor"
+    def spacetime
+      io = input[:input]
+      pattern = input[:pattern]
+      scale = input[:scale]
+
+      prev_time = nil
+      io.each do |entry|
+        prev_time = space_line(
+          entry, pattern, scale, prev_time)
+      end
+    end
+
+    private
+
+    def space_line(entry, pattern, scale, prev_time)
+      matches = entry.match(pattern)
+      return unless matches
+
+      current_time =
+        begin
+          Time.parse(matches[1])
+        rescue
+          line c("failed to parse: #{matches[1]}", :error)
+          return
+        end
+
+      print_spacing(prev_time, current_time, scale)
+
+      current_time
+    ensure
+      line entry.chomp
+    end
+
+    def print_spacing(prev_time, current_time, scale)
+      return unless prev_time
+
+      ((current_time - prev_time) * scale).round.times do
+        line
+      end
+    end
+  end
+end

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

@@ -14,6 +14,11 @@ module CFTools::Tunnel
       "router" => ["gorouter/gorouter.log"]
     }
 
+    # colorize if told to; don't check if output is tty
+    def color?
+      input[:color]
+    end
+
     desc "Stream logs from the jobs of a deployment"
     input :director, :argument => :required, :desc => "BOSH director address"
     input :components, :argument => :splat, :desc => "Which components to log"

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

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

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

@@ -1,3 +1,5 @@
+require "time"
+
 require "cf/cli"
 require "nats/client"
 
@@ -5,6 +7,11 @@ module CFTools
   class Watch < CF::App::Base
     def precondition; end
 
+    # colorize if told to; don't check if output is tty
+    def color?
+      input[:color]
+    end
+
     REPLY_PREFIX = "`- reply to "
     COLUMN_WIDTH = 30
 
@@ -23,6 +30,7 @@ module CFTools
           :desc => "NATS server user"
     input :password, :alias => "-p", :default => "nats",
           :desc => "NATS server password"
+    input :logs, :alias => "-l", :desc => "NATS server logs to replay"
     def watch
       app = get_app(input[:app])
       host = input[:host]
@@ -37,12 +45,17 @@ module CFTools
 
       $stdout.sync = true
 
-      watching_nats("nats://#{user}:#{pass}@#{host}:#{port}", subjects) do |msg, reply, sub|
+      watching_nats(
+          :uri => "nats://#{user}:#{pass}@#{host}:#{port}",
+          :logs => input[:logs],
+          :subjects => subjects) do |msg, reply, sub, time|
         begin
+          time ||= Time.now.strftime("%r")
+
           if @requests.include?(sub)
-            process_response(sub, reply, msg, app)
+            process_response(sub, reply, msg, app, time)
           elsif !app || msg.include?(app.guid)
-            process_message(sub, reply, msg, app)
+            process_message(sub, reply, msg, app, time)
           end
         rescue => e
           line c("couldn't deal w/ #{sub} '#{msg}': #{e.class}: #{e}", :error)
@@ -52,10 +65,6 @@ module CFTools
 
     private
 
-    def timestamp
-      Time.now.strftime("%r")
-    end
-
     def list(vals)
       if vals.empty?
         d("none")
@@ -64,7 +73,7 @@ module CFTools
       end
     end
 
-    def process_message(sub, reply, msg, app)
+    def process_message(sub, reply, msg, app, time)
       register_request(sub, reply) if reply
 
       payload = JSON.parse(msg) rescue msg
@@ -120,10 +129,10 @@ module CFTools
       end
 
       sub = sub.ljust(COLUMN_WIDTH)
-      line "#{timestamp}\t#{sub}\t#{payload}"
+      line "#{time}\t#{sub}\t#{payload}"
     end
 
-    def process_response(sub, _, msg, _)
+    def process_response(sub, _, msg, _, time)
       payload = JSON.parse(msg) # rescue msg
 
       sub, id = @requests[sub]
@@ -139,7 +148,7 @@ module CFTools
         sub, payload = pretty_component_discover_response(sub, payload)
       end
 
-      line "#{timestamp}\t#{REPLY_PREFIX}#{sub} (#{c(id, :error)})\t#{payload}"
+      line "#{time}\t#{REPLY_PREFIX}#{sub} (#{c(id, :error)})\t#{payload}"
     end
 
     def pretty_dea_advertise(sub, payload)
@@ -455,14 +464,62 @@ module CFTools
       guid
     end
 
-    def watching_nats(uri, subjects, &blk)
-      NATS.start(:uri => uri) do
-        subjects.each do |subject|
-          NATS.subscribe(subject, &blk)
+    def watching_nats(options, &blk)
+      if options[:logs]
+        logs = Dir[File.expand_path(options[:logs])]
+
+        logs.each do |log|
+          File.open(log) do |io|
+            io.each do |line|
+              dispatch_line(line, options[:subjects], &blk)
+            end
+          end
+        end
+      else
+        begin
+          NATS.start(:uri => options[:uri]) do
+            options[:subjects].each do |subject|
+              NATS.subscribe(subject, &blk)
+            end
+          end
+        rescue NATS::ServerError => e
+          if e.to_s =~ /slow consumer/i
+            line c("dropped by server; reconnecting...", :error)
+            retry
+          end
         end
       end
     end
 
+    def dispatch_line(line, subjects)
+      matches = line.match(/^([^ ]+) \[#\d+\] Received on \[([^\]]+)\] : '(.*)'$/)
+      timestamp = matches[1]
+      subject = matches[2]
+      message = matches[3]
+
+      return unless subjects.any? { |p| subject_matches?(subject, p) }
+
+      gmt = Time.parse("#{timestamp} GMT")
+      yield message, nil, subject, gmt.strftime("%Y-%m-%d %r")
+    end
+
+    def subject_matches?(subject, pattern)
+      ssegs = subject.split(".")
+      psegs = pattern.split(".")
+
+      # match sizes because zip is silly
+      ssegs[psegs.size - 1] ||= nil
+
+      ssegs.zip(psegs) do |a, b|
+        break if b == ">"
+        return false if a == nil
+        next if b == "*"
+        return false if a != b
+      end
+
+      true
+    end
+
     def register_request(sub, reply)
       @requests[reply] = [sub, @request_ticker += 1]
     end

data/spec/dea-apps_spec.rb

@@ -8,11 +8,11 @@ describe CFTools::DEAApps do
 
   before { stub_client }
 
-  before {
+  before do
     app1.stub(:exists? => true)
     app2.stub(:exists? => true)
     app3.stub(:exists? => true)
-  }
+  end
 
   before do
     NATS.stub(:start).and_yield
@@ -20,8 +20,7 @@ describe CFTools::DEAApps do
     EM.stub(:add_periodic_timer).and_yield
   end
 
-  context "When a NATS message is recieved" do
-    let(:advertise) { <<PAYLOAD }
+  let(:advertise) { <<PAYLOAD }
 {
   "app_id_to_count": {
     "#{app1.guid}": #{app1.total_instances},
@@ -38,17 +37,35 @@ describe CFTools::DEAApps do
 }
 PAYLOAD
 
-    before do
-      NATS.stub(:subscribe).and_yield(advertise)
+  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
+
+  context "when the server drops us for being a slow consumer" do
+    it "reconnects" do
+      expect(NATS).to receive(:subscribe).and_raise(
+        NATS::ServerError, "Slow consumer detected, connection dropped")
+
+      expect(NATS).to receive(:start).twice
+
+      cf %W[dea-apps]
     end
 
-    it "outputs the list of apps, memory and math" do
+    it "says it's reconnecting" do
+      expect(NATS).to receive(:subscribe).and_raise(
+        NATS::ServerError, "Slow consumer detected, connection dropped")
+
       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\)})
+
+      expect(output).to say("reconnecting")
     end
   end
-
 end

data/spec/fixtures/nats_logs/1

@@ -0,0 +1,4 @@
+2013-07-04_18:00:36.99086 [#12294219] Received on [health.stop] : '{"droplet":"some-app-guid","last_updated":1372959488,"instances":{"bd56b936c9ba8e69b4c3f0b8a4dab1cb":"1837d4f7-2e02-4f4e-98a4-e1bd4b016194"},"running":{"c1820a4c-846a-4581-9be3-a7488829c138":16,"1837d4f7-2e02-4f4e-98a4-e1bd4b016194":0,"7a99dd4d-c525-4fdc-a18d-1f9919a765d0":0},"version":"c1820a4c-846a-4581-9be3-a7488829c138"}'
+2013-07-04_18:00:36.99088 [#12294220] Received on [dea.stop] : '{"droplet":"some-app-guid","instances":["bd56b936c9ba8e69b4c3f0b8a4dab1cb"]}'
+2013-07-04_19:00:36.99088 [#12294220] Received on [foo.bar] : 'sup'
+2013-07-04_19:00:39.99088 [#12294220] Received on [foo] : 'sup'

data/spec/fixtures/spacetime/1

@@ -0,0 +1,5 @@
+[2013-07-04 16:15:12 -0700] line one
+[2013-07-04 16:15:12 -0700] line two
+[2013-07-04 16:15:13 -0700] line three
+[2013-07-04 16:15:13 -0700] line four
+[2013-07-04 16:15:23 -0700] line five

data/spec/spacetime.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+
+describe CFTools::SpaceTime do
+  it "spaces the lines out based on the time between them" do
+    cf %W[spacetime #{fixture("spacetime/1")} ^\\[([^\\\]]+)\\]]
+    expect(output).to say <<EOF
+[2013-07-04 16:15:12 -0700] line one
+[2013-07-04 16:15:12 -0700] line two
+
+[2013-07-04 16:15:13 -0700] line three
+[2013-07-04 16:15:13 -0700] line four
+
+
+
+
+
+
+
+
+
+
+[2013-07-04 16:15:23 -0700] line five
+EOF
+  end
+
+  context "when the regex fails" do
+    it "prints the lines anyway" do
+      cf %W[spacetime #{fixture("spacetime/1")} LOL --scale 0.5]
+      expect(output).to say <<EOF
+[2013-07-04 16:15:12 -0700] line one
+[2013-07-04 16:15:12 -0700] line two
+[2013-07-04 16:15:13 -0700] line three
+[2013-07-04 16:15:13 -0700] line four
+[2013-07-04 16:15:23 -0700] line five
+EOF
+    end
+  end
+
+  context "when the regex matches something that ain't no time" do
+    it "prints the lines anyway" do
+      cf %W[spacetime #{fixture("spacetime/1")} line --scale 0.5]
+      expect(output).to say <<EOF
+[2013-07-04 16:15:12 -0700] line one
+[2013-07-04 16:15:12 -0700] line two
+[2013-07-04 16:15:13 -0700] line three
+[2013-07-04 16:15:13 -0700] line four
+[2013-07-04 16:15:23 -0700] line five
+EOF
+    end
+  end
+
+  context "when a scaling factor is given" do
+    it "divides the spacing by the scaling factor" do
+      cf %W[spacetime #{fixture("spacetime/1")} ^\\[([^\\\]]+)\\] --scale 0.5]
+      expect(output).to say <<EOF
+[2013-07-04 16:15:12 -0700] line one
+[2013-07-04 16:15:12 -0700] line two
+
+[2013-07-04 16:15:13 -0700] line three
+[2013-07-04 16:15:13 -0700] line four
+
+
+
+
+
+[2013-07-04 16:15:23 -0700] line five
+EOF
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,10 @@ require "nats/client"
 
 require "#{SPEC_ROOT}/../lib/tools-cf-plugin/plugin"
 
+def fixture(path)
+  "#{SPEC_ROOT}/fixtures/#{path}"
+end
+
 RSpec.configure do |c|
   c.include Fake::FakeMethods
 

data/spec/watch_spec.rb

@@ -78,6 +78,78 @@ describe CFTools::Watch do
     end
   end
 
+
+  context "when the server drops us for being a slow consumer" do
+    it "reconnects" do
+      expect(NATS).to receive(:subscribe).and_raise(
+        NATS::ServerError, "Slow consumer detected, connection dropped")
+
+      expect(NATS).to receive(:start).twice
+
+      cf %W[watch]
+    end
+
+    it "says it's reconnecting" do
+      expect(NATS).to receive(:subscribe).and_raise(
+        NATS::ServerError, "Slow consumer detected, connection dropped")
+
+      cf %W[watch]
+
+      expect(output).to say("reconnecting")
+    end
+  end
+
+  context "when NATS message logs are given" do
+    let(:app) { fake :app, :guid => "some-app-guid" }
+    let(:client) { fake_client :apps => [app] }
+
+    it "does not connect to NATS" do
+      expect(NATS).to_not receive(:start)
+      cf %W[watch -l #{fixture("nats_logs")}/1]
+    end
+
+    it "prints the date/time from the source file, in local time" do
+      cf %W[watch -l #{fixture("nats_logs")}/1]
+      gmt = Time.parse("2013-07-04_18:00:36.99086 GMT")
+      local = gmt.strftime("%Y-%m-%d %r")
+      expect(output).to say(/^#{local}/)
+    end
+
+    context "and a subject is given" do
+      it "only prints matching entries" do
+        cf %W[watch -s dea.stop -l #{fixture("nats_logs")}/1]
+        expect(output).to_not say("health.stop")
+        expect(output).to say("dea.stop")
+      end
+
+      context "and it uses *" do
+        it "only prints matching entries" do
+          cf %W[watch -s *.stop -l #{fixture("nats_logs")}/1]
+          expect(output).to say("health.stop")
+          expect(output).to say("dea.stop")
+          expect(output).to_not say("foo.bar")
+        end
+
+        it "matches based on segment length" do
+          cf %W[watch -s * -l #{fixture("nats_logs")}/1]
+          expect(output).to_not say("health.stop")
+          expect(output).to_not say("dea.stop")
+          expect(output).to_not say("foo.bar")
+          expect(output).to say("foo")
+        end
+      end
+
+      context "and it uses >" do
+        it "only prints matching entries" do
+          cf %W[watch -s foo.> -l #{fixture("nats_logs")}/1]
+          expect(output).to_not say("health.stop")
+          expect(output).to_not say("dea.stop")
+          expect(output).to say("foo.bar")
+        end
+      end
+    end
+  end
+
   context "when a malformed message comes in" do
     let(:messages) { [["foo", nil, "some.subject"]] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tools-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -271,29 +271,33 @@ 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/version.rb
-- lib/tools-cf-plugin/tunnel/watch-logs.rb
-- lib/tools-cf-plugin/tunnel/log_entry.rb
-- lib/tools-cf-plugin/tunnel/tunnel-nats.rb
-- lib/tools-cf-plugin/tunnel/stream_location.rb
+- lib/tools-cf-plugin/shell.rb
+- lib/tools-cf-plugin/spacetime.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/tunnel-nats.rb
+- lib/tools-cf-plugin/tunnel/watch-logs.rb
+- lib/tools-cf-plugin/version.rb
 - lib/tools-cf-plugin/watch.rb
-- lib/tools-cf-plugin/dea-apps.rb
-- lib/tools-cf-plugin/shell.rb
-- lib/tools-cf-plugin/dea-ads.rb
+- spec/dea-ads_spec.rb
+- spec/dea-apps_spec.rb
+- spec/fixtures/nats_logs/1
+- spec/fixtures/spacetime/1
 - spec/shell_spec.rb
-- spec/watch_spec.rb
+- spec/spacetime.rb
 - spec/spec_helper.rb
-- spec/dea-apps_spec.rb
-- spec/dea-ads_spec.rb
-- spec/tunnel/log_entry_spec.rb
-- spec/tunnel/watch-logs_spec.rb
 - spec/tunnel/base_spec.rb
-- spec/tunnel/stream_location_spec.rb
+- spec/tunnel/log_entry_spec.rb
 - spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/stream_location_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,14 +323,17 @@ signing_key:
 specification_version: 3
 summary: Cloud Foundry tooling commands.
 test_files:
+- spec/dea-ads_spec.rb
+- spec/dea-apps_spec.rb
+- spec/fixtures/nats_logs/1
+- spec/fixtures/spacetime/1
 - spec/shell_spec.rb
-- spec/watch_spec.rb
+- spec/spacetime.rb
 - spec/spec_helper.rb
-- spec/dea-apps_spec.rb
-- spec/dea-ads_spec.rb
-- spec/tunnel/log_entry_spec.rb
-- spec/tunnel/watch-logs_spec.rb
 - spec/tunnel/base_spec.rb
-- spec/tunnel/stream_location_spec.rb
+- spec/tunnel/log_entry_spec.rb
 - spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/stream_location_spec.rb
 - spec/tunnel/tunnel-nats_spec.rb
+- spec/tunnel/watch-logs_spec.rb
+- spec/watch_spec.rb