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

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

@@ -3,7 +3,7 @@ require 'faye/websocket'
 require 'eventmachine'
 
 module TailCfPlugin
-  require 'tail-cf-plugin/loggregator_client'
+  require 'tail-cf-plugin/loggregrator_client'
   require 'log_message/log_message.pb'
 
   class Plugin < CF::CLI
@@ -11,6 +11,7 @@ module TailCfPlugin
 
     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, :type => :boolean, :desc => "Logs of all apps in the current space", :default => false
 
@@ -25,18 +26,11 @@ module TailCfPlugin
         app_guid = input[:app].guid
       end
 
-      loggregator_client = LoggregatorClient.new(STDOUT)
-      loggregator_client.listen(loggregator_host, client.current_space.guid, app_guid, client.token.auth_header)
+      loggregrator_client = LoggregatorClient.new(STDOUT)
+      loggregrator_client.listen(input[:loggregator_host], client.current_space.guid, app_guid, client.token.auth_header)
     end
 
     ::ManifestsPlugin.default_to_app_from_manifest(:tail, false)
 
-    private
-
-    def loggregator_host
-      target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
-      "loggregator.#{target_base}"
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tail-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre
+  version: 0.0.11.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -19,6 +19,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,6 +30,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tail-cf-plugin/loggregator_client.rb
+- lib/tail-cf-plugin/loggregrator_client.rb
 - lib/tail-cf-plugin/plugin.rb
 - vendor/log_message/log_message.pb.rb
 - vendor/log_message/log_message.proto