bin/barometer in barometer-0.6.7 vs bin/barometer in barometer-0.7.0
- old
+ new
@@ -49,26 +49,26 @@
# == Author
# Mark G
# http://github.com/attack/barometer
#
# == Copyright
-# Copyright (c) 2009 Mark G. Licensed under the MIT License:
+# Copyright (c) 2009-2010 Mark G. Licensed under the MIT License:
# http://www.opensource.org/licenses/mit-license.php
require 'rubygems'
-require 'barometer'
+#require 'barometer'
+require '/Users/mark/work/fresh/gems/barometer/lib/barometer'
-require 'optparse'
-#require 'rdoc/usage'
+require 'optparse'
require 'ostruct'
require 'time'
require 'date'
require 'yaml'
# file where API keys are stored
KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.6.7'
+BAROMETER_VERSION = '0.6.8'
class App
attr_reader :options
@@ -524,9 +524,12 @@
end
# set API keys
if File.exists?(KEY_FILE)
keys = YAML.load_file(KEY_FILE)
+ if keys["yahoo"] && keys["yahoo"]["app_id"]
+ Barometer.yahoo_placemaker_app_id = keys["yahoo"]["app_id"]
+ end
if keys["google"] && keys["google"]["geocode"]
Barometer.google_geocode_key = keys["google"]["geocode"]
else
geocode_google_key_message
exit