deputy 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/deputy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deputy}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-06-02}
   s.default_executable = %q{deputy}
   s.email = %q{mirko@dawanda.com}
   s.executables = ["deputy"]

data/lib/deputy.rb

@@ -48,9 +48,10 @@ module Deputy
   end
 
   def self.config
-    file = File.expand_path('~/.deputy.yml')
-    YAML.load(File.read(file))
-  rescue => e
-    e.message << " -- do you have a #{file} ?"
+    home = File.expand_path('~')
+    ["#{home}/.deputy.yml", '/etc/deputy.yml'].each do |file|
+      return YAML.load(File.read(file)) if File.exist?(file)
+    end
+    raise "No deputy.yml found in /etc or #{home}"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +02:00
+date: 2010-06-02 00:00:00 +02:00
 default_executable: deputy
 dependencies: []