constantinople 0.2.1 → 0.2.2

data/Rakefile

@@ -1,4 +1,9 @@
-require 'bundler/gem_tasks'
+begin
+  require 'bundler/gem_tasks'
+rescue Exception => e
+  require 'rubygems'
+  require 'bundler/gem_tasks'
+end
 require 'rspec/core/rake_task'
 
 desc "Run all specs"

data/lib/constantinople.rb

@@ -8,19 +8,26 @@ module Constantinople
 
   def self.reload!
     result = Map.new
+    ignore_files = []
     caller_config_directories do |dir|
-      result.deeper_merge!(load_from_directory(dir))
+      ignore_files += files_to_ignore(dir)
+    end
+    ignore_files.uniq!
+    caller_config_directories do |dir|
+      result.deeper_merge!(load_from_directory(dir, :ignore => ignore_files))
     end
     result # I'm the map, I'm the map, I'm the map, I'm the map...
   end
 
   private
 
-  def self.load_from_directory(dir)
+  def self.load_from_directory(dir, args={})
     env = environment
     result = Map.new
+    ignore_files = args[:ignore]
     ['.yml.default', '.yml', '.yml.override'].each do |ext|
       Dir.glob(File.join(dir,"*#{ext}")) do |path|
+        next if ignore_files.include?(File.basename(path))
         filename = File.basename(path,ext)
         sub = load_yaml_or_warn(path)
         if sub
@@ -74,6 +81,14 @@ module Constantinople
     end
   end
 
+  def self.files_to_ignore(dir)
+    File.open(File.join(dir,".constantinopleignore")) do |f|
+      f.readlines
+    end
+  rescue Exception => e
+    []
+  end
+
 end
 
 CONSTANTINOPLE = Constantinople.reload!

data/lib/constantinople/version.rb

@@ -1,3 +1,3 @@
 module Constantinople
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/config/.constantinopleignore

@@ -0,0 +1 @@
+error.yml

data/spec/config/error.yml

@@ -0,0 +1,4 @@
+<%
+error = ".constantinopleignore my butt."
+%>
+error: <%= error %>

data/spec/lib/constantinople_spec.rb

@@ -18,4 +18,14 @@ describe Constantinople do
     CONFIG.spec.animal.should == 'turtle' # from test environment
     CONFIG.empty.should be_empty
   end
+
+  describe "ignore files" do
+    it "should read .constantinopleignore if it exists" do
+      Constantinople.send(:files_to_ignore, "spec/config").should == ['error.yml']
+    end
+
+    it "should not bother reading error.yml" do
+      CONFIG.should_not include(:error)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constantinople
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Johnson
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: map
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +30,12 @@ dependencies:
         - 4
         - 2
         version: "4.2"
-  requirement: *id001
   type: :runtime
-  prerelease: false
-  name: map
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: deep_merge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +45,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id002
   type: :runtime
-  prerelease: false
-  name: deep_merge
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +60,12 @@ dependencies:
         - 2
         - 6
         version: "2.6"
-  requirement: *id003
   type: :development
-  prerelease: false
-  name: rspec
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: simplecov
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +75,12 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  requirement: *id004
   type: :development
-  prerelease: false
-  name: simplecov
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rb-fsevent
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,12 +90,12 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  requirement: *id005
   type: :development
-  prerelease: false
-  name: rb-fsevent
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: guard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -103,12 +105,12 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  requirement: *id006
   type: :development
-  prerelease: false
-  name: guard
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: guard-bundler
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -118,12 +120,12 @@ dependencies:
         - 0
         - 1
         version: "0.1"
-  requirement: *id007
   type: :development
-  prerelease: false
-  name: guard-bundler
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,10 +135,8 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  requirement: *id008
   type: :development
-  prerelease: false
-  name: guard-rspec
+  version_requirements: *id008
 description: Supports defaults, over-rides, and environments
 email: 
 - chris@kindkid.com
@@ -157,8 +157,10 @@ files:
 - lib/constantinople.rb
 - lib/constantinople/deep_merge_map.rb
 - lib/constantinople/version.rb
+- spec/config/.constantinopleignore
 - spec/config/empty.yml
 - spec/config/erby.yml
+- spec/config/error.yml
 - spec/config/spec.yml
 - spec/config/spec.yml.default
 - spec/config/spec.yml.override
@@ -198,8 +200,10 @@ signing_key:
 specification_version: 3
 summary: Load all your config/*.yml files
 test_files: 
+- spec/config/.constantinopleignore
 - spec/config/empty.yml
 - spec/config/erby.yml
+- spec/config/error.yml
 - spec/config/spec.yml
 - spec/config/spec.yml.default
 - spec/config/spec.yml.override