barometer 0.7.3 → 0.8.0

data/Rakefile

@@ -6,27 +6,7 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rspec_opts = ["-c"]
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  spec.rspec_opts = ["--color"]
 end
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "barometer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/TODO

@@ -1,12 +1,11 @@
 == now
 - use Yahoo placemaker for geocoding (as exclusive, or as priority for supported conversions)
-- remove use of google api key
 
 == very soon
 
 - google geocoding terms of service indicate that "a map must be shown" ... what to do?
 - driver: hamweather
-- driver: meter
+- driver: metar
 - improve code based on metrics
 - use Geomojo to convert coords to woe_id (when no yahoo key)
 - remove use of HTTParty, use Net:HTTP and Nokogiri instead
@@ -20,13 +19,13 @@
 
 - Rdoc compatible documentation
 - add uv, moon, elevation info to current
-- driver: noaa, intellicast
+- driver: intellicast
 - weather.com simple_questions improve answers (use extra data)
 - make sure you can compare LocalTime to LocalDateTime in LocalTime class
 
 - be smart, never make duplicate queries
   - ie. if you are including wunderground, do it first and use the timezone info
-    
+
 - conversion and weather fetching queries should have hooks to allow
   for configurable caching via memcache, then web service calls can 
   be cached across multiple measurement instances.
@@ -38,15 +37,15 @@
 - Parsing dates is slow (ie Time.parse)
   for data parsing with known date/time formats, parse the
   needed information explicitly
-  
+
   example:
-  
+
   _parse_date(text)
     text =~ /^(\d\d\d\d)-(\d\d)-(\d\d)/
     Time.new($3,$2,$1)
   end
-  
-  
+
+
 == other weather info
 
 === intellicast
@@ -58,4 +57,4 @@ http://www.arl.noaa.gov/READYcmet.php
 http://www.windguru.cz/int/index.php
 http://www.nco.ncep.noaa.gov/pmb/products/gfs/
 http://www.weatherdeveloper.com/2008/01/31/grib2-migration/
-http://www.cpc.noaa.gov/products/wesley/wgrib2/
+http://www.cpc.noaa.gov/products/wesley/wgrib2/

data/barometer.gemspec

@@ -1,35 +1,36 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'barometer/version'
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.7.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = %q{1.3.5}
-
+  s.version = Barometer::VERSION
   s.authors = ["Mark G"]
   s.email = %q{barometer@attackcorp.com}
-  s.date = %q{2011-06-02}
-
   s.summary = %q{A multi API consuming weather forecasting superstar.}
   s.description = %q{A multi API consuming weather forecasting superstar.}
   s.homepage = %q{http://github.com/attack/barometer}
 
   s.default_executable = %q{barometer}
-  
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- spec/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.add_dependency(%q<httparty>, ">= 0.4.5")
-  s.add_dependency(%q<tzinfo>, ">= 0.3.14")
-  s.add_dependency("nokogiri")
-
-  s.add_development_dependency("rspec", "~> 2.6")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("fakeweb")
+  s.add_dependency %q<httparty>, ">= 0.4.5"
+  s.add_dependency %q<tzinfo>, ">= 0.3.14"
+  s.add_dependency "nokogiri"
+  s.add_dependency "yajl-ruby"
+  s.add_dependency "crack"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "webmock"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "vcr"
+  s.add_development_dependency "fakefs"
 end
-

data/bin/barometer

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# == Barometer 
+# == Barometer
 #   This is the command line interface to the barometer gem.
 #
 # == Examples
@@ -11,7 +11,7 @@
 #     barometer --yahoo 90210
 #     barometer --verbose 'new york'
 #
-# == Usage 
+# == Usage
 #   barometer [options] query
 #
 #   For help use: barometer -h
@@ -26,9 +26,8 @@
 #   -i, --imperial      measure in imperial
 #   --wunderground      add wunderground as a source
 #   --yahoo             add yahoo as a source
-#   --google            add google as a source
-#   --weather           add weather.com as a source
 #   --bug               add weather_bug as a source
+#   --noaa              add NOAA as a source
 #   -p, --pop           pop threshold used to determine wet?
 #   -s, --wind          wind speed threshold used to determine windy?
 #   -a, --at            time/date used to determine when to calculate summary
@@ -38,7 +37,7 @@
 #   http://github.com/attack/barometer
 #
 # == Copyright
-#   Copyright (c) 2009-2011 Mark G. Licensed under the MIT License:
+#   Copyright (c) 2009-2013 Mark G. Licensed under the MIT License:
 #   http://www.opensource.org/licenses/mit-license.php
 
 require 'rubygems'
@@ -53,15 +52,13 @@ require 'yaml'
 
 # file where API keys are stored
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.7.3'
 
 class App
-  
   attr_reader :options
 
   def initialize(arguments, stdin)
     @arguments = arguments.dup
-    
+
     # Set defaults
     @options = OpenStruct.new
     @options.timeout = 15
@@ -72,7 +69,7 @@ class App
     @options.verbose = false
     @options.at = nil
     @options.default = true
-    
+
     # thresholds
     @options.windy_m = 10
     @options.windy_i = 7
@@ -81,28 +78,27 @@ class App
 
   # Parse options, check arguments, then process the command
   def run
-    if parsed_options? && arguments_valid? 
+    if parsed_options? && arguments_valid?
       puts "Start at #{DateTime.now}\n\n" if @options.verbose
       output_options if @options.verbose # [Optional]
-            
-      process_arguments            
+
       process_command
-      
+
       puts "\nFinished at #{DateTime.now}" if @options.verbose
     else
       output_usage
     end
   end
-  
+
   protected
-  
+
     # future options
     #
     # time: -a --at
     #
     def parsed_options?
       # Specify options
-      opt = OptionParser.new 
+      opt = OptionParser.new
       opt.on('-v', '--version')    { output_version ; exit 0 }
       opt.on('-h', '--help')       { output_help }
       opt.on('-V', '--verbose')    { @options.verbose = true }
@@ -114,41 +110,22 @@ class App
       opt.on('-i', '--imperial')   { @options.metric = false }
       opt.on('--wunderground')     { @options.sources << :wunderground; @options.default = false }
       opt.on('--yahoo')            { @options.sources << :yahoo; @options.default = false }
-      opt.on('--google')           { @options.sources << :google; @options.default = false }
-      opt.on('--weather')          { @options.sources << :weather_dot_com; @options.default = false }
       opt.on('--bug')              { @options.sources << :weather_bug; @options.default = false }
+      opt.on('--noaa')             { @options.sources << :noaa; @options.default = false }
       opt.on('-p n', '--pop n')    {|n| @options.pop = n.to_i || 50 }
       opt.on('-s n', '--wind n')   {|n| @options.metric ? @options.windy_m = n.to_f || 10 : @options.windy_i = n.to_f || 7 }
-            
+
       opt.parse!(@arguments) rescue return false
-      
+
       process_options
-      true      
-    end
-    
-    def config_weather_dot_com
-      if File.exists?(KEY_FILE)
-      	keys = YAML.load_file(KEY_FILE)
-      	if keys["weather"] && keys["weather"]["partner"] && keys["weather"]["license"]
-      	  partner_key = keys["weather"]["partner"].to_s
-      	  license_key = keys["weather"]["license"].to_s
-        else
-          weather_key_message
-          exit
-        end
-      else
-        File.open(KEY_FILE, 'w') {|f| f << "\nweather:\n  partner: PARTNER_KEY\n  license: LICENSE_KEY" }
-        weather_key_message
-        exit
-      end
-      { :weather_dot_com => { :keys => { :partner => partner_key, :license => license_key } } }
+      true
     end
-    
+
     def config_weather_bug
       if File.exists?(KEY_FILE)
-      	keys = YAML.load_file(KEY_FILE)
-      	if keys["weather_bug"] && keys["weather_bug"]["code"]
-      	  code = keys["weather_bug"]["code"].to_s
+        keys = YAML.load_file(KEY_FILE)
+        if keys["weather_bug"] && keys["weather_bug"]["code"]
+          code = keys["weather_bug"]["code"].to_s
         else
           bug_key_message
           exit
@@ -167,10 +144,6 @@ class App
       @options.sources = @options.sources.uniq
       Barometer.force_geocode =  @options.geocode
       Barometer.enhance_timezone =  @options.timezone
-      if @options.sources.include?(:weather_dot_com)
-        @options.sources.delete(:weather_dot_com)
-        @options.sources << config_weather_dot_com
-      end
       if @options.sources.include?(:weather_bug)
         @options.sources.delete(:weather_bug)
         @options.sources << config_weather_bug
@@ -178,11 +151,11 @@ class App
       Barometer.config = { 1 => @options.sources }
       Barometer.timeout = @options.timeout
     end
-    
+
     def output_options
       puts "Options:\n"
-      
-      @options.marshal_dump.each do |name, val|        
+
+      @options.marshal_dump.each do |name, val|
         puts "  #{name} = #{val}"
       end
       puts
@@ -192,17 +165,11 @@ class App
     def arguments_valid?
       true if (@arguments.length >= 1 || @options.web)
     end
-    
-    # Setup the arguments
-    def process_arguments
-      #puts @arguments.inspect
-    end
-    
+
     def output_help
       output_version
-      #output_usage
     end
-    
+
     def output_usage
       puts "Usage: "
       puts "barometer [options] query"
@@ -219,18 +186,17 @@ class App
       puts "  -i, --imperial      measure in imperial"
       puts "  --wunderground      add wunderground as a source"
       puts "  --yahoo             add yahoo as a source"
-      puts "  --google            add google as a source"
-      puts "  --weather           add weather.com as a source"
       puts "  --bug               add weather_bug as a source"
+      puts "  --noaa              add NOAA as a source"
       puts "  -p, --pop           pop threshold used to determine wet?"
       puts "  -s, --wind          wind speed threshold used to determine windy?"
       puts "  -a, --at            time/date used to determine when to calculate summary"
     end
-    
+
     def output_version
-      puts "#{File.basename(__FILE__)} version #{BAROMETER_VERSION}"
+      puts "#{File.basename(__FILE__)} version #{Barometer::VERSION}"
     end
-    
+
     def process_command
       barometer = Barometer.new(@arguments.join(" "))
       begin
@@ -359,7 +325,7 @@ def pretty_current(c)
   return unless c
   section("CURRENT", 2) do
     pretty_hash({
-      "Measured at" => c.current_at, "Updated at" => c.updated_at,
+      "Measured at" => c.current_at, "Updated at" => c.updated_at.to_s(true),
       "Humidity" => c.humidity, "Icon" => c.icon,
       "Condition" => c.condition, "Temperature" => c.temperature,
       "Dew Point" => c.dew_point, "Heat Index" => c.heat_index,
@@ -375,7 +341,7 @@ def pretty_forecast(f)
   return unless f
   section("FOR: #{f.date}", 3) do
     pretty_hash({
-      "Valid From" => f.valid_start_date.to_s(true), 
+      "Valid From" => f.valid_start_date.to_s(true),
       "Valid Until" => f.valid_end_date.to_s(true),
       "Icon" => f.icon, "Description" => f.description,
       "Condition" => f.condition, "High" => f.high,
@@ -428,7 +394,7 @@ end
 def pretty_info(w)
   title("INFO", 1)
   value("GitHub", "http://github.com/attack/barometer")
-  value("Barometer Version", BAROMETER_VERSION)
+  value("Barometer Version", Barometer::VERSION)
   value("Total Time", "#{(w.end_at - w.start_at)} s")
 end
 
@@ -449,18 +415,6 @@ def pretty_output(barometer)
   end
 end
 
-def weather_key_message
-  puts
-  puts "MISSING KEYS !!!"
-  puts "Please update the key_file '#{KEY_FILE}' with your weather api keys"
-  puts "Get it here: ???"
-  puts "Then, add these lines to the file:"
-  puts "weather:"
-  puts "  partner: PARTNER_KEY"
-  puts "  license: LICENSE_KEY"
-  puts
-end
-
 def bug_key_message
   puts
   puts "MISSING KEYS !!!"
@@ -474,13 +428,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"]
+  keys = YAML.load_file(KEY_FILE)
+  if keys["yahoo"] && keys["yahoo"]["app_id"]
+    Barometer.yahoo_placemaker_app_id = keys["yahoo"]["app_id"]
   end
 else
-  File.open(KEY_FILE, 'w') {|f| f << "yahoo: app_id: YOUR_KEY_KERE" }
-  exit
+  File.open(KEY_FILE, 'w') {|f| f << "yahoo:\n  app_id: YOUR_KEY_KERE" }
 end
 
 # Create and run the application

data/lib/barometer.rb

@@ -1,31 +1,33 @@
 $:.unshift(File.dirname(__FILE__))
 
+require 'barometer/version'
 require 'barometer/base'
 require 'barometer/query'
 require 'barometer/weather'
 require 'barometer/services'
 require 'barometer/data'
 require 'barometer/formats'
- 
+require 'barometer/key_file_parser'
+
 module Barometer
-  
+
   @@debug_mode = false
   def self.debug; @@debug_mode; end;
   def self.debug=(value); @@debug_mode = value; end;
   def self.debug!; @@debug_mode = true; end;
   def self.debug?; @@debug_mode; end;
-  
+
   def self.google_geocode_key
     warn "[DEPRECATION] `Barometer.google_geocode_key` is deprecated.  A Google API key is no longer needed"
   end
   def self.google_geocode_key=(google_key)
     warn "[DEPRECATION] `Barometer.google_geocode_key=(key)` is deprecated.  A Google API key is no longer needed"
   end
-  
+
   @@yahoo_placemaker_app_id = nil
   def self.yahoo_placemaker_app_id; @@yahoo_placemaker_app_id; end;
   def self.yahoo_placemaker_app_id=(yahoo_key); @@yahoo_placemaker_app_id = yahoo_key; end;
-  
+
   # sometimes a query is used as is and never gets geocoded (ie zipcode)
   # often, it is useful to have queries geocoded to know where in the
   # world that query points to.  you can force the geocoding of
@@ -37,28 +39,28 @@ module Barometer
   def self.force_geocode; @@force_geocode; end;
   def self.force_geocode=(value); @@force_geocode = value; end;
   def self.force_geocode!; @@force_geocode = true; end;
-  
+
   @@enhance_timezone = false
   def self.enhance_timezone; @@enhance_timezone; end;
   def self.enhance_timezone=(value); @@enhance_timezone = value; end;
   def self.enhance_timezone!; @@enhance_timezone = true; end;
-  
+
   # adjust the timeout used when interactind with external web services
   #
   @@timeout = 15
   def self.timeout; @@timeout; end;
   def self.timeout=(value); @@timeout = value; end;
-  
+
   def self.new(query=nil)
     Barometer::Base.new(query)
   end
-  
+
   # update the Barometer configuration
   #
   def self.config=(config=nil)
     Barometer::Base.config = config
   end
-  
+
   # shortcut to Barometer::Service.source method
   # allows Barometer.source(:wunderground)
   #
@@ -69,6 +71,6 @@ module Barometer
   # custom errors
   #
   class OutOfSources < StandardError; end
-  
+
 end