travis 1.5.6.travis.329.4 → 1.5.6.travis.330.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmE4ZjA2Y2FkNzhhNmM4YzViYzlhZTE4MDI0OTdmNWM5OWE0OTg5NA==
+    NWUyYTBlYjM5MDJhMTdmYjk5YTQ0NDU2MmNlNzk3YTE0NWI2MTRhYg==
   data.tar.gz: !binary |-
-    NjI4Y2YyZmY4MDY5YjMwNmRlODgyZDU4ODZlMDU0YTI5NDE3MjBlMQ==
+    NDQxN2I3N2ZiZjMxMTQwMzIyZjRlYmRiNThjZWRjODY4NDhkOGRjYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTM3NmIzZjhlZGEyNGE2OWRjMjIzZjc2YmFlZTI0YmI0YTU4ZjJkOTcxNWY2
-    OGZmNmE5ZmE1YzE4YWUwN2I4ODEyYjU4MDNlZDY3NDk1YTdmMmFiYWUxNzMy
-    NzhhMjE2YTE1YzgyODQzOWI2OGM2ZGE3MjJmZWFkNGIzODYwZmM=
+    YjAzNDhlODQyOGRhNDc0NTkwOTg3MmE3NDQzMWY2NjEzOTM0NWQ0YjI3YTkw
+    NTE4NzA5MjBiYjhjMGFlZDhjNTNmYzVhYzRmOWI0ZmI2MzljYzEzOTQ5YjUy
+    OTkxNzJhMWNjYzlmODY4Nzg5YzEwYzc4MmJjZDIzZWM0OTgzMGI=
   data.tar.gz: !binary |-
-    NjUwMWUxYTdjOWM0M2IyZjA0MzUyZGQzZmUyNDBmOTFhOWExNmE2YmNiNzJk
-    MTlkZjk0YWRkMzVlMThlNmZkZjUyMjI3NTg4YjA4Yjc3NDViMWM1NGM0YTdj
-    ZmY2ZjQ2NTE3YmZkMGFkOGFkM2RmMDJmOTVjYWM5OTcwM2Y0NDU=
+    YTNmY2QwZTc4ZTUyM2M0NzI3MWVjYTM0YTg4MDQ0Y2YwMmM2ZGFmMDQxYTBm
+    ZjNiYTg4MWQ3MDcyZmI1N2I4MDA2MmY3M2I5MDdlZjczZWY3NjljNTYzMTQ3
+    YjI3ZjBmZWY5ZTc2YTU1ZDZmZGUwMGEzYzc5MjY0OWJkMzY1ZGI=

data/README.md

@@ -36,6 +36,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a [command line
         * [`setup`](#setup)
         * [`show`](#show)
         * [`status`](#status)
+    * [Pro and Enterprise](#pro-and-enterprise)
     * [Environment Variables](#environment-variables)
 * [Ruby Library](#ruby-library)
     * [Authentication](#authentication)
@@ -110,8 +111,6 @@ Additionally, every API command understands the following options:
         --debug                      show API requests
         --adapter ADAPTER            Faraday adapter to use for HTTP requests
 
-By default, [General API Commands](#general-api-commands) will talk to [api.travis-ci.org](https://api.travis-ci.org). You can change this by supplying `--pro` for [api.travis-ci.com](https://api.travis-ci.com) or `--api-endpoint` with your own endpoint. Note that all [Repository Commands](#repository-commands) will try to figure out the API endpoint to talk to automatically depending on the project's visibility on GitHub.
-
 You can supply an access token via `--token` if you want to make an authenticated call. If you don't have an access token stored for the API endpoint, it will remember it for subsequent requests. Keep in mind, this is not the "Travis token" used when setting up GitHub hooks (due to security). You probably don't have an access token handy right now. Don't worry, usually you won't use this option but instead just do a [`travis login`](#login).
 
 The `--debug` option will print HTTP requests to STDERR. Like `--explode`, this is really helpful when contributing to this project.
@@ -775,6 +774,30 @@ Outputs a one line status message about the project's last build. With `-q` that
 
     $ travis status -qpx && cap deploy
 
+### Pro and Enterprise
+
+By default, [General API Commands](#general-api-commands) will talk to [api.travis-ci.org](https://api.travis-ci.org). You can change this by supplying `--pro` for [api.travis-ci.com](https://api.travis-ci.com) or `--api-endpoint` with your own endpoint. Note that all [Repository Commands](#repository-commands) will try to figure out the API endpoint to talk to automatically depending on the project's visibility on GitHub.
+
+    $ travis login --pro
+    ...
+    $ travis monitor --pro -m
+    ...
+
+The custom `--api-endpoint` option is handy for local development:
+
+    $ travis whatsup --api-endpoint http://localhost:3000
+    ...
+
+If you have a Travis Enterprise setup in house, you can use the `--enterprise` (or short `-X`) option. It will ask you for the enterprise domain the first time it is used.
+
+    $ travis login -X
+    Enterprise domain: travisci.example.com
+    ...
+    $ travis whatsup -X
+    ...
+
+Note that currently [Repository Commands](#repository-commands) will not be able to detect Travis Enterprise automatically at the moment. You will have to use the `-X` flag at least once per repository. The command line tool will remember the API endpoint for subsequent commands issued against the same repository.
+
 ### Environment Variables
 
 You can set the following environment variables to influence the travis behavior:
@@ -1299,7 +1322,11 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 * Fix double `provider` entry generated by `travis setup engineyard`.
 * Only load auto-completions if available.
 * Fix and improve growl notifications.
-* Fix netrc parsing for `travis login --auto`.
+* Fix GitHub host detection `travis login --auto`.
+* API endpoint may now include a path all the requests will be prefixed with.
+* Allow overriding SSL options in Ruby client.
+* Add `--insecure` to turn off SSL verification.
+* Add `--enterprise`/`-X` option for Travis Enterprise integration.
 
 **1.5.5** (October 2, 2013)
 

data/lib/travis/cli/api_command.rb

@@ -4,10 +4,12 @@ module Travis
   module CLI
     class ApiCommand < Command
       include Travis::Client::Methods
+      attr_accessor :enterprise_name
       attr_reader :session
       abstract
 
       on('-e', '--api-endpoint URL', 'Travis API server to talk to')
+      on('-I', '--[no-]insecure', 'do not verify SSL certificate of API endpoint')
       on('--pro', "short-cut for --api-endpoint '#{Travis::Client::PRO_URI}'") { |c,_| c.api_endpoint = Travis::Client::PRO_URI }
       on('--org', "short-cut for --api-endpoint '#{Travis::Client::ORG_URI}'") { |c,_| c.api_endpoint = Travis::Client::ORG_URI }
       on('--staging', 'talks to staging system') { |c,_| c.api_endpoint = c.api_endpoint.gsub(/api/, 'api-staging') }
@@ -23,6 +25,10 @@ module Travis
         end
       end
 
+      on('-X', '--enterprise [NAME]', 'use enterprise setup (optionally takes name for multiple setups)') do |c, name|
+        c.enterprise_name = name || 'default'
+      end
+
       on('--adapter ADAPTER', 'Faraday adapter to use for HTTP requests') do |c, adapter|
         adapter.gsub! '-', '_'
         require "faraday/adapter/#{adapter}"
@@ -41,9 +47,13 @@ module Travis
       end
 
       def setup
+        setup_enterprise if enterprise?
         self.api_endpoint = default_endpoint if default_endpoint and not explicit_api_endpoint?
         self.access_token               ||= fetch_token
         endpoint_config['access_token'] ||= access_token
+        endpoint_config['insecure']       = insecure unless insecure.nil?
+        self.insecure                     = endpoint_config['insecure']
+        session.ssl                       = { :verify => false } if insecure?
         authenticate if pro?
       end
 
@@ -80,6 +90,23 @@ module Travis
 
       private
 
+        def setup_enterprise
+          c = config['enterprise'] ||= {}
+          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/"
+          end
+          self.api_endpoint = c[enterprise_name]
+          self.insecure     = true if insecure.nil?
+        end
+
+        def enterprise?
+          !!enterprise_name
+        end
+
         def load_gh
           return if defined? GH
           require 'gh'

data/lib/travis/client/session.rb

@@ -17,7 +17,7 @@ module Travis
     class Session
       SSL_OPTIONS = { :ca_file => File.expand_path("../../cacert.pem", __FILE__) }
       include Methods
-      attr_reader :connection, :headers, :access_token, :instruments, :faraday_adapter, :agent_info
+      attr_reader :connection, :headers, :access_token, :instruments, :faraday_adapter, :agent_info, :ssl
 
       def initialize(options = Travis::Client::ORG_URI)
         @headers         = {}
@@ -26,6 +26,7 @@ module Travis
         @agent_info      = []
         @config          = nil
         @faraday_adapter = defined?(Typhoeus) ? :typhoeus : :net_http
+        @ssl             = SSL_OPTIONS
 
         options = { :uri => options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }
@@ -44,9 +45,14 @@ module Travis
         set_user_agent
       end
 
+      def ssl=(options)
+        @ssl     = options.dup.freeze
+        self.uri = uri if uri
+      end
+
       def uri=(uri)
         clear_cache!
-        self.connection = Faraday.new(:url => uri, :ssl => SSL_OPTIONS) do |faraday|
+        self.connection = Faraday.new(:url => uri, :ssl => ssl) do |faraday|
           faraday.request  :url_encoded
           faraday.response :json
           faraday.response :follow_redirects
@@ -154,8 +160,11 @@ module Travis
         raw(:put, *args)
       end
 
-      def raw(verb, *args)
-        instrumented(verb.to_s.upcase, *args) { connection.public_send(verb, *args).body }
+      def raw(verb, url, *args)
+        url    = url.sub(/^\//, '')
+        result = instrumented(verb.to_s.upcase, url, *args) { connection.public_send(verb, url, *args) }
+        raise Travis::Client::Error, 'SSL error: could not verify peer' if result.status == 0
+        result.body
       rescue Faraday::Error::ClientError => e
         handle_error(e)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.6.travis.329.4
+  version: 1.5.6.travis.330.4
 platform: ruby
 authors:
 - Konstantin Haase