persey 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1f9f5660692b33b255dc9b0157e8a13392d89c
-  data.tar.gz: 6799d9fe91d1e3786e0f43a998ce6a03ea249a71
+  metadata.gz: 4b2133ecea516e37fec41f835ff20f23e1f9a071
+  data.tar.gz: dffc911ff91650efc41f037de58551e941b9d69c
 SHA512:
-  metadata.gz: 570ad3fc120b38e2c530be2de118f32ad8889679a561033eecb9fd9f2d92d7e0e6cdb2a1907b6953f750c9378a456d8def7a72ff735d4586a6c67c97fcc31018
-  data.tar.gz: 9f4170c5e32b8ca80be03def4e0eceb75dcd24f364940ad96d36a43997d68263448663e0addbcc9c024a99018cd8b6143aaafd673fcd4324d9eb45c962b3a156
+  metadata.gz: 1b3d757c399a4d9d81d587b1623126400bed5d2094f8af44542cc4e9155bce0a043a03450fa1de9ec26fe142bc93fbe90c9e28b1926a931dba318c80c86a79e3
+  data.tar.gz: c490136c10bdcc155db2f66cf90028bed006e47245219dcf7ff3dcd51686d4a7543e8734331d0d41218987011350a20bafe56ee39a6f51265c1af023df8a3f46

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - 2.2.5
   - 2.3.0
   - 2.3.1
-script: "bundle exec rake test"
+  - 2.4.1
+script: "bundle exec rspec"

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1
+FROM ruby:2.4.1
 
 ENV APP_HOME /app
 WORKDIR $APP_HOME

data/Gemfile

@@ -1,11 +1,10 @@
 source "http://rubygems.org"
 
-gemspec
-
 gem 'bundler'
 gem 'rake'
 gem 'pry'
-gem 'minitest', '> 5.0'
+gem 'rspec'
 gem 'configus', require: true
 gem 'activesupport'
-gem 'wrong'
+
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Persey [![Build Status](https://travis-ci.org/zzet/persey.png?branch=master)](https://travis-ci.org/zzet/persey) [![Gem Version](https://badge.fury.io/rb/persey.png)](http://badge.fury.io/rb/persey) [![Dependency Status](https://gemnasium.com/zzet/persey.png)](https://gemnasium.com/zzet/persey) [![Code Climate](https://codeclimate.com/github/zzet/persey.png)](https://codeclimate.com/github/zzet/persey) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/zzet/persey/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+# Persey [![Build Status](https://travis-ci.org/zzet/persey.svg?branch=master)](https://travis-ci.org/zzet/persey) [![Gem Version](https://badge.fury.io/rb/persey.svg)](http://badge.fury.io/rb/persey) [![Dependency Status](https://gemnasium.com/zzet/persey.svg)](https://gemnasium.com/zzet/persey) [![Code Climate](https://codeclimate.com/github/zzet/persey.svg)](https://codeclimate.com/github/zzet/persey) [![Downloads count](https://img.shields.io/gem/dt/persey.svg)](https://img.shields.io/gem/dt/persey.svg)
 
 
 ## Summary
@@ -25,7 +25,7 @@ This solution allows to **accumulate** different configs in one, with the **poss
 Add this to your `Gemfile`:
 
 ``` ruby
-gem "persey", '>= 0.0.10'
+gem "persey", '>= 0.0.11'
 ```
 
 Generate default config file

data/Rakefile

@@ -1,10 +1 @@
 require "bundler/gem_tasks"
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-end
-
-task :default => :test

data/docker-compose.yml

@@ -4,4 +4,4 @@ services:
     build: .
     command: tail -f /dev/null
     volumes:
-      - .:/gem
+      - .:/app

data/lib/persey.rb

@@ -1,13 +1,13 @@
-require "persey/version"
-require "persey/builder"
-require "persey/inspector"
-require "persey/loader"
-require "persey/adapters/base"
-require "persey/adapters/yaml"
-require "persey/adapters/json"
-require "persey/adapters/toml"
-require "persey/adapters/ini"
-require "persey/configus_patch"
+require 'persey/version'
+require 'persey/builder'
+require 'persey/inspector'
+require 'persey/loader'
+require 'persey/adapters/base'
+require 'persey/adapters/yaml'
+require 'persey/adapters/json'
+require 'persey/adapters/toml'
+require 'persey/adapters/ini'
+require 'persey/configus_patch'
 
 module Persey
   class << self

data/lib/persey/adapters/yaml.rb

@@ -2,6 +2,8 @@ require 'yaml'
 require 'erb'
 
 module Persey
+  class MissingEnvVariable < RuntimeError; end
+
   module Adapters
     class Yaml < Persey::Adapters::Base
       class << self
@@ -9,8 +11,13 @@ module Persey
           begin
             raw_hash = YAML.load(ERB.new(File.read(file)).result)
             symbolize_keys(raw_hash)
-          rescue
-            puts "FATAL: Error while process config from file '#{file}'"
+          rescue KeyError => e
+            _, line, method = /\(erb\):(\d+):in `(.*)'/.match(e.backtrace[0]).to_a
+            if method == 'fetch'
+              raise MissingEnvVariable.new("Check line ##{line} in #{file}")
+            else
+              raise e
+            end
           end
         end
       end

data/lib/persey/inspector.rb

@@ -1,6 +1,8 @@
 require 'active_support/inflector'
 
 module Persey
+  class MissingConfigFile < RuntimeError; end
+
   class Inspector
     class << self
       def analize(&block)
@@ -10,10 +12,12 @@ module Persey
       end
 
       def source(source_type, config_file, namespace = nil)
-        override_config_file = config_file + '.override'
+        raise MissingConfigFile.new("Can't find #{source_type} config: #{config_file}") unless File.exist?(config_file)
 
         klass = "persey/adapters/#{source_type}".camelize.constantize
-        @sources << { class: klass, file: config_file, namespace: namespace } if File.exist?(config_file)
+        @sources << { class: klass, file: config_file, namespace: namespace }
+
+        override_config_file = config_file + '.override'
         @sources << { class: klass, file: override_config_file, namespace: namespace } if File.exist?(override_config_file)
       end
 

data/lib/persey/version.rb

@@ -1,3 +1,3 @@
 module Persey
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/persey.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'configus', '>= 0.0.5'
   spec.add_runtime_dependency 'yajl-ruby'
-  spec.add_runtime_dependency "toml", "~> 0.1.0"
-  spec.add_runtime_dependency "inifile"
+  spec.add_runtime_dependency 'toml', '~> 0.1.0'
+  spec.add_runtime_dependency 'inifile'
+
+  spec.add_development_dependency 'simplecov'
 end

data/spec/fixtures/broken_yaml_config.yml

@@ -0,0 +1,5 @@
+---
+option: good line
+hash: good hash
+  val: hash val
+failed_string: <%= ENV.fetch('SOME_VAR') %>

data/spec/lib/persey_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Persey do
+  context 'true-flow input data' do
+    before do
+      plain_config = File.join(fixtures_path, 'yaml_config.yml')
+      env_config = File.join(fixtures_path, 'yaml_config_with_envs.yml')
+      plain_json_config = File.join(fixtures_path, 'json_config.json')
+      plain_toml_config = File.join(fixtures_path, 'toml_config.toml')
+      plain_ini_config = File.join(fixtures_path, 'ini_config.ini')
+
+      Persey.init :production do
+        source :yaml, plain_config
+        source :yaml, env_config,         :namespace
+        source :json, plain_json_config,  :json_config
+        source :toml, plain_toml_config,  :toml_config
+        source :ini,  plain_ini_config,   :ini_config
+
+        env :production do
+          option do
+            first "first value"
+            second "second value"
+          end
+
+          first do
+            testss -> { second }
+          end
+        end
+      end
+    end
+
+    it '#config' do
+      expect { Persey.config }.not_to raise_exception
+    end
+
+    it '#config.methods' do
+      @config = Persey.config
+      expect(@config.option.first).to eq('first value')
+      expect(@config.first.testss).to eq('foo value')
+      expect(@config.first.second).to eq('foo value')
+      expect(@config.namespace.another_key).to eq('another key value')
+      expect(@config.namespace.another_key).to eq('another key value')
+      expect(@config.key).to eq('key value')
+      expect(@config.json_config.owner.name).to eq('John Doe')
+      expect(@config.toml_config.owner.name).to eq('Tom Preston-Werner')
+      expect(@config.ini_config.section1.var1).to eq('foo')
+    end
+  end
+
+  context 'false-flow data' do
+    it 'missing config' do
+      missing_config = File.join(fixtures_path, 'missing_yaml_config.yml')
+
+      expect do
+        Persey.init :production do
+          source :yaml, missing_config
+
+          env :production
+        end
+      end.to raise_error(Persey::MissingConfigFile)
+    end
+
+    it 'missing ENV.fetch' do
+      broken_yaml_config = File.join(fixtures_path, 'broken_yaml_config.yml')
+
+      expect do
+        Persey.init :production do
+          source :yaml, broken_yaml_config
+
+          env :production
+        end
+      end.to raise_error(Persey::MissingEnvVariable)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+require 'pry'
+require 'persey'
+
+PROJECT_ROOT = File.join(Dir.pwd)
+
+Dir[File.expand_path('..', __FILE__) + '/support/**/*.rb'].each { |f| require f }
+
+RSpec.configure do |config|
+  def fixtures_path
+    @path ||= File.expand_path(File.join(__FILE__, "../fixtures"))
+  end
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: persey
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Andrey Kumanyaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Persey helps you easily load configs from different files and use them
   from one variable. Based on Configus.
 email:
@@ -110,13 +124,14 @@ files:
 - lib/persey/loader.rb
 - lib/persey/version.rb
 - persey.gemspec
-- test/fixtures/ini_config.ini
-- test/fixtures/json_config.json
-- test/fixtures/toml_config.toml
-- test/fixtures/yaml_config.yml
-- test/fixtures/yaml_config_with_envs.yml
-- test/lib/persey_test.rb
-- test/test_helper.rb
+- spec/fixtures/broken_yaml_config.yml
+- spec/fixtures/ini_config.ini
+- spec/fixtures/json_config.json
+- spec/fixtures/toml_config.toml
+- spec/fixtures/yaml_config.yml
+- spec/fixtures/yaml_config_with_envs.yml
+- spec/lib/persey_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/zzet/persey
 licenses:
 - MIT
@@ -142,10 +157,11 @@ signing_key:
 specification_version: 4
 summary: Helps you easily manage environment specific settings
 test_files:
-- test/fixtures/ini_config.ini
-- test/fixtures/json_config.json
-- test/fixtures/toml_config.toml
-- test/fixtures/yaml_config.yml
-- test/fixtures/yaml_config_with_envs.yml
-- test/lib/persey_test.rb
-- test/test_helper.rb
+- spec/fixtures/broken_yaml_config.yml
+- spec/fixtures/ini_config.ini
+- spec/fixtures/json_config.json
+- spec/fixtures/toml_config.toml
+- spec/fixtures/yaml_config.yml
+- spec/fixtures/yaml_config_with_envs.yml
+- spec/lib/persey_spec.rb
+- spec/spec_helper.rb

data/test/lib/persey_test.rb

@@ -1,47 +0,0 @@
-require 'test_helper'
-
-class PerseyTest < TestCase
-  def setup
-    plain_config = File.join(fixtures_path, 'yaml_config.yml')
-    env_config = File.join(fixtures_path, 'yaml_config_with_envs.yml')
-    plain_json_config = File.join(fixtures_path, 'json_config.json')
-    plain_toml_config = File.join(fixtures_path, 'toml_config.toml')
-    plain_ini_config = File.join(fixtures_path, 'ini_config.ini')
-
-    Persey.init :production do
-      source :yaml, plain_config
-      source :yaml, env_config,         :namespace
-      source :json, plain_json_config,  :json_config
-      source :toml, plain_toml_config,  :toml_config
-      source :ini,  plain_ini_config,   :ini_config
-
-      env :production do
-        option do
-          first "first value"
-          second "second value"
-        end
-
-        first do
-          testss -> { second }
-        end
-      end
-    end
-  end
-
-  def test_load_config
-    assert { Persey.config }
-  end
-
-  def test_correct_config
-    @config = Persey.config
-    assert { @config.option.first == "first value" }
-    assert { @config.first.testss == "foo value" }
-    assert { @config.first.second == "foo value" }
-    assert { @config.namespace.another_key == "another key value" }
-    assert { @config.namespace.another_key == "another key value" }
-    assert { @config.key == "key value" }
-    assert { @config.json_config.owner.name == "John Doe" }
-    assert { @config.toml_config.owner.name == "Tom Preston-Werner" }
-    assert { @config.ini_config.section1.var1 == "foo" }
-  end
-end

data/test/test_helper.rb

@@ -1,21 +0,0 @@
-require "rubygems"
-require 'bundler/setup'
-require 'pry'
-
-Bundler.require
-
-require 'wrong/adapters/minitest'
-
-PROJECT_ROOT = File.join(Dir.pwd)
-
-Wrong.config.color
-
-Minitest.autorun
-
-class TestCase < Minitest::Test
-  include Wrong
-
-  def fixtures_path
-    @path ||= File.expand_path(File.join(__FILE__, "../fixtures"))
-  end
-end