dacs 0.3.0 → 0.3.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Devver, Inc.
+Copyright (c) 2009, 2010 Devver, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/dacs/app_config.rb

@@ -109,8 +109,11 @@ module Dacs
       defaults_source = DefaultSource.new(@defaults)
       file_source     = FileSource.new(config_path, @environment)
       env_source      = EnvironmentSource.new(env_var_prefix)
-
-      load_values!(self.class.schema, env_source, file_source, defaults_source)
+      sources         = []
+      sources    << env_source
+      sources    << file_source if file_source.readable?
+      sources    << defaults_source
+      load_values!(self.class.schema, *sources)
       verify_no_missing_required_values!
     end
 
@@ -124,7 +127,8 @@ module Dacs
 
     def source(key)
       assert_key_defined!(key)
-      configured_value.source.to_s
+      # TODO is there a simpler way?
+      Hash.instance_method(:[]).bind(self.class.instance).call(key).source.to_s
     end
 
     def [](key)
@@ -204,6 +208,16 @@ module Dacs
       end
       logger.info "Starter config file created at #{config_path}. " +
         "Please customize it to your needs."
+    rescue SystemCallError => error
+      # NOTE It is important to catch system call errors here, rather than using
+      # path.writable? checks. Read-only filesystems report files as having the
+      # "write" bit set even though writing isn't actually
+      # permitted. E.g. the filesystem used on Heroku. The first we'll find out
+      # that it's a read-only filesystem is when we try to write to it.
+      logger.info <<"END"
+Unable to write starter config file to #{path}. The error was:
+  '#{error.message}'
+END
     end
 
     def starter_config_content

data/lib/dacs/file_source.rb

@@ -1,8 +1,13 @@
 require 'pathname'
 require 'yaml'
+require 'forwardable'
 
 module Dacs
   class FileSource
+    extend Forwardable
+    
+    def_delegators :@path, :readable?, :exist?
+
     def initialize(config_path, environment)
       @path        = Pathname(config_path)
       @environment = environment.to_s

data/spec/dacs/app_config_spec.rb

@@ -28,6 +28,38 @@ module Dacs
       end
     end
 
+    def self.it_should_not_choke_on_file_source
+      it "should not write an example config file" do
+        AppConfig.init!(@app_name, :logger => @logger)
+        AppConfig.instance
+        (@construct+'config'+'foo_app.yml').should_not exist
+      end
+
+      it "should not raise an error" do
+        lambda do 
+          AppConfig.init!(@app_name, :logger => @logger)
+          AppConfig.instance
+        end.should_not raise_error
+      end
+    end
+
+    context "when first initialized in a read-only filesystem" do
+      before do
+        @construct.chmod(0444)
+      end
+      
+      it_should_not_choke_on_file_source
+    end
+
+    context "when first initialized with a read-only config dir" do
+      before do
+        config_dir = @construct.directory 'config'
+        config_dir.chmod(0444)
+      end
+      
+      it_should_not_choke_on_file_source
+    end
+
     context "given a config file lacking the expected environment key" do
       append_before :each do
         @construct.file("config/foo_app.yml") do |f|
@@ -173,7 +205,7 @@ module Dacs
           YAML.dump({
               'development'=>{
                 'bar' => 'file_bar',
-                'baz' => 'file_buz'
+                'baz' => 'file_baz'
               }
             }, 
             f)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dacs
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Devver, Inc.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -05:00
+date: 2010-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency