Skip to content

Commit

Permalink
Add some simple error handling
Browse files Browse the repository at this point in the history
- Make sure we can read ~/.zenpush.yml before merging options
- Raise an error if uri, user, or password is nil
  • Loading branch information
torandu committed Dec 11, 2012
1 parent 0fb8e76 commit f7720b4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions lib/zenpush/zendesk.rb
Expand Up @@ -22,11 +22,14 @@ def initialize(options = {})
}

zenpush_yml = File.join(ENV['HOME'], '.zenpush.yml')
zenpush_yml_opts = YAML.load_file(zenpush_yml) if File.readable?(zenpush_yml)

default_options.merge!(zenpush_yml_opts)
if File.readable?(zenpush_yml)
zenpush_yml_opts = YAML.load_file(zenpush_yml)
default_options.merge!(zenpush_yml_opts)
end

opts = default_options.merge!(options)
opts.each_pair { |k,v| raise "#{k} is nil" if v.nil? }

@options = opts

Expand Down

0 comments on commit f7720b4

Please sign in to comment.