simple_forecast 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75d7c0552ace3efb79aef082d5e4ed1ea4e8643
-  data.tar.gz: f84c79f3632a26f1d013a6f9060a85b3a2108f1c
+  metadata.gz: a55167aba9bc0078e3ca220ca45251b5e141e04b
+  data.tar.gz: 9453f1260b7b6be4783c1aabe2b90a6f51ad90e4
 SHA512:
-  metadata.gz: 07fd89d3acd2384fa273c04c83e82a46032facafed4019daba67cdbe0a822070686711b561b88035ac87942af5a0ff259e8b36a7963f90145d05f5724cdd3374
-  data.tar.gz: 68c4417b2d25c56b389bbc82b22bc7d91b3516dff8696b31e1e981c52b35fde380a87e9d366c11a02bc075509de844a9c67e56b0a62be1c3ace4c7667b9dd19a
+  metadata.gz: d78b42052ff134d30a0ff8d8ac8cf716f624526f7db29505cedf856caf28ebf2ad6d3fb884e8d6d5e99abe337c40272d3e0a0d8f642c8e82a5b2cde7cb20145a
+  data.tar.gz: 67797b201fcb5b82da75532b3c944f3f98b86f94f65ce997f7652330fe53cf70fa0826581c2728191c7b3a64abb7e524c15b44159ddf221143b74fba3181fb17

data/bin/forecast

@@ -4,12 +4,11 @@
 
 require_relative '../config/environment.rb'
 
-cli = CLI.new
-
-if ARGV.empty?
-  # this should return the same as 'forecast today'
-  ARGV[0] = "help"
-  cli.send(ARGV[0])
-else
-  cli.send(ARGV[0])
-end
+cli = CLIRouter.new(ARGV)
+
+# if ARGV.empty?
+#   # this should return the same as 'forecast today'
+#   ARGV[0] = "help"
+# end
+
+cli.commands

data/config/cli.rb

@@ -43,8 +43,14 @@ class CLI
 
   def tomorrow
     get_data = Forecast.new(WeatherData.new)
-    puts get_data.generate_forecast
+    puts get_data.tomorrow
     # exit
   end
 
+  def today
+    get_data = Forecast.new(WeatherData.new)
+    puts get_data.today
+  end
+
+
 end

data/config/environment.rb

@@ -7,3 +7,4 @@ require_relative '../config/cli'
 require_relative '../lib/models/scraper'
 require_relative '../lib/models/forecast'
 require_relative '../lib/weather_data'
+require_relative '../lib/models/cli_router'

data/lib/models/cli_router.rb

@@ -0,0 +1,33 @@
+class CLIRouter
+
+  attr_reader :weather_forecast, :args
+
+  def initialize(args)
+    @weather_forecast = Forecast.new(WeatherData.new)
+    @args = args # in fact this is ARGV
+  end
+
+  def help
+    weather_forecast.today
+    puts "if you'd like a different forecast try something like 'forecast tomorrow'"
+  end
+
+  def commands
+    if args.length == 1
+      puts weather_forecast.send(self.args[0])
+    elsif args.length == 0
+      help
+    end
+  end
+
+  # def this_weekend
+  #   puts weather_data.this_weekend
+
+  # end
+
+  # def next_week
+  #   puts weather_data.next_week
+  # end
+
+end
+

data/lib/models/forecast.rb

@@ -1,25 +1,76 @@
 class Forecast
 
-  attr_accessor :today_temp, :yesterday_temp
+  attr_accessor :today_temp, :yesterday_temp, :tomorrow_temp, :weather_data
 
   def initialize(weather_data_object)
+    @weather_data = weather_data_object
 
-    @today_temp = weather_data_object.get_temp_today
-    @yesterday_temp = weather_data_object.get_temp_yesterday
+    @today_temp = self.weather_data.temp_today
+    @tomorrow_temp = self.weather_data.temp_tomorrow
+    # @this_weekend = self.avg_temp_this_weekend
+    # @next_week = self.avg_temp_next_week
   end
 
-  def generate_forecast
-    # determine whether today temp is higher, lower or the same as yesterday
-    # return a string based on that result
-    if self.today_temp == self.yesterday_temp
-      "same as yesterday"
-    elsif self.today_temp < self.yesterday_temp
-      "colder than yesterday"
+  def today
+    puts "hmm, interesting!"
+    @yesterday_temp = self.weather_data.temp_yesterday
+    compare(today_temp, yesterday_temp) + "yesterday"
+  end
+
+  def tomorrow
+    compare(tomorrow_temp, today_temp) + "today"
+  end
+
+  def avg_temp_this_weekend
+
+  end
+
+  def avg_temp_next_weekend
+
+  end
+
+  def this_weekend
+    # compare(this_week_avg_temp?, temp_for_upcoming_weekend)
+  end
+
+  def next_week
+    # compare(this_week_avg, next_week_avg)
+  end
+
+  def compare(temp1, temp2)
+    diff = temp1-temp2
+
+    case diff.abs
+    when (1..2)
+      temp1 = temp2
+    when (3..7)
+      mod = "slightly "
+    when (7..12)
+      mod = "somewhat "
+    when (12..30)
+      mod = "much "
     else
-      "warmer than yesterday"
+      mod = ''
+    end
+
+    if temp1 == temp2
+      "pretty much the same as "
+    elsif temp1 < temp2
+      mod + "colder than "
+    else
+      mod + "warmer than "
     end
   end
 
+# categorization
+# "same"
+# "colder than"
+# "warmer than"
+
+# compared objects
+# "yesterday"
+# "today"
+# "tomorrow"
 
 end
 

data/lib/weather_data.rb

@@ -1,34 +1,33 @@
 class WeatherData
 
-  attr_accessor :yesterday_data, :today_data
+  attr_accessor :yesterday_data, :today_data, :lat, :long
 
-  NYC_LAT = 40.714623
-  NYC_LON = -74.006605
+  NYC = [40.714623, -74.006605]
+  NYC_LAT = NYC[0]
+  NYC_LONG = NYC[1] 
 
-  def initialize(lat = NYC_LAT, lon = NYC_LON)
-    print "checking the weather."
-    @today_data = ForecastIO.forecast(lat, lon, time: Time.now.to_i)
-    print " . "
-    @yesterday_data = ForecastIO.forecast(lat, lon, time: time_yesterday)
-    print ".\n "
-
-  end
-
-
-
-  def time_yesterday
-    Time.now.to_i - 86400
+  def initialize(lat = NYC_LAT, long = NYC_LONG)
+    @lat = lat
+    @long = long
+    puts "checking my instruments"
+    @today_data = ForecastIO.forecast(self.lat, self.long, time: Time.now.to_i)
   end
 
-
-  def get_temp_yesterday
+  def temp_yesterday
+    @yesterday_data = ForecastIO.forecast(self.lat, self.long, time: time_yesterday)
     self.yesterday_data["currently"]["temperature"]
   end
 
-  def get_temp_today
+  def temp_today
     self.today_data["currently"]["temperature"]
   end
 
+  def temp_tomorrow
+    self.today_data["hourly"]["data"][23]["temperature"] 
+  end
 
+  def time_yesterday
+    Time.now.to_i - 86400
+  end
 
 end

data/simple_forecast.gemspec

@@ -1,17 +1,17 @@
 Gem::Specification.new do |s|
   s.name        = 'simple_forecast'
-  s.executables << 'forecast'
-  s.version     = "0.0.1"
+  s.executables  << 'forecast'
+  s.version     = "0.0.2"
   s.date        = "2013-10-19"
   s.summary     = "A simple weather forecaster"
-  s.description = "A simple weather forecaster"
+  s.description = "A weather forecast relative to current conditions where you are.  Currently only works for New York, NY."
   s.authors     = ["Anders Ramsay", "Joe O'Conor"]
   s.email       = ["andersr@gmail.com", "joe.oconor@gmail.com"]
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/andersr/simple_weather'
   s.license     = 'MIT'
   s.require_path = '.'
-  s.add_runtime_dependency 'forecast_io' >= '2.0.0'
+  s.add_runtime_dependency 'forecast_io', ['>= 2.0.0']
   s.post_install_message = <<-MSG
   Thanks for installing Simple Forecast.  Enter 'forecast' to get the current forecast or something like 'forecast tomorrow' for a different forecast.
   MSG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_forecast
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anders Ramsay
@@ -12,20 +12,21 @@ cert_chain: []
 date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: 'true'
+  name: forecast_io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-description: A simple weather forecaster
+        version: 2.0.0
+description: A weather forecast relative to current conditions where you are.  Currently
+  only works for New York, NY.
 email:
 - andersr@gmail.com
 - joe.oconor@gmail.com
@@ -43,6 +44,7 @@ files:
 - config/cli.rb
 - config/environment.rb
 - data/forecast_io_sample.rb
+- lib/models/cli_router.rb
 - lib/models/forecast.rb
 - lib/models/scraper.rb
 - lib/weather_data.rb