cinch-weatherman 1.0.4 → 1.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 5887b5ac74948b0a81ea55a1a21ec3b876ea1e00
+  data.tar.gz: 83a86b0fb6e5444eb8814c349598229c44689a45
+SHA512:
+  metadata.gz: 3c41fb98aa1b1d2f10fcb331dab583c70421bf4d349211a2925212703d2f6b64c05d58ade4311349798bcb0941433accbb247740f386ddd68428ab915ed5d366
+  data.tar.gz: c13abb6865d09d2491f3d23612555065f55812391e8e34cf4e3062aa7959073a9a3809312ed80a5c44874e9308b405018e47ce7caf4f940a59b4d1fa8144340c

data/.travis.yml

@@ -1,4 +1,23 @@
 language: ruby
+env:
+  global:
+    - "JRUBY_OPTS=-Xcext.enabled=true"
 rvm:
-  - 1.9.2
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - jruby-18mode
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
+  - ree
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: ree
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+  fast_finish: true

data/cinch-weatherman.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency  'rake'
-  gem.add_development_dependency  'rspec'
-  gem.add_development_dependency  'coveralls'
-  gem.add_development_dependency  'cinch-test'
-
-  gem.add_dependency              'cinch',                 '~> 2.0.12'
-  gem.add_dependency              'weather-underground',   '~> 1.1.1'
-  gem.add_dependency              'time-lord',             '~> 1.0.1'
-  gem.add_dependency              'cinch-cooldown',        '~> 1.1.1'
-end 
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'coveralls', '~> 0.7'
+  gem.add_development_dependency 'cinch-test', '~> 0.1', '>= 0.1.0'
+  gem.add_dependency 'cinch', '~> 2'
+  gem.add_dependency 'cinch-cooldown', '~> 1.1', '>= 1.1.1'
+  gem.add_dependency 'weather-underground',   '~> 1.1', '>= 1.1.1'
+  gem.add_dependency 'time-lord', '~> 1.0', '>= 1.0.1'
+end

data/lib/cinch/plugins/weatherman.rb

@@ -4,45 +4,53 @@ require 'cinch/cooldown'
 require 'time-lord'
 require 'weather-underground'
 
-module Cinch::Plugins
-  # Cinch Plugin to report weather
-  class Weatherman
-    include Cinch::Plugin
-
-    enforce_cooldown
-
-    self.help = 'Use .w <location> to see information on the weather.'
-
-    def initialize(*args)
-      super
-      @append = config[:append_forecast] || false
-    end
-
-    match(/(?:w|weather) (.+)/, method: :weather)
-    match(/forecast (.+)/,      method: :forecast)
-
-    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)
-      weather = Weather.new(query).to_s
-      weather << " #{Forecast.new(query).append}" if true
-      weather
-    rescue ArgumentError
-      "Sorry, couldn't find #{query}."
-    end
-
-    def get_forecast(query)
-      Forecast.new(query).to_s
-    rescue ArgumentError
-      "Sorry, couldn't find #{query}."
+module Cinch
+  module Plugins
+    # Cinch Plugin to report weather
+    class Weatherman
+      include Cinch::Plugin
+
+      enforce_cooldown
+
+      self.help = 'Use .w <location> to see information on the weather.'
+
+      def initialize(*args)
+        super
+        @append =
+          if config.key?(:append_forecast)
+            config[:append_forecast]
+          else
+            false
+          end
+      end
+
+      match(/(?:w|weather) (.+)/, method: :weather)
+      match(/forecast (.+)/,      method: :forecast)
+
+      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)
+        weather = Weather.new(query).to_s
+        weather << " #{Forecast.new(query).append}" if @append
+        debug "#{@append.to_s}  #{config}"
+        weather
+      rescue ArgumentError
+        "Sorry, couldn't find #{query}."
+      end
+
+      def get_forecast(query)
+        Forecast.new(query).to_s
+      rescue ArgumentError
+        "Sorry, couldn't find #{query}."
+      end
     end
   end
 end

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

@@ -1,24 +1,28 @@
 # -*- 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
+module Cinch
+  module Plugins
+    class Weatherman
+      # Class to manage information on future conditions
+      class Forecast
+        def initialize(location)
+          @data = WeatherUnderground::Base.new.SimpleForecast(location).days[1]
 
-      def to_s
-        "Tommorrow in #{@location}; #{@forecast}, " +
-        "high of #{@temp_high}F, low of #{@temp_low}F."
-      end
+          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}", '')
+        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.4'
+      VERSION = '1.0.5'
     end
   end
 end

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

@@ -1,21 +1,23 @@
 # -*- coding: utf-8 -*-
-module Cinch::Plugins
-  class Weatherman
-    class Weather
-      attr_reader :location
+module Cinch
+  module Plugins
+    class Weatherman
+      # Class to manage information for current conditions
+      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 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})."
+        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

@@ -11,40 +11,40 @@ describe Cinch::Plugins::Weatherman do
   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')
+      expect(get_replies(msg).last.text)
+       .to 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')
+      expect(get_replies(msg).last.text)
+       .to 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/)
+      expect(get_replies(msg).last.text)
+        .to 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')
+      expect(get_replies(msg).last.text)
+       .to 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.')
+      expect(get_replies(msg).last.text)
+       .to 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;')
+      msg = make_message(bot, '!weather 94062')
+      message = get_replies(msg).last.text
+      expect(message).to include('In Redwood City, CA it is')
+      expect(message).to include('Tommorrow;')
     end
 
   end
@@ -52,32 +52,32 @@ describe Cinch::Plugins::Weatherman do
   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;')
+      expect(get_replies(msg).last.text)
+       .to 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;')
+      expect(get_replies(msg).last.text)
+       .to 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;')
+      expect(get_replies(msg).last.text)
+       .to 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.')
+      expect(get_replies(msg).last.text)
+       .to 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/)
+      expect(get_replies(msg).last.text)
+       .to match(/\d+F/)
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-weatherman
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.5
 platform: ruby
 authors:
 - Brian Haberer
@@ -10,136 +9,144 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: cinch-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: weather-underground
+  name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: time-lord
+  name: weather-underground
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: cinch-cooldown
+  name: time-lord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Cinch Plugin to get Weather data using the Weather-Underground gem
 email:
 - bhaberer@gmail.com
@@ -164,29 +171,27 @@ files:
 homepage: https://github.com/canonical-hackers/cinch-weatherman
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cinch Plugin to get Weather data
 test_files:
 - spec/cinch-weatherman_spec.rb
 - spec/spec_helper.rb
-has_rdoc: