barometer 0.7.0 → 0.7.1

data/README.rdoc

@@ -15,7 +15,7 @@ this.
 
 == version
 
-Version 0.6.8 is the current release of this gem. The gem is available from
+Version 0.7.1 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).
@@ -25,7 +25,7 @@ It is fully functional (for five weather service APIs).
 
 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.
+Barometer is developed using only Ruby 1.9.2, but will probably on both Ruby 1.8.7 and 1.9.1.
 
 Features to be added in the future:
 - better command line output
@@ -198,15 +198,6 @@ This will output the weather information for the given query.
 See the help for more command line information.
 
   # barometer -h
-
-=== web demo
-
-There is a Sinatra application that demos the functionality of Barometer,
-and provides Barometer information.  Start this local demo with:
-
-  # barometer -w
-  
-NOTE: This requires the gems "sinatra" and "vegas".
   
 === fail
 

data/VERSION.yml

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

data/barometer.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barometer}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   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.date = %q{2011-06-01}
 
   s.summary = %q{A multi API consuming weather forecasting superstar.}
   s.description = %q{A multi API consuming weather forecasting superstar.}

data/bin/barometer

@@ -11,14 +11,6 @@
 #     barometer --yahoo 90210
 #     barometer --verbose 'new york'
 #
-# == Local Web Demo
-#   You can easily interact directly with barometer with the command:
-#     barometer -w
-#
-#   This demo has 2 gem requirements:
-#     - sinatra (tested with 0.9.1.1)
-#     - vegas (tested with 0.0.1)
-#
 # == Usage 
 #   barometer [options] query
 #
@@ -41,22 +33,17 @@
 #   -s, --wind          wind speed threshold used to determine windy?
 #   -a, --at            time/date used to determine when to calculate summary
 #
-#   Web Demo:
-#   -w, --web           run web-app with barometer demo
-#   -k, --kill          stop the web demo background process
-#   -S, --status        show the web demo status
-#
 # == Author
 #   Mark G
 #   http://github.com/attack/barometer
 #
 # == Copyright
-#   Copyright (c) 2009-2010 Mark G. Licensed under the MIT License:
+#   Copyright (c) 2009-2011 Mark G. Licensed under the MIT License:
 #   http://www.opensource.org/licenses/mit-license.php
 
 require 'rubygems'
-#require 'barometer'
-require '/Users/mark/work/fresh/gems/barometer/lib/barometer'
+require 'barometer'
+#require '/Users/mark/code/gems/barometer/lib/barometer'
 
 require 'optparse'
 require 'ostruct'
@@ -66,7 +53,7 @@ require 'yaml'
 
 # file where API keys are stored
 KEY_FILE = File.expand_path(File.join('~', '.barometer'))
-BAROMETER_VERSION = '0.6.8'
+BAROMETER_VERSION = '0.7.1'
 
 class App
   
@@ -83,7 +70,6 @@ class App
     @options.metric = true
     @options.sources = []
     @options.verbode = false
-    @options.web = false
     @options.at = nil
     @options.default = true
     
@@ -133,11 +119,6 @@ class App
       opt.on('--bug')              { @options.sources << :weather_bug; @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 }
-      
-      # pass these onto vegas
-      opt.on('-w', '--web')        { @options.web = true; ARGV.shift }
-      opt.on('-k', '--kill')       { @options.web = true }
-      opt.on('-S', '--status')     { @options.web = true }
             
       opt.parse!(@arguments) rescue return false
       
@@ -244,11 +225,6 @@ class App
       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"
-      puts
-      puts "  Web Demo:"
-      puts "  -w, --web           run web-app with barometer demo"
-      puts "  -k, --kill          stop the web demo background process"
-      puts "  -S, --status        show the web demo status"
     end
     
     def output_version
@@ -256,25 +232,21 @@ class App
     end
     
     def process_command
-      if @options.web
-        run_web_mode(@arguments.join(" "))
-      else
-        barometer = Barometer.new(@arguments.join(" "))
-        begin
-          if @options.verbose
-            Barometer::debug!
-            div(char="*")
-            puts "DEBUG LOG"
-            blank
-          end
-          barometer.measure(@options.metric) if barometer
-          blank if @options.verbose
-          pretty_output(barometer) if barometer.weather
-        rescue Barometer::OutOfSources
-          puts
-          puts "   SORRY: your query did not provide any results"
-          puts
+      barometer = Barometer.new(@arguments.join(" "))
+      begin
+        if @options.verbose
+          Barometer::debug!
+          div(char="*")
+          puts "DEBUG LOG"
+          blank
         end
+        barometer.measure(@options.metric) if barometer
+        blank if @options.verbose
+        pretty_output(barometer) if barometer.weather
+      rescue Barometer::OutOfSources
+        puts
+        puts "   SORRY: your query did not provide any results"
+        puts
       end
     end
 end
@@ -477,18 +449,6 @@ def pretty_output(barometer)
   end
 end
 
-def run_web_mode(query=nil)
-  
-  require 'rubygems'
-  require File.expand_path(File.dirname(__FILE__) + '/../lib/demometer/demometer.rb')
-  require 'vegas'
-  
-  Vegas::Runner.new(Demometer, 'demometer') do |opts, app|
-    # opts is an option parser object
-    # app is your app class
-  end
-end
-
 def geocode_google_key_message
   puts
   puts "MISSING KEYS !!!"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Mark G
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2011-06-01 00:00:00 -04:00
 default_executable: barometer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,19 +164,6 @@ files:
 - 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

data/lib/demometer/demometer.rb

@@ -1,104 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require 'barometer'
-
-# load API keys
-@@config_file ||= File.expand_path(File.join('~', '.barometer'))
-keys = YAML.load_file(@@config_file)
-if keys["google"] && keys["google"]["geocode"]
-  Barometer.google_geocode_key = keys["google"]["geocode"]
-else
-  raise RunTimeError "no geocoding keys"
-  exit
-end
-
-class Demometer < Sinatra::Default
-
-  def config_weather_dot_com
-    if File.exists?(@@config_file)
-    	keys = YAML.load_file(@@config_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
-        raise RunTimeError "no weather.com keys"
-        exit
-      end
-    else
-      File.open(@@config_file, 'w') {|f| f << "\nweather:\n  partner: PARTNER_KEY\n  license: LICENSE_KEY" }
-      raise RunTimeError "no weather.com keys"
-      exit
-    end
-    { :weather_dot_com => { :keys => { :partner => partner_key, :license => license_key } } }
-  end
-
-  def config_weather_bug
-    if File.exists?(@@config_file)
-    	keys = YAML.load_file(@@config_file)
-    	if keys["weather_bug"] && keys["weather_bug"]["code"]
-    	  code = keys["weather_bug"]["code"].to_s
-      else
-        raise RunTimeError "no weatherbug.com keys"
-        exit
-      end
-    else
-      File.open(@@config_file, 'w') {|f| f << "\weather_bug:\n  code: API_CODE" }
-      raise RunTimeError "no weatherbug.com keys"
-      exit
-    end
-    { :weather_bug => { :keys => { :code => code } } }
-  end
-
-  helpers do
-    def data(title, value)
-      return if value.nil?
-      "<li>#{title}: #{value}</li>"
-    end
-  end
-
-  get '/' do
-    erb :index
-  end
-  
-  post '/' do
-    # apply options
-    Barometer.force_geocode = (params[:query][:geocode].to_s == "1" ? true : false)
-    metric = (params[:query][:metric].to_s == "1" ? true : false)
-    
-    # determine sources
-    Barometer.config = { 1 => params[:query][:source].collect{|s| s.to_sym } }
-    
-    # setup weather.com
-    if Barometer::Base.config && Barometer::Base.config[1] &&
-      Barometer::Base.config[1].include?(:weather_dot_com)
-      Barometer::Base.config[1].delete(:weather_dot_com)
-      Barometer::Base.config[1] << config_weather_dot_com
-    end
-    
-    # setup weatherbug.com
-    if Barometer::Base.config && Barometer::Base.config[1] &&
-      Barometer::Base.config[1].include?(:weather_bug)
-      Barometer::Base.config[1].delete(:weather_bug)
-      Barometer::Base.config[1] << config_weather_bug
-    end
-    
-    if params[:query] && !params[:query][:q].empty?
-      @barometer = Barometer.new(params[:query][:q])
-      @weather = @barometer.measure(metric)
-    end
-    erb :index
-  end
-
-  get '/contributing.html' do
-    erb :contributing
-  end
-  
-  get '/readme.html' do
-    erb :readme
-  end
-  
-  get '/about.html' do
-    erb :about
-  end
-
-end

data/lib/demometer/public/css/master.css

@@ -1,188 +0,0 @@
-/*
-	Inspired By: Blake Mizerany, www.sinatrarb.com
-*/
-
-body {
-  color:#000;
-  font-family:"Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Helvetica, Arial, sans-serif;
-  font-size:100%;
-  line-height:1.3;
-  background-color:#fff;
-  margin:0;
-  padding:0;
-}
-
-/* HEADER */
-#head {
-  text-align:center;
-}
-#head h1 {
-  color:#000;
-  font-size:4em;
-  font-weight:normal;
-  letter-spacing:-3px;
-  line-height:1;
-  margin:0;
-  padding:20px 0 15px 0;
-}
-#head h1 a, #head h1 a:link, #head h1 a:visited, #head h1 a:hover {
-  color:#100;
-  text-decoration:none;
-}
-#head ul {
-  font-size:1.1em;
-  font-weight:normal;
-  text-transform:uppercase;
-  letter-spacing:2px;
-  text-align:center;
-  margin:0;
-  padding:0 40px 0.25em 40px;
-}
-#head ul li {
-  display:inline;
-  list-style-type:none;
-  padding:0 0.5em 0 0;
-}
-#head ul a, #head ul a:link, #head ul a:visited {
-  color:#56534f;
-  text-decoration:none;
-}
-#head ul a:hover {
-  color:#000;
-  text-decoration:underline
-}
-
-/* CONTENT */
-
-#content {
-  color:#333;
-  font-size:1.1em;
-  max-width:44em;
-  min-width:30em;
-  margin:7px auto;
-  border-top:2px solid #837d7c;
-}
-strong {
-  font-weight:bold;
-}
-
-/* HEADINGS */
-
-h1, h2, h3, h4, h5, h6 {
-  color:#000;
-}
-h1, h2 {
-  color:#211d1f;
-  font-weight:normal;
-}
-h1 a, h2 a { color:#222 }
-h1 {
-  font-size:2.25em;
-  letter-spacing:-1px;
-  margin-bottom:0;
-}
-h2 {
-  font-size:1.5em;
-  letter-spacing:-1px;
-  margin:1.25em 0 -0.32em 0;
-}
-h3 {
-  color:#211d1f;
-  font-size:1.02em;
-  font-weight:bold;
-  margin:1.8em 0 -0.25em 0;
-  letter-spacing:-1px;
-}
-h3 a {
-  color:#000;
-  text-decoration:underline;
-}
-
-/* LINKS */
-a {
-  color:#000;
-  text-decoration:underline;
-}
-a:hover {
-  color:#910;
-  text-decoration:underline;
-}
-a img {
-  border:none;
-}
-a.out {
-  background: url('/images/link-out.gif') center right no-repeat;
-  padding-right: 12px;
-}
-
-
-/* CODE */
-
-code, pre, textarea, tt {
-  font-family:"lucida console", "monaco", "andale mono", "bitstream vera sans mono",
-    "consolas", monospace;
-}
-pre {
-  font-size:0.85em;
-  background:#f4f5f5;
-  border:2px solid #d5d0d2;
-  padding:0.5em;
-  line-height:1.15;
-  color:#222;
-}
-code, tt {
-  font-size:0.85em;
-  color:#444;
-}
-h1 code, h2 code, h3 code, h4 code {
-  color:#333;
-}
-pre code {
-  font-size:1em;
-  color:#222;
-}
-
-/* MISC */
-
-hr {
-  margin:3em 0;
-  padding:0;
-  color:#eee;
-}
-
-/* HOME */
-
-#home #content {
-  font-size:1.05em;
-  margin:20px 0 0 0;
-  padding:0 20px;
-  border-width:0;
-}
-#home #head, #home #foot {
-  display:none;
-}
-form {
-	text-align: center;
-}
-	
-form .text-input input {
-	font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Helvetica, Arial, sans-serif;
-	margin: 10px 0 5px 10px;
-	color: #686868;
-	font-size: 40px;
-	text-align: left;
-	text-transform: lowercase;
-}
-
-form .submit-input input {
-	position: relative;
-	margin: 0 7% 0 0;
-	float: right;
-}
-
-form .options-input {
-	position: relative;
-	margin: 0 7% 0 0;
-	text-align: left;
-}
-