weathercli 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4382e8b6b054419cb4f627c5d59260220e68d0
-  data.tar.gz: f45a6dca7648a0c0678d9b4c965dcafc3825a0e9
+  metadata.gz: cbf5af73f2cb6c2d22aa3534f88d903ab2c0e0a8
+  data.tar.gz: 68d0de76d757a9d9d484f1a2777f61ca22ab1a0b
 SHA512:
-  metadata.gz: ab2b19f5541792886c38e4e6650da8f222afb3312df7013d7bc557ac1f57391dd5f3ba5c6d045be404d204cd127d9505b393fe910148ddfd4be77cf77157f6f1
-  data.tar.gz: 1632b5f36ece5b43e74e4c98fbd075ae8ad7da50418938368591675d50c77c1458868166022f5b34e4a77ea9a936554f44e7dc67c53a5a29ff86fa5eacfbf05d
+  metadata.gz: b8871a1315684f45a4e5a8994bc853615d926ab8234f68989eb4c9552e7696bb8dc41b1dc125b20a212a025be86fab5509bc76ca1e42fdfd9c5a963cf760ed38
+  data.tar.gz: 46d854b1d7752fd7528c151a9c7a184adcc693a7b90efb64271c687fb85ecd2ecf57b5dd5aecca57dda2245690b86c817bc3fd395c9db273c9fdd6eb7765828b

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://gitlab.com/kmcq/weathercli"
   gem.license = "MIT"
   gem.summary = "Weather updates on the command line."
-  gem.description = "weathercli asks Yahoo for the current weather a few forecasts. You can have a default location or specify one when calling it."
+  gem.description = "weathercli asks Yahoo for the current weather and a few forecasts. You can have a default location or specify one when calling it."
   gem.authors = ["kmcq"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.5.0

data/bin/weather

@@ -1,28 +1,6 @@
 #!/usr/bin/env ruby
 require 'weathercli'
 
-CONFIG_FILE = File.join(Dir.home, ".weathercli")
-
-def save_default_location(location)
-  File.open(CONFIG_FILE, 'w').write(location)
-end
-
-def location
-  location_args = ARGV.join unless ARGV.empty?
-  if location_args
-    print "Save as default location? [y/n]: "
-    if STDIN.gets.chomp.downcase == 'y'
-      save_default_location(location_args)
-    end
-    location_args
-  elsif File.file?(CONFIG_FILE)
-    File.read(CONFIG_FILE)
-  else
-    print "Add default location [e.g. San Francisco, CA]:  "
-    location = gets
-    save_default_location(location)
-    location
-  end
-end
-
-puts WeatherCli::Weather.new(location)
+weather = WeatherCli::Weather.new(WeatherCli::Cli.location)
+weather.get_weather
+puts weather

data/lib/weathercli.rb

@@ -1 +1,2 @@
 require 'weathercli/weather.rb'
+require 'weathercli/cli.rb'

data/lib/weathercli/cli.rb

@@ -0,0 +1,39 @@
+module WeatherCli
+
+  module Cli
+    module_function
+
+    def location
+      if location_args
+        print "Save as default location? [y/n]: "
+        if user_input.downcase == 'y'
+          save_default_location(location_args)
+        end
+        location_args
+      elsif File.file?(config_file)
+        File.read(config_file)
+      else
+        print "Add default location [e.g. San Francisco, CA]:  "
+        location = user_input
+        save_default_location(location)
+        location
+      end
+    end
+
+    def config_file
+      File.join(Dir.home, ".weathercli")
+    end
+
+    def save_default_location(location)
+      File.open(config_file, 'w').write(location)
+    end
+
+    def user_input
+      STDIN.gets.chomp
+    end
+
+    def location_args
+      ARGV.join unless ARGV.empty?
+    end
+  end
+end

data/lib/weathercli/weather.rb

@@ -6,11 +6,12 @@ module WeatherCli
     attr_reader :location, :conditions, :options, :title, :forecasts
 
     def initialize(location, *options)
+      @location = location
       @options = Hash[options.map { |o| [o, true] }]
-      get_weather(location)
     end
 
     def to_s
+      return '' unless title && conditions && forecasts
       todays_forecast = forecasts.first
       tomorrows_forecast = forecasts.last
       [
@@ -21,14 +22,17 @@ module WeatherCli
       ].join("\n")
     end
 
-    private
-
-    def get_weather(location)
-      query = construct_query(location)
+    def get_weather
+      query = construct_query(@location)
       url = construct_url(query)
-      parse_api_results(retrieve_api_results(url))
+      results = retrieve_api_results(url)
+      if results
+        parse_api_results(results)
+      end
     end
 
+    private
+
     def construct_query(location)
       "select * from weather.forecast where woeid in (select woeid from geo.places(1) where text=\"#{location}\")"
     end
@@ -41,7 +45,15 @@ module WeatherCli
     end
 
     def retrieve_api_results(url)
-      JSON.parse(Net::HTTP::get(URI.parse(url)))['query']['results']['channel']['item']
+      begin
+        results_hash = JSON.parse(Net::HTTP::get(URI.parse(url)))
+        raise unless results_hash['query'] && results_hash['query']['results']
+      rescue => _
+        $stderr.puts 'Sorry, something went wrong.'
+        return false
+      else
+        results_hash['query']['results']['channel']['item']
+      end
     end
 
     def parse_api_results(results)

data/spec/cli_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe WeatherCli::Cli do
+  before { allow(subject).to receive(:save_default_location).and_return(true) }
+
+  context '::location' do
+    let(:location_string) { 'San Francisco, CA' }
+
+
+    context 'when there are arguments' do
+      before do
+        allow(subject).to receive(:location_args).and_return(location_string)
+        allow(subject).to receive(:user_input).and_return('no')
+        allow($stdout).to receive(:write)
+      end
+
+      it 'should return the arguments' do
+        expect(subject.location).to eq(location_string)
+      end
+    end
+
+    context 'when there are no arguments' do
+      context 'and a default file' do
+        before do
+          allow(subject).to receive(:config_file).and_return('a_file_name')
+          allow(File).to receive(:file?).and_return(true)
+          allow(File).to receive(:read).and_return(location_string)
+        end
+
+        it 'should return the default file contents' do
+          expect(File).to receive(:read).with('a_file_name')
+          expect(subject.location).to eq(location_string)
+        end
+      end
+
+      context 'and no default file' do
+        before do
+          allow(subject).to receive(:config_file).and_return('not_a_real_file')
+          allow(subject).to receive(:user_input).and_return('new default locale')
+        end
+
+        it 'should ask for a default location' do
+          add_default_message = "Add default location [e.g. San Francisco, CA]:  "
+          expect { subject.location }.to output(add_default_message).to_stdout
+        end
+
+        it 'should save the default location' do
+          allow($stdout).to receive(:write)
+          expect(subject).to receive(:save_default_location).with('new default locale')
+          subject.location
+        end
+      end
+    end
+  end
+end

data/spec/weather_spec.rb

@@ -30,41 +30,81 @@ describe WeatherCli::Weather do
     }
   }
 
-  before do
-    allow_any_instance_of(WeatherCli::Weather).to receive(:retrieve_api_results).and_return(api_results)
+  context '#initialize' do
+    it 'should map any options to a truthy hash' do
+      expect(weather.options).to eq({'option1' => true, 'option2' => true})
+    end
   end
 
-  context '#initialize' do
+  it 'should construct the correct query' do
+    expect(weather.send(:construct_query, location)).to eq(correct_query)
+  end
 
-    it 'should construct the correct query' do
-      expect(weather.send(:construct_query, location)).to eq(correct_query)
-    end
+  it 'should construct the correct URL' do
+    encoded_location = URI.encode(location)
+    correct_url = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%20in%20(select%20woeid%20from%20geo.places(1)%20where%20text%3D%22#{encoded_location}%22)&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys"
+    expect(weather.send(:construct_url, correct_query)).to eq(correct_url)
+  end
 
-    it 'should construct the correct URL' do
-      encoded_location = URI.encode(location)
-      correct_url = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%20in%20(select%20woeid%20from%20geo.places(1)%20where%20text%3D%22#{encoded_location}%22)&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys"
-      expect(weather.send(:construct_url, correct_query)).to eq(correct_url)
-    end
+  context '#get_weather' do
+    context 'with a successful api call' do
+      before do
+        allow_any_instance_of(WeatherCli::Weather).to receive(:retrieve_api_results).and_return(api_results)
+        weather.get_weather
+      end
 
-    it 'should have a title' do
-      expect(weather.title).to eq(title)
-    end
+      it 'should have a title' do
+        expect(weather.title).to eq(title)
+      end
+
+      it 'should have the current condition' do
+        expect(weather.conditions).to eq(conditions)
+      end
 
-    it 'should have the current condition' do
-      expect(weather.conditions).to eq(conditions)
+      it 'should have the forecast for today and tomorrow' do
+        expect(weather.forecasts.length).to eq(2)
+        expect(weather.forecasts).to eq(forecasts)
+      end
     end
 
-    it 'should have the forecast for today and tomorrow' do
-      expect(weather.forecasts.length).to eq(2)
-      expect(weather.forecasts).to eq(forecasts)
+    context 'with an unsuccessful api call' do
+      before do
+        allow_any_instance_of(WeatherCli::Weather).to receive(:retrieve_api_results).and_return(false)
+        weather.get_weather
+      end
+
+      it 'should not set the weather attributes' do
+        [:title, :conditions, :forecasts].each do |attr|
+          expect(weather.send(attr)).to eq(nil)
+        end
+      end
     end
+  end
 
-    it 'should map any options to a truthy hash' do
-      expect(weather.options).to eq({'option1' => true, 'option2' => true})
+  describe '#retrieve_api_results' do
+    context 'with a failure' do
+      let(:url) { 'fake_url.fake' }
+
+      before do
+        allow(JSON).to receive(:parse).and_raise(StandardError)
+      end
+
+      it 'should apologize' do
+        expect { weather.send(:retrieve_api_results, url) }.to output("Sorry, something went wrong.\n").to_stderr
+      end
+
+      it 'should return false' do
+        allow($stderr).to receive(:write)
+        expect(weather.send(:retrieve_api_results, url)).to eq(false)
+      end
     end
   end
 
   context '#to_s' do
+    before do
+      allow_any_instance_of(WeatherCli::Weather).to receive(:retrieve_api_results).and_return(api_results)
+      weather.get_weather
+    end
 
     it 'should print out the weather nicely' do
       output_string = [
@@ -75,7 +115,5 @@ describe WeatherCli::Weather do
       ].join("\n")
       expect(weather.to_s).to eq(output_string)
     end
-
   end
-
 end

data/weathercli.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: weathercli 0.2.0 ruby lib
+# stub: weathercli 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "weathercli"
-  s.version = "0.2.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kmcq"]
-  s.date = "2015-01-25"
-  s.description = "weathercli asks Yahoo for the current weather a few forecasts. You can have a default location or specify one when calling it."
+  s.date = "2015-01-30"
+  s.description = "weathercli asks Yahoo for the current weather and a few forecasts. You can have a default location or specify one when calling it."
   s.executables = ["weather"]
   s.extra_rdoc_files = [
     "README.md"
@@ -25,8 +25,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/weather",
     "lib/weathercli.rb",
+    "lib/weathercli/cli.rb",
     "lib/weathercli/weather.rb",
     "license.md",
+    "spec/cli_spec.rb",
     "spec/spec_helper.rb",
     "spec/weather_spec.rb",
     "weathercli.gemspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weathercli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - kmcq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,8 +52,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.1
-description: weathercli asks Yahoo for the current weather a few forecasts. You can
-  have a default location or specify one when calling it.
+description: weathercli asks Yahoo for the current weather and a few forecasts. You
+  can have a default location or specify one when calling it.
 email: 
 executables:
 - weather
@@ -68,8 +68,10 @@ files:
 - VERSION
 - bin/weather
 - lib/weathercli.rb
+- lib/weathercli/cli.rb
 - lib/weathercli/weather.rb
 - license.md
+- spec/cli_spec.rb
 - spec/spec_helper.rb
 - spec/weather_spec.rb
 - weathercli.gemspec