logs-cf-plugin 0.0.29.pre → 0.0.30.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk1YjNjYjNiZDg1YjU1MWYyNGQyZWNhMWY4MWU4MDgyNDllNDM2MQ==
+    ODUzNzJmODQxZWE1N2VjODk2MjJlYWIzMTcxOGMxOGE1NTdiYmY3Ng==
   data.tar.gz: !binary |-
-    ZDFjNTE1NDA2N2M3YzYxYzllODIwZjE5MWMzZGM2ZjBkZjE5NDI0MQ==
+    ZDMzMTk2NDA0M2M1ZDMwZDA4NjliNDI1NTY4Yzc2MzBkYWZjMTY2NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzVhZDRjZmJkOTYyZTY3ZDgwZDRlODg0NWNkNmFjODRhZGZjYmUzMGMzNWVl
-    YjUyMGJiZGZkOGY4YjJiZGI2NjJkNTdmZjIxNjM2NTFlOGNmZTc0YWI1NzI3
-    NGY5NzY2ZWZkYzI1NzU5MWNmOGNlNTAyZGJkN2ZhNjY5MGNkZGQ=
+    N2Y2NWQ4MjA4Y2RjZGUzNjM2ZGZmOTI4MDE1MzE0MTBhNTQ2MjAwMWM1NzU0
+    YjgzYTRiNGU2NjAyMmZmMjNiMzg5MzE1ZjM2MjRmYTRkNmZmYWIxNzZjMWU1
+    MThlN2VjZGIwMTI5MDlmNjRmMGM0NjFkMzRhNzU3NGVkZmYxYTk=
   data.tar.gz: !binary |-
-    ZTAxZTJjMGZiNGFkNDgzZTFiMmZmNTY3OGJkODdhZjQxZjIzYWFmYzhlOGY3
-    NmIyMDJmYmFjOGVkYTE1ZGFhZjUxMDNhNmU5YmUzODNhNjQ5MjI2OTc0NGM1
-    NDE5MmU1Njg1MmU3NTAxMDcwNmFlM2ViNTJiOTA2NDRhNWYwODg=
+    MzM2ZmQ2YjJiZjRmZjZhNmM1MjFkZTZhMjJiYjczMWEzYmQxMDJiOTFmZDkx
+    YWVjN2Q1NTI1YjdiNmZkZWIwYTA4ODgzMjVkMDdlYmFiOWIyNmNjM2E4ZDVh
+    ZDU3YzM5OTBmZGJmMzZkYzA5MWRmODUwMzZkYTc3M2ZjYzYwMjg=

data/lib/logs-cf-plugin/log_target.rb

@@ -1,46 +1,21 @@
 module LogsCfPlugin
   class LogTarget
-    def initialize(target_organization, target_space, ids)
-      raise ArgumentError, "Requires 3 ids" unless ids.size == 3
-      @target_organization = target_organization
-      @target_space = target_space
-
-      @org_id = ids[0]
-      @space_id = ids[1]
-      @app_id = ids[2]
-    end
-
-    def ambiguous?
-      @target_organization && @target_space
+    def initialize(app_id)
+      @app_id = app_id
     end
 
     def valid?
-      !!target
+      !@app_id.nil?
     end
 
     def query_params
-      case target
-        when :org
-          {org: @org_id}
-        when :space
-          {org: @org_id, space: @space_id}
-        when :app
-          {org: @org_id, space: @space_id, app: @app_id}
-      end
+      {app: @app_id}
     end
 
     private
 
     def target
-      return nil if ambiguous?
-      case
-        when @target_organization
-          :org
-        when @target_space
-          :space
-        when @app_id
-          :app
-      end
+      :app if @app_id
     end
   end
 end

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

@@ -12,20 +12,13 @@ module LogsCfPlugin
     desc "Tail or dump logs for CF applications or spaces"
     group :apps
     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
-    input :org, :type => :boolean, :desc => "Logs of all apps and spaces in the current organization", :default => false
     input :recent, :type => :boolean, :desc => "Dump recent logs instead of tailing", :default => false
 
     def logs
       client.current_organization.name # resolve org name so CC will validate AuthToken
-      guids = [client.current_organization.guid, client.current_space.guid, input[:app].try(:guid)]
+      app_id = input[:app].try(:guid)
 
-      log_target = LogTarget.new(input[:org], input[:space], guids)
-
-      if log_target.ambiguous?
-        Mothership::Help.command_help(@@commands[:logs])
-        fail "Please provide either --space or --org, but not both."
-      end
+      log_target = LogTarget.new(app_id)
 
       unless log_target.valid?
         Mothership::Help.command_help(@@commands[:logs])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.29.pre
+  version: 0.0.30.pre
 platform: ruby
 authors:
 - Pivotal