umbrella_cli_app 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9754f3bb9ec137791204a3dce1c98ab24ae8447d9c4c743db65fa6b4466f41
-  data.tar.gz: 4859a853e5e3c86f6c29bd5c025c740e5f63c2b6232bd62d46eae344dc3887eb
+  metadata.gz: 26c7954b0ceb6cda4a0dba00882bb74ed98847ad768c117a2928f05074dc9583
+  data.tar.gz: 6e7477e9b91a57c374a00f0b4fc8b0c45f21bb1489d29e9011d4dc35cf2131e4
 SHA512:
-  metadata.gz: e026929fd77323f1ecb6d18ef85505a0f72d8798b56ddb4fa3196f933406f84bc39801019f4a45388e90ca6bd8cadc551c8ef2a6b526b171cac597e9bb419c05
-  data.tar.gz: 658443fd3146d507049bc0355b92d21c66eab7d27ac82d6e86131fdf1dff5a39e7afa75f0bbe15b890523b9f07b5bf047877ade5ab9c268481d67f7e7b99efc2
+  metadata.gz: ae8c80283a3f093f88628e062ef344645cfdcd14809cd2570387eb87b6b487f2c9492bd8a786ef93763e5fc9823bb388474e53b1707374980c68c309ade0bace
+  data.tar.gz: a9cc683ec134ed36b26fa02a88089da1f39008417930b958fb1c670a1b2ccbce09e61e2d47c451c3abbae090cc0c7df5914ec698fd547c12ea4293780a0aa764

data/README.md

@@ -7,7 +7,7 @@ Have you ever ran out the door wondering if you need an umbrella? This CLI Data
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'Umbrella'
+gem 'umbrella_cli_app'
 ```
 
 And then execute:
@@ -16,11 +16,13 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install Umbrella
+    $ gem install umbrella_cli_app
 
 ## Usage
 
-TODO: Write usage instructions here
+Run executable file.
+
+Follow on screen prompts to choose location and access further weather features.
 
 ## Development
 

data/lib/Umbrella/CLI.rb

@@ -11,16 +11,30 @@ class Umbrella::CLI
   def choose_location
       puts "Do you need an Umbrella today in:(pick a number)"
       
-        ["Chicago", "New York", "Los Angeles"].each.with_index(1){|a, i| puts "#{i}. #{a}"}
+        ["Chicago, IL", "New York, NY", "Los Angeles, CA"].each.with_index(1){|a, i| puts "#{i}. #{a}"}
         
         input = gets.chomp.downcase 
         case input
         when "1"
-           @rain = Umbrella::Weather.weather_setter("Chicago+IL+USIL0225:1:US")
+          if Umbrella::Weather.find_by_city("Chicago, IL") == nil
+           @rain = Umbrella::Scraper.weather_setter("Chicago+IL+USIL0225:1:US")
+          else
+           @rain = Umbrella::Weather.find_by_city("Chicago, IL")
+          end 
+           
         when "2"
-           @rain = Umbrella::Weather.weather_setter("USNY0996:1:US")
+            if Umbrella::Weather.find_by_city("New York, NY") == nil
+           @rain = Umbrella::Scraper.weather_setter("USNY0996:1:US")
+            else 
+            @rain = Umbrella::Weather.find_by_city("New York, NY")
+          end
+            
         when "3"
-          @rain = Umbrella::Weather.weather_setter("USCA0638:1:US")
+          if Umbrella::Weather.find_by_city("Los Angeles, CA") == nil
+          @rain = Umbrella::Scraper.weather_setter("USCA0638:1:US")
+          else
+          @rain = Umbrella::Weather.find_by_city("Los Angeles, CA")
+        end 
         when "exit"
           puts "Stay dry!"
           exit 

data/lib/Umbrella/scraper.rb

@@ -0,0 +1,18 @@
+class Umbrella::Scraper
+  
+  def self.weather_setter(location_url)
+    doc = Nokogiri::HTML(open("https://weather.com/weather/today/l/#{location_url}"))
+    
+    rain = Umbrella::Weather.new 
+    
+    rain.city = doc.search("h1.today_nowcard-location").text
+    rain.temperature = doc.search("div.today_nowcard-temp").text
+    rain.weather_condition = doc.search("div.today_nowcard-phrase").text 
+    rain.wind = doc.search("div.today_nowcard-sidecar").search("td")[0].text
+    rain.sunrise = doc.search("span.wx-dsxdate")[0].text
+    rain.sunset = doc.search("span.wx-dsxdate")[1].text
+    rain.rain_perc = doc.search("span.precip-val").first.text
+    rain.save
+    rain 
+  end 
+end 

data/lib/Umbrella/version.rb

@@ -1,3 +1,3 @@
 module Umbrella
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/Umbrella/weather.rb

@@ -1,20 +1,19 @@
 class Umbrella::Weather
-  attr_accessor :temperature, :wind, :sunrise, :sunset, :weather_condition, :rain_perc
+   attr_accessor :temperature, :wind, :sunrise, :sunset, :weather_condition, :rain_perc, :city
   
-  def self.weather_setter(location_url)
-    
-    doc = Nokogiri::HTML(open("https://weather.com/weather/today/l/#{location_url}"))
-    
-    rain = self.new 
-    
-    rain.temperature = doc.search("div.today_nowcard-temp").text
-    rain.weather_condition = doc.search("div.today_nowcard-phrase").text 
-    rain.wind = doc.search("div.today_nowcard-sidecar").search("td")[0].text
-    rain.sunrise = doc.search("span.wx-dsxdate")[0].text
-    rain.sunset = doc.search("span.wx-dsxdate")[1].text
-    rain.rain_perc = doc.search("span.precip-val").first.text
-    
-    rain
+  @@all = []
+  
+  def save
+    @@all << self 
+  end 
+  
+  def self.all 
+    @@all
+  end 
+  
+  def self.find_by_city(city)
+    self.all.find{|a| a.city == city}
   end 
   
-  end 
+end 
+  

data/lib/Umbrella.rb

@@ -1,8 +1,9 @@
 require 'open-uri'
 require 'nokogiri'
+require 'pry'
 
 
 require_relative "./Umbrella/version"
 require_relative "./Umbrella/CLI"
 require_relative "./Umbrella/weather"
-
+require_relative "./Umbrella/scraper"

data/umbrella_cli_app.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = ["umbrella_cli"]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrella_cli_app
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Conor Hamilton
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,7 +69,8 @@ dependencies:
 description: 
 email:
 - conhamil19@gmail.com
-executables: []
+executables:
+- umbrella_cli
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,9 +84,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bin/umbrella
+- bin/umbrella_cli
 - lib/Umbrella.rb
 - lib/Umbrella/CLI.rb
+- lib/Umbrella/scraper.rb
 - lib/Umbrella/version.rb
 - lib/Umbrella/weather.rb
 - spec.md