jared 0.0.7a2 → 0.0.7a3

data/jared.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activerecord"
   s.add_runtime_dependency "sqlite3"
   s.add_runtime_dependency "launchy"
-  s.add_runtime_dependency 'google-weather'
+  s.add_runtime_dependency 'weatherboy'
+  s.add_runtime_dependency 'area'
   s.add_runtime_dependency 'gmail'
   s.add_runtime_dependency 'gibberish'
   s.add_runtime_dependency 'faster_require'

data/lib/jared/helpers/date.rb

@@ -23,7 +23,7 @@ class Helpers
    puts nd.gsub("0", "")
   elsif Time.now.strftime("%d") == "22"
    puts nd
-  elsif  Time.now.strftime("%d") == "3"
+  elsif  Time.now.strftime("%d") == "03"
    puts rd
   elsif Time.now.strftime("%d") == "33"
    puts rd

data/lib/jared/helpers/jamendo.rb

@@ -23,20 +23,20 @@ class Helpers
   
   def self.jamendo(mode='once')
     Lib.db
-    @jared = Info.first
+    @jared = Music.first
     @user  = User.first
     require 'gtk2'
     require 'open-uri'
     require 'json'
     require 'gst'
-    @list = open("http://api.jamendo.com/get2/name+url+stream+album_name+album_url+album_image+artist_name+artist_url/track/json/track_album+album_artist/?n=100&order=ratingmonth_desc&tag_idstr=#{@user.music}").read
+    @list = open("http://api.jamendo.com/get2/name+url+stream+album_name+album_url+album_image+artist_name+artist_url/track/json/track_album+album_artist/?n=25&order=ratingmonth_desc&tag_idstr=#{@user.music}").read
     @d = JSON.parse(@list)
     @data = @d[2]
 
     if mode == 'loop'
       puts 'Starting loop, use CTRL-Pause(Break) to stop.'
       loop do
-        v = Random.rand(0..49)
+        v = Random.rand(0..24)
         @data = @d[v]
         @jared.update_attributes(:author_url => "#{@data['artist_url']}", :album_image => "#{@data['album_image']}", :music_url => "#{@data['url']}", :album_url => "#{@data['album_url']}", :now_playing => "#{@data['name']}", :now_playing_author => "#{@data['artist_name']}", :now_playing_album => "#{@data['album_name']}")
         Helpers.player(v)

data/lib/jared/helpers/map.rb

@@ -3,8 +3,8 @@ class Helpers
  #
  # TODO: make command work it this: <em>jared map Texas, USA</em> instead of using gets.
  def self.map(place)
-  @m = place
+  @m = place.gsub(" ", "+")
   puts @m
-  system("launchy http://maps.google.com/?q=#{@m}")
+  Launchy.open("http://maps.google.com/?q=#{@m}")
  end
 end

data/lib/jared/helpers/weather.rb

@@ -19,8 +19,7 @@ elsif Time.now.strftime("%a") == "Fri"
 elsif Time.now.strftime("%a") == "Sat"
  $day = "Sun"
  $dn = "Sunday"
-end
-
+end
 class Helpers
 Lib.db 
  require_relative "../models/user.rb"
@@ -30,39 +29,34 @@ Lib.db
  # Usage: <em>jared weather (10001/today/tomorrow/forecast)</em>
  def self.weather(option=nil)
   begin
-   weather = GoogleWeather.new(@user.zip)
+   weather = Weatherboy.new(@user.zip)
 
   if option == nil
-   forecast = weather.current_conditions
-   puts weather.forecast_information.city + "."
-   puts forecast.temp_f + " Degrees Fahrenheit.", forecast.temp_c + " Degrees Celsius.", forecast.condition + ".", forecast.wind_condition + ".", forecast.humidity + "."
+   forecast = weather.current
+   puts @user.zip.to_i.to_region
+   puts forecast.temp_f + " Degrees Fahrenheit.", forecast.weather + ".", forecast.wind_mph + " mile per hour winds from the #{forecast.wind_dir}."
    
   elsif option == "today"
-   weather.forecast_conditions.each do |condition|
-    if condition.day_of_week == Time.now.strftime("%a")
-     puts Time.now.strftime("%A")
-     puts " #{condition.condition}."
-     puts " High: #{condition.high} Degrees Fahrenheit."
-     puts " Low: #{condition.low} Degrees Fahrenheit."
+   weather.forecasts.each do |condition|
+    if condition.title == 'Today'
+     puts "#{condition.title}."
+     puts " #{condition.text}"
 	end
    end
    
   elsif option == "tomorrow"
-   weather.forecast_conditions.each do |condition|
-    if condition.day_of_week == $day
-     puts $dn
-     puts " #{condition.condition}."
-     puts " High: #{condition.high} Degrees Fahrenheit."
-     puts " Low: #{condition.low} Degrees Fahrenheit."
+   weather.forecasts.each do |condition|
+    if condition.title == $dn
+     puts "#{condition.title}."
+     puts " #{condition.text}"
 	end
    end
    
   elsif option == "forecast"
-   weather.forecast_conditions.each do |condition|
-    puts "#{condition.day_of_week}."
-    puts " #{condition.condition}."
-    puts " High: #{condition.high} Degrees Fahrenheit."
-    puts " Low: #{condition.low} Degrees Fahrenheit."
+   weather.forecasts.each do |condition|
+    puts "#{condition.title}."
+    puts " #{condition.text}"
+    puts
    end
   else
    puts "Unable to fetch weather due to argument error."

data/lib/jared/jared.rb

@@ -17,7 +17,8 @@ class Jared < Thor
  desc "weather [FORECAST]", "Gets weather information, If no argument then returns current weather information."
  def weather(option=nil)
   require_relative 'helpers/weather.rb'
-  require 'google_weather'
+  require 'weatherboy'
+  require 'area'
   Helpers.weather(option)
  end
  
@@ -66,7 +67,7 @@ class Jared < Thor
   at_exit do
     require_relative 'lib.rb'
     Lib.db
-    @jared = Info.first
+    @jared = Music.first
     @jared.update_attributes(:author_url => "", :music_url => "", :album_image => "", :album_url => "", :now_playing => "", :now_playing_author => "", :now_playing_album => "")
   end
   Helpers.jamendo(mode)

data/lib/jared/lib.rb

@@ -1,13 +1,13 @@
-# Lib file loads all Helpers and Models.
-
-class Lib
-# ActiveRecord DataBase connect
- def self.db
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => "#{Dir.home}/.jared.sqlite3")
- end
-end
-
-# Model files requires
-require_relative 'models/info.rb'
-require_relative 'models/task.rb'
-require_relative 'models/user.rb'
+# Lib file loads all Helpers and Models.
+
+class Lib
+# ActiveRecord DataBase connect
+ def self.db
+   ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => "#{Dir.home}/.jared.sqlite3")
+ end
+end
+
+# Model files requires
+require_relative 'models/music.rb'
+require_relative 'models/task.rb'
+require_relative 'models/user.rb'

data/lib/jared/models/music.rb

@@ -0,0 +1,2 @@
+class Music < ActiveRecord::Base
+end

data/lib/jared/version.rb

@@ -1,3 +1,3 @@
 module Jared
-  VERSION = "0.0.7a2"
-end
+  VERSION = "0.0.7a3"
+end

data/lib/jared.rb

@@ -1,7 +1,6 @@
 #!/bin/ruby
-require "faster_require"
-require 'etc'
-require "fileutils"
+
+require 'faster_require'
 require 'sqlite3'
 require 'active_record'
 
@@ -10,6 +9,7 @@ puts "Setting up database."
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => "#{Dir.home}/.jared.sqlite3")
 ActiveRecord::Migration.verbose = false
 
+ # Create Database table for Tasks
  ActiveRecord::Schema.define do
   create_table :tasks do |t|
    t.column :title, :string
@@ -19,20 +19,22 @@ ActiveRecord::Migration.verbose = false
   end
  end
 
+ # Create table table for Ifos
  ActiveRecord::Schema.define do
-  create_table :infos do |t|
+  create_table :musics do |t|
    t.column :status, :string
-   t.column :now_playing, :string
-   t.column :now_playing_album, :string
-   t.column :album_image, :string
-   t.column :now_playing_author, :string
-   t.column :author_url, :string
-   t.column :music_url, :string
-   t.column :album_url, :string
+   t.column :now_playing, :string
+   t.column :now_playing_album, :string
+   t.column :album_image, :string
+   t.column :now_playing_author, :string
+   t.column :author_url, :string
+   t.column :music_url, :string
+   t.column :album_url, :string
    t.timestamps
   end
  end
 
+ # Create Database table for User
  ActiveRecord::Schema.define do
   create_table :users do |t|
    t.column :name, :string
@@ -47,7 +49,6 @@ ActiveRecord::Migration.verbose = false
 end
 
 require_relative "jared/lib.rb"
-#require "jared/lib"
 Lib.db
 if User.first.blank?
  require 'green_shoes'
@@ -55,20 +56,21 @@ if User.first.blank?
  new_user.save
  c=confirm "Setup Jared?"
  if c == true
-  Helpers.config
+   require 'jared/helpers/config'
+   Helpers.config
  else
    alert "Run: 'jared config' to setup later."
  end
 end
 
-if Info.first.blank?
+if Music.first.blank?
  require 'green_shoes'
- jrd = Info.new(:status => "Ready", :now_playing => "", :now_playing_author => "")
+ jrd = Music.new(:status => "Ready", :now_playing => "", :now_playing_author => "")
  jrd.save
  if jrd
    puts 'Ready.'
  else
-   puts 'Failed to create Info!'
+   puts 'Failed to create Music!'
  end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'sqlite3'
+require 'active_record'
+require 'jared/lib'
+require 'open-uri'

data/spec/template.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/.rb'
+
+describe Helpers do
+  it "" do
+    #Helpers.
+    pending
+  end
+end
+puts 'Helpers#, Not tested.'

data/spec/tests/date_spec.rb

@@ -0,0 +1,9 @@
+require 'jared/helpers/date.rb'
+
+describe Helpers do
+  it "#date returns the current date" do
+    #Helpers.date
+    pending
+  end
+end
+puts 'Helpers#date, Not tested.'

data/spec/tests/greeting_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/greeting.rb'
+
+describe Helpers do
+  it "#greeting should respond with a time-dynamic greeting" do
+    #Helpers.greeting
+    pending
+  end
+end
+puts 'Helpers#greeting, Not tested.'

data/spec/tests/jamendo_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/jamendo.rb'
+
+describe Helpers do
+  it "#jamendo should play media from Jamendo" do
+    #Helpers.jamendo('once')
+    pending "Don't know how to test Gstreamer."
+  end
+end
+puts 'Helpers#jamendo, Not tested.'

data/spec/tests/mail_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/mail.rb'
+
+describe Helpers do
+  it "#mail should respond with unread emails" do
+    #Helpers.mail
+    pending
+  end
+end
+puts 'Helpers#greeting, Not tested.'

data/spec/tests/map_spec.rb

@@ -0,0 +1,12 @@
+require_relative '../spec_helper'
+require 'jared/helpers/map.rb'
+
+describe Helpers do
+  it "#map should respond open a browser to PLACE" do
+    a=open("http://maps.google.com/?q=google+ca").read
+    if a.include?('google ca')
+    else
+      fail
+    end
+  end
+end

data/spec/tests/player_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/player.rb'
+
+describe Helpers do
+  it "#player should open green_shoes powered media player (Windows Only)" do
+    #Helpers.player
+    pending "don't know how to test."
+  end
+end
+puts 'Helpers#player, Not tested.'

data/spec/tests/stock_spec.rb

@@ -0,0 +1,10 @@
+require_relative '../spec_helper'
+require 'jared/helpers/stock.rb'
+
+describe Helpers do
+  it "#stock should respond with stock information" do
+    #Helpers.stock('GOOG')
+    pending
+  end
+end
+puts 'Helpers#stock, Not tested.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jared
 version: !ruby/object:Gem::Version
-  version: 0.0.7a2
+  version: 0.0.7a3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stock_quote
@@ -156,7 +156,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google-weather
+  name: weatherboy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: area
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -268,11 +284,20 @@ files:
 - lib/jared/helpers/weather.rb
 - lib/jared/jared.rb
 - lib/jared/lib.rb
-- lib/jared/models/info.rb
+- lib/jared/models/music.rb
 - lib/jared/models/task.rb
 - lib/jared/models/user.rb
 - lib/jared/version.rb
 - readme.md
+- spec/spec_helper.rb
+- spec/template.rb
+- spec/tests/date_spec.rb
+- spec/tests/greeting_spec.rb
+- spec/tests/jamendo_spec.rb
+- spec/tests/mail_spec.rb
+- spec/tests/map_spec.rb
+- spec/tests/player_spec.rb
+- spec/tests/stock_spec.rb
 homepage: https://github.com/cyberarm/jared
 licenses: []
 post_install_message: 
@@ -299,3 +324,4 @@ signing_key:
 specification_version: 3
 summary: Ruby powered digital assistant
 test_files: []
+has_rdoc: 

data/lib/jared/models/info.rb

@@ -1,2 +0,0 @@
-class Info < ActiveRecord::Base
-end