barometer 0.6.7 → 0.7.0

data/.gitignore

@@ -6,3 +6,7 @@ pkg
 lib/attic
 coverage
 *.gem
+
+.rvmrc
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/LICENSE

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

data/README.rdoc

@@ -15,16 +15,20 @@ this.
 
 == version
 
-Version 0.6.7 is the current release of this gem.
-The gem is available from github (attack-barometer) or rubyforge (barometer).
+Version 0.6.8 is the current release of this gem. The gem is available from
+gemcutter (barometer: http://gemcutter.org/gems/barometer).
+Older version are available through rubyforge (barometer) and github
+(attack-barometer).
 It is fully functional (for five weather service APIs).
 
 == status
 
-Currently this project is in development and will only work for a few weather
-services (wunderground, google, yahoo, weather.com, weather_bug).
+Currently this project has completed initial development and will work for a
+few weather services (wunderground, google, yahoo, weather.com, weather_bug).
+Barometer has been tested on both Ruby 1.8.7 and 1.9.1.
 
-Features to be added next:
+Features to be added in the future:
+- better command line output
 - even more weather service drivers (hamweather)
 - icon support
 
@@ -60,6 +64,11 @@ eg. weatherbug.com
 
   weather_bug:
     code: YOUR_API_CODE
+    
+eg. Yahoo! Placemaker
+
+  yahoo:
+    app_id: YOUR_APP_ID
 
 == HTTParty
 
@@ -67,7 +76,7 @@ Why? HTTParty was created and designed specifically for consuming web services.
 I choose to use this over using the Net::HTTP library directly to allow for
 faster development of this project.
 
-HTTParty is also extended to include configurable Timeout support.
+It is possible that I will use Net::HTTP in the future.
 
 == tzinfo
 
@@ -100,6 +109,7 @@ code (ICAO) and it will return the weather as expected.
 - postal code
 - weather.com ID
 - location name (ie address, city, state, landmark, etc.)
+- woeid (where on earth id, by Yahoo!)
 
 * if the query is of the formats zipcode or postal code it may not
   support conversion to other formats.
@@ -130,7 +140,7 @@ with geo-coding.
   barometer = Barometer.new("Paris")
   weather = barometer.measure
   
-  puts weather.current.temperture
+  puts weather.current.temperature
   
 == sources
 
@@ -357,6 +367,24 @@ Barometer attempts to be a common API to any weather service API.  I have includ
 several weather service 'drivers', but I know there are many more available.
 Please use the provided ones as examples to create more.
 
+= development
+
+Barometer now uses 'bundler'.  You just need to 'git clone' the repo and 'bundle install'.
+
+== Contributions
+
+Thank you to these developers who have contributed. No contribution is too small.
+
+- nofxx (https://github.com/nofxx)
+- floere (https://github.com/floere)
+- plukevdh (https://github.com/plukevdh)
+
+
+= Links
+
+- repo: http://github.com/attack/barometer
+- rdoc: http://rdoc.info/projects/attack/barometer
+
 == copyright
 
-Copyright (c) 2009 Mark G. See LICENSE for details.
+Copyright (c) 2009-2011 Mark G. See LICENSE for details.

data/Rakefile

@@ -1,40 +1,19 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "barometer"
-    gem.summary = "A multi API consuming weather forecasting superstar."
-    gem.description = "A multi API consuming weather forecasting superstar."
-    gem.email = "barometer@attackcorp.com"
-    gem.homepage = "http://github.com/attack/barometer"
-    gem.authors = ["Mark G"]
-    
-    gem.add_dependency 'httparty', '>= 0.4.5'
-    gem.add_dependency 'tzinfo', '>= 0.3.14'
-    
-    #gem.add_development_dependency "mocha"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ["-c"]
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ["-c"]
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-
 task :default => :spec
 
 require 'rake/rdoctask'
@@ -50,4 +29,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "barometer #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/TODO

@@ -3,6 +3,10 @@
 - google geocoding terms of service indicate that "a map must be shown" ... what to do?
 - driver: hamweather
 - driver: meter
+- improve code based on metrics
+- ability to use Placemaker for geocoding (instead of Google)
+- use Geomojo to convert coords to woe_id (when no yahoo key)
+- remove use of HTTParty, use Net:HTTP and Nokogiri instead
 
 == soon
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 6
-:patch: 7
+:minor: 7
+:patch: 0
 :build: 

data/barometer.gemspec

@@ -1,208 +1,35 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.6.7"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = %q{1.3.5}
+
   s.authors = ["Mark G"]
+  s.email = %q{barometer@attackcorp.com}
   s.date = %q{2010-02-10}
-  s.default_executable = %q{barometer}
+
+  s.summary = %q{A multi API consuming weather forecasting superstar.}
   s.description = %q{A multi API consuming weather forecasting superstar.}
-  s.email = %q{barometer@attackcorp.com}
-  s.executables = ["barometer"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc",
-     "TODO"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION.yml",
-     "barometer.gemspec",
-     "bin/barometer",
-     "lib/barometer.rb",
-     "lib/barometer/base.rb",
-     "lib/barometer/data.rb",
-     "lib/barometer/data/distance.rb",
-     "lib/barometer/data/geo.rb",
-     "lib/barometer/data/local_datetime.rb",
-     "lib/barometer/data/local_time.rb",
-     "lib/barometer/data/location.rb",
-     "lib/barometer/data/pressure.rb",
-     "lib/barometer/data/speed.rb",
-     "lib/barometer/data/sun.rb",
-     "lib/barometer/data/temperature.rb",
-     "lib/barometer/data/units.rb",
-     "lib/barometer/data/zone.rb",
-     "lib/barometer/extensions/httparty.rb",
-     "lib/barometer/formats.rb",
-     "lib/barometer/formats/coordinates.rb",
-     "lib/barometer/formats/format.rb",
-     "lib/barometer/formats/geocode.rb",
-     "lib/barometer/formats/icao.rb",
-     "lib/barometer/formats/postalcode.rb",
-     "lib/barometer/formats/short_zipcode.rb",
-     "lib/barometer/formats/weather_id.rb",
-     "lib/barometer/formats/zipcode.rb",
-     "lib/barometer/measurements/measurement.rb",
-     "lib/barometer/measurements/result.rb",
-     "lib/barometer/measurements/result_array.rb",
-     "lib/barometer/query.rb",
-     "lib/barometer/services.rb",
-     "lib/barometer/translations/icao_country_codes.yml",
-     "lib/barometer/translations/weather_country_codes.yml",
-     "lib/barometer/translations/zone_codes.yml",
-     "lib/barometer/weather.rb",
-     "lib/barometer/weather_services/google.rb",
-     "lib/barometer/weather_services/noaa.rb",
-     "lib/barometer/weather_services/service.rb",
-     "lib/barometer/weather_services/weather_bug.rb",
-     "lib/barometer/weather_services/weather_dot_com.rb",
-     "lib/barometer/weather_services/wunderground.rb",
-     "lib/barometer/weather_services/yahoo.rb",
-     "lib/barometer/web_services/geocode.rb",
-     "lib/barometer/web_services/timezone.rb",
-     "lib/barometer/web_services/weather_id.rb",
-     "lib/barometer/web_services/web_service.rb",
-     "lib/demometer/demometer.rb",
-     "lib/demometer/public/css/master.css",
-     "lib/demometer/public/css/print.css",
-     "lib/demometer/public/css/syntax.css",
-     "lib/demometer/public/images/go.png",
-     "lib/demometer/public/images/link-out.gif",
-     "lib/demometer/views/about.erb",
-     "lib/demometer/views/contributing.erb",
-     "lib/demometer/views/forecast.erb",
-     "lib/demometer/views/index.erb",
-     "lib/demometer/views/layout.erb",
-     "lib/demometer/views/measurement.erb",
-     "lib/demometer/views/readme.erb",
-     "spec/barometer_spec.rb",
-     "spec/data/distance_spec.rb",
-     "spec/data/geo_spec.rb",
-     "spec/data/local_datetime_spec.rb",
-     "spec/data/local_time_spec.rb",
-     "spec/data/location_spec.rb",
-     "spec/data/pressure_spec.rb",
-     "spec/data/speed_spec.rb",
-     "spec/data/sun_spec.rb",
-     "spec/data/temperature_spec.rb",
-     "spec/data/units_spec.rb",
-     "spec/data/zone_spec.rb",
-     "spec/fixtures/formats/weather_id/90210.xml",
-     "spec/fixtures/formats/weather_id/atlanta.xml",
-     "spec/fixtures/formats/weather_id/from_USGA0028.xml",
-     "spec/fixtures/formats/weather_id/ksfo.xml",
-     "spec/fixtures/formats/weather_id/new_york.xml",
-     "spec/fixtures/geocode/40_73.json",
-     "spec/fixtures/geocode/40_73.xml",
-     "spec/fixtures/geocode/90210.json",
-     "spec/fixtures/geocode/90210.xml",
-     "spec/fixtures/geocode/T5B4M9.json",
-     "spec/fixtures/geocode/T5B4M9.xml",
-     "spec/fixtures/geocode/atlanta.json",
-     "spec/fixtures/geocode/atlanta.xml",
-     "spec/fixtures/geocode/calgary_ab.json",
-     "spec/fixtures/geocode/calgary_ab.xml",
-     "spec/fixtures/geocode/ksfo.json",
-     "spec/fixtures/geocode/ksfo.xml",
-     "spec/fixtures/geocode/newyork_ny.json",
-     "spec/fixtures/geocode/newyork_ny.xml",
-     "spec/fixtures/services/google/calgary_ab.xml",
-     "spec/fixtures/services/weather_bug/90210_current.xml",
-     "spec/fixtures/services/weather_bug/90210_forecast.xml",
-     "spec/fixtures/services/weather_dot_com/90210.xml",
-     "spec/fixtures/services/wunderground/current_calgary_ab.xml",
-     "spec/fixtures/services/wunderground/forecast_calgary_ab.xml",
-     "spec/fixtures/services/yahoo/90210.xml",
-     "spec/formats/coordinates_spec.rb",
-     "spec/formats/format_spec.rb",
-     "spec/formats/geocode_spec.rb",
-     "spec/formats/icao_spec.rb",
-     "spec/formats/postalcode_spec.rb",
-     "spec/formats/short_zipcode_spec.rb",
-     "spec/formats/weather_id_spec.rb",
-     "spec/formats/zipcode_spec.rb",
-     "spec/measurements/measurement_spec.rb",
-     "spec/measurements/result_array_spec.rb",
-     "spec/measurements/result_spec.rb",
-     "spec/query_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/weather_services/google_spec.rb",
-     "spec/weather_services/services_spec.rb",
-     "spec/weather_services/weather_bug_spec.rb",
-     "spec/weather_services/weather_dot_com_spec.rb",
-     "spec/weather_services/wunderground_spec.rb",
-     "spec/weather_services/yahoo_spec.rb",
-     "spec/weather_spec.rb",
-     "spec/web_services/geocode_spec.rb",
-     "spec/web_services/web_services_spec.rb"
-  ]
   s.homepage = %q{http://github.com/attack/barometer}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  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.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A multi API consuming weather forecasting superstar.}
-  s.test_files = [
-    "spec/barometer_spec.rb",
-     "spec/data/distance_spec.rb",
-     "spec/data/geo_spec.rb",
-     "spec/data/local_datetime_spec.rb",
-     "spec/data/local_time_spec.rb",
-     "spec/data/location_spec.rb",
-     "spec/data/pressure_spec.rb",
-     "spec/data/speed_spec.rb",
-     "spec/data/sun_spec.rb",
-     "spec/data/temperature_spec.rb",
-     "spec/data/units_spec.rb",
-     "spec/data/zone_spec.rb",
-     "spec/formats/coordinates_spec.rb",
-     "spec/formats/format_spec.rb",
-     "spec/formats/geocode_spec.rb",
-     "spec/formats/icao_spec.rb",
-     "spec/formats/postalcode_spec.rb",
-     "spec/formats/short_zipcode_spec.rb",
-     "spec/formats/weather_id_spec.rb",
-     "spec/formats/zipcode_spec.rb",
-     "spec/measurements/measurement_spec.rb",
-     "spec/measurements/result_array_spec.rb",
-     "spec/measurements/result_spec.rb",
-     "spec/query_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/weather_services/google_spec.rb",
-     "spec/weather_services/services_spec.rb",
-     "spec/weather_services/weather_bug_spec.rb",
-     "spec/weather_services/weather_dot_com_spec.rb",
-     "spec/weather_services/wunderground_spec.rb",
-     "spec/weather_services/yahoo_spec.rb",
-     "spec/weather_spec.rb",
-     "spec/web_services/geocode_spec.rb",
-     "spec/web_services/web_services_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  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")
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.14"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_dependency(%q<tzinfo>, [">= 0.3.14"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0.4.5"])
-    s.add_dependency(%q<tzinfo>, [">= 0.3.14"])
-  end
+  s.add_development_dependency("rspec", "~> 2.6")
+  s.add_development_dependency("mocha")
+  s.add_development_dependency("fakeweb")
 end
 

data/bin/barometer

@@ -51,14 +51,14 @@
 #   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'
@@ -66,7 +66,7 @@ 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
   
@@ -526,6 +526,9 @@ 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