travis 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c5dc1503f0463d6a5796598d0aa64e872fdb58
-  data.tar.gz: 02494adbd371242d2b34590855ad0ce0d11c10d8
+  metadata.gz: 59fa585d065c2861f86697dd0f9f7384eedc51c1
+  data.tar.gz: 3e146b3991d09acd99a45f1107d3faacf440be3d
 SHA512:
-  metadata.gz: 96a75b115553443178382b8168a207ae47dd91ddfbd9ec5aa46008a4e989501277f413173e545efdbe1ac27b2b1e3e81083efc2ceb44eea3119d965acd297323
-  data.tar.gz: 79457fc6db1fba431a41df0211505e5c8b195d946126f23a0b76ded02b40885dfc8d90eeb5be4b5cb945c794eec515f2be216b1e8819e256103f70bc44ce64f2
+  metadata.gz: 489bace43b9a98d2709a9624dc07280da03dc8947c0c5ffc74e070b29379da95a647a34e89b5345b442e2698b8ed4e0ef63688d62ae9fc1bd38aac3ae3ade1de
+  data.tar.gz: e45008f6a26db5e0513ca7da5751d545b3ec53e6511ba93c880f4229c0a778f6000b0538dccefd1d1bc4628aa4965e35ca45526d0b4343db06eca9312094cc43

data/README.md

@@ -609,7 +609,7 @@ Helps you configure Travis addons.
         -r, --repo SLUG                  repository to use (will try to detect from current git clone)
         -f, --force                      override config section if it already exists
 
-Available services: `heroku`, `nodejitsu`, `openshift`, `rubygems` and `sauce_connect`.
+Available services: `cloudcontrol`, `engineyard`, `heroku`, `nodejitsu`, `openshift`, `rubygems` and `sauce_connect`.
 
 Example:
 
@@ -1127,12 +1127,12 @@ You can check your Ruby version by running `ruby -v`:
 
 Then run:
 
-    $ gem install travis -v 1.5.0 --no-rdoc --no-ri
+    $ gem install travis -v 1.5.1 --no-rdoc --no-ri
 
 Now make sure everything is working:
 
     $ travis version
-    1.5.0
+    1.5.1
 
 ### Updating your Ruby
 
@@ -1179,6 +1179,12 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.5.1** (August 15, 2013)
+
+* Add `travis setup engineyard`.
+* Silence warnings when running `travis help` or `travis console`.
+* Add `travis setup cloudcontrol`
+
 **1.5.0** (August 7, 2013)
 
 * Add `travis setup rubygems`.

data/completion/travis.sh

@@ -471,12 +471,14 @@ completions="--help
 ;;
 setup)
 completions="heroku
+engineyard
 openshift
 rubygems
 nodejitsu
 sauce_connect
 sauce_labs
 sauce
+cloudcontrol
 --help
 -h
 --interactive
@@ -1130,12 +1132,14 @@ completions="--help
 ;;
 setup)
 completions="heroku
+engineyard
 openshift
 rubygems
 nodejitsu
 sauce_connect
 sauce_labs
 sauce
+cloudcontrol
 --help
 -h
 --interactive

data/lib/travis/cli/console.rb

@@ -1,12 +1,12 @@
 require 'travis/cli'
-require 'pry'
+Travis::CLI.silent { require 'pry' }
 
 module Travis
   module CLI
     class Console < ApiCommand
       def run
         Object.send(:include, Client::Namespace.new(session))
-        binding.pry(:quiet => true, :prompt => Pry::SIMPLE_PROMPT)
+        binding.pry(:quiet => true, :prompt => Pry::SIMPLE_PROMPT, :output => $stdout)
       end
     end
   end

data/lib/travis/cli/setup.rb

@@ -22,6 +22,20 @@ module Travis
         end
       end
 
+      def setup_engineyard
+        configure 'deploy', 'provider' => 'engineyard' do |config|
+          eyrc                  = File.expand_path(".eyrc", Dir.home)
+          config['api_key']     = YAML.load_file(eyrc)["api_token"] if File.exists?(eyrc)
+          config['api_key']     = ask("API token: ") { |q| q.echo = "*" }.to_s unless config['api_key']
+          env                   = ask("Environment (optional): ").to_s
+          config['environment'] = env unless env.empty?
+          migrate               = agree("Run migrations on deploy? ") { |q| q.default = 'yes' }
+          config['migrate']     = ask("Migration command: ") { |q| q.default = "rake db:migrate" } if migrate
+          config['on']          = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
+        end
+      end
+
       def setup_openshift
         configure 'deploy', 'provider' => 'openshift' do |config|
           config['user']     = ask("OpenShift user: ").to_s
@@ -76,6 +90,18 @@ module Travis
       alias setup_sauce_labs setup_sauce_connect
       alias setup_sauce      setup_sauce_connect
 
+      def setup_cloudcontrol
+        configure 'deploy', 'provider' => 'cloudcontrol' do |config|
+          config['email'] = ask("cloudControl email: ").to_s
+          config['password'] = ask("cloudControl password: ") { |q| q.echo = "*" }.to_s
+          app = ask("cloudControl application: ").to_s
+          dep = ask("cloudControl deployment: ").to_s
+          config['deployment'] = "#{app}/#{dep}"
+          config['on']      = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          encrypt(config, 'password') if agree("Encrypt password key? ") { |q| q.default = 'yes' }
+        end
+      end
+      
       private
 
         def encrypt(config, key)

data/lib/travis/cli.rb

@@ -12,6 +12,8 @@ end
 require 'gh'
 GH.set(:ssl => Travis::Client::Session::SSL_OPTIONS)
 
+require 'stringio'
+
 module Travis
   module CLI
     autoload :Token,        'travis/cli/token'
@@ -73,8 +75,22 @@ module Travis
       CLI.constants.map { |n| CLI.const_get(n) }.select { |c| command? c }
     end
 
+    def silent
+      stderr, $stderr = $stderr, dummy_io
+      stdout, $stdout = $stdout, dummy_io
+      yield
+    ensure
+      $stderr = stderr if stderr
+      $stdout = stdout if stdout
+    end
+
     private
 
+      def dummy_io
+        return StringIO.new unless defined? IO::NULL and IO::NULL
+        File.open(IO::NULL, 'w')
+      end
+
       def command?(constant)
         constant and constant < Command and not constant.abstract?
       end

data/lib/travis/client.rb

@@ -1,4 +1,4 @@
-require 'backports/1.9.3' if RUBY_VERSION < '1.9.3'
+require 'backports/2.0.0' if RUBY_VERSION < '2.0.0'
 require 'travis/client/error'
 require 'travis/client/states'
 require 'travis/client/methods'

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/spec/cli/setup_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Travis::CLI::Setup do
+  example 'setup cloudcontrol' do
+    run_cli('setup', 'cloudcontrol') { |i|
+      i.puts('email')
+      i.puts('password')
+      i.puts('application')
+      i.puts('deployment')
+      i.puts('yes')
+      i.puts('yes')}.should be_success
+    stdout.should be == "cloudControl email: cloudControl password: ********\ncloudControl application: cloudControl deployment: Deploy only from rails/rails? |yes| Encrypt password key? |yes| "
+    file = File.expand_path('.travis.yml', Dir.pwd.gsub!(/\/spec/, ''))
+    config = YAML.load_file(file)
+    
+    config['deploy']['provider'].should eql('cloudcontrol')
+    config['deploy']['email'].should eql('email')
+    config['deploy']['deployment'].should eql('application/deployment')
+
+    config.delete('deploy')
+    yaml = config.to_yaml
+    yaml.gsub! /\A---\s*\n/, ''
+    File.write(file, yaml)
+  end
+end

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.5.0"
+  s.version     = "1.5.1"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -17,14 +17,17 @@ Gem::Specification.new do |s|
     "Peter Souter",
     "Max Barnash",
     "Aaron Hill",
-    "Justin Lambert",
     "Adrien Brault",
-    "Laurent Petit",
+    "Justin Lambert",
     "Daniel Chatfield",
+    "Laurent Petit",
+    "Mario Visic",
+    "Mathias Meyer",
+    "Benjamin Manns",
     "Piotr Sarnacki",
     "Rapha\xC3\xABl Pinson",
-    "Mario Visic",
-    "Benjamin Manns"
+    "Tobias Wilken",
+    "Jacob Burkhart"
   ]
 
   # generated from git shortlog -sne
@@ -34,14 +37,17 @@ Gem::Specification.new do |s|
     "p.morsou@gmail.com",
     "i.am@anhero.ru",
     "aa1ronham@gmail.com",
+    "jlambert@eml.cc",
     "benmanns@gmail.com",
     "adrien.brault@gmail.com",
     "laurent.petit@gmail.com",
     "chatfielddaniel@gmail.com",
+    "meyer@paperplanes.de",
     "drogus@gmail.com",
     "raphael.pinson@camptocamp.com",
+    "tw@cloudcontrol.de",
     "mario@mariovisic.com",
-    "jlambert@eml.cc"
+    "jburkhart@engineyard.com"
   ]
 
   # generated from git ls-files
@@ -131,6 +137,7 @@ Gem::Specification.new do |s|
     "spec/cli/logs_spec.rb",
     "spec/cli/open_spec.rb",
     "spec/cli/restart_spec.rb",
+    "spec/cli/setup_spec.rb",
     "spec/cli/show_spec.rb",
     "spec/cli/status_spec.rb",
     "spec/cli/token_spec.rb",
@@ -158,7 +165,7 @@ Gem::Specification.new do |s|
   ]
 
   # dependencies
-  s.add_dependency "faraday",               "~> 0.8"
+  s.add_dependency "faraday",               "~> 0.8.7" # FIXME
   s.add_dependency "faraday_middleware",    "~> 0.9"
   s.add_dependency "highline",              "~> 1.6"
   s.add_dependency "netrc",                 "~> 0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -9,18 +9,21 @@ authors:
 - Peter Souter
 - Max Barnash
 - Aaron Hill
-- Justin Lambert
 - Adrien Brault
-- Laurent Petit
+- Justin Lambert
 - Daniel Chatfield
-- Piotr Sarnacki
-- Raphaël Pinson
+- Laurent Petit
 - Mario Visic
+- Mathias Meyer
 - Benjamin Manns
+- Piotr Sarnacki
+- Raphaël Pinson
+- Tobias Wilken
+- Jacob Burkhart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -28,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -231,14 +234,17 @@ email:
 - p.morsou@gmail.com
 - i.am@anhero.ru
 - aa1ronham@gmail.com
+- jlambert@eml.cc
 - benmanns@gmail.com
 - adrien.brault@gmail.com
 - laurent.petit@gmail.com
 - chatfielddaniel@gmail.com
+- meyer@paperplanes.de
 - drogus@gmail.com
 - raphael.pinson@camptocamp.com
+- tw@cloudcontrol.de
 - mario@mariovisic.com
-- jlambert@eml.cc
+- jburkhart@engineyard.com
 executables:
 - travis
 extensions:
@@ -330,6 +336,7 @@ files:
 - spec/cli/logs_spec.rb
 - spec/cli/open_spec.rb
 - spec/cli/restart_spec.rb
+- spec/cli/setup_spec.rb
 - spec/cli/show_spec.rb
 - spec/cli/status_spec.rb
 - spec/cli/token_spec.rb
@@ -374,9 +381,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Travis CI client
 test_files: []
-has_rdoc: