tail-cf-plugin 0.0.9.pre → 0.0.10.pre

data/lib/tail-cf-plugin/{loggregrator_client.rb → loggregator_client.rb}

@@ -23,7 +23,8 @@ module TailCfPlugin
         end
 
         ws.on :close do |event|
-          output.puts("Server dropped connection")
+          output.puts("Server dropped connection...goodbye.")
+          EM.stop
         end
       }
     end

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

@@ -3,27 +3,40 @@ require 'faye/websocket'
 require 'eventmachine'
 
 module TailCfPlugin
-  require 'tail-cf-plugin/loggregrator_client'
+  require 'tail-cf-plugin/loggregator_client'
   require 'log_message/log_message.pb'
 
   class Plugin < CF::CLI
     include LoginRequirements
 
-    desc "Tail a CF application's logs"
+    desc "Tail logs for CF applications or spaces"
     group :apps
-    input :loggregator_host, :argument => :required, :desc => "The ip:port of the loggregator"
     input :app, :desc => "App to tail logs from", :argument => :optional, :from_given => by_name(:app)
-    input :space, :desc => "App to tail logs from", :argument => :optional, :from_given => by_name(:space)
+    input :space, :type => :boolean, :desc => "Logs of all apps in the current space", :default => false
 
     def tail
+      if input[:space]
+        app_guid = nil
+      else
+        unless input[:app]
+          Mothership::Help.command_help(@@commands[:tail])
+          fail "Please provide an application to log or call with --space"
+        end
+        app_guid = input[:app].guid
+      end
 
-      raise "Missing an app or space" unless input[:app] || input[:space]
+      loggregator_client = LoggregatorClient.new(STDOUT)
+      loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
+    end
+
+    ::ManifestsPlugin.default_to_app_from_manifest(:tail, false)
 
-      space_guid = (input[:space] && input[:space].guid) || input[:app].space.guid
-      app_guid = input[:app] && input[:app].guid
+    private
 
-      loggregrator_client = LoggregatorClient.new(STDOUT)
-      loggregrator_client.listen(input[:loggregator_host], space_guid, app_guid, client.token.auth_header)
+    def loggregator_host
+      target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
+      "loggregator.#{target_base}"
     end
+
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre
-  prerelease: 6
+  version: 0.0.10.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tail-cf-plugin/loggregrator_client.rb
+- lib/tail-cf-plugin/loggregator_client.rb
 - lib/tail-cf-plugin/plugin.rb
 - vendor/log_message/log_message.pb.rb
 - vendor/log_message/log_message.proto