travis-config 0.1.4 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceacc0f6edcb2ac39967e9aa9832ec98b9a9cba0
-  data.tar.gz: f33a79c5c2c5d5a18e577ff91d5ea0a985dcfed4
+  metadata.gz: f96540c8353be57638c3e7bc3b649a581d2df086
+  data.tar.gz: b6140d403624472488a8fb6ce88b8fc43969ddef
 SHA512:
-  metadata.gz: 9e0964efaa98ae82564b5e861d322b048f923125c1b4bc15ba5e1fe0369dd1032eef43d2ec3966b51078c737fa8367aff219d2530933b93dab7bde39ac38e0a4
-  data.tar.gz: 013f0dc42b9cf4143a847db644aa6d92e878a0b2337884f2f61355da7320ca875f87c9959e3bf9fc98b184e7ea1ae53ec1d7ea967e4e2e0ccdd74674bc1de7f1
+  metadata.gz: 23b23106676b996e2510d500bc3b759714e0c8f3342bd2051c19d5b8dc8a1ca188e88db5fdaea386b73801afa8f6863d347756a3e72cac9c36f38ed9d3fd40cd
+  data.tar.gz: a5ec1c92c9ed4c2d405c2feeaf01aafa9817a59f14f4046e0c611e9d8c2c9abab889fee74c560983b7459dbdc6b2febc95a51eb8501b9b7bd0c964745ee730be

data/Gemfile

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

data/Gemfile.lock

@@ -1,34 +1,40 @@
 PATH
   remote: .
   specs:
-    travis-config (0.1.3)
-      hashr (~> 0.0)
+    travis-config (1.0.0.rc1)
+      hashr (~> 2.0.0.rc1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    hashr (0.0.22)
+    hashr (2.0.0.rc1)
     metaclass (0.0.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  hashr (~> 2.0.0.rc1)
   mocha (~> 1.1)
   rspec (~> 3.0)
   travis-config!
+
+BUNDLED WITH
+   1.10.6

data/lib/travis/config.rb

@@ -1,26 +1,14 @@
 require 'hashr'
-require 'travis/config/docker'
-require 'travis/config/env'
-require 'travis/config/files'
-require 'travis/config/heroku'
-
-# patch Hashr to merge with existing definitions and defaults
-class Hashr < Hash
-  class << self
-    def define(definition)
-      definition = self.definition.merge(definition.deep_symbolize_keys)
-      @definition = deep_accessorize(definition)
-    end
-
-    def default(defaults)
-      defaults = self.defaults.merge(defaults)
-      @defaults = deep_accessorize(defaults)
-    end
-  end
-end
 
 module Travis
   class Config < Hashr
+    require 'travis/config/docker'
+    require 'travis/config/env'
+    require 'travis/config/files'
+    require 'travis/config/heroku'
+
+    include Hashr::Delegate::Conditional
+
     class << self
       include Helpers
 
@@ -28,17 +16,22 @@ module Travis
         @env ||= ENV['ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
       end
 
-      def load(*loaders)
-        loaders = [:files, :env, :heroku, :docker] if loaders.empty?
+      def load(*names)
+        new(load_from(*names))
+      end
+
+      private
 
-        data = loaders.inject({}) do |data, name|
-          const = const_get(camelize(name)).new
-          other = deep_symbolize_keys(const.load)
-          deep_merge(data, other)
+        def load_from(*names)
+          loaders(*names).inject({}) do |data, loader|
+            deep_merge(data, deep_symbolize_keys(loader.load))
+          end
         end
 
-        new(data)
-      end
+        def loaders(*names)
+          names = [:files, :env, :heroku, :docker] if names.empty?
+          names.map { |name| const_get(camelize(name)).new }
+        end
     end
 
     def env

data/lib/travis/config/docker.rb

@@ -1,8 +1,7 @@
-require 'hashr'
 require 'travis/config/helpers'
 
 module Travis
-  class Config < Hashr
+  class Config
     class Docker
       include Helpers
 

data/lib/travis/config/env.rb

@@ -1,7 +1,5 @@
-require 'hashr'
-
 module Travis
-  class Config < Hashr
+  class Config
     class Env
       def load
         ENV['travis_config'] ? YAML.load(ENV['travis_config']) : {}

data/lib/travis/config/files.rb

@@ -1,9 +1,8 @@
 require 'yaml'
-require 'hashr'
 require 'travis/config/helpers'
 
 module Travis
-  class Config < Hashr
+  class Config
     class Files
       include Helpers
 

data/lib/travis/config/helpers.rb

@@ -1,7 +1,5 @@
-require 'hashr'
-
 module Travis
-  class Config < Hashr
+  class Config
     module Helpers
       def deep_symbolize_keys(hash)
         hash.inject({}) do |result, (key, value)|
@@ -40,11 +38,10 @@ module Travis
       end
 
       def camelize(string)
-        string = string.to_s
-        string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-        string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
-        string.gsub!('/', '::')
-        string
+        string.to_s.
+          sub(/^[a-z\d]*/) { $&.capitalize }.
+          gsub(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }.
+          gsub('/', '::')
       end
     end
   end

data/lib/travis/config/heroku.rb

@@ -1,13 +1,12 @@
-require 'hashr'
 require 'travis/config/helpers'
+require 'travis/config/heroku/database'
 
 module Travis
-  class Config < Hashr
+  class Config
     class Heroku
       include Helpers
 
-      DATABASE_URL = %r((?:.+?)://(?<username>.+):(?<password>.+)@(?<host>[^:]+):?(?<port>.*)/(?<database>.+))
-
+      # TODO add rabbitmq, redis, memcached addons etc
       def load
         compact(database: database, logs_database: logs_database)
       end
@@ -15,36 +14,11 @@ module Travis
       private
 
         def database
-          config = parse_database_url(database_url)
-          config = config.merge(pool: pool_size.to_i) if pool_size
-          config
+          Database.new.config
         end
 
         def logs_database
-          config = parse_database_url(logs_database_url)
-          config = config.merge(pool: logs_pool_size.to_i) if logs_pool_size
-          config.merge(adapter: 'postgresql', encoding: 'unicode') unless config.empty?
-        end
-
-        def parse_database_url(url)
-          matches = DATABASE_URL.match(url.to_s)
-          matches ? compact(Hash[matches.names.zip(matches.captures)]) : {}
-        end
-
-        def pool_size
-          ENV.values_at('DB_POOL', 'DATABASE_POOL_SIZE').compact.first
-        end
-
-        def logs_pool_size
-          ENV.values_at('LOGS_DB_POOL', 'LOGS_DATABASE_POOL_SIZE').compact.first
-        end
-
-        def database_url
-          ENV.values_at('DATABASE_URL', 'SHARED_DATABASE_URL').compact.first
-        end
-
-        def logs_database_url
-          ENV.values_at('LOGS_DATABASE_URL', 'SHARED_LOGS_DATABASE_URL').compact.first
+          Database.new(prefix: 'logs').config
         end
     end
   end

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

@@ -0,0 +1,45 @@
+module Travis
+  class Config
+    class Heroku
+      class Database
+        include Helpers
+
+        URL = %r((?:.+?)://(?<username>.+):(?<password>.+)@(?<host>[^:]+):?(?<port>.*)/(?<database>.+))
+        DEFAULTS = { adapter: 'postgresql', encoding: 'unicode' }
+
+        attr_reader :options
+
+        def initialize(options = {})
+          @options = options
+        end
+
+        def config
+          parse_url.tap do |config|
+            config[:pool] = pool.to_i if pool
+          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 url
+          env('DATABASE_URL').compact.first
+        end
+
+        def env(*keys)
+          ENV.values_at(*keys.map { |key| prefix(key) })
+        end
+
+        def prefix(key)
+          [options[:prefix], key].compact.join('_').upcase
+        end
+      end
+    end
+  end
+end

data/lib/travis/config/version.rb

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

data/spec/spec_helper.rb

@@ -13,3 +13,4 @@ end
 RSpec.configure do |config|
   config.mock_with :mocha
 end
+

data/spec/travis/config_spec.rb

@@ -20,14 +20,8 @@ describe Travis::Config do
       expect(config.foo.bar).to be_kind_of(Hashr)
     end
 
-    it 'can access all keys recursively' do
-      access = proc do |config|
-        config.keys.each do |key|
-          expect(proc { config.send(key) }).to_not raise_error
-          access.call(config.send(key)) if config[key].is_a?(Hash)
-        end
-      end
-      access.call(config)
+    it 'can access nested keys' do
+      expect(config.amqp.username).to eq('guest')
     end
   end
 

data/travis-config.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
 
-  s.add_dependency 'hashr', '~> 0.0'
+  s.add_dependency 'hashr', '~> 2.0.0.rc1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-config
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 2.0.0.rc1
 description: Travis CI config.
 email: contact@travis-ci.org
 executables: []
@@ -40,6 +40,7 @@ files:
 - lib/travis/config/files.rb
 - lib/travis/config/helpers.rb
 - lib/travis/config/heroku.rb
+- lib/travis/config/heroku/database.rb
 - lib/travis/config/version.rb
 - spec/spec_helper.rb
 - spec/travis/config/docker_spec.rb
@@ -62,9 +63,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: "[none]"
 rubygems_version: 2.4.5