travis 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e921c3e50d219945b7a6dd95288a2bd941c8ed
-  data.tar.gz: 6f053ea71b23f940a0c6d25de1e3541deb59145a
+  metadata.gz: 69f1142a4738539ef3a046bb4aaf0ae0efd9f903
+  data.tar.gz: 57ece6aa4348ecddaf91d1b730505224dad272fb
 SHA512:
-  metadata.gz: b3888323efad2668054faa063208894261bfe7f906ef43c53373549de22252d48f875ffef7f67f96dc884f32ebc6346f94b5bdc99029e732d1b522832e2aaa57
-  data.tar.gz: e109cb1086c344be1a16090d3676adb1224eaab912682efa89b6d01bf09f23faaf761aea388a173ef965d1d1dbc5ad0fd3b125f960f8c44000e77648a0698aca
+  metadata.gz: c47d69aeb0af9e9d4157e6c6c031b875a023aa28826c9d286bd5c485c078239401eb254bb792dfd302ca6560a531e7fbe2b7c275c9e6f6ecdf65f131204fe97f
+  data.tar.gz: 0ba7a6ee85b9eebea6b303ff3f7b6ad2ca0a7d627e4720f4fcc23e8adf52933f94538eebb366f2153364450ea9375cd43f83f481f297c142a14001c6e32df616

data/README.md

@@ -1177,12 +1177,12 @@ You can check your Ruby version by running `ruby -v`:
 
 Then run:
 
-    $ gem install travis -v 1.5.2 --no-rdoc --no-ri
+    $ gem install travis -v 1.5.3 --no-rdoc --no-ri
 
 Now make sure everything is working:
 
     $ travis version
-    1.5.2
+    1.5.3
 
 ### Updating your Ruby
 
@@ -1229,6 +1229,14 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.5.3** (August 22, 2013)
+
+* Fix issues on Windows.
+* Improve `travis setup rubygems` (automatically figure out API token for newer RubyGems versions, offer to only release tagged commits, allow changing gem name).
+* Add command descriptions to help pages.
+* Smarter check if travis gem is outdated.
+* Better error messages for non-existing build/job numbers.
+
 **1.5.2** (August 18, 2013)
 
 * Add `travis cancel`.

data/lib/travis/cli.rb

@@ -49,10 +49,6 @@ module Travis
 
     extend self
 
-    def windows?
-      File::ALT_SEPARATOR == "\\"
-    end
-
     def run(*args)
       args, opts = preparse(args)
       name       = args.shift unless args.empty?

data/lib/travis/cli/accounts.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Accounts < ApiCommand
+      description "displays accounts and their subscription status"
+
       def run
         authenticate
         accounts.each do |account|

data/lib/travis/cli/branches.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Branches < RepoCommand
+      description "displays the most recent build for each branch"
+
       def run
         repository.last_on_branch.each do |build|
           say [

data/lib/travis/cli/cancel.rb

@@ -3,9 +3,12 @@ require 'travis/cli'
 module Travis
   module CLI
     class Cancel < RepoCommand
+      description "cancels a job or build"
+
       def run(number = last_build.number)
         authenticate
         entity = job(number) || build(number)
+        error "could not find job or build #{repository.slug}##{number}" unless entity
         entity.cancel
 
         say "canceled", "#{entity.class.one} ##{entity.number} has been %s"

data/lib/travis/cli/command.rb

@@ -1,4 +1,5 @@
 require 'travis/cli'
+require 'travis/tools/system'
 require 'travis/tools/formatter'
 require 'travis/version'
 
@@ -14,7 +15,7 @@ module Travis
       extend Forwardable
       def_delegators :terminal, :agree, :ask, :choose
 
-      HighLine.use_color = !CLI.windows? && $stdout.tty?
+      HighLine.use_color = !Tools::System.windows? && $stdout.tty?
       HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
         cs[:command]   = [ :bold             ]
         cs[:error]     = [ :red              ]
@@ -30,7 +31,7 @@ module Travis
       end
 
       on('-i', '--[no-]interactive', "be interactive and colorful") do |c, v|
-        HighLine.use_color = v unless CLI.windows?
+        HighLine.use_color = v unless Tools::System.windows?
         c.force_interactive = v
       end
 
@@ -54,6 +55,11 @@ module Travis
         define_method(name) {}
       end
 
+      def self.description(description = nil)
+        @description = description if description
+        @description ||= ""
+      end
+
       attr_accessor :arguments, :config, :force_interactive, :formatter
       attr_reader :input, :output
 
@@ -99,23 +105,28 @@ module Travis
       def setup
       end
 
+      def last_check
+        config['last_check'] ||= {
+          # migrate from old values
+          'at'   => config.delete('last_version_check'),
+          'etag' => config.delete('etag')
+        }
+      end
+
       def check_version
+        last_check.clear if last_check['version'] != Travis::VERSION
+
         return if skip_version_check?
-        return if Time.now.to_i - config['last_version_check'].to_i < 3600
-        version = Travis::VERSION
+        return if Time.now.to_i - last_check['at'].to_i < 3600
 
         Timeout.timeout 1.0 do
-          response       = Faraday.get('https://rubygems.org/api/v1/gems/travis.json', {}, 'If-None-Match' => config['etag'].to_s)
-          config['etag'] = response.headers['etag']
-          version        = JSON.parse(response.body)['version'] if response.status == 200
+          response              = Faraday.get('https://rubygems.org/api/v1/gems/travis.json', {}, 'If-None-Match' => last_check['etag'].to_s)
+          last_check['etag']    = response.headers['etag']
+          last_check['version'] = JSON.parse(response.body)['version'] if response.status == 200
         end
 
-        if Travis::VERSION >= version
-          config['last_version_check'] = Time.now.to_i
-        else
-          error "Outdated CLI version (#{Travis::VERSION}, current is #{version}), " \
-            "run `gem install travis -v #{version}` or use --skip-version-check."
-        end
+        last_check['at'] = Time.now.to_i
+        error "Outdated CLI version, run `gem install travis` or use --skip-version-check." if Travis::VERSION < last_check['version']
       rescue Timeout::Error, Faraday::Error::ClientError
       end
 
@@ -145,7 +156,7 @@ module Travis
       end
 
       def usage
-        usage  = "#$0 #{command_name}"
+        usage  = "travis #{command_name}"
         method = method(:run)
         if method.respond_to? :parameters
           method.parameters.each do |type, name|
@@ -162,7 +173,7 @@ module Travis
 
       def help
         parser.banner = usage
-        parser.to_s
+        self.class.description.sub(/./) { |c| c.upcase } + ".\n" + parser.to_s
       end
 
       def say(data, format = nil, style = nil)

data/lib/travis/cli/console.rb

@@ -4,6 +4,8 @@ Travis::CLI.silent { require 'pry' }
 module Travis
   module CLI
     class Console < ApiCommand
+      description "interactive shell"
+
       def run
         Object.send(:include, Client::Namespace.new(session))
         binding.pry(:quiet => true, :prompt => Pry::SIMPLE_PROMPT, :output => $stdout)

data/lib/travis/cli/disable.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Disable < RepoCommand
+      description "disables a project"
+
       def run
         authenticate
         repository.disable

data/lib/travis/cli/enable.rb

@@ -3,6 +3,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class Enable < RepoCommand
+      description "enables a project"
       on('-s', '--skip-sync', "don't trigger a sync if the repo is unknown")
 
       def run

data/lib/travis/cli/encrypt.rb

@@ -4,6 +4,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class Encrypt < RepoCommand
+      description "encrypts values for the .travis.yml"
       attr_accessor :config_key
 
       on('-a', '--add [KEY]', 'adds it to .travis.yml under KEY (default: env.global)') do |c, value|

data/lib/travis/cli/endpoint.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Endpoint < ApiCommand
+      description "displays or changes the API endpoint"
+
       skip :authenticate
       on '--drop-default', 'delete stored default endpoint'
       on '--set-default', 'store endpoint as global default'

data/lib/travis/cli/help.rb

@@ -3,12 +3,14 @@ require 'travis/cli'
 module Travis
   module CLI
     class Help < Command
+      description "helps you out when in dire need of information"
+
       def run(command = nil)
         if command
           say CLI.command(command).new.help
         else
-          say "Usage: #$0 COMMAND ...\n\nAvailable commands:\n\n"
-          commands.each { |c| say "\t#{c.command_name}" }
+          say "Usage: travis COMMAND ...\n\nAvailable commands:\n\n"
+          commands.each { |c| say "\t#{color(c.command_name, :command).ljust(20)} #{color(c.description, :info)}" }
           say "\nrun `#$0 help COMMAND` for more infos"
         end
       end

data/lib/travis/cli/history.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class History < RepoCommand
+      description "displays a projects build history"
+
       on('-a', '--after BUILD', 'Only show history after a given build number')
       on('-p', '--pull-request NUMBER', 'Only show history for the given Pull Request')
       on('-b', '--branch BRANCH', 'Only show history for the given branch')

data/lib/travis/cli/init.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Init < Enable
+      description "generates a .travis.yml and enables the project"
+
       on('-f', '--force', 'override .travis.yml if it already exists')
       on('-k', '--skip-enable', 'do not enable project, only add .travis.yml')
       on('-p', '--print-conf', 'print generated config instead of writing to file')
@@ -23,7 +25,7 @@ module Travis
       attr_writer :travis_config
 
       def run(language = nil, file = '.travis.yml')
-        error ".travis.yml already exists, use --force to override" if File.exist?(file) and not force? and not print_conf?
+        error "#{file} already exists, use --force to override" if File.exist?(file) and not force? and not print_conf?
         language ||= ask('Main programming language used: ') { |q| q.default = detect_language }
         self.travis_config = template(language).merge(custom_config)
 

data/lib/travis/cli/login.rb

@@ -5,6 +5,8 @@ require 'json'
 module Travis
   module CLI
     class Login < ApiCommand
+      description "authenticates against the API and stores the token"
+
       skip :authenticate
       attr_accessor :github_login, :github_password, :github_token, :callback
 

data/lib/travis/cli/logs.rb

@@ -1,14 +1,31 @@
 require 'travis/cli'
 require 'travis/tools/safe_string'
+require 'travis/tools/system'
 
 module Travis
   module CLI
     class Logs < RepoCommand
+      description "streams test logs"
+
+      def setup
+        super
+        check_websocket
+      end
+
       include Tools::SafeString
       def run(number = last_build.number)
         error "##{number} is not a job, try #{number}.1" unless job = job(number)
         job.log.body { |part| print interactive? ? encoded(part) : clean(part) }
       end
+
+      private
+
+        def check_websocket
+          require 'websocket-native'
+        rescue LoadError => e
+          raise e if e.respond_to?(:path) and e.path != 'websocket-native'
+          info "speed up log streaming by installing the websocket-native gem"
+        end
     end
   end
 end

data/lib/travis/cli/monitor.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Monitor < ApiCommand
+      description "live monitor for what's going on"
+
       on('-m', '--my-repos', 'Only monitor my own repositories')
       on('-r', '--repo SLUG', 'monitor given repository (can be used more than once)') do |c, slug|
         c.repos << slug

data/lib/travis/cli/open.rb

@@ -4,6 +4,8 @@ require 'launchy'
 module Travis
   module CLI
     class Open < RepoCommand
+      description "opens a build or job in the browser"
+
       on('-g', '--github', 'Open the corresponding project, compare view or pull request on GitHub')
       on('-p', '--print',  'Print out the URL instead of opening it in a browser')
 
@@ -21,6 +23,7 @@ module Travis
         def url_for(number)
           return repo_url unless number
           entity = job(number) || build(number)
+          error "could not find job or build #{repository.slug}##{number}" unless entity
           github ? entity.commit.compare_url : "#{repo_url}/#{entity.class.many}/#{entity.id}"
         end
 

data/lib/travis/cli/pubkey.rb

@@ -4,6 +4,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class Pubkey < RepoCommand
+      description "prints out a repository's public key"
       on('-p', '--[no-]pem', 'encode in format used by pem')
 
       def run

data/lib/travis/cli/raw.rb

@@ -4,6 +4,8 @@ require 'pp'
 module Travis
   module CLI
     class Raw < ApiCommand
+      description "makes an (authenticated) API call and prints out the result"
+
       skip :authenticate
       on('--[no-]json', 'display as json')
 

data/lib/travis/cli/restart.rb

@@ -3,9 +3,12 @@ require 'travis/cli'
 module Travis
   module CLI
     class Restart < RepoCommand
+      description "restarts a build or job"
+
       def run(number = last_build.number)
         authenticate
         entity = job(number) || build(number)
+        error "could not find job or build #{repository.slug}##{number}" unless entity
         entity.restart
 
         say "restarted", "#{entity.class.one} ##{entity.number} has been %s"

data/lib/travis/cli/setup.rb

@@ -1,9 +1,11 @@
 require 'travis/cli'
 require 'json'
+require 'yaml'
 
 module Travis
   module CLI
     class Setup < RepoCommand
+      description "sets up an addon or deploy target"
       on('-f', '--force', 'override config section if it already exists')
 
       def run(service)
@@ -49,14 +51,16 @@ module Travis
 
       def setup_rubygems
         configure 'deploy', 'provider' => 'rubygems' do |config|
-          rubygems_file = File.expand_path('.rubygems/authorization', ENV['HOME'])
-
-          if File.exist? rubygems_file
-            config['api_key'] = File.read(rubygems_file)
-          end
+          authorization_file  = File.expand_path('.rubygems/authorization', ENV['HOME'])
+          credentials_file    = File.expand_path('.gem/credentials', ENV['HOME'])
 
+          config['api_key'] ||= File.read(authorization_file)                       if File.exist? authorization_file
+          config['api_key'] ||= YAML.load_file(credentials_file)[:rubygems_api_key] if File.exist? credentials_file
           config['api_key'] ||= ask("RubyGems API token: ") { |q| q.echo = "*" }.to_s
-          config['on']        = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          config['gem']     ||= ask("Gem name: ") { |q| q.default = repository.name }.to_s
+
+          on("Release only from #{repository.slug}? ", config, 'repo' => repository.slug)
+          on("Release only tagged commits? ",          config, 'tags' => true)
           encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
         end
       end
@@ -116,6 +120,12 @@ module Travis
 
       private
 
+        def on(question, config, condition)
+          return unless agree(question) { |q| q.default = 'yes' }
+          config['on'] ||= {}
+          config['on'].merge! condition
+        end
+
         def encrypt(config, key)
           encrypted   = repository.encrypt(config.fetch(key))
           config[key] = { 'secure' => encrypted }

data/lib/travis/cli/show.rb

@@ -3,11 +3,13 @@ require 'travis/cli'
 module Travis
   module CLI
     class Show < RepoCommand
+      description "displays a build or job"
+
       def run(number = last_build.number)
         number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ and repository.branch(number)
         entity = job(number) || build(number)
 
-        error "unknown build or job #{number}" unless entity
+        error "could not find job or build #{repository.slug}##{number}" unless entity
 
         say template(__FILE__) % [
           entity.class.one.capitalize,

data/lib/travis/cli/status.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Status < RepoCommand
+      description "checks status of the latest build"
+
       on '-x', '--[no-]exit-code',    'sets the exit code to 1 if the build failed'
       on '-q', '--[no-]quiet',        'does not print anything'
       on '-p', '--[no-]fail-pending', 'sets the status code to 1 if the build is pending'

data/lib/travis/cli/sync.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Sync < ApiCommand
+      description "triggers a new sync with GitHub"
+
       on '-c', '--check',      'only check the sync status'
       on '-b', '--background', 'will trigger sync but not block until sync is done'
       on '-f', '--force',      'will force sync, even if one is already running'

data/lib/travis/cli/token.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Token < ApiCommand
+      description "outputs the secret API token"
+
       def run
         authenticate
         say access_token, "Your access token is %s"

data/lib/travis/cli/version.rb

@@ -4,6 +4,8 @@ require 'travis/version'
 module Travis
   module CLI
     class Version < Command
+      description "outputs the client version"
+
       def run
         say Travis::VERSION
       end

data/lib/travis/cli/whatsup.rb

@@ -3,6 +3,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class Whatsup < ApiCommand
+      description "lists most recent builds"
       on('-m', '--my-repos', 'Only display my own repositories')
 
       def run

data/lib/travis/cli/whoami.rb

@@ -3,6 +3,8 @@ require 'travis/cli'
 module Travis
   module CLI
     class Whoami < ApiCommand
+      description "outputs the current user"
+
       def run
         authenticate
         say user.login, "You are %s (#{user.name})"

data/lib/travis/client/session.rb

@@ -2,7 +2,12 @@ require 'travis/client'
 
 require 'faraday'
 require 'faraday_middleware'
-require 'typhoeus/adapters/faraday'
+require 'travis/tools/system'
+
+begin
+  require 'typhoeus/adapters/faraday' unless Travis::Tools::System.windows?
+rescue LoadError
+end
 
 require 'json'
 
@@ -18,7 +23,7 @@ module Travis
         @cache           = {}
         @instruments     = []
         @config          = nil
-        @faraday_adapter = :typhoeus
+        @faraday_adapter = defined?(Typhoeus) ? :typhoeus : :net_http
 
         options = { :uri => options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }

data/lib/travis/tools/system.rb

@@ -0,0 +1,11 @@
+module Travis
+  module Tools
+    module System
+      extend self
+
+      def windows?
+        File::ALT_SEPARATOR == "\\"
+      end
+    end
+  end
+end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/spec/cli/help_spec.rb

@@ -3,31 +3,31 @@ require 'spec_helper'
 describe Travis::CLI::Help do
   example "travis help" do
     run_cli('help').should be_success
-    stdout.should start_with("Usage: #$0 COMMAND")
+    stdout.should include("Usage: travis COMMAND")
   end
 
   example "travis --help" do
     run_cli('--help').should be_success
-    stdout.should start_with("Usage: #$0 COMMAND")
+    stdout.should include("Usage: travis COMMAND")
   end
 
   example "travis -h" do
     run_cli('-h').should be_success
-    stdout.should start_with("Usage: #$0 COMMAND")
+    stdout.should include("Usage: travis COMMAND")
   end
 
   example "travis -?" do
     run_cli('-?').should be_success
-    stdout.should start_with("Usage: #$0 COMMAND")
+    stdout.should include("Usage: travis COMMAND")
   end
 
   example "travis help endpoint" do
     run_cli('help', 'endpoint').should be_success
-    stdout.should start_with("Usage: #$0 endpoint [options]")
+    stdout.should include("Usage: travis endpoint [options]")
   end
 
   example "travis endpoint --help" do
     run_cli('endpoint', '--help').should be_success
-    stdout.should start_with("Usage: #$0 endpoint [options]")
+    stdout.should include("Usage: travis endpoint [options]")
   end
 end

data/spec/cli/login_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Travis::CLI::Login do
-  example "travis login", :unless => Travis::CLI.windows? do
+  example "travis login", :unless => Travis::Tools::System.windows? do
     run_cli('login') { |i| i.puts('rkh', 'password') }.should be_success
     run_cli('whoami').out.should be == "rkh\n"
   end
 
-  example "travis login (with bad credentials)", :unless => Travis::CLI.windows? do
+  example "travis login (with bad credentials)", :unless => Travis::Tools::System.windows? do
     run_cli('login') { |i| i.puts('rkh', 'wrong password') }.should_not be_success
     run_cli('whoami').should_not be_success
   end

data/spec/spec_helper.rb

@@ -25,7 +25,6 @@ RSpec.configure do |c|
   end
 
   c.after do
-    ENV.delete_if { |k,v| k.start_with? "TRAVIS_" }
     FileUtils.rm_rf(temp_dir)
   end
 end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.5.2"
+  s.version     = "1.5.3"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
     "lib/travis/pro.rb",
     "lib/travis/tools/formatter.rb",
     "lib/travis/tools/safe_string.rb",
+    "lib/travis/tools/system.rb",
     "lib/travis/tools/token_finder.rb",
     "lib/travis/version.rb",
     "spec/cli/cancel_spec.rb",
@@ -180,7 +181,6 @@ Gem::Specification.new do |s|
   s.add_dependency "pry",                   "~> 0.9"
   s.add_dependency "typhoeus",              "~> 0.5"
   s.add_dependency "pusher-client",         "~> 0.3", ">= 0.3.1"
-  s.add_dependency "websocket-native",      "~> 1.0"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Konstantin Haase
@@ -24,7 +24,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -172,20 +172,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: websocket-native
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +315,7 @@ files:
 - lib/travis/pro.rb
 - lib/travis/tools/formatter.rb
 - lib/travis/tools/safe_string.rb
+- lib/travis/tools/system.rb
 - lib/travis/tools/token_finder.rb
 - lib/travis/version.rb
 - spec/cli/cancel_spec.rb