lib/travis/cli/api_command.rb in travis-1.5.1 vs lib/travis/cli/api_command.rb in travis-1.5.2

@@ -39,10 +39,11 @@
         config['endpoints'] ||= {}
         config['endpoints'][api_endpoint] ||= {}
       end
 
       def setup
+        self.api_endpoint = default_endpoint if default_endpoint and not explicit_api_endpoint?
         self.access_token               ||= fetch_token
         endpoint_config['access_token'] ||= access_token
         authenticate if pro?
       end
 
@@ -84,22 +85,26 @@
             on_signal { listener.disconnect }
             yield listener
           end
         end
 
+        def default_endpoint
+          ENV['TRAVIS_ENDPOINT'] || config['default_endpoint']
+        end
+
         def detected_endpoint
-          Travis::Client::ORG_URI
+          default_endpoint || Travis::Client::ORG_URI
         end
 
         def endpoint_option
           return ""       if org? and detected_endpoint?
           return " --org" if org?
           return " --pro" if pro?
           " -e %p" % api_endpoint
         end
 
         def fetch_token
-          return endpoint_config['access_token'] if endpoint_config['access_token']
+          ENV['TRAVIS_TOKEN'] || endpoint_config['access_token']
         end
     end
   end
 end