travis 1.5.7.travis.341.4 → 1.5.7.travis.345.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWJjYWVhYjI5ZDc5MDBmYjZlOTE1N2M2NmZlYjcwMjc3MjYyNzczZQ==
+    YmM3NjI1NGU2ZTQ3ZmE3ODY0Y2EyODBmODI3ZDVhNjVkYWYzNGEwOA==
   data.tar.gz: !binary |-
-    ZWM4YWZlY2E2MWIyMjY2MTZlN2Q1NmY1YjQ2ZjBjYjM0MmE3MTVkYw==
+    MGRhOWI2MWNmOWE4MTU2ZGQ3YzQ5ODEwMWVmOTdmNTZjYTljZTRlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjY2MmQwOTlkNmVlMTNhNjI1MmRkOTliZTI4Njc5ODgxNzkxZTI1N2NiYTAy
-    NjU1YTRjZTA2NzU4NzlkZDg5YTg4MzNmZjY2NTliYWFlMDE2YzQ0ODc2MDQz
-    MTNkYmYyMjlmYWM0YzMxM2VjZDQ5MmQ2MTE4ODAzODZkMjQzN2E=
+    M2UxNzM1NDg0ZDdiYzhmNjUyNGEyZmI2NTFkYjBkNWY3YjYzMzYzMGRjMDlh
+    MTdmMjllNGZhM2NmOWViYWI1ZmJkMjQ5OGFmOGJjOTNmZDNjOTM4MzUxNWFk
+    YmY0OGJjNzMzMmM4MmFiMjViZThkOTUyMzM2YjY3NDU2Nzk2YTk=
   data.tar.gz: !binary |-
-    YTU2YzA3ODQyZTI5YWMyODUxYTQzYzgyMzI4ZGEwNzM0ZmJmOGU5ZDFhZWJl
-    MzcwM2ZkYmE4M2E0YjljZjViMDJkZGMwZTJkZGZhODczODViMjQyODY3ZTM5
-    NWI3ZGMxYjFmNTFkYWM5M2IwM2VkNWVjZTcyZDk4M2MwMjM1MjI=
+    ZjcxN2IxY2M0YzI1N2IzNDhjNWM4NjQ4NDBhZmE0OTBiMzI4NjA5YjcxNTc3
+    Nzg4NDk5MTUyYTkyMGMwZjk3YjIzMWY1NGFiMGQwZWEzOWIzMWFhZTI3YjE5
+    OTRlNDJhZjAyNmZhY2ZjNTNlMTc5Y2ZkZDljZjQ0ZDZhNTI3Mjk=

data/lib/travis/cli/api_command.rb

@@ -54,7 +54,11 @@ module Travis
         endpoint_config['insecure']       = insecure unless insecure.nil?
         self.insecure                     = endpoint_config['insecure']
         session.ssl                       = { :verify => false } if insecure?
-        authenticate if pro?
+        authenticate if pro? or enterprise?
+      end
+
+      def enterprise?
+        !!endpoint_config['enterprise']
       end
 
       def pro?
@@ -95,12 +99,15 @@ module Travis
           c[enterprise_name] = api_endpoint if explicit_api_endpoint?
           c[enterprise_name] ||= write_to($stderr) do
             error "enterprise setup not configured" unless interactive?
-            user_input = ask(color("Enterprise domain: ", :bold)).to_s
-            domain     = user_input[%r{^(?:https?://)?(.*?)(?:/api/?)?$}, 1]
-            "https://#{domain}/api/"
+            user_input                  = ask(color("Enterprise domain: ", :bold)).to_s
+            domain                      = user_input[%r{^(?:https?://)?(.*?)/?(?:/api/?)?$}, 1]
+            endpoint                    = "https://#{domain}/api"
+            config['default_endpoint']  = endpoint if agree("Use #{color domain, :bold} as default endpoint? ") { |q| q.default = 'yes' }
+            endpoint
           end
-          self.api_endpoint = c[enterprise_name]
-          self.insecure     = true if insecure.nil?
+          self.api_endpoint             = c[enterprise_name]
+          self.insecure                 = true if insecure.nil?
+          endpoint_config['enterprise'] = true
         end
 
         def enterprise?
@@ -144,6 +151,13 @@ module Travis
           return ""       if org? and detected_endpoint?
           return " --org" if org?
           return " --pro" if pro?
+
+          if config['enterprise']
+            key, _ = config['enterprise'].detect { |k,v| v.start_with? api_endpoint }
+            return " -X"        if key == "default"
+            return " -X #{key}" if key
+          end
+
           " -e %p" % api_endpoint
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.7.travis.341.4
+  version: 1.5.7.travis.345.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -28,7 +28,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday