endeco 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,5 @@
+script: "bundle exec rspec"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -2,6 +2,8 @@
 
 https://github.com/morimori/endeco
 
+[![Build Status](https://secure.travis-ci.org/morimori/endeco.png)](http://travis-ci.org/morimori/endeco)
+
 ## DESCRIPTION
 
 Manages environment dependent configurations.

data/lib/endeco.rb

@@ -10,18 +10,23 @@ module Endeco
   end
 
   def self.[](key, options = {})
-    safe_key = key.sub(/!$/, '')
-    return Cache[safe_key] if Cache.enable and !options[:force] and Cache.key?(safe_key)
-    fullpath = expand_path safe_key
-    if File.exists? fullpath
-      Cache[safe_key] = File.read fullpath
+    safe_key = key.sub(/[!\?]$/, '')
+    value = if Cache.enable and !options[:force] and Cache.key?(safe_key)
+      Cache[safe_key]
     else
-      if key == safe_key
-        nil
+      fullpath = expand_path safe_key
+      if exists? safe_key
+        Cache[safe_key] = File.read fullpath
       else
-        raise Errno::ENOENT, "Errno::ENOENT: No such file or directory - #{fullpath}"
+        if key == safe_key
+          nil
+        else
+          raise Errno::ENOENT, "Errno::ENOENT: No such file or directory - #{fullpath}"
+        end
       end
     end
+    value.chomp! if value && !(options[:chomp] === false) && Config.default_chomp
+    value
   end
 
   private
@@ -29,6 +34,10 @@ module Endeco
     File.expand_path File.join([Config.path, Config.env, name].compact)
   end
 
+  def self.exists?(name)
+    File.exists? expand_path(name)
+  end
+
   def self.def_methods(name)
     module_eval %[
       def self.#{name}(options = {})
@@ -41,5 +50,11 @@ module Endeco
         self[__method__.to_s, options]
       end
     ], __FILE__, __LINE__
+
+    module_eval %[
+      def self.#{name}?
+        exists? "#{name}"
+      end
+    ], __FILE__, __LINE__
   end
 end

data/lib/endeco/config.rb

@@ -1,7 +1,6 @@
 module Endeco
   module Config
     @@path = nil
-    @@env  = nil
     def self.path
       @@path
     end
@@ -10,6 +9,7 @@ module Endeco
       @@path = new_path
     end
 
+    @@env  = nil
     def self.env
       @@env
     end
@@ -17,5 +17,14 @@ module Endeco
     def self.env=(new_env)
       @@env = new_env
     end
+
+    @@default_chomp = false
+    def self.default_chomp=(new_value)
+      @@default_chomp = new_value
+    end
+
+    def self.default_chomp
+      @@default_chomp
+    end
   end
-end
+end

data/lib/endeco/version.rb

@@ -1,3 +1,3 @@
 module Endeco
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/endeco_spec.rb

@@ -12,31 +12,35 @@ describe Endeco do
     FileUtils.rm_rf File.expand_path(File.join(Endeco::Config.path))
   end
 
-  context 'file exists' do
+  shared_context 'file prepared' do
     before do
       open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
-        f << 'hoge'
+        f << "hoge\n"
       end
     end
 
     after do
       File.unlink File.join(Endeco::Config.path, Endeco::Config.env, 'test_var')
     end
+  end
+
+  context 'file exists' do
+    include_context 'file prepared'
 
     it 'can read file contents through filename method' do
-      Endeco.test_var.should == 'hoge'
+      Endeco.test_var.should == "hoge\n"
     end
 
     it 'can read file contents through filename method with bang' do
-      Endeco.test_var!.should == 'hoge'
+      Endeco.test_var!.should == "hoge\n"
     end
 
     it 'can read file contents through brace with filename key' do
-      Endeco['test_var'].should == 'hoge'
+      Endeco['test_var'].should == "hoge\n"
     end
 
     it 'can read file contents through brace with filename key with bang' do
-      Endeco['test_var!'].should == 'hoge'
+      Endeco['test_var!'].should == "hoge\n"
     end
   end
 
@@ -46,7 +50,7 @@ describe Endeco do
     end
 
     it 'raise Errno::ENOENT through filename method with bang' do
-      expect{ Endeco.test_var! }.should raise_error(Errno::ENOENT)
+      expect{ Endeco.test_var! }.to raise_error(Errno::ENOENT)
     end
 
     it 'return nil through brace with filename key' do
@@ -54,23 +58,15 @@ describe Endeco do
     end
 
     it 'raise Errno::ENOENT through brace with filename key with bang' do
-      expect{ Endeco['test_var!'] }.should raise_error(Errno::ENOENT)
+      expect{ Endeco['test_var!'] }.to raise_error(Errno::ENOENT)
     end
   end
 
   context 'cache disable' do
-    before do
-      open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
-        f << 'hoge'
-      end
-    end
-
-    after do
-      File.unlink File.join(Endeco::Config.path, Endeco::Config.env, 'test_var')
-    end
+    include_context 'file prepared'
 
     it 'read variable is not cached' do
-      Endeco.test_var!.should == 'hoge'
+      Endeco.test_var!.should == "hoge\n"
       open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
         f << 'fuga'
       end
@@ -81,29 +77,53 @@ describe Endeco do
   context 'cache enable' do
     before do
       Endeco::Cache.enable = true
-      open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
-        f << 'hoge'
-      end
     end
 
-    after do
-      File.unlink File.join(Endeco::Config.path, Endeco::Config.env, 'test_var')
-    end
+    include_context 'file prepared'
 
     it 'read variable is cached' do
-      Endeco.test_var!.should == 'hoge'
+      Endeco.test_var!.should == "hoge\n"
       open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
         f << 'fuga'
       end
-      Endeco.test_var!.should == 'hoge'
+      Endeco.test_var!.should == "hoge\n"
     end
 
     it 'force read cached variable with :force option' do
-      Endeco.test_var!.should == 'hoge'
+      Endeco.test_var!.should == "hoge\n"
       open File.join(Endeco::Config.path, Endeco::Config.env, 'test_var'), 'w' do |f|
         f << 'fuga'
       end
       Endeco.test_var!(:force => true).should == 'fuga'
     end
   end
+
+  context 'enable default chomp' do
+    include_context 'file prepared'
+
+    before do
+      Endeco::Config.default_chomp = true
+    end
+
+    it 'remove line feed' do
+      Endeco.test_var.should eq 'hoge'
+    end
+
+    it 'disable chomp with option' do
+      Endeco.test_var(:chomp => false).should eq "hoge\n"
+    end
+  end
+
+  describe '? method' do
+    subject { Endeco.test_var? }
+
+    context 'file exists' do
+      include_context 'file prepared'
+      it { should be_true }
+    end
+
+    context 'file not exists' do
+      it { should be_false }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: endeco
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162604052720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162604052720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Environment Dependent Configuration
 email:
 - hawk@at-exit.com
@@ -31,6 +36,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - History.txt
@@ -64,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: endeco
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Environment Dependent Configuration