weatheruby 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7787ec777c7e28c511d3afb014c0e89adaf18652
-  data.tar.gz: 61ab8ab8949b5d85605db19177d535bcad195b9b
+  metadata.gz: 080f4dae1ac613cf073d26a558b44df9c9e8cc60
+  data.tar.gz: f222373bc209df14fb962f995ab6a102151670e5
 SHA512:
-  metadata.gz: a0a0573dcd72d6986343a7fff63cae502b0d77736bfa73d3a12a7758f4b9688efd4c25860b66f1cb4cc40edced7fc7406260ab021bec698d274a5597c695a9cc
-  data.tar.gz: 80b259e9c15493c1d88970fce879f5ad19082968313866d17260a765305ac5d5e5cc9527ffb3c65ae5946dcda2774cca3c8423e8f03b56a5d3dbfddd19ba75ce
+  metadata.gz: 488fd79edc6c949452c50754a0e24d7598a311f20a969279cbe8bbc02541b09d9b6fcf40c797cb879be6967a43f2eed98f9e0ede18cd1ea6c116ac428db47a9c
+  data.tar.gz: 4a5d071ac7d746646c927f479165970bd3e813ab4e9229c200a3b4c3c0e550f1e4a3a0c833bc3e1f51b0e80abc272d0e5263820bfaac48def1249c43baae1baa

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 ## Version 0
+### Version 0.4.0
+* New weatheruby executable.
+* Fail when there are many results and it cannot get actual data.
+* Many style fixes.
+
 ### Version 0.3.1
 * Fix forecast names to 10day, and made it apparent in documentation that the non-10 day methods are only for the next 3 days.
 

data/bin/weatheruby

@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+path = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(path)
+
+require 'rainbow'
+require 'string-utility'
+require_relative '../lib/weatheruby'
+
+fail ArgumentError if ARGV.empty?
+
+@args = {
+  help: false,
+  verbose: false,
+  token: nil,
+  location: nil,
+  language: 'EN'
+}
+
+usage = 'Usage: weatheruby [t] token [-l] [-j] languagecode [-v] [-h]'
+help = "-h, --help       Show helpful information about Weatheruby usage\n" \
+       "-v, --verbose    Output verbose errors\n" \
+       "-t, --token      The token to log in as\n" \
+       "-l, --location   The location to get weather data for\n" \
+       '-j, --language   The language code to use'
+
+ARGV.each do |arg|
+  case arg
+  when '-t', '--token' then @args[:token] = ARGV.at(ARGV.index(arg) + 1)
+  when '-h', '--help' then @args[:help] = true
+  when '-l', '--location' then @args[:location] = ARGV.at(ARGV.index(arg) + 1)
+  when '-v', '--verbose' then @args[:verbose] = true
+  when '-j', '--language' then @args[:language] = ARGV.at(ARGV.index(arg) + 1)
+  end
+end
+
+if @args[:help]
+  puts usage
+  puts help
+  exit
+end
+
+if @args[:token].nil? || @args[:location].nil?
+  puts usage
+  exit
+end
+
+client = Weatheruby.new(@args[:token],
+                        @args[:language],
+                        true,
+                        true,
+                        @args[:verbose])
+
+conditions = client.conditions(@args[:location])
+moon = client.moon_phase(@args[:location])
+alerts = client.alerts(@args[:location])
+forecast = client.simple_forecast_10day(@args[:location])
+
+location = Rainbow(@args[:location]).color(StringUtility.random_color_six)
+updated = Rainbow(conditions[:updated]).magenta
+weather = Rainbow(conditions[:weather]).color(StringUtility.random_color_six)
+temp = Rainbow(conditions[:formatted_temperature].to_s).cyan
+humidity = Rainbow(conditions[:humidity].to_s).cyan
+wind = Rainbow(conditions[:formatted_wind]).green
+feels = Rainbow(conditions[:formatted_feelslike]).yellow
+age = Rainbow(moon[:age].to_s).white
+illum = Rainbow("#{moon[:illumination]} %").white
+
+puts "Getting weather data for #{location}"
+puts updated
+puts weather
+puts temp
+puts feels
+puts "Humidity: #{humidity} %"
+puts wind
+alerts.each do |a|
+  alert = Rainbow(a[:description]).red.bright + ' until ' +
+          Rainbow(a[:expires]).red.bright
+  puts alert
+end
+puts "Moon phase: #{age}"
+puts "Moon illumination: #{illum}"
+
+puts '* BEGIN 10 DAY FORECAST *'
+20.times do |i|
+  d = Rainbow(forecast[i][:weekday_name]).color(StringUtility.random_color_six)
+  puts "#{d}: #{forecast[i][:text]}"
+end

data/lib/weather/actions.rb

@@ -12,11 +12,11 @@ module Weather
         count = 0
         response['alerts'].each do |a|
           ret[count] = {
-            :type => a['type'],
-            :description => a['description'],
-            :date => a['date'],
-            :expires => a['expires'],
-            :message => a['message'],
+            type: a['type'],
+            description: a['description'],
+            date: a['date'],
+            expires: a['expires'],
+            message: a['message']
           }
           count += 1
         end
@@ -64,26 +64,26 @@ module Weather
         display_location = current_observation['display_location']
 
         ret = {
-          :full_name => display_location['full'],
-          :city_name => display_location['city'],
-          :state_abbreviation => display_location['state'],
-          :state_name => display_location['state_name'],
-          :country => display_location['country'],
-          :zip_code => display_location['zip'].to_i,
-          :updated => current_observation['observation_time'],
-          :weather => current_observation['weather'],
-          :formatted_temperature => current_observation['temperature_string'],
-          :temperature_f => current_observation['temp_f'],
-          :temperature_c => current_observation['temp_c'],
-          :humidity => current_observation['relative_humidity'],
-          :formatted_wind => current_observation['wind_string'],
-          :wind_direction => current_observation['wind_dir'],
-          :wind_degrees => current_observation['wind_degrees'],
-          :wind_speed => current_observation['wind_mph'],
-          :wind_gust_speed => current_observation['wind_gust_mph'].to_i,
-          :formatted_feelslike => current_observation['feelslike_string'],
-          :feelslike_f => current_observation['feelslike_f'].to_i,
-          :feelslike_c => current_observation['feelslike_c'].to_i
+          full_name: display_location['full'],
+          city_name: display_location['city'],
+          state_abbreviation: display_location['state'],
+          state_name: display_location['state_name'],
+          country: display_location['country'],
+          zip_code: display_location['zip'].to_i,
+          updated: current_observation['observation_time'],
+          weather: current_observation['weather'],
+          formatted_temperature: current_observation['temperature_string'],
+          temperature_f: current_observation['temp_f'],
+          temperature_c: current_observation['temp_c'],
+          humidity: current_observation['relative_humidity'],
+          formatted_wind: current_observation['wind_string'],
+          wind_direction: current_observation['wind_dir'],
+          wind_degrees: current_observation['wind_degrees'],
+          wind_speed: current_observation['wind_mph'],
+          wind_gust_speed: current_observation['wind_gust_mph'].to_i,
+          formatted_feelslike: current_observation['feelslike_string'],
+          feelslike_f: current_observation['feelslike_f'].to_i,
+          feelslike_c: current_observation['feelslike_c'].to_i
         }
 
         ret[:humidity] = ret[:humidity].sub('%', '').to_i
@@ -106,11 +106,11 @@ module Weather
 
       if response['response']['error'].nil?
         ret = {
-          :average_low_f => response['almanac']['temp_low']['normal']['F'].to_i,
-          :average_low_c => response['almanac']['temp_low']['normal']['C'].to_i,
-          :record_year => response['almanac']['temp_low']['recordyear'].to_i,
-          :record_low_f => response['almanac']['temp_low']['record']['F'].to_i,
-          :record_low_c => response['almanac']['temp_low']['record']['C'].to_i
+          average_low_f: response['almanac']['temp_low']['normal']['F'].to_i,
+          average_low_c: response['almanac']['temp_low']['normal']['C'].to_i,
+          record_year: response['almanac']['temp_low']['recordyear'].to_i,
+          record_low_f: response['almanac']['temp_low']['record']['F'].to_i,
+          record_low_c: response['almanac']['temp_low']['record']['C'].to_i
         }
 
         ret
@@ -131,11 +131,11 @@ module Weather
 
       if response['response']['error'].nil?
         ret = {
-          :average_high_f => response['almanac']['temp_high']['normal']['F'].to_i,
-          :average_high_c => response['almanac']['temp_high']['normal']['C'].to_i,
-          :record_year => response['almanac']['temp_high']['recordyear'].to_i,
-          :record_high_f => response['almanac']['temp_high']['record']['F'].to_i,
-          :record_high_c => response['almanac']['temp_high']['record']['C'].to_i
+          average_high_f: response['almanac']['temp_high']['normal']['F'].to_i,
+          average_high_c: response['almanac']['temp_high']['normal']['C'].to_i,
+          record_year: response['almanac']['temp_high']['recordyear'].to_i,
+          record_high_f: response['almanac']['temp_high']['record']['F'].to_i,
+          record_high_c: response['almanac']['temp_high']['record']['C'].to_i
         }
 
         ret
@@ -158,16 +158,16 @@ module Weather
         ret = {}
         response['currenthurricane'].each do |h|
           ret[h['stormInfo']['stormName_Nice']] = {
-            :name => h['stormInfo']['stormName'],
-            :number => h['stormInfo']['stormNumber'],
-            :category => h['Current']['Category'],
-            :time => h['Current']['Time']['pretty'],
-            :wind_speed_mph => h['Current']['WindSpeed']['Mph'],
-            :wind_speed_kts => h['Current']['WindSpeed']['Kts'],
-            :wind_speed_kph => h['Current']['WindSpeed']['Kph'],
-            :gust_speed_mph => h['Current']['WindGust']['Mph'],
-            :gust_speed_kts => h['Current']['WindGust']['Kts'],
-            :gust_speed_kph => h['Current']['WindGust']['Kph'],
+            name: h['stormInfo']['stormName'],
+            number: h['stormInfo']['stormNumber'],
+            category: h['Current']['Category'],
+            time: h['Current']['Time']['pretty'],
+            wind_speed_mph: h['Current']['WindSpeed']['Mph'],
+            wind_speed_kts: h['Current']['WindSpeed']['Kts'],
+            wind_speed_kph: h['Current']['WindSpeed']['Kph'],
+            gust_speed_mph: h['Current']['WindGust']['Mph'],
+            gust_speed_kts: h['Current']['WindGust']['Kts'],
+            gust_speed_kph: h['Current']['WindGust']['Kph']
           }
         end
 
@@ -191,7 +191,7 @@ module Weather
     def simple_forecast(location)
       response = get('forecast', location)
 
-      return parse_simple_forecast(response)
+      parse_simple_forecast(response)
     end
 
     # Gets more complicated forecast information for the location. Only gets
@@ -205,7 +205,7 @@ module Weather
     def complex_forecast(location)
       response = get('forecast', location)
 
-      return parse_complex_forecast(response)
+      parse_complex_forecast(response)
     end
 
     # Exactly the same as #simple_forecast, except that it gets the data for
@@ -213,7 +213,7 @@ module Weather
     def simple_forecast_10day(location)
       response = get('forecast10day', location)
 
-      return parse_simple_forecast(response)
+      parse_simple_forecast(response)
     end
 
     # Exactly the same as #complex_forecast, except that it gets the data for
@@ -221,10 +221,11 @@ module Weather
     def complex_forecast_10day(location)
       response = get('forecast10day', location)
 
-      return parse_complex_forecast(response)
+      parse_complex_forecast(response)
     end
 
     private
+
     # Parses the simple forecast information.
     def parse_simple_forecast(response)
       if response['response']['error'].nil?
@@ -232,9 +233,9 @@ module Weather
 
         response['forecast']['txt_forecast']['forecastday'].each do |f|
           ret[f['period']] = {
-            :weekday_name => f['title'],
-            :text => f['fcttext'],
-            :text_metric => f['fcttext_metric']
+            weekday_name: f['title'],
+            text: f['fcttext'],
+            text_metric: f['fcttext_metric']
           }
         end
 
@@ -255,36 +256,36 @@ module Weather
 
         response['forecast']['simpleforecast']['forecastday'].each do |f|
           ret[f['period'] - 1] = {
-            :high_f => f['high']['fahrenheit'].to_i,
-            :high_c => f['high']['celsius'].to_i,
-            :low_f => f['low']['fahrenheit'].to_i,
-            :low_c => f['low']['celsius'].to_i,
-            :conditions => f['conditions'].to_i,
-            :snow => {
-              :snow_total_in => f['snow_allday']['in'],
-              :snow_total_cm => f['snow_allday']['cm'],
-              :snow_night_in => f['snow_night']['in'],
-              :snow_night_cm => f['snow_night']['cm'],
-              :snow_day_in => f['snow_day']['in'],
-              :snow_day_cm => f['snow_day']['cm']
+            high_f: f['high']['fahrenheit'].to_i,
+            high_c: f['high']['celsius'].to_i,
+            low_f: f['low']['fahrenheit'].to_i,
+            low_c: f['low']['celsius'].to_i,
+            conditions: f['conditions'].to_i,
+            snow: {
+              snow_total_in: f['snow_allday']['in'],
+              snow_total_cm: f['snow_allday']['cm'],
+              snow_night_in: f['snow_night']['in'],
+              snow_night_cm: f['snow_night']['cm'],
+              snow_day_in: f['snow_day']['in'],
+              snow_day_cm: f['snow_day']['cm']
             },
-            :quantative_precipitation => {
-              :qpf_total_in => f['qpf_allday']['in'],
-              :qpf_total_cm => f['qpf_allday']['cm'],
-              :qpf_night_in => f['qpf_night']['in'],
-              :qpf_night_cm => f['qpf_night']['cm'],
-              :qpf_day_in => f['qpf_day']['in'],
-              :qpf_day_cm => f['qpf_day']['cm']
+            quantative_precipitation: {
+              qpf_total_in: f['qpf_allday']['in'],
+              qpf_total_cm: f['qpf_allday']['cm'],
+              qpf_night_in: f['qpf_night']['in'],
+              qpf_night_cm: f['qpf_night']['cm'],
+              qpf_day_in: f['qpf_day']['in'],
+              qpf_day_cm: f['qpf_day']['cm']
             },
-            :wind => {
-              :average_mph => f['avewind']['mph'],
-              :average_kph => f['avewind']['kph'],
-              :average_dir => f['avewind']['dir'],
-              :average_temp => f['avewind']['degrees'],
-              :max_mph => f['maxwind']['mph'],
-              :max_kph => f['maxwind']['kph'],
-              :max_dir => f['maxwind']['dir'],
-              :max_temp => f['maxwind']['degrees']
+            wind: {
+              average_mph: f['avewind']['mph'],
+              average_kph: f['avewind']['kph'],
+              average_dir: f['avewind']['dir'],
+              average_temp: f['avewind']['degrees'],
+              max_mph: f['maxwind']['mph'],
+              max_kph: f['maxwind']['kph'],
+              max_dir: f['maxwind']['dir'],
+              max_temp: f['maxwind']['degrees']
             }
           }
         end

data/lib/weatheruby.rb

@@ -1,6 +1,7 @@
 require 'httpclient'
 require 'json'
 require_relative 'weather/actions'
+require_relative 'weather/exceptions'
 
 class Weatheruby
   include Weather::Actions
@@ -38,10 +39,13 @@ class Weatheruby
     url = URI.encode(url)
     uri = URI.parse(url)
     res = @client.get(uri)
+    json = JSON.parse(res.body)
+    unless json['response']['results'].nil?
+      fail Weather::Exceptions::TooManyResultsError
+    end
 
     if autoparse
-      return JSON.parse(res.body)
-      # puts JSON.parse(res.body)
+      return json
     else
       return res
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weatheruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Eli Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -24,13 +24,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: string-utility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Accessing the Weather Underground API through HTTPClient.
 email: elifosterwy@gmail.com
-executables: []
+executables:
+- weatheruby
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- bin/weatheruby
 - lib/weather/actions.rb
 - lib/weatheruby.rb
 homepage: https://github.com/elifoster/weatheruby
@@ -59,3 +89,4 @@ signing_key:
 specification_version: 4
 summary: A Ruby gem for accessing the Weather Underground API.
 test_files: []
+has_rdoc: