lita-your-weather 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac0924448f551a9a15954bdf9149c3e2e8967eaf
-  data.tar.gz: 7f7197292d6e14cf367cbe1895192042d9d716ef
+SHA256:
+  metadata.gz: 4e57dcc3d134994c806990317845e133b496ebeb489e55a17f2bae5e409612da
+  data.tar.gz: e64c837d034d8b965f3b871aad4cfdd44d45b54f9d9f9de6084cb9030fa205aa
 SHA512:
-  metadata.gz: f0a3d581ad907eae85eb1e8577e22d7d651de2b9a8bd2633353052135fbcb4b78b226aaabe2e020b18237b34e4ca451b4e23bcf62f203d594405c89906790220
-  data.tar.gz: 6c71461cbda2f26873fd54cc27560035dac4335c0cd9b0fdef621cfd358abc5db0adfb120df7bd4cfa9eaa3f90fb2eb4b03ab69facbced8aa9d5082ac0085e89
+  metadata.gz: 7fc95e02bbe0a390563043aaac24e0d29f3d65054a71770f4b8f1ff1f8a71245a3cbd1eaa44b583464f61698f9c813af1191ab7d05b4151ade2bdbb82f177fa7
+  data.tar.gz: 5bbfa9bb99dff03bf3b1ce1e364f44f79bd2fb980a3ff988195b7f858fedb7be1f29b79ff16749644176951cf6ff8ffa9089876dbc145d703fbbf30666eb6b54

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.2.3
+services:
+  - redis-server

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+## [0.0.5] - Unreleased
+### Added
+- Added weather icon for current weather
+
+### Changed
+- Separated images to new command `lita weather i <location>`
+
+### Fixed
+- Bug forecast broken in non default locations. Thx @ben-tinc
+
+## [0.0.4] - 2017-01-13
+### Fixed
+- Bug calling multiple weather methods
+
+## [0.0.3] - 2017-01-13
+### Added
+- `lita` command required
+
+## [0.0.2] - 2017-01-12
+### Added
+- Images added of Edmonton, AB, Canada
+- Added `weather <location>` command
+
+## 0.0.1 - 2016-11-21
+### Added
+- Initial release
+- Added `weather c <location> and weather f <location>` for current weather and 7-day forecast
+- `lita` command not required

data/README.md

@@ -7,9 +7,9 @@ lita-your-weather provides the ability to ask for the current weather conditions
 Add lita-your-weather to your Lita instance's Gemfile:
 
 ``` ruby
-gem "lita-your-weather"
+gem 'lita-your-weather'
 ```
-$ bundle install
+`$ bundle install`
 
 ## Configuration
 
@@ -25,12 +25,19 @@ config.handlers.your_weather.api_key = 'www.apixu.com Api Key'
 
 Commands include:
 
-<!-- For current weather of default location -->
-$ lita weather or $ lita weather c
-<!-- For current weather of specified location-->
-$ lita weather c Your_Location,Your_State,Your_Country
+<!-- Current weather of default location -->
+`$ lita weather`
 
-<!-- For weather forecast of default location-->
-$ lita weather f
-<!-- For weather forecast of specified location-->
-$ lita weather f Your_Location,Your_State,Your_Country
+`$ lita weather c`
+<!-- Current weather of specified location-->
+`$ lita weather c <location>`
+
+<!-- Weather forecast of default location-->
+`$ lita weather f`
+<!-- Weather forecast of specified location-->
+`$ lita weather f <location>`
+
+<!-- Weather images from default location-->
+`$ lita weather i <location>`
+<!-- Weather images-->
+`$ lita weather i <location>`

data/Rakefile

@@ -1,5 +1,7 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/lita-your-weather.rb

@@ -1,12 +1,14 @@
-require "lita"
+# frozen_string_literal: true
+
+require 'lita'
 
 Lita.load_locales Dir[File.expand_path(
-  File.join("..", "..", "locales", "*.yml"), __FILE__
+  File.join('..', '..', 'locales', '*.yml'), __FILE__
 )]
 
-require "lita/handlers/your_weather"
+require 'lita/handlers/your_weather'
 
 Lita::Handlers::YourWeather.template_root File.expand_path(
-  File.join("..", "..", "templates"),
- __FILE__
+  File.join('..', '..', 'templates'),
+  __FILE__
 )

data/lib/lita/handlers/your_weather.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Lita
@@ -11,49 +13,49 @@ module Lita
       config :api_key, type: String, required: true
 
       # Routes
-      route(/^weather\s?[c?|f?]?\s?(.*)/, :weather, command: true, help: { "lita weather CITY,STATE,COUNTRY or lita weather CITY,STATE,COUNTRY or lita weather f CITY,STATE,COUNTRY" => "Responds with the specified city's current weather or forecast." })
+      route(/^weather\s?[c?|f?|i?]?\s?(.*)/, :weather, command: true, help: { 'lita weather CITY,STATE,COUNTRY or lita weather c CITY,STATE,COUNTRY or lita weather f CITY,STATE,COUNTRY' => "Responds with the specified city's current weather or 7-day forecast." })
 
       # Current Weather
       def weather(response)
-          location = get_location(response.matches[0][0])
-
-          if response.message.body.eql? 'weather f'
-            data = request('/forecast.json?key=' + config.api_key + '&days=7', location)
-          else
-            data = request('/current.json?key=' + config.api_key , location)
+        location = get_location(response.matches[0][0])
+
+        if response.message.body.include? 'weather f'
+          data = request('/forecast.json?key=' + config.api_key + '&days=7', location)
+        elsif response.message.body.include? 'weather i'
+          if location.downcase.include? 'edmonton,alberta'
+            response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-ne.jpg')
+            response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-nw.jpg')
+            response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-w.jpg')
           end
+        else
+          data = request('/current.json?key=' + config.api_key, location)
+        end
 
-          if data['error']
-            response.reply('Error: ' + data['error']['message'])
-          else
-            if response.message.body.eql? 'weather f'
-              response.reply('The forecast for ' + data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ':')
-              data['forecast']['forecastday'].each do |object|
-                response.reply('On ' + object['date'] + ' forecasted is a high of ' +  object['day']['maxtemp_c'].to_s + "\xC2\xB0" + 'C' + ' and a low of ' + object['day']['mintemp_c'].to_s + "\xC2\xB0" + 'C It is expected to be ' + object['day']['condition']['text'] )
-              end
-            else
-              response.reply( data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ' currently is ' +  data['current']['condition']['text'] + ' and ' + data['current']['temp_c'].to_s + "\xC2\xB0" + 'C. It feels like ' + data['current']['feelslike_c'].to_s  + "\xC2\xB0" + 'C' )
-              if location.downcase.include? "edmonton"
-                response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-ne.jpg')
-                response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-nw.jpg')
-                response.reply('https://ssl.eas.ualberta.ca/sitecore/camera/live/camera-w.jpg')
-              end
+        unless data.nil?
+          return response.reply('Error: ' + data['error']['message']) if data['error']
+
+          if response.message.body.include? 'weather f'
+            response.reply('The forecast for ' + data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ':')
+            data['forecast']['forecastday'].each do |object|
+              response.reply('On ' + object['date'] + ' forecasted is a high of ' + object['day']['maxtemp_c'].to_s + "\xC2\xB0" + 'C' + ' and a low of ' + object['day']['mintemp_c'].to_s + "\xC2\xB0" + 'C It is expected to be ' + object['day']['condition']['text'])
             end
+          else
+            response.reply('http:' + data['current']['condition']['icon'])
+            response.reply(data['location']['name'] + ', ' + data['location']['region'] + ', ' + data['location']['country'] + ' currently is ' + data['current']['condition']['text'] + ' and ' + data['current']['temp_c'].to_s + "\xC2\xB0" + 'C. It feels like ' + data['current']['feelslike_c'].to_s + "\xC2\xB0" + 'C')
           end
+        end
       end
 
       # Get location
       def get_location(location)
-        if location.eql? ''
-          location = config.default_location
-        end
+        location = config.default_location if location.eql? ''
         location
       end
 
       # Request method
       def request(url, location)
-        http_response = http.get( URL + url, q: location)
-        return JSON.parse(http_response.body)
+        http_response = http.get(URL + url, q: location)
+        JSON.parse(http_response.body)
       end
     end
   end

data/lita-your-weather.gemspec

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |spec|
-  spec.name          = "lita-your-weather"
-  spec.version       = "0.0.4"
-  spec.authors       = ["Zoie Carnegie"]
-  spec.email         = ["zoie.carnegie@gmail.com"]
-  spec.description   = "lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast."
-  spec.summary       = "lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast."
-  spec.homepage      = "http://zoiecarnegie.com"
-  spec.license       = "MIT"
-  spec.metadata      = { "lita_plugin_type" => "handler" }
+  spec.name          = 'lita-your-weather'
+  spec.version       = '0.0.5'
+  spec.authors       = ['Zoie Carnegie']
+  spec.email         = ['zoie.carnegie@gmail.com']
+  spec.description   = 'lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast.'
+  spec.summary       = 'lita-your-weather provides the ability to ask for the current weather conditions or for a 7 day forecast.'
+  spec.homepage      = 'http://zoiecarnegie.com'
+  spec.license       = 'MIT'
+  spec.metadata      = { 'lita_plugin_type' => 'handler' }
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "lita", ">= 4.7"
+  spec.add_runtime_dependency 'lita', '>= 4.7'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
 end

data/spec/lita/handlers/your_weather_spec.rb

@@ -1,28 +1,33 @@
-require "spec_helper"
+# frozen_string_literal: true
+
+require 'spec_helper'
 
 describe Lita::Handlers::YourWeather, lita_handler: true do
+  it 'will route lita weather to the weather method' do
+    is_expected.to route('lita weather').to(:weather)
+  end
 
-  it "will route lita weather to the weather method" do
-    is_expected.to_not route("weather").to(:weather)
+  it 'will route lita weather c to the weather method' do
+    is_expected.to route('lita weather c').to(:weather)
   end
 
-  it "will route lita weather c to the weather method" do
-    is_expected.to_not route("weather c").to(:weather)
+  it 'will route lita weather f to the weather method' do
+    is_expected.to route('lita weather f').to(:weather)
   end
 
-  it "will route lita weather f to the weather method" do
-    is_expected.to_not route("weather f").to(:weather)
+  it 'will route lita weather i to the weather method' do
+    is_expected.to route('lita weather i').to(:weather)
   end
 
-  it "will not route weather" do
-    is_expected.to_not route("weather")
+  it 'will not route weather' do
+    is_expected.to_not route('weather')
   end
 
-  it "will not route weather c" do
-    is_expected.to_not route("weather c")
+  it 'will not route weather c' do
+    is_expected.to_not route('weather c')
   end
 
-  it "will not route weather f" do
-    is_expected.to_not route("weather f")
+  it 'will not route weather f' do
+    is_expected.to_not route('weather f')
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require "lita-your-weather"
-require "lita/rspec"
+# frozen_string_literal: true
+
+require 'lita-your-weather'
+require 'lita/rspec'
 
 # A compatibility mode is provided for older plugins upgrading from Lita 3. Since this plugin
 # was generated with Lita 4, the compatibility mode should be left disabled.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-your-weather
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Zoie Carnegie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,6 +103,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -134,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: lita-your-weather provides the ability to ask for the current weather conditions