Merge pull request #127 from travis-ci/ha-activerecord-3_2_19

Update dependencies and gemspec

Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/eric/metriks-librato_metrics.git
-  revision: 6ceeb78f419d990e5815443f7627aca848aa3810
+  revision: ccbeb751ec5fc4edfe446d8a67a423b96ebe86c7
   specs:
-    metriks-librato_metrics (0.0)
+    metriks-librato_metrics (1.0.2)
       metriks (>= 0.9.9.6)
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: f6c79103e1ff07abc8a1863b5d2ec43d9527e0ed
+  revision: 8e63d48823a60b7d591932582b6e3ee3678fea60
   specs:
-    sentry-raven (0.6.0)
+    sentry-raven (0.9.3)
       faraday (>= 0.7.6)
       hashie (>= 1.1.0)
       uuidtools
@@ -24,14 +24,14 @@ GIT
 
 GIT
   remote: git://github.com/rack/rack-contrib.git
-  revision: 951760b1710634623ebbccef8d65df9139bb41c2
+  revision: 5c12ace4ba2b9e4802e4d948a8ee0114da18760b
   specs:
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
 
 GIT
   remote: git://github.com/rkh/yard-sinatra.git
-  revision: cebeb4fc5c0ddddb8e46b0a2222900b3df9150ac
+  revision: 00774d355123617ff0faa7e0ebd54c4cdcfcdf93
   specs:
     yard-sinatra (1.0.0)
       yard (~> 0.7)
@@ -76,13 +76,13 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: d37220d766a3fb218f0f8e60ab8764034f6b376f
+  revision: 507cecf8c8d5638b72d6743a2f7ba5f3d98e3cde
   specs:
     travis-support (0.0.1)
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 7e6e31e82240e170ffc20dfd02c0353b3bd5d33b
+  revision: 6a01fbc5a075bdd606ef6f3de04173dcb581de76
   specs:
     travis-yaml (0.1.0)
 
@@ -111,6 +111,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
     actionmailer (3.2.19)
       actionpack (= 3.2.19)
       mail (~> 2.5.4)
@@ -153,7 +154,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     connection_pool (0.9.3)
     daemons (1.1.9)
-    dalli (2.6.4)
+    dalli (2.7.2)
     data_migrations (0.0.1)
       activerecord
       rake
@@ -161,17 +162,18 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    dotenv (0.9.0)
+    dotenv (0.7.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    facter (1.7.3)
+    facter (2.1.0)
+      CFPropertyList (~> 2.2.6)
     factory_girl (2.4.2)
       activesupport
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
-    foreman (0.63.0)
+    foreman (0.64.0)
-      dotenv (>= 0.7)
+      dotenv (~> 0.7.0)
       thor (>= 0.13.6)
     gh (0.13.2)
       addressable
@@ -180,14 +182,14 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (>= 2.7)
       net-http-pipeline
-    hashie (2.0.5)
+    hashie (3.1.0)
     hashr (0.0.22)
     hike (1.2.3)
     hitimes (1.2.1)
     i18n (0.6.9)
     journey (1.0.4)
     json (1.8.1)
-    kgio (2.8.0)
+    kgio (2.9.2)
     listen (1.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -196,7 +198,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcachier (0.0.2)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     method_source (0.8.2)
     metriks (0.9.9.6)
       atomic (~> 1.0)
@@ -212,17 +214,17 @@ GEM
     pg (0.13.2)
     polyglot (0.3.5)
     proxies (0.2.1)
-    pry (0.9.12.4)
+    pry (0.10.0)
-      coderay (~> 1.0)
+      coderay (~> 1.1.0)
-      method_source (~> 0.8)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     pusher (0.11.3)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
-    rack-attack (2.3.0)
+    rack-attack (4.1.0)
       rack
-    rack-protection (1.5.1)
+    rack-protection (1.5.3)
       rack
     rack-ssl (1.3.4)
       rack
@@ -235,30 +237,30 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.12.0)
+    raindrops (0.13.0)
     rake (0.9.6)
-    rb-fsevent (0.9.3)
+    rb-fsevent (0.9.4)
-    rb-inotify (0.9.2)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.3.0)
-    redis (3.0.7)
+    redis (3.1.0)
-    redis-namespace (1.3.2)
+    redis-namespace (1.5.0)
-      redis (~> 3.0.4)
+      redis (~> 3.0, >= 3.0.4)
     rerun (0.8.2)
       listen (~> 1.0.3)
     rollout (1.1.0)
-    rspec (2.14.1)
+    rspec (2.99.0)
-      rspec-core (~> 2.14.0)
+      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.14.0)
+      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-mocks (~> 2.99.0)
-    rspec-core (2.14.7)
+    rspec-core (2.99.1)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.99.1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.99.1)
     s3 (0.3.21)
       proxies (~> 0.2.0)
     sidekiq (2.5.4)
@@ -271,41 +273,42 @@ GEM
     simple_states (1.0.1)
       activesupport
       hashr (~> 0.0.10)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.1)
+    sinatra-contrib (1.4.2)
       backports (>= 2.0)
       multi_json
       rack-protection
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    slop (3.4.7)
+    slop (3.5.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thin (1.6.1)
+    thin (1.6.2)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.14.6)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (1.1.0)
+    timers (3.0.1)
+      hitimes
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.39)
-    unicorn (4.7.0)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
     uuidtools (2.1.4)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby

travis-api.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "Brian Ford",
     "Steve Richert",
     "rainsun",
+    "Bryan Goldstein",
     "James Dennes",
     "Nick Schonning",
     "Patrick Williams",
@@ -40,19 +41,20 @@ Gem::Specification.new do |s|
     "me@henrikhodne.com",
     "henrik@hodne.io",
     "konstantin.haase@gmail.com",
-    "svenfuchs@artweb-design.de",
     "andre@arko.net",
+    "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
     "bford@engineyard.com",
     "steve.richert@gmail.com",
-    "rainsuner@gmail.com",
-    "jdennes@gmail.com",
-    "nschonni@gmail.com",
     "patrick@bittorrent.com",
     "punchagan@muse-amuse.in",
+    "jdennes@gmail.com",
+    "nschonni@gmail.com",
+    "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
-    "e@zzak.io"
+    "e@zzak.io",
+    "brysgo@gmail.com"
   ]
 
   s.files = [
@@ -68,7 +70,7 @@ Gem::Specification.new do |s|
     "config/unicorn.rb",
     "lib/tasks/build_update_branch.rake",
     "lib/tasks/build_update_pull_request_data.rake",
-    "lib/tasks/encyrpt_all_data.rake",
+    "lib/tasks/encrypt_all_data.rake",
     "lib/travis/api/app.rb",
     "lib/travis/api/app/access_token.rb",
     "lib/travis/api/app/base.rb",
@@ -131,6 +133,8 @@ Gem::Specification.new do |s|
     "lib/travis/api/v2/http/build.rb",
     "lib/travis/api/v2/http/builds.rb",
     "lib/travis/api/v2/http/caches.rb",
+    "lib/travis/api/v2/http/env_var.rb",
+    "lib/travis/api/v2/http/env_vars.rb",
     "lib/travis/api/v2/http/error.rb",
     "lib/travis/api/v2/http/hooks.rb",
     "lib/travis/api/v2/http/job.rb",
@@ -159,7 +163,6 @@ Gem::Specification.new do |s|
     "public/images/result/unknown.svg",
     "script/console",
     "script/server",
-    "set_up_travis_logs.sh",
     "spec/integration/formats_handling_spec.rb",
     "spec/integration/responders_spec.rb",
     "spec/integration/routes.backup.rb",
@@ -178,6 +181,7 @@ Gem::Specification.new do |s|
     "spec/integration/v2/jobs_spec.rb",
     "spec/integration/v2/repositories_spec.rb",
     "spec/integration/v2/requests_spec.rb",
+    "spec/integration/v2/settings/env_vars_spec.rb",
     "spec/integration/v2/users_spec.rb",
     "spec/integration/v2_spec.backup.rb",
     "spec/integration/version_spec.rb",