travis-config 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f96540c8353be57638c3e7bc3b649a581d2df086
-  data.tar.gz: b6140d403624472488a8fb6ce88b8fc43969ddef
+  metadata.gz: aee4a6bf44828bb44bf30a91dbc9ca7028813495
+  data.tar.gz: 4db6880197343768cad8e0692fad58741367d198
 SHA512:
-  metadata.gz: 23b23106676b996e2510d500bc3b759714e0c8f3342bd2051c19d5b8dc8a1ca188e88db5fdaea386b73801afa8f6863d347756a3e72cac9c36f38ed9d3fd40cd
-  data.tar.gz: a5ec1c92c9ed4c2d405c2feeaf01aafa9817a59f14f4046e0c611e9d8c2c9abab889fee74c560983b7459dbdc6b2febc95a51eb8501b9b7bd0c964745ee730be
+  metadata.gz: 7498ab1b0c1b05c615d01ee2f17efac2cadb44f0bde156cb707fde3a624c1aca7d7170fbc7a54b1024ae3740f0bb90e40e197729d1a6ca32962f835893b1bbc6
+  data.tar.gz: d992acfaa9b8ace9e80ad07ac363e6d65204dd13dd4678dcee00935b608ea56a1f7b9f6151304939c6dbaae07c64788163728732134fdbc48bbb01b40373c106

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'hashr', '~> 2.0.0.rc1'
+gem 'hashr', '~> 2.0.0'
 
 group :test do
   gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    travis-config (1.0.0.rc1)
-      hashr (~> 2.0.0.rc1)
+    travis-config (1.0.0)
+      hashr (~> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    hashr (2.0.0.rc1)
+    hashr (2.0.0)
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
@@ -31,7 +31,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  hashr (~> 2.0.0.rc1)
+  hashr (~> 2.0.0)
   mocha (~> 1.1)
   rspec (~> 3.0)
   travis-config!

data/lib/travis/config.rb

@@ -29,7 +29,7 @@ module Travis
         end
 
         def loaders(*names)
-          names = [:files, :env, :heroku, :docker] if names.empty?
+          names = [:files, :heroku, :env, :docker] if names.empty?
           names.map { |name| const_get(camelize(name)).new }
         end
     end

data/lib/travis/config/heroku.rb

@@ -1,14 +1,20 @@
 require 'travis/config/helpers'
 require 'travis/config/heroku/database'
+require 'travis/config/heroku/memcached'
 
 module Travis
   class Config
     class Heroku
       include Helpers
 
-      # TODO add rabbitmq, redis, memcached addons etc
       def load
-        compact(database: database, logs_database: logs_database)
+        compact(
+          database: database,
+          logs_database: logs_database,
+          amqp: amqp,
+          redis: redis,
+          memcached: memcached
+        )
       end
 
       private
@@ -20,6 +26,18 @@ module Travis
         def logs_database
           Database.new(prefix: 'logs').config
         end
+
+        def amqp
+          compact(Url.parse(ENV['RABBITMQ_URL']).to_h)
+        end
+
+        def redis
+          compact(url: ENV['REDIS_URL'])
+        end
+
+        def memcached
+          Memcached.new.config
+        end
     end
   end
 end

data/lib/travis/config/heroku/database.rb

@@ -1,44 +1,45 @@
+require 'travis/config/heroku/url'
+
 module Travis
   class Config
     class Heroku
-      class Database
+      class Database < Struct.new(:options)
         include Helpers
 
-        URL = %r((?:.+?)://(?<username>.+):(?<password>.+)@(?<host>[^:]+):?(?<port>.*)/(?<database>.+))
         DEFAULTS = { adapter: 'postgresql', encoding: 'unicode' }
 
-        attr_reader :options
-
-        def initialize(options = {})
-          @options = options
+        def config
+          config = parse_url
+          config = DEFAULTS.merge(config) unless config.empty?
+          config[:pool] = pool.to_i if pool
+          config
         end
 
-        def config
-          parse_url.tap do |config|
-            config[:pool] = pool.to_i if pool
+        private
+
+          def parse_url
+            compact(Url.parse(url).to_h)
           end
-        end
 
-        def parse_url
-          matches = URL.match(url.to_s)
-          matches ? compact(Hash[matches.names.zip(matches.captures)]).merge(DEFAULTS) : {}
-        end
+          def pool
+            env('DB_POOL', 'DATABASE_POOL_SIZE').compact.first
+          end
 
-        def pool
-          env('DB_POOL', 'DATABASE_POOL_SIZE').compact.first
-        end
+          def url
+            env('DATABASE_URL').compact.first
+          end
 
-        def url
-          env('DATABASE_URL').compact.first
-        end
+          def env(*keys)
+            ENV.values_at(*keys.map { |key| prefix(key) })
+          end
 
-        def env(*keys)
-          ENV.values_at(*keys.map { |key| prefix(key) })
-        end
+          def prefix(key)
+            [options[:prefix], key].compact.join('_').upcase
+          end
 
-        def prefix(key)
-          [options[:prefix], key].compact.join('_').upcase
-        end
+          def options
+            super || {}
+          end
       end
     end
   end

data/lib/travis/config/heroku/memcached.rb

@@ -0,0 +1,31 @@
+module Travis
+  class Config
+    class Heroku
+      class Memcached
+        include Helpers
+
+        def config
+          compact(servers: servers, options: options)
+        end
+
+        private
+
+          def servers
+            ENV['MEMCACHED_SERVERS']
+          end
+
+          def options
+            { username: username, password: password }
+          end
+
+          def username
+            ENV['MEMCACHED_USERNAME']
+          end
+
+          def password
+            ENV['MEMCACHED_PASSWORD']
+          end
+      end
+    end
+  end
+end

data/lib/travis/config/heroku/url.rb

@@ -0,0 +1,34 @@
+require 'uri'
+
+module Travis
+  class Config
+    class Heroku
+      module Url
+        Base     = Struct.new(:username, :password, :host, :port, :database)
+        Postgres = Class.new(Base)
+        Redis    = Class.new(Base)
+
+        class Amqp < Base
+          alias :vhost :database
+
+          def to_h
+            super.reject { |key, value| key == :database }.merge(vhost: vhost)
+          end
+        end
+
+        class << self
+          def parse(url)
+            return {} if url.nil? || url.empty?
+            uri   = URI.parse(url)
+            const = const_get(camelize(uri.scheme))
+            const.new(uri.user, uri.password, uri.host, uri.port, uri.path[1..-1])
+          end
+
+          def camelize(string)
+            string.to_s.split('_').collect(&:capitalize).join
+          end
+        end
+      end
+    end
+  end
+end

data/lib/travis/config/version.rb

@@ -1,3 +1,3 @@
 module TravisConfig
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0'
 end

data/spec/travis/config/heroku/amqp_spec.rb

@@ -0,0 +1,18 @@
+describe Travis::Config::Heroku, :Amqp do
+  let(:config) { Travis::Test::Config.load(:heroku) }
+  let(:url)    { 'amqp://username:password@hostname:1234/vhost' }
+
+  before       { ENV['RABBITMQ_URL'] = url }
+  after        { ENV.delete('RABBITMQ_URL') }
+
+  it 'loads a RABBITMQ_URL' do
+    expect(config.amqp).to eq(
+      host:     'hostname',
+      port:     1234,
+      vhost:    'vhost',
+      username: 'username',
+      password: 'password',
+      prefetch: 1
+    )
+  end
+end

data/spec/travis/config/{heroku_spec.rb → heroku/database_spec.rb}

@@ -1,15 +1,15 @@
-describe Travis::Config::Heroku do
+describe Travis::Config::Heroku, :Database do
   let(:config) { Travis::Test::Config.load(:heroku) }
   let(:vars)   { %w(DATABASE_URL DB_POOL DATABASE_POOL_SIZE LOGS_DATABASE_URL LOGS_DB_POOL LOGS_DATABASE_POOL_SIZE) }
   after        { vars.each { |key| ENV.delete(key) } }
 
   it 'loads a DATABASE_URL with a port' do
-    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
 
-    expect(config.database.to_hash).to eq(
+    expect(config.database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'database',
       username: 'username',
       password: 'password',
@@ -20,7 +20,7 @@ describe Travis::Config::Heroku do
   it 'loads a DATABASE_URL without a port' do
     ENV['DATABASE_URL'] = 'postgres://username:password@hostname/database'
 
-    expect(config.database.to_hash).to eq(
+    expect(config.database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
       database: 'database',
@@ -31,13 +31,13 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads DB_POOL' do
-    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
     ENV['DB_POOL'] = '25'
 
-    expect(config.database.to_hash).to eq(
+    expect(config.database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'database',
       username: 'username',
       password: 'password',
@@ -47,13 +47,13 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads DATABASE_POOL_SIZE' do
-    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:port/database'
+    ENV['DATABASE_URL'] = 'postgres://username:password@hostname:1234/database'
     ENV['DATABASE_POOL_SIZE'] = '25'
 
-    expect(config.database.to_hash).to eq(
+    expect(config.database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'database',
       username: 'username',
       password: 'password',
@@ -63,12 +63,12 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads a LOGS_DATABASE_URL with a port' do
-    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
 
-    expect(config.logs_database.to_hash).to eq(
+    expect(config.logs_database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'logs_database',
       username: 'username',
       password: 'password',
@@ -79,7 +79,7 @@ describe Travis::Config::Heroku do
   it 'loads a LOGS_DATABASE_URL without a port' do
     ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname/logs_database'
 
-    expect(config.logs_database.to_hash).to eq(
+    expect(config.logs_database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
       database: 'logs_database',
@@ -90,13 +90,13 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads LOGS_DB_POOL' do
-    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
     ENV['LOGS_DB_POOL'] = '25'
 
-    expect(config.logs_database.to_hash).to eq(
+    expect(config.logs_database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'logs_database',
       username: 'username',
       password: 'password',
@@ -106,13 +106,13 @@ describe Travis::Config::Heroku do
   end
 
   it 'loads LOGS_DATABASE_POOL_SIZE' do
-    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:port/logs_database'
+    ENV['LOGS_DATABASE_URL'] = 'postgres://username:password@hostname:1234/logs_database'
     ENV['LOGS_DATABASE_POOL_SIZE'] = '25'
 
-    expect(config.logs_database.to_hash).to eq(
+    expect(config.logs_database).to eq(
       adapter:  'postgresql',
       host:     'hostname',
-      port:     'port',
+      port:     1234,
       database: 'logs_database',
       username: 'username',
       password: 'password',

data/spec/travis/config/heroku/memcached_spec.rb

@@ -0,0 +1,23 @@
+describe Travis::Config::Heroku, :Memcached do
+  let(:config)   { Travis::Test::Config.load(:heroku) }
+  let(:servers)  { 'hostname:1234' }
+  let(:username) { 'username' }
+  let(:password) { 'password' }
+
+  [:servers, :username, :password].each do |key|
+    before { ENV["MEMCACHED_#{key.to_s.upcase}"] = send(key) }
+    after  { ENV.delete("MEMCACHED_#{key.to_s.upcase}") }
+  end
+
+  it 'loads a MEMCACHED_SERVERS' do
+    expect(config.memcached.servers).to eq(servers)
+  end
+
+  it 'loads a MEMCACHED_USERNAME' do
+    expect(config.memcached.options.username).to eq(username)
+  end
+
+  it 'loads a MEMCACHED_SERVERS' do
+    expect(config.memcached.options.password).to eq(password)
+  end
+end

data/spec/travis/config/heroku/redis_spec.rb

@@ -0,0 +1,11 @@
+describe Travis::Config::Heroku, :Redis do
+  let(:config) { Travis::Test::Config.load(:heroku) }
+  let(:url)    { 'redis://username:password@hostname:1234/database' }
+
+  before       { ENV['REDIS_URL'] = url }
+  after        { ENV.delete('REDIS_URL') }
+
+  it 'loads a REDIS_URL' do
+    expect(config.redis).to eq(url: url)
+  end
+end

data/travis-config.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version      = TravisConfig::VERSION
   s.authors      = ["Travis CI"]
   s.email        = "contact@travis-ci.org"
-  s.homepage     = "https://github.com/travis-ci/travis-core"
+  s.homepage     = "https://github.com/travis-ci/travis-config"
   s.summary      = "Travis CI config"
   s.description  = "#{s.summary}."
   s.license      = "MIT"
@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
 
-  s.add_dependency 'hashr', '~> 2.0.0.rc1'
+  s.add_dependency 'hashr', '~> 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
 description: Travis CI config.
 email: contact@travis-ci.org
 executables: []
@@ -41,14 +41,19 @@ files:
 - lib/travis/config/helpers.rb
 - lib/travis/config/heroku.rb
 - lib/travis/config/heroku/database.rb
+- lib/travis/config/heroku/memcached.rb
+- lib/travis/config/heroku/url.rb
 - lib/travis/config/version.rb
 - spec/spec_helper.rb
 - spec/travis/config/docker_spec.rb
 - spec/travis/config/files_spec.rb
-- spec/travis/config/heroku_spec.rb
+- spec/travis/config/heroku/amqp_spec.rb
+- spec/travis/config/heroku/database_spec.rb
+- spec/travis/config/heroku/memcached_spec.rb
+- spec/travis/config/heroku/redis_spec.rb
 - spec/travis/config_spec.rb
 - travis-config.gemspec
-homepage: https://github.com/travis-ci/travis-core
+homepage: https://github.com/travis-ci/travis-config
 licenses:
 - MIT
 metadata: {}
@@ -63,9 +68,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: "[none]"
 rubygems_version: 2.4.5