meteo 1.0.2 → 1.1.0

data/CHANGES

@@ -10,4 +10,8 @@
 
 == Version 1.0.2
 
-* Bug fixes.
+* Bug fixes.
+
+== Version 1.1.0
+
+* Adding forecast flag.

data/bin/meteo

@@ -7,6 +7,7 @@ require 'meteo/meteo_cli'
 params = []
 
 units = "imperial"
+forecast = 0
 
 index = 0
 
@@ -18,6 +19,11 @@ while index < ARGV.size do
   elsif param =~ /--units/ or param =~ /-u/
     units = ARGV[index+1]
     index = index + 1
+  elsif param =~ /--forecast=/ or param =~ /-f=/
+    forecast = ARGV[index][ARGV[index].index("=")+1..-1]
+  elsif param =~ /--forecast/ or param =~ /-f/
+    forecast = ARGV[index+1]
+    index = index + 1
   else
     params << param
   end
@@ -25,4 +31,4 @@ while index < ARGV.size do
   index = index + 1
 end
 
-MeteoCLI.start ["quote", "--units=#{units}", "#{params.join(' ')}"]
+MeteoCLI.start ["quote", "--units=#{units}", "--forecast=#{forecast}", "#{params.join(' ')}"]

data/lib/meteo/colors.rb

@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+
+module Colors
+  def sun
+    "\033[33;1m\xe2\x98\x80"
+  end
+
+  def moon
+    "\033[36m\xe2\x98\xbd"
+  end
+
+  def clouds
+    "\033[37;1m\xe2\x98\x81"
+  end
+
+  def rain
+    "\xe2\x98\x94"
+  end
+
+  def fog
+    "\033[37;1m\xe2\x96\x92"
+  end
+
+  def snow
+    "\033[37;1m\xe2\x9d\x84"
+  end
+
+  def thunderstorm
+    "\xe2\x9a\xa1"
+  end
+
+  def background
+    "\033[44m"
+  end
+
+  def dashes
+    "\033[34m-"
+  end
+
+  def text
+    "\033[36;1m"
+  end
+
+  def delimiter
+    "\033[35m=>"
+  end
+
+  def data
+    "\033[33;1m"
+  end
+
+  def stop
+    "\033[0m"
+  end
+end

data/lib/meteo/geo.rb

@@ -0,0 +1,20 @@
+require 'net/http'
+require 'json'
+
+class Geo
+  GEO_LOCATION_SERVICE_URL = "http://freegeoip.net/json/"
+
+  attr_reader :url
+
+  def initialize
+    @url = GEO_LOCATION_SERVICE_URL
+  end
+
+  def quote ip_address=nil
+    quote_url = ip_address ? "#{url}#{ip_address}" : url
+
+    uri = URI.parse(URI.escape(quote_url))
+
+    JSON.parse(Net::HTTP.get(uri))
+  end
+end

data/lib/meteo/meteo.rb

@@ -1,19 +1,24 @@
 require 'net/http'
+require 'json'
 
 class Meteo
-  OPEN_WEATHER_MAP_SERVICE_URL = 'http://api.openweathermap.org/data/2.5/weather'
+  OPEN_WEATHER_MAP_SERVICE_URL = 'http://api.openweathermap.org/data/2.5'
 
   attr_reader :url
 
-  def initialize
-    @url = OPEN_WEATHER_MAP_SERVICE_URL
+  def initialize(forecast=false)
+    if forecast
+      @url = "#{OPEN_WEATHER_MAP_SERVICE_URL}/forecast/daily"
+    else
+      @url = "#{OPEN_WEATHER_MAP_SERVICE_URL}/weather"
+    end
   end
 
   def quote location, units
-    quote_url = "#{url}?q=#{location}%20nj&units=#{units}"
+    quote_url = "#{url}?q=#{location}&units=#{units}"
 
     uri = URI.parse(URI.escape(quote_url))
 
-    Net::HTTP.get(uri)
+    JSON.parse(Net::HTTP.get(uri))
   end
 end

data/lib/meteo/meteo_cli.rb

@@ -1,10 +1,9 @@
 require "thor"
-require 'json'
-require 'meteo'
-require 'meteo/reporter'
+require 'meteo/meteo'
+require 'meteo/geo'
+require 'meteo/weather_reporter'
 
 class MeteoCLI < Thor
-  include Reporter
 
   desc "quote location", "quote weather for location"
   long_desc <<-LONGDESC
@@ -15,20 +14,23 @@ class MeteoCLI < Thor
 
     > $ meteo Plainsboro, NJ
     > $ meteo Moscow, RU --units=metric
+    > $ meteo # get weather for current location based on IP address
   LONGDESC
   option :units, :aliases => "-u"
+  option :forecast
   def quote(location)
+    location = (location.nil? or location.strip.size == 0) ? Geo.new.quote : location
+
     units = options[:units] ? options[:units] : "imperial"
+    forecast = options[:forecast] ? options[:forecast].to_i : 0
+
+    service = Meteo.new(forecast > 0)
 
-    service = Meteo.new
+    response = service.quote(location, units)
 
-    response = JSON.parse(service.quote(location, units))
+    reporter = WeatherReporter.new
 
-    if response["message"]
-      puts response["message"]
-    else
-      puts report(response, units).join(' ')
-    end
+    reporter.report(response, units, forecast)
   end
 
 end

data/lib/meteo/version.rb

@@ -1,3 +1,3 @@
 module Meteo
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/meteo/weather_reporter.rb

@@ -0,0 +1,147 @@
+# -*- encoding: utf-8 -*-
+
+require 'meteo/colors'
+require 'awesome_print'
+
+class WeatherReporter
+  include Colors
+
+  WIND_DIRECTIONS = %W(N NNE NE ENE E ESE SE SSE S SSW SW WSW W WNW NW NNW)
+
+  def report(response, units, forecast)
+    if forecast == 0
+      current_weather_report response, units
+    else
+      forecast_report response, units, forecast
+    end
+  end
+
+  def current_weather_report response, units
+    if response["message"]
+      puts response["message"]
+    else
+      sunrise = response['sys']['sunrise']
+      sunset = response['sys']['sunset']
+      pressure = response['main']['pressure']
+      city = response['name']
+      temperature = response['main']['temp']
+      humidity = response['main']['humidity']
+      sky = response['weather'][0]['main']
+      wind = response['wind']['speed']
+      azimuth = response['wind']['deg']
+
+      direction = WIND_DIRECTIONS[((azimuth + 11.25)/22.5 % 16).to_i]
+
+      result = %W(
+        #{background}#{text}#{get_icon(sky, current_period(sunset, sunrise))}#{dashes}#{text}
+        #{city} #{delimiter}#{data}
+        #{text}Temperature #{data}#{temperature}#{temperature_scale(units)}
+        #{text}Humidity #{data}#{humidity}%
+        #{text}Wind #{data}#{wind}#{speed_unit(units)} #{direction}
+        #{text}Pressure #{data}#{pressure(pressure, units)}#{pressure_unit(units)}
+        #{text}Sunrise #{data}#{Time.at(sunrise).strftime('%I:%M:%S%p')}
+        #{text}Sunset #{data}#{Time.at(sunset).strftime('%I:%M:%S%p')}#{stop}
+      )
+
+      puts result.join(' ')
+    end
+  end
+
+  def forecast_report response, units, forecast
+    city = response['city']['name']
+
+    max_forecast = response['list'].size
+
+    forecast = (forecast <= max_forecast) ? forecast : max_forecast
+
+    puts "#{background}#{text}Forecast for #{city}:"
+
+    (0..forecast-1).each do |index|
+      day = response['list'][index]
+      sky = day['weather'][0]['main']
+      date = day['dt']
+      max = day['temp']['max']
+      min = day['temp']['min']
+      morning = day['temp']['morn']
+      evening = day['temp']['eve']
+      night = day['temp']['night']
+      humidity = day['humidity']
+      pressure = day['pressure']
+
+      wind = day['speed']
+      azimuth = day['deg']
+
+      direction = WIND_DIRECTIONS[((azimuth + 11.25)/22.5 % 16).to_i]
+
+      result = %W(
+        #{background}#{text}#{index+1}. #{get_icon(sky, 'none')}
+        #{data}#{Time.at(date).strftime('%Y/%m/%d')}
+        #{text}Temperature
+        #{text}min: #{data}#{min}#{temperature_scale(units)}
+        #{text}max: #{data}#{max}#{temperature_scale(units)}
+        #{text}morning: #{data}#{morning}#{temperature_scale(units)}
+        #{text}evening: #{data}#{evening}#{temperature_scale(units)}
+        #{text}night: #{data}#{night}#{temperature_scale(units)}
+        #{text}Humidity #{data}#{humidity}%
+        #{text}Wind #{data}#{wind}#{speed_unit(units)} #{direction}
+        #{text}Pressure #{data}#{pressure(pressure, units)}#{pressure_unit(units)}#{stop}
+      )
+
+      puts result.join(' ')
+    end
+  end
+
+  def get_icon(sky, period)
+    name =
+    case sky
+      when 'Clear'
+        (period == "night") ? moon : sun
+
+      when 'Clouds'
+        clouds
+
+      when 'Rain'
+        rain
+
+      when 'Fog'
+        fog
+
+      when 'Snow'
+        snow
+
+      when 'Thunderstorm'
+        thunderstorm
+
+      else
+        (period == "night") ? moon : sun
+    end
+  end
+
+  def current_period
+    current_time = Time.now.to_i
+
+    if current_time >= sunset or current_time <= sunrise
+      'night'
+    else
+      'day'
+    end
+  end
+
+  def temperature_scale units
+    (units == 'metric') ? "°C" : "°F"
+  end
+
+  def speed_unit units
+    (units == 'metric') ? "m/s" : "mph"
+  end
+
+  def pressure_unit units
+    (units == 'metric') ? "hPa" : "inHg"
+  end
+
+  def pressure pressure, units
+    (units == 'metric') ? sprintf('%.0f', pressure) : sprintf('%.2f', pressure*0.0295)
+  end
+end
+
+

data/meteo.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/meteo/version')
+
+Gem::Specification.new do |spec|
+    spec.name          = "meteo"
+    spec.summary       = %q{Provides command line access to OpenWeatherMap service.}
+    spec.description   = %q{Provides command line access to OpenWeatherMap service.}
+    spec.email         = "alexander.shvets@gmail.com"
+    spec.authors       = ["Alexander Shvets"]
+    spec.homepage      = "http://github.com/shvets/meteo"
+    spec.executables   = ["meteo"]
+
+    spec.files         = `git ls-files`.split($\)
+    spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+    spec.require_paths = ["lib"]
+    spec.version       = Meteo::VERSION
+    spec.license       = "MIT"
+
+    
+  spec.add_runtime_dependency "thor", [">= 0"]
+  spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
+  spec.add_development_dependency "gemcutter", [">= 0"]
+
+end
+

data/spec/geo_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'meteo/geo'
+
+describe Geo do
+  describe "#quote" do
+    it "gets the quote" do
+      result = subject.quote("apple.com")
+
+      expect(result['city']).to eq("Cupertino")
+      expect(result['country_code']).to eq("US")
+    end
+  end
+
+end

data/spec/meteo_spec.rb

@@ -1,15 +1,11 @@
-# meteo_spec.rb
-
 require File.dirname(__FILE__) + '/spec_helper'
 
-require 'meteo'
-require 'json'
-#require 'awesome_print'
+require 'meteo/meteo'
 
 describe Meteo do
   describe "#quote" do
     it "gets the quote" do
-      result = JSON.parse(subject.quote("plainsboro, nj", "imperial"))
+      result = subject.quote("plainsboro, nj", "imperial")
 
       expect(result['sys']['country']).to eq("United States of America")
     end

data/spec/spec_helper.rb

@@ -1 +1,3 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'awesome_print'

data/spec/weather_reporter_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'meteo/weather_reporter'
+
+describe WeatherReporter do
+  it 'has expected meteo status instance methods' do
+    %w[fog rain moon sun clouds thunderstorm].each do |status|
+      subject.methods.should include(status.to_sym)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meteo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -60,6 +60,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .idea/.name
+- .idea/.rakeTasks
+- .idea/encodings.xml
+- .idea/meteo.iml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
+- .idea/workspace.xml
 - .ruby-gemset
 - .ruby-version
 - CHANGES
@@ -70,13 +79,18 @@ files:
 - bin/meteo
 - bin/meteo.bat
 - lib/meteo.rb
+- lib/meteo/colors.rb
+- lib/meteo/geo.rb
 - lib/meteo/meteo.rb
 - lib/meteo/meteo_cli.rb
-- lib/meteo/reporter.rb
 - lib/meteo/version.rb
+- lib/meteo/weather_reporter.rb
+- meteo.gemspec
 - meteo.gemspec.erb
+- spec/geo_spec.rb
 - spec/meteo_spec.rb
 - spec/spec_helper.rb
+- spec/weather_reporter_spec.rb
 homepage: http://github.com/shvets/meteo
 licenses:
 - MIT
@@ -102,5 +116,7 @@ signing_key:
 specification_version: 4
 summary: Provides command line access to OpenWeatherMap service.
 test_files:
+- spec/geo_spec.rb
 - spec/meteo_spec.rb
 - spec/spec_helper.rb
+- spec/weather_reporter_spec.rb