tools-cf-plugin 1.1.0 → 2.0.0

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

@@ -0,0 +1,129 @@
+require "cf/cli"
+require "nats/client"
+
+module CFTools
+  class DEAAds < 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_ads
+      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)
+          id = payload["id"]
+          prev = advertisements[id]
+          advertisements[id] = [payload, prev && prev.first]
+        end
+
+        EM.add_periodic_timer(3) do
+          render_table
+        end
+      end
+    end
+
+    private
+
+    def advertisements
+      @advertisements ||= {}
+    end
+
+    def render_table
+      rows = 
+        advertisements.sort.collect do |id, (attrs, prev)|
+          idx, _ = id.split("-", 2)
+
+          [ c(idx, :name),
+            list(attrs["stacks"]),
+            diff(attrs, prev) { |x| x["app_id_to_count"].values.inject(&:+) },
+            diff(attrs, prev, :pretty_memory, :pretty_memory_diff) do |x|
+              x["available_memory"]
+            end
+          ]
+        end
+
+      table(["dea", "stacks", "droplets", "available memory"], rows)
+    end
+
+    def diff(curr, prev, pretty = nil, pretty_diff = :signed)
+      new = yield curr
+      old = yield prev if prev
+      diff = new - old if old
+
+      display = pretty ? send(pretty, new) : new.to_s
+      diff_display = pretty_diff ? send(pretty_diff, diff) : diff.to_s if diff
+
+      if !old || new == old
+        display
+      else
+        "#{display} (#{diff_display})"
+      end
+    end
+
+    def signed(num)
+      num > 0 ? c("+#{num}", :good) : c(num, :bad)
+    end
+
+    def pretty_memory(mem)
+      human = human_mb(mem)
+
+      if mem < 1024
+        c(human, :bad)
+      elsif mem < 2048
+        c(human, :warning)
+      else
+        c(human, :good)
+      end
+    end
+
+    def pretty_memory_diff(diff)
+      human = human_mb(diff)
+
+      if diff < 0
+        c(human, :bad)
+      else
+        c("+#{human}", :good)
+      end
+    end
+
+    def human_mb(mem)
+      human_size(mem * 1024 * 1024)
+    end
+
+    def human_size(num, precision = 1)
+      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,3 +1,5 @@
 require "tools-cf-plugin/watch"
-require "tools-cf-plugin/tunnel/watch"
-require "tools-cf-plugin/tunnel/watch_logs"
+require "tools-cf-plugin/shell"
+require "tools-cf-plugin/dea-ads"
+require "tools-cf-plugin/tunnel/tunnel-nats"
+require "tools-cf-plugin/tunnel/watch-logs"

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

@@ -0,0 +1,14 @@
+require "cf/cli"
+require "pry"
+require "cli"
+
+module CFTools
+  class Shell < CF::CLI
+    def precondition; end
+
+    desc "Launch an IRB session with client APIs available."
+    def shell
+      binding.pry :quiet => true
+    end
+  end
+end

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

@@ -18,8 +18,6 @@ module CFTools
       def stream(locations)
         entries = entry_queue
 
-        Thread.abort_on_exception = true
-
         locations.each do |(name, index), locs|
           Thread.new do
             stream_location(name, index, locs, entries)

data/lib/tools-cf-plugin/tunnel/{watch.rb → tunnel-nats.rb}

@@ -7,15 +7,26 @@ require "cf/cli"
 require "tools-cf-plugin/tunnel/base"
 
 module CFTools::Tunnel
-  class Watch < Base
-    desc "Watch, by grabbing the connection info from your BOSH deployment."
+  class TunnelNATS < Base
+    def self.command_by_name
+      proc do |name|
+        @@commands[name.gsub("-", "_").to_sym] || \
+          fail("Unknown command '#{name}'.")
+      end
+    end
+
+    desc "Invoke another command with a local tunnel to a remote NATS."
     input :director, :argument => :required, :desc => "BOSH director address"
-    input :gateway, :argument => :optional, 
-          :default => proc { "vcap@#{input[:director]}" },
+    input :command, :argument => :required, :from_given => command_by_name,
+          :desc => "Command to invoke"
+    input :args, :argument => :splat, :desc => "Arguments for wrapped command"
+    input :gateway, :default => proc { "vcap@#{input[:director]}" },
           :desc => "SSH connection string (default: vcap@director)"
-    def tunnel_watch
+    def tunnel_nats
+      command = input[:command]
       director_host = input[:director]
       gateway = input[:gateway]
+      args = input[:args]
 
       director = connected_director(director_host, gateway)
 
@@ -35,8 +46,14 @@ module CFTools::Tunnel
         login_as_admin(manifest)
       end
 
-      invoke :watch, :port => nport,
-             :user => nats["user"], :password => nats["password"]
+      execute(
+        command,
+        args + %W[
+          --user #{nats["user"]}
+          --password #{nats["password"]}
+          --port #{nport}
+        ],
+        input.global)
     end
 
     private
@@ -46,7 +63,7 @@ module CFTools::Tunnel
       admin_user, admin_pass, _ = admin.split("|", 3)
 
       @@client = CFoundry::V2::Client.new(manifest["properties"]["cc"]["srv_api_uri"])
-      client.login(admin_user, admin_pass)
+      @@client.login(admin_user, admin_pass)
     end
   end
 end

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

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

data/spec/dea-ads_spec.rb

@@ -0,0 +1,145 @@
+require "spec_helper"
+
+describe CFTools::DEAAds do
+  let(:client) { fake_client }
+
+  before { stub_client }
+
+  before do
+    stub(NATS).start.yields
+    stub(NATS).subscribe
+    stub(EM).add_periodic_timer.yields
+  end
+
+  it "subscribes to dea.advertise" do
+    mock(NATS).subscribe("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
+    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(
+        :uri => "nats://nats:nats@127.0.0.1:4222"))
+
+      cf %W[dea-ads]
+    end
+  end
+
+  context "when NATS server info is specified" do
+    it "connects to the given location using the given credentials" do
+      mock(NATS).start(hash_including(
+        :uri => "nats://someuser:somepass@example.com:4242"))
+
+      cf %W[dea-ads -h example.com -P 4242 -u someuser -p somepass]
+    end
+  end
+
+  it "prints the table header" do
+    cf %W[dea-ads]
+    expect(output).to say(/dea\s+stacks\s+droplets\s+available memory/)
+  end
+
+  context "when a dea.advertise is seen" do
+    let(:advertise) { <<PAYLOAD }
+{
+  "app_id_to_count": {
+    "id1": 2,
+    "id2": 1,
+    "id3": 3
+  },
+  "available_memory": 1256,
+  "stacks": [
+    "lucid64",
+    "lucid86"
+  ],
+  "prod": false,
+  "id": "2-1d0cf3bcd994d9f2c5ea22b9b624d77b"
+}
+PAYLOAD
+
+    before do
+      stub(NATS).subscribe.yields(advertise)
+    end
+
+    it "prints its entry in the table" do
+      cf %W[dea-ads]
+      expect(output).to say(/^2\s+lucid64, lucid86\s+6\s+1\.2G$/)
+    end
+
+    context "and another advertise is seen" do
+      before do
+        stub(NATS).subscribe do |_, blk|
+          blk.call(advertise)
+          blk.call(other_advertise)
+        end
+      end
+
+      context "from a different DEA" do
+        let(:other_advertise) { <<PAYLOAD }
+{
+  "app_id_to_count": {
+    "id2": 3,
+    "id3": 1,
+    "id4": 1
+  },
+  "available_memory": 1024,
+  "stacks": [
+    "lucid64"
+  ],
+  "prod": false,
+  "id": "3-1d0cf3bcd994d9f2c5ea22b9b624d77b"
+}
+PAYLOAD
+
+        it "prints its entry in the table" do
+          cf %W[dea-ads]
+          expect(output).to say(/^3\s+lucid64\s+5\s+1\.0G$/)
+        end
+
+        it "keeps the other entry in the table" do
+          cf %W[dea-ads]
+          expect(output).to say(/^2\s+lucid64, lucid86\s+6\s+1\.2G$/)
+        end
+
+        it "sorts the rows by DEA index" do
+          cf %W[dea-ads]
+          expect(output).to say(/^2\s+.*\n^3/)
+        end
+      end
+
+      context "from the same DEA" do
+        let(:other_advertise) { <<PAYLOAD }
+{
+  "app_id_to_count": {
+    "id1": 1,
+    "id2": 1,
+    "id3": 3
+  },
+  "available_memory": 1000,
+  "stacks": [
+    "lucid64"
+  ],
+  "prod": false,
+  "id": "2-1d0cf3bcd994d9f2c5ea22b9b624d77b"
+}
+PAYLOAD
+
+        it "clears the original entry" do
+          cf %W[dea-ads]
+          expect(output).to_not say("1.2G")
+        end
+
+        it "shows the difference from the last advertisement" do
+          cf %W[dea-ads]
+          expect(output).to say(/^2\s+lucid64\s+5 \(-1\)\s+1000\.0M \(-256\.0M\)$/)
+        end
+      end
+    end
+  end
+end

data/spec/shell_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe CFTools::Shell do
+  let(:client) { fake_client }
+
+  before { stub_client }
+
+  it "starts a pry session with :quiet" do
+    binding = stub
+
+    mock.instance_of(described_class).binding { binding }
+    mock(binding).pry :quiet => true
+
+    cf %w[shell]
+  end
+end

data/spec/tunnel/tunnel-nats_spec.rb

@@ -0,0 +1,97 @@
+require "spec_helper"
+
+module CFTools::Tunnel
+  describe TunnelNATS do
+    let(:director) { mock }
+
+    let(:deployments) do
+      [{ "name" => "some-deployment",  "releases" => [{ "name" => "cf-release" }] }]
+    end
+
+    let(:deployment) { <<MANIFEST }
+---
+properties:
+  nats:
+    address: 1.2.3.4
+    port: 5678
+    user: natsuser
+    password: natspass
+  uaa:
+    scim:
+      users:
+      - someadmin|somepass|cloud_controller.admin
+  cc:
+    srv_api_uri: https://api.cf.museum
+MANIFEST
+
+    let(:tunneled_port) { 65535 }
+
+    let(:initial_client) { stub }
+
+    before do
+      stub(initial_client).token { CFoundry::AuthToken.new("initial token") }
+
+      any_instance_of(described_class) do |cli|
+        stub(cli).connected_director { director }
+        stub(cli).client { initial_client }
+        stub(cli).tunnel_to { tunneled_port }
+      end
+
+      any_instance_of(CFoundry::V2::Client) do |cf|
+        stub(cf).login { CFoundry::AuthToken.new(nil) }
+      end
+
+      stub(director).list_deployments { deployments }
+      stub(director).get_deployment { { "manifest" => deployment } }
+    end
+
+    it "connects to the given director" do
+      any_instance_of(described_class) do |cli|
+        mock(cli).connected_director(
+            "some-director.com", "someuser@somehost.com") do
+          director
+        end
+      end
+
+      cf %W[tunnel-nats some-director.com help --gateway someuser@somehost.com]
+    end
+
+    it "tunnels to the NATS server through the director" do
+      any_instance_of(described_class) do |cli|
+        mock(cli).tunnel_to("1.2.3.4", 5678, "someuser@somehost.com") do
+          tunneled_port
+        end
+      end
+
+      cf %W[tunnel-nats some-director.com help --gateway someuser@somehost.com]
+    end
+
+    it "logs in as the admin user from the deployment" do
+      client = mock
+      stub(client).token { CFoundry::AuthToken.new("bar") }
+
+      mock(CFoundry::V2::Client).new("https://api.cf.museum") do
+        client
+      end
+
+      mock(client).login("someadmin", "somepass") do
+        CFoundry::AuthToken.new("foo")
+      end
+
+      cf %W[tunnel-nats some-director.com help]
+    end
+
+    it "invokes the given command with the NATS credentials" do
+      stub.proxy.instance_of(described_class).execute
+      mock.instance_of(described_class).execute(
+        Mothership.commands[:target],
+        %w[
+          some-arg --flag some-val --user natsuser
+          --password natspass --port 65535
+        ],
+        is_a(Mothership::Inputs))
+
+      cf %W[tunnel-nats some-director.com target some-arg --flag some-val]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tools-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -81,6 +81,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -250,21 +266,26 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/tools-cf-plugin/plugin.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/tunnel-nats.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/tunnel/base.rb
+- lib/tools-cf-plugin/tunnel/multi_line_stream.rb
 - lib/tools-cf-plugin/watch.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-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/watch_logs_spec.rb
-- spec/watch_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/tunnel-nats_spec.rb
 homepage: http://github.com/cloudfoundry/tools-cf-plugin
 licenses: []
 post_install_message: 
@@ -290,10 +311,13 @@ signing_key:
 specification_version: 3
 summary: Cloud Foundry tooling commands.
 test_files:
+- spec/shell_spec.rb
+- spec/watch_spec.rb
 - spec/spec_helper.rb
-- spec/tunnel/base_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/watch_logs_spec.rb
-- spec/watch_spec.rb
+- spec/tunnel/multi_line_stream_spec.rb
+- spec/tunnel/tunnel-nats_spec.rb