figleaf 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5869ef2c999e43091e838f2a33ce9459f794263b
-  data.tar.gz: 6d17596302f7159732184840c7470f259723b7a9
+  metadata.gz: ebc37827cd68fb9d931fa327581d19acd47a2c02
+  data.tar.gz: 7f5c2050291f1ead028c57e98febeba9329fbe97
 SHA512:
-  metadata.gz: 41b2fe47cd6eaf320643f34aa773649e0f23f6fa69e3a272132e0644d51edf19a4b37c9d7a3138c93df565518b3618584a28abeb99194aea6d239d4e05a312e9
-  data.tar.gz: 26f5296732827c581a12c9c50603dfca4c8febb294052356cf5d513a5f263653b8ddb8134d2d70e2e5df80a3bf0a87e96599aa5da3203f6c64c5c63408af9e57
+  metadata.gz: 73bc054a55de88db693d019a84d816e5a6e2adf40d76b8fcbba5484a49d79e0afc36fddada3e9d72bd1ff6e2797844c193f765cdd482d7166656f8d424f8d34e
+  data.tar.gz: 452291366fe8950e631cf4a0c77c8da558e68291b904481e9df10b3abf797656d0b31b86640a5b95c280b9ea7882a45b300065c8cf39d9449ced1493ad9262b9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.2.5 (2017/09/28)
+Add support for `default` options
+
 ## 0.2.4 (2017/08/25)
 Relax active support version dependency
 

data/Gemfile

@@ -12,10 +12,14 @@ group :development do
   gem "rb-fchange", require: false
   gem "rb-fsevent", require: false
   gem "rb-inotify", require: false
-  gem "ruby_gntp"
-  gem "terminal-notifier-guard"
-  gem "guard-bundler"
-  gem "guard-rspec"
+
+  gem 'guard-bundler', :require => false
+  gem 'guard-livereload', :require => false
+  gem 'guard-rspec', :require => false
+  gem 'libnotify', :require => false # linux notifications
+  gem 'ruby_gntp', :require => false # os x notifications
+  gem "terminal-notifier-guard", :require => false
+
   gem "pry"
   gem "pry-debugger", platforms: :ruby_19
 end

data/Guardfile

@@ -1,10 +1,46 @@
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
+platform = RUBY_PLATFORM.match(/(linux|darwin)/)[0].to_sym
+notification case platform
+  when :darwin
+    :gntp
+  when :linux
+    require 'libnotify'
+    :libnotify
+  end
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
 end
 
-guard :rspec do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
 end

data/lib/figleaf/settings.rb

@@ -43,8 +43,11 @@ module Figleaf
           Dir.glob(file_pattern).each do |file|
             property_name = File.basename(file, '.yml')
             yaml_hash     = load_file(file) or next
+            default       = yaml_hash["default"]
             property      = yaml_hash[env_to_load]
 
+            property = default.merge(property) if !default.nil?
+
             next if property.nil?
 
             if self.respond_to?(property_name) &&

data/lib/figleaf/version.rb

@@ -1,3 +1,3 @@
 module Figleaf
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/spec/figleaf/settings_spec.rb

@@ -109,5 +109,35 @@ describe Figleaf::Settings do
         expect(described_class.boolean).to eq(true) # remains unchanged
       end
     end
+
+    context "default is applied" do
+      before do
+        default = File.expand_path("../../fixtures/extra/default.yml", __FILE__)
+        described_class.load_settings(default, "test")
+      end
+
+      it "overrides values" do
+        expect(described_class.default.foo).to eq("overriden")
+      end
+
+      it "respects values set in default" do
+        expect(described_class.default.bar).to eq("baz")
+      end
+    end
+
+    context "using default as a YAML anchor is OK" do
+      before do
+        default = File.expand_path("../../fixtures/extra/default_anchor.yml", __FILE__)
+        described_class.load_settings(default, "test")
+      end
+
+      it "overrides values" do
+        expect(described_class.default.foo).to eq("overriden")
+      end
+
+      it "respects values set in default" do
+        expect(described_class.default.bar).to eq("baz")
+      end
+    end
   end
 end

data/spec/fixtures/extra/default.yml

@@ -0,0 +1,6 @@
+default:
+  foo: bar
+  bar: baz
+
+test:
+  foo: overriden

data/spec/fixtures/extra/default_anchor.yml

@@ -0,0 +1,7 @@
+default: &default
+  foo: bar
+  bar: baz
+
+test:
+  <<: *default
+  foo: overriden

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figleaf
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Juan C. Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,6 +69,8 @@ files:
 - spec/fixtures/errors/bad_file.yml
 - spec/fixtures/extra/array.yml
 - spec/fixtures/extra/boolean.yml
+- spec/fixtures/extra/default.yml
+- spec/fixtures/extra/default_anchor.yml
 - spec/fixtures/extra/service.yml
 - spec/fixtures/service.yml
 - spec/fixtures/string.yml
@@ -106,6 +108,8 @@ test_files:
 - spec/fixtures/errors/bad_file.yml
 - spec/fixtures/extra/array.yml
 - spec/fixtures/extra/boolean.yml
+- spec/fixtures/extra/default.yml
+- spec/fixtures/extra/default_anchor.yml
 - spec/fixtures/extra/service.yml
 - spec/fixtures/service.yml
 - spec/fixtures/string.yml