cinch-weatherman 1.0.3 → 1.0.4

data/lib/cinch-weatherman.rb

@@ -1,3 +1,5 @@
 # -*- encoding: utf-8 -*-
 require 'cinch/plugins/weatherman/version'
 require 'cinch/plugins/weatherman'
+require 'cinch/plugins/weatherman/forecast'
+require 'cinch/plugins/weatherman/weather'

data/lib/cinch/plugins/weatherman.rb

@@ -13,33 +13,36 @@ module Cinch::Plugins
 
     self.help = 'Use .w <location> to see information on the weather.'
 
-    match /(?:w|weather) (.+)/
+    def initialize(*args)
+      super
+      @append = config[:append_forecast] || false
+    end
+
+    match(/(?:w|weather) (.+)/, method: :weather)
+    match(/forecast (.+)/,      method: :forecast)
 
-    def execute(m, query)
+    def weather(m, query)
       m.reply get_weather(query)
     end
 
+    def forecast(m, query)
+      m.reply get_forecast(query)
+    end
+
     private
 
     def get_weather(query)
-      location, temp_f, conditions, updated = get_forcast(query)
-
-      message = "In #{location} it is #{conditions} "
-      message << "and #{temp_f}°F "
-      message << "(last updated about #{updated})"
-
-      message
+      weather = Weather.new(query).to_s
+      weather << " #{Forecast.new(query).append}" if true
+      weather
     rescue ArgumentError
       "Sorry, couldn't find #{query}."
     end
 
-    def get_forcast(query)
-      data = WeatherUnderground::Base.new.CurrentObservations(query)
-      weather = [data.display_location.first.full,
-                 data.temp_f,
-                 data.weather.downcase,
-                 Time.parse(data.observation_time).ago.to_words]
-      weather
+    def get_forecast(query)
+      Forecast.new(query).to_s
+    rescue ArgumentError
+      "Sorry, couldn't find #{query}."
     end
   end
 end

data/lib/cinch/plugins/weatherman/forecast.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+module Cinch::Plugins
+  class Weatherman
+    class Forecast
+      def initialize(location)
+        @data       = WeatherUnderground::Base.new
+                        .SimpleForecast(location).days[1]
+        fail ArgumentError if @data.nil?
+        @location   = Weather.new(location).location
+        @forecast   = @data.conditions.downcase
+        @temp_high  = @data.high.fahrenheit.round
+        @temp_low   = @data.low.fahrenheit.round
+      end
+
+      def to_s
+        "Tommorrow in #{@location}; #{@forecast}, " +
+        "high of #{@temp_high}F, low of #{@temp_low}F."
+      end
+
+      def append
+        to_s.gsub(" in #{@location}", '')
+      end
+    end
+  end
+end

data/lib/cinch/plugins/weatherman/version.rb

@@ -3,7 +3,7 @@ module Cinch
   module Plugins
     # Versioning Info
     class Weatherman
-      VERSION = '1.0.3'
+      VERSION = '1.0.4'
     end
   end
 end

data/lib/cinch/plugins/weatherman/weather.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module Cinch::Plugins
+  class Weatherman
+    class Weather
+      attr_reader :location
+
+      def initialize(location)
+        @data       = WeatherUnderground::Base.new
+                        .CurrentObservations(location)
+        @location   = @data.display_location.first.full
+        @temp       = @data.temp_f
+        @conditions = @data.weather.downcase
+        @updated    = Time.parse(@data.observation_time).ago.to_words
+      end
+
+      def to_s
+        "In #{@location} it is #{@conditions} " +
+        "and #{@temp}F (last updated about #{@updated})."
+      end
+    end
+  end
+end

data/spec/cinch-weatherman_spec.rb

@@ -8,27 +8,76 @@ describe Cinch::Plugins::Weatherman do
     @bot = make_bot(Cinch::Plugins::Weatherman)
   end
 
-  it 'should allow users to ask for weather by zip' do
-     msg = make_message(@bot, '!weather 94062')
-     get_replies(msg).last.text.
-      should include('In Redwood City, CA it is')
-  end
+  describe 'weather' do
+    it 'should allow users to ask for weather by zip' do
+      msg = make_message(@bot, '!weather 94062')
+      get_replies(msg).last.text
+       .should include('In Redwood City, CA it is')
+    end
 
-  it 'should allow users to ask for weather by city, state' do
-     msg = make_message(@bot, '!weather redwood city, ca')
-     get_replies(msg).last.text.
-      should include('In Redwood City, CA it is')
-  end
+    it 'should allow users to ask for weather by city, state' do
+      msg = make_message(@bot, '!weather redwood city, ca')
+      get_replies(msg).last.text
+       .should include('In Redwood City, CA it is')
+    end
+
+    it 'should return temps' do
+      msg = make_message(@bot, '!weather redwood city, ca')
+      get_replies(msg).last.text
+        .should match(/\d+F/)
+    end
+
+    it 'should allow users to ask for weather by airport code' do
+      msg = make_message(@bot, '!weather SFO')
+      get_replies(msg).last.text
+       .should include('In San Francisco International, CA it is')
+    end
+
+    it 'should return an error when location not found' do
+      msg = make_message(@bot, '!weather 34')
+      get_replies(msg).last.text
+       .should include('Sorry, couldn\'t find 34.')
+    end
+
+    it 'should allow users to append forecasts' do
+      bot = make_bot(Cinch::Plugins::Weatherman, { append_forecast: true })
+      msg = make_message(@bot, '!weather 94062')
+      message = get_replies(msg).first.text
+      message.should include('In Redwood City, CA it is')
+      message.should include('Tommorrow;')
+    end
 
-  it 'should allow users to ask for weather by airport code' do
-     msg = make_message(@bot, '!weather SFO')
-     get_replies(msg).last.text.
-      should include('In San Francisco International, CA it is')
   end
 
-  it 'should return an error when location not found' do
-     msg = make_message(@bot, '!weather 34')
-     get_replies(msg).last.text.
-      should include('Sorry, couldn\'t find 34.')
+  describe 'forecast' do
+    it 'should allow users to ask for forecast by zip' do
+      msg = make_message(@bot, '!forecast 94062')
+      get_replies(msg).last.text
+       .should include('Tommorrow in Redwood City, CA;')
+    end
+
+    it 'should allow users to ask for forecast by city, state' do
+      msg = make_message(@bot, '!forecast redwood city, ca')
+      get_replies(msg).last.text
+       .should include('Tommorrow in Redwood City, CA;')
+    end
+
+    it 'should allow users to ask for forecast by airport code' do
+      msg = make_message(@bot, '!forecast SFO')
+      get_replies(msg).last.text
+       .should include('Tommorrow in San Francisco International, CA;')
+    end
+
+    it 'should return an error when location not found' do
+      msg = make_message(@bot, '!forecast 34')
+      get_replies(msg).last.text
+       .should include('Sorry, couldn\'t find 34.')
+    end
+
+    it 'should return temps' do
+      msg = make_message(@bot, '!weather redwood city, ca')
+      get_replies(msg).last.text
+       .should match(/\d+F/)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
 require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 require 'cinch-weatherman'
 require 'cinch/test'
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-weatherman
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,7 +156,9 @@ files:
 - cinch-weatherman.gemspec
 - lib/cinch-weatherman.rb
 - lib/cinch/plugins/weatherman.rb
+- lib/cinch/plugins/weatherman/forecast.rb
 - lib/cinch/plugins/weatherman/version.rb
+- lib/cinch/plugins/weatherman/weather.rb
 - spec/cinch-weatherman_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/canonical-hackers/cinch-weatherman