travis 1.6.4.travis.413.4 → 1.6.4.travis.414.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDU4MDY3N2Q0MjI3OTg1ZjJjNWJmM2FhZjA4NTBmNTk1NjEyYzBlNw==
+    YjRjNjRiMmY4NGFkYTAxZjI0OTEzM2QyMDg1MmY4MWI5YzRkNDgwNA==
   data.tar.gz: !binary |-
-    ODMxYTYxYTlhNWJiOGQ3NjdkZmQ2NmE2ZjgwMjRkMWEwOTM4YWYwNg==
+    ZmUyZDZiMjU2MDlmODdjNGVlM2EzODJmNjlmZjU3ZTA4MmUzNWY2Nw==
 SHA512:
   metadata.gz: !binary |-
-    MGNkZWVhZmNiZDAwMzNhMTVmNDFiYmZhODVmNDVjZTY0NzFjYmYxZmQ0MGMx
-    NWI0MTljYzA5NDNlZjYxZDhhMmUxYTJhYTNlMDRjZTFiOTQ0Y2Q2ZmIzNjU1
-    NTM0OTYzOWUzMjVkZTBlNTc0Nzg3NmFlY2ExMGVlMjU5NTk3ZDI=
+    NjY5Mjc1MDJjODdiZjkxZjA3Yjk0OGJlYmQ1NWQ3NmJjZmU1NDMzNGQzN2Jl
+    MmE0Y2FkOTViNzVjMWI1NTkyZjk1ZmM2ODkzZmY3YWE2ZmZhZDBlODVhZDYx
+    ZmQyMmE4NTc2MDBjNzQyNWZmOWI0ODgwYjQ1MTdhN2U3MjQzMDI=
   data.tar.gz: !binary |-
-    NTU2NjY5NjIwZTRlZWI0MWNkMjRmMjk0ZThhMzQ2NDdkMDQwMjNmMjhlNDNm
-    NTAxYTdiZjgwZDNiYzllNTQ1NzBhZmY3MjJlNjk2MDIxZjc0MjVmZGM5Zjhh
-    MzE2NDY0MDc2NmEzYWRhZmMzNmQ4MjEyY2Q3ODNjOTEwYjAzMDI=
+    MzQ2YzRjNjQ1M2YwYzQzYTBjNDIyZjMwZTFmZjQxZDIyYTFlM2NlYjE3MTE2
+    OTdlN2VkZTU4NDdlYjdiY2ZmMmRjMjM4MTdhNjI3ZGE3NGQ5MjYyNmFhYjI2
+    ODU0NmRiMDJjMDJiYmNjNGNiYjg4Y2IwNmEwMDU0MjQ2MzY4OTY=

data/README.md

@@ -1349,7 +1349,7 @@ repo.delete_caches(branch: "master", match: "rbx")
 
 #### Repository Settings
 
-You can access a repositories settings.
+You can access a repositories settings via `Repository#settings`:
 
 ``` ruby
 require 'travis'
@@ -1535,9 +1535,15 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
-**Unreleased**
+**1.6.4** (not yet released)
 
+* Add `travis settings` command for accessing repository settings.
 * Add `travis setup opsworks`.
+* Add `travis console -x` to run a line of Ruby code with a valid session.
+* Add Ruby API for dealing with repository settings.
+* Improve `travis login` and `travis login --auto`. Add ability to load GitHub token from Keychain.
+* Only ask for GitHub two-factor auth token if two-factor auth is actually required.
+* Fix access right check for `travis caches`.
 
 **1.6.3** (November 27, 2013)
 

data/lib/travis/cli/settings.rb

@@ -0,0 +1,54 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Settings < RepoCommand
+      attr_accessor :setting
+
+      description "access repository settings"
+      on('--keys', 'always use setting key instead of description')
+      on('-t', '--enable',  'enable the setting(s)')  { |c| c.setting = true  }
+      on('-f', '--disable', 'disable the setting(s)') { |c| c.setting = false }
+      on('-c', '--configure', 'change settings interactively')
+
+      DESCRIPTIONS = {
+        :builds_only_with_travis_yml => "Only run builds with a .travis.yml",
+        :build_pushes                => "Build pushes",
+        :build_pull_requests         => "Build pull requests"
+      }
+
+      def run(*keys)
+        exit 1 if interactive? and keys.empty? and !setting.nil? and !all_settings? and !configure?
+        authenticate
+        say repository.slug, "Settings for %s:"
+        repository.settings.to_h.each do |key, value|
+          next unless keys.empty? or keys.include? key
+          if configure?
+            repository.settings[key] = agree("#{describe(key, "enable #{key}")}? ") do |q|
+              default   = setting.nil? ? value : setting
+              q.default = default ? "yes" : "no"
+            end
+          else
+            value = repository.settings[key] = setting unless setting.nil?
+            descr = color(describe(key, color(key, :info)) { |s| key.ljust(30) + " " + color(s, [:reset, :bold]) }, :info)
+            say color("[#{value ? "+" : "-"}] ", [:bold, value ? :green : :red]) << descr
+          end
+        end
+        repository.settings.save if configure? or !setting.nil?
+      end
+
+      def all_settings?
+        agree("Really #{setting ? "enable" : "disable"} all settings? ") do |q|
+          q.default = "no"
+        end
+      end
+
+      def describe(key, description = key)
+        return description if keys?
+        desc = DESCRIPTIONS[key.to_sym]
+        desc &&= yield(desc) if block_given?
+        desc || description
+      end
+    end
+  end
+end

data/lib/travis/cli/setup/opsworks.rb

@@ -0,0 +1,22 @@
+require 'travis/cli/setup'
+
+module Travis
+  module CLI
+    class Setup
+      class OpsWorks < Service
+        description "deployment to OpsWorks"
+
+        def run
+          deploy 'opsworks' do |config|
+            config['access_key_id'] = ask("Access key ID: ").to_s
+            config['secret_access_key'] = ask("Secret access key: ") { |q| q.echo = "*" }.to_s
+            config['app-id'] = ask("App ID: ").to_s
+            on("Migrate the database? ", config, 'migrate' => true)
+
+            encrypt(config, 'secret_access_key') if agree("Encrypt secret access key? ") { |q| q.default = 'yes' }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/travis/client/settings.rb

@@ -0,0 +1,25 @@
+require 'travis/client/weak_entity'
+require 'json'
+
+module Travis
+  module Client
+    class Settings < WeakEntity
+      attr_accessor :repository
+      # @!parse attr_reader :builds_only_with_travis_yml, :build_pushes, :build_pull_requests
+      attributes :builds_only_with_travis_yml, :build_pushes, :build_pull_requests
+      one :settings
+      many :settings
+
+      def save
+        raise "repository unknown" unless repository
+        result = session.patch("/repos/#{repository.id}/settings", JSON.dump("settings" => attributes))
+        attributes.replace(result['settings'].attributes)
+        self
+      end
+
+      def inspect_info
+        repository ? repository.slug : repository
+      end
+    end
+  end
+end

data/lib/travis/tools/github.rb

@@ -196,10 +196,10 @@ module Travis
         opt[:headers] = { "X-GitHub-OTP" => otp } if otp
         gh            = GH.with(opt)
         reply         = gh.post('/authorizations', :scopes => scopes, :note => note)
-        self.callback = proc { gh.delete reply['_links']['self']['href'] }
+        self.callback = proc { gh.delete reply['_links']['self']['href'] } if drop_token
         reply['token']
       rescue GH::Error => error
-        if error.info[:response_status] == 401
+        if error.info[:response_status] == 401 and error.info[:response_headers]['x-github-otp'].to_s =~ /required/
           login(user, password, die, ask_otp.call(user))
         elsif die
           raise gh_error(error)

data/travis.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
     "Peter Souter",
     "Peter van Dijk",
     "Max Barnash",
-    "Mathias Meyer",
     "joshua-anderson",
+    "Mathias Meyer",
     "Justin Lambert",
     "Adrien Brault",
     "Laurent Petit",
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Piotr Sarnacki",
     "Rapha\xC3\xABl Pinson",
     "Tobias Wilken",
+    "jeffdh",
     "Daniel Chatfield",
     "Adam Lavin",
     "Benjamin Manns",
@@ -43,23 +44,24 @@ Gem::Specification.new do |s|
     "p.morsou@gmail.com",
     "henrik@hodne.io",
     "peter.van.dijk@netherlabs.nl",
+    "j@zatigo.com",
     "i.am@anhero.ru",
     "meyer@paperplanes.de",
-    "j@zatigo.com",
-    "benmanns@gmail.com",
+    "adam@lavoaster.co.uk",
     "adrien.brault@gmail.com",
     "laurent.petit@gmail.com",
     "maartenvanvliet@gmail.com",
     "mario@mariovisic.com",
+    "jlambert@eml.cc",
+    "josh.kalderimis@gmail.com",
     "neamar@neamar.fr",
+    "jburkhart@engineyard.com",
     "drogus@gmail.com",
     "raphael.pinson@camptocamp.com",
     "tw@cloudcontrol.de",
-    "adam@lavoaster.co.uk",
+    "jeffdh@gmail.com",
     "chatfielddaniel@gmail.com",
-    "jburkhart@engineyard.com",
-    "josh.kalderimis@gmail.com",
-    "jlambert@eml.cc"
+    "benmanns@gmail.com"
   ]
 
   # generated from git ls-files
@@ -125,6 +127,7 @@ Gem::Specification.new do |s|
     "lib/travis/cli/report.rb",
     "lib/travis/cli/repos.rb",
     "lib/travis/cli/restart.rb",
+    "lib/travis/cli/settings.rb",
     "lib/travis/cli/setup.rb",
     "lib/travis/cli/setup/appfog.rb",
     "lib/travis/cli/setup/cloud_control.rb",
@@ -136,6 +139,7 @@ Gem::Specification.new do |s|
     "lib/travis/cli/setup/nodejitsu.rb",
     "lib/travis/cli/setup/npm.rb",
     "lib/travis/cli/setup/open_shift.rb",
+    "lib/travis/cli/setup/opsworks.rb",
     "lib/travis/cli/setup/pypi.rb",
     "lib/travis/cli/setup/ruby_gems.rb",
     "lib/travis/cli/setup/s3.rb",
@@ -164,6 +168,7 @@ Gem::Specification.new do |s|
     "lib/travis/client/repository.rb",
     "lib/travis/client/restartable.rb",
     "lib/travis/client/session.rb",
+    "lib/travis/client/settings.rb",
     "lib/travis/client/states.rb",
     "lib/travis/client/user.rb",
     "lib/travis/client/weak_entity.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.4.travis.413.4
+  version: 1.6.4.travis.414.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,8 +10,8 @@ authors:
 - Peter Souter
 - Peter van Dijk
 - Max Barnash
-- Mathias Meyer
 - joshua-anderson
+- Mathias Meyer
 - Justin Lambert
 - Adrien Brault
 - Laurent Petit
@@ -21,6 +21,7 @@ authors:
 - Piotr Sarnacki
 - Raphaël Pinson
 - Tobias Wilken
+- jeffdh
 - Daniel Chatfield
 - Adam Lavin
 - Benjamin Manns
@@ -29,7 +30,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -235,23 +236,24 @@ email:
 - p.morsou@gmail.com
 - henrik@hodne.io
 - peter.van.dijk@netherlabs.nl
+- j@zatigo.com
 - i.am@anhero.ru
 - meyer@paperplanes.de
-- j@zatigo.com
-- benmanns@gmail.com
+- adam@lavoaster.co.uk
 - adrien.brault@gmail.com
 - laurent.petit@gmail.com
 - maartenvanvliet@gmail.com
 - mario@mariovisic.com
+- jlambert@eml.cc
+- josh.kalderimis@gmail.com
 - neamar@neamar.fr
+- jburkhart@engineyard.com
 - drogus@gmail.com
 - raphael.pinson@camptocamp.com
 - tw@cloudcontrol.de
-- adam@lavoaster.co.uk
+- jeffdh@gmail.com
 - chatfielddaniel@gmail.com
-- jburkhart@engineyard.com
-- josh.kalderimis@gmail.com
-- jlambert@eml.cc
+- benmanns@gmail.com
 executables:
 - travis
 extensions: []
@@ -318,6 +320,7 @@ files:
 - lib/travis/cli/report.rb
 - lib/travis/cli/repos.rb
 - lib/travis/cli/restart.rb
+- lib/travis/cli/settings.rb
 - lib/travis/cli/setup.rb
 - lib/travis/cli/setup/appfog.rb
 - lib/travis/cli/setup/cloud_control.rb
@@ -329,6 +332,7 @@ files:
 - lib/travis/cli/setup/nodejitsu.rb
 - lib/travis/cli/setup/npm.rb
 - lib/travis/cli/setup/open_shift.rb
+- lib/travis/cli/setup/opsworks.rb
 - lib/travis/cli/setup/pypi.rb
 - lib/travis/cli/setup/ruby_gems.rb
 - lib/travis/cli/setup/s3.rb
@@ -357,6 +361,7 @@ files:
 - lib/travis/client/repository.rb
 - lib/travis/client/restartable.rb
 - lib/travis/client/session.rb
+- lib/travis/client/settings.rb
 - lib/travis/client/states.rb
 - lib/travis/client/user.rb
 - lib/travis/client/weak_entity.rb