travis 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43bd32ce16eb549066ab5484c7da1736b64f60ff
-  data.tar.gz: 999f1b38a292b48c210df8046d798852880e12dc
+  metadata.gz: 5e9ba04f7bc2ce5298cc1449e4d2835b26539b2f
+  data.tar.gz: 3dc663c0c3726335d2e5393023ddf1ba4c187bb4
 SHA512:
-  metadata.gz: 1927ceed3d07a753e7ccde4dd7e952daded43bb974c069a59d88efbf71d5d604c789bfbfd2325b213e854cbb1b71252a9194ec72e5f9ac2a8303a0797bd49f89
-  data.tar.gz: 64ab6d079c38d482810cfebdba22e9b3a5c7fe3cc546252d336e57c4188e9a4f9df1772e052dfe887ca82e301cd5575a9c821959cfb95544731a08dd09368db4
+  metadata.gz: d08eecff707521d33acd5466764e151cb7e687fe4b191ffa12ee5ea2cb481ec9aa9aed8a4cef5b80b544757c97b97bbdded7c03daeffd86a4a0e0b3423b5d326
+  data.tar.gz: 70f7ea86abb1f3260ccae4d34d337d61d00f7ba7579507d2be669e149fc9c6c2bb0e9fffcff91e1c6f2f16c87393ba3829fd1065a2c77a0ae0327f10ba78714e

data/README.md

@@ -233,6 +233,18 @@ It's just a tiny feature, but it allows you to take a look at repositories that
     qcubed/framework failed: #21
     ...
 
+If you only want to see what happened in your repositories, add the `--my-repos` flag (short: `-m`):
+
+    $ travis whatsup -m
+    travis-ci/travis passed: #169
+    rkh/dpl passed: #50
+    rubinius/rubinius passed: #3235
+    sinatra/sinatra errored: #619
+    rtomayko/tilt failed: #162
+    ruby-no-kai/rubykaigi2013 passed: #50
+    rack/rack passed: #519
+    ...
+
 #### `whoami`
 
 This command is useful to verify that you're in fact logged in:
@@ -304,18 +316,23 @@ If you don't want the sync to be triggered, use `--skip-sync`.
 
 #### `encrypt`
 
-    Usage: travis encrypt [args..] [options]
+    Usage: bin/travis encrypt [args..] [options]
         -h, --help                       Display help
         -i, --[no-]interactive           be interactive and colorful
         -E, --[no-]explode               don't rescue exceptions
+            --skip-version-check         don't check if travis client is up to date
         -e, --api-endpoint URL           Travis API server to talk to
             --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
+            --staging                    talks to staging system
         -t, --token [ACCESS_TOKEN]       access token to use
             --debug                      show API requests
-        -r, --repo SLUG
-            --add [KEY]                  adds it to .travis.yml under KEY (default: env.global)
+            --adapter ADAPTER            Faraday adapter to use for HTTP requests
+        -r, --repo SLUG                  repository to use (will try to detect from current git clone)
+        -a, --add [KEY]                  adds it to .travis.yml under KEY (default: env.global)
         -s, --[no-]split                 treat each line as a separate input
+        -p, --append                     don't override existing values, instead treat as list
+        -x, --override                   override existing value
 
 This command is useful to encrypt [environment variables](http://about.travis-ci.org/docs/user/encryption-keys/) or deploy keys for private dependencies.
 
@@ -348,6 +365,11 @@ This will by default add it as global variables for every job. You can also add
 
     $ travis encrypt FOO=bar --add env.matrix
 
+There are two ways the client can treat existing values:
+
+* Turn existing value into a list if it isn't already, append new value to that list. This is the default behavior for keys that start with `env.` and can be enforced with `--append`.
+* Replace existing value. This is the default behavior for keys that do not start with `env.` and can be enforced with `--override`.
+
 #### `history`
 
     Usage: travis history [options]
@@ -974,7 +996,7 @@ MyTravis::Repository.find('rails/rails')
 
 ## Installation
 
-Make sure you have at least [Ruby](http://www.ruby-lang.org/en/downloads/) 1.8.7 (1.9.3 recommended) installed. Then run:
+Make sure you have at least [Ruby](http://www.ruby-lang.org/en/downloads/) 1.8.7 (2.0.0 recommended) installed. Then run:
 
     $ gem install travis --no-rdoc --no-ri
 
@@ -984,6 +1006,13 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.3.1** (July 21, 2013)
+
+* Add `travis whatsup --my-repos`, which corresponds to the "My Repositories" tab in the web interface
+* It is now recommended to use Ruby 2.0, any Ruby version prior to 1.9.3 will lead to a warning being displayed. Disable with `--skip-version-check`.
+* Add `--override` and `--append` to `travis encrypt`, make default behavior depend on key.
+* Add shorthand for `travis encrypt --add`.
+
 **1.3.0** (July 20, 2013)
 
 * Add `travis setup [heroku|openshift|nodejitsu|sauce_connect]`

data/lib/travis/cli/command.rb

@@ -118,7 +118,13 @@ module Travis
       rescue Timeout::Error, Faraday::Error::ClientError
       end
 
+      def check_ruby
+        return if RUBY_VERSION > '1.9.2' or skip_version_check?
+        warn "Your Ruby version is outdated, please consider upgrading, as we will drop support for #{RUBY_VERSION} soon!"
+      end
+
       def execute
+        check_ruby
         check_arity(method(:run), *arguments)
         load_config
         check_version

data/lib/travis/cli/encrypt.rb

@@ -6,13 +6,20 @@ module Travis
     class Encrypt < RepoCommand
       attr_accessor :config_key
 
-      on('--add [KEY]', 'adds it to .travis.yml under KEY (default: env.global)') do |c, value|
+      on('-a', '--add [KEY]', 'adds it to .travis.yml under KEY (default: env.global)') do |c, value|
         c.config_key = value || 'env.global'
       end
 
-      on('-s', '--[no-]split', 'treat each line as a separate input')
+      on('-s', '--[no-]split', "treat each line as a separate input")
+      on('-p', '--append',     "don't override existing values, instead treat as list")
+      on('-x', '--override',   "override existing value")
 
       def run(*args)
+        error "cannot combine --override and --append"   if append?   and override?
+        error "--append without --add makes no sense"    if append?   and not add?
+        error "--override without --add makes no sense"  if override? and not add?
+        self.override |= !config_key.start_with?('env.') if add?      and not append?
+
         if args.first =~ %r{\w+/\w+}
           warn "WARNING: The name of the repository is now passed to the command with the -r option:"
           warn "    #{command("encrypt [...] -r #{args.first}")}"
@@ -41,12 +48,16 @@ module Travis
 
       private
 
+        def add?
+          !!config_key
+        end
+
         def set_config(result)
           parent_config[last_key] = merge_config(result)
         end
 
         def merge_config(result)
-          case subconfig = parent_config[last_key]
+          case subconfig = (parent_config[last_key] unless override?)
           when nil   then result.size == 1 ? result.first : result
           when Array then subconfig + result
           else            result.unshift(subconfig)

data/lib/travis/cli/whatsup.rb

@@ -3,14 +3,23 @@ require 'travis/cli'
 module Travis
   module CLI
     class Whatsup < ApiCommand
+      on('-m', '--my-repos')
+
       def run
-        repos.each do |repo|
+        recent.each do |repo|
           say [
             color(repo.slug, [:bold, repo.color]),
             color("#{repo.last_build.state}: ##{repo.last_build.number}", repo.color)
           ].join(" ")
         end
       end
+
+      private
+
+        def recent
+          return repos unless my_repos
+          repos(:member => user.login)
+        end
     end
   end
 end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.3.0"
+  s.version     = "1.3.1"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday