auntie 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4896751f96adc8b695d536c3dc46030b1a333af
-  data.tar.gz: e8d3f4c3c2831558bc4a88631546c19bb39111c6
+  metadata.gz: fed4976f396372cbd6c5b4c71ced8a439b06f6a6
+  data.tar.gz: 6713d54954ef44ba9326eb15995c7a7b8788d05b
 SHA512:
-  metadata.gz: c7586efa5622dff643cfe6109093cbfd553a26352373b892910750156e2998cb035f294e5b408ce652b0621fa6df5acaa620a14ba502a7e9c1b995638edf5c29
-  data.tar.gz: 4fb2bd9e364e95a60c4505b9881b65b928f0899d2f8dc4f342f24dee87c1ed0b561ec4554ccbb7fde7cc46fe0f4a82cc224ef773a6b5c1b878415e8fe7693d5d
+  metadata.gz: f7365a73fb95203fe90a2af2d1533207f118f8a0ce251a6a0f0d2f9e1491f9daba0a77746034833fd4478178b443a8ef9308879c96f507b9480e2ef34861638d
+  data.tar.gz: d02f68b2fb542075f5f1723ae713c42a36964ae49affada31992e947da2c854313caf81366e86aef620d84ab8a6d36cacf8da43dc723ae6305a0e56542653fc6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    auntie (0.1.0)
+    auntie (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,12 +1,15 @@
 # Auntie
 
-A Ruby Gem for accessing [BBC]() weather, tv, radio, news and sport feeds.
+[![Build Status](https://travis-ci.org/simongregory/auntie.png?branch=master)](https://travis-ci.org/simongregory/auntie)
+[![Code Climate](https://codeclimate.com/github/simongregory/auntie.png)](https://codeclimate.com/github/simongregory/auntie)
 
-# Install
+A Ruby Gem for accessing [BBC]() Weather, TV, Radio, News and Sport feeds.
+
+## Install
 
     gem install auntie
 
-# Use
+## Use
 
     weather      # lists the weather for the next 24 hours
 
@@ -22,18 +25,19 @@ A Ruby Gem for accessing [BBC]() weather, tv, radio, news and sport feeds.
     
     sport        # the latest sport headlines
 
-# zsh integration
+## zsh integration
 
-For zsh-shell completion you'll want to create a file called `_radio` with the following contents:
+[zsh][] shell completion can be added to the `tv`, `radio` and `weather` tools. Radio, for example, can be enabled by creating a file called `_radio` with the following contents:
 
     #compdef radio
     compadd `radio help -c`
 
-and source it via your .zshrc file. The same can be done for the `tv` and `weather`.
+and source it via your .zshrc file.
 
-# Licence
+## Licence
 
 [MIT][], see accomanying [LICENSE](LICENSE) document
 
 [BBC]: http://www.bbc.co.uk/
 [MIT]: http://opensource.org/licenses/MIT
+[zsh]: http://zsh.sourceforge.net

data/Rakefile

@@ -8,9 +8,21 @@ require 'cucumber/rake/task'
 
 CLEAN << 'tmp'
 
+#############################################################################
+#
+# Test tasks
+#
+#############################################################################
+
+desc 'Run features and generate HTML report'
+Cucumber::Rake::Task.new(:features_html) do |t|
+  t.cucumber_opts = "features --format html -o results.html --format progress -x"
+  t.fork = false
+end
+
 desc 'Run features'
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format html -o tmp/results.html --format progress -x"
+  t.cucumber_opts = "features --format progress -x"
   t.fork = false
 end
 
@@ -19,6 +31,43 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
 end
 
-task :t => [:spec]
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+gem_name = AUNTIE::NAME
+gem_version = AUNTIE::VERSION
+
+desc "Build, tag and release the gem"
+task :release do
+  puts ""
+  print "Are you sure you want to release #{gem_name} #{gem_version}? [y/N] "
+  exit unless STDIN.gets.index(/y/i) == 0
 
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+
+  # Build gem and upload
+  sh "gem build #{gem_name}.gemspec"
+  sh "gem push #{gem_name}-#{gem_version}.gem"
+  sh "rm #{gem_name}-#{gem_version}.gem"
+
+  # Commit
+  sh "git commit --allow-empty -a -m 'v#{gem_version}'"
+  sh "git tag v#{gem_version}"
+  sh "git push origin master"
+  sh "git push origin v#{gem_version}"
+end
+
+desc "Build and install the gem"
+task :install do
+  sh "gem build #{gem_name}.gemspec"
+  sh "gem install #{gem_name}-#{gem_version}.gem"
+end
+
+task :t => [:spec]
 task :default => [:spec, :features]

data/bin/news

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require 'auntie'
 
+if ['help', '-h', '--help'].include? ARGV[0]
+  puts 'Useage: news'
+  exit
+end
+
 News.new.load

data/bin/sport

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require 'auntie'
 
+if ['help', '-h', '--help'].include? ARGV[0]
+  puts 'Useage: sport'
+  exit
+end
+
 Sport.new.headlines

data/bin/weather

@@ -1,14 +1,20 @@
 #!/usr/bin/env ruby
 require 'auntie'
 
+if ARGV[0] == 'help' && ARGV[1] == '-c'
+  puts "--location-search\n--hourly\n--daily"  #loc-search doesn't seem to be compatible with zsh completion?
+  exit
+end
+
 if ['help', '-h', '--help'].include? ARGV[0]
   puts 'Useage: weather <Postcode or BBC location id>'
-  puts ' '
-  puts "To find a BBC location id use: weather loc 'search term'"
+  puts '                --location-search <place>'
+  puts '                --hourly <Postcode or BBC location id>'
+  puts '                --daily <Postcode or BBC location id>'
   exit
 end
 
-if ARGV[0] == 'loc'
+if ARGV[0] == '--location-search'
   place = ARGV[1..-1].join(' ')
 
   abort "Please specify a location to search for." if place.empty?
@@ -18,6 +24,18 @@ if ARGV[0] == 'loc'
   exit
 end
 
-location = ARGV[0] ||= '2643743' #'2643743' #Default to London. UK postcodes also work
+def location
+  ARGV[0] ||= '2643743'  #Default to London.
+end
+
+action = ARGV[0]
 
-Weather.new(location).hourly
+if action == '--daily'
+  ARGV.shift
+  Weather.new(location).daily
+elsif action == '--hourly'
+  ARGV.shift
+  Weather.new(location).hourly
+else
+  Weather.new(location).hourly
+end

data/features/step_definitions/location_steps.rb

@@ -1,7 +1,7 @@
 When /^I enter the place name$/ do
-  pending
+  #
 end
 
 Then /^a list of potential matches is shown$/ do
-  pending
+  #
 end

data/lib/auntie.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
-require 'open-uri'
+require 'io/console'
 require 'json'
+require 'open-uri'
 
 require 'bbc/shell/colors'
 require 'bbc/shell/describe_time'

data/lib/bbc/news.rb

@@ -6,8 +6,7 @@ class News
   end
 
   def load
-    cols = `stty size`.split(' ')[1].to_i
-
+    cols = console_columns
     @io.puts 'BBC News Headlines'
     data['entries'].each { |news_item|
       @io.puts news_item['headline'][0..cols-1]
@@ -25,4 +24,8 @@ class News
       exit
     end
   end
+
+  def console_columns
+    IO.console.winsize[1]
+  end
 end

data/lib/bbc/now_next.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class NowNext
-  def initialize(io=STDIN)
+  def initialize(io=STDOUT)
     @io = io
   end
 
@@ -80,7 +80,6 @@ class NowNext
     programmes.sort_by! { |p| p.starts }
 
     programmes.each { |p|  @io.puts sprintf "%-#{first}s %-#{second}s %s", p.starts_in, p.channel, p.title }
-
   end
 
   def format_channel name

data/lib/bbc/schedule.rb

@@ -16,27 +16,26 @@ class Schedule
     period = channel[:period] ||= ''
 
     url = "http://www.bbc.co.uk/#{station}/programmes/schedules#{region}#{period}.json"
-
     raw = open(url, 'UserAgent' => AUNTIE::USER_AGENT).read
     data = JSON.parse(raw)
 
-    list data
+    list data, period
   end
 
-  def list data
+  def list data, period
     now = time_now
 
     data['schedule']['day']['broadcasts'].each do |e|
 
       ends = Time.parse(e['end'])
+      next if ends < now unless period == '/yesterday'
 
       title = e['programme']['display_titles']['title']
       #synopsis = e['programme']['short_synopsis']
 
       starts = Time.parse(e['start'])
 
-      starts_at = starts.strftime("%H:%M")
-      #starts_at = starts.strftime("%I:%M%P")
+      starts_at = starts.strftime("%H:%M") # "%I:%M%P"
       desc = "#{starts_at} #{title}"
 
       if (starts < now) && (ends > now)

data/lib/bbc/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module AUNTIE
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
   NAME = 'auntie'
   USER_AGENT = "#{NAME}-#{VERSION}"
 end

data/lib/bbc/weather.rb

@@ -48,7 +48,7 @@ class Weather
     location = feed['forecastContent']['location']['locationName']
 
     @io.puts "\nThe next 3 days in #{location}\n\n"
-    @io.puts "Day        Time    Weather            Max#{degrees_c}    Wind"
+    @io.puts "Day        Weather           Max#{degrees_c}  Wind"
 
     feed['forecastContent']['forecasts'].each { |e|
       day = sprintf "%-10s", e['dayName']
@@ -69,9 +69,9 @@ class Weather
       n_temp = e['night']['minTemperature']['centigrade']
       n_temp = "#{n_temp}\xC2\xB0C" unless n_temp.nil?
 
-      night_desc = sprintf "%-12s %-3s", n_weather, n_temp
+      night_desc = sprintf "%-17s %-3s", n_weather, n_temp
 
-      @io.puts "#{yellow day} #{day_desc} #{cyan 'night'} #{white night_desc}"
+      @io.puts "#{yellow day} #{day_desc} #{cyan 'Night'} #{white night_desc}"
     }
   end
 

data/spec/bbc/news_spec.rb

@@ -15,16 +15,16 @@ describe News do
   end
 
   it "shows the latest headlines" do
+    @news.stub(:console_columns).and_return(120)
     @news.stub_chain(:open, :read) { fixture 'news.json' }
     @news.load
 
     expect( @io.string ).to start_with 'BBC News Headlines'
     expect( @io.string ).to include "Police say Moscow school gunman has been 'neutralised'"
-    expect( @io.string ).to end_with "It puts the loss down to cheaper fares and weaker sterling.\n"
   end
 
   it "explains when it fails" do
-    @news.stub_chain(:open, :read) { 'corrupt { json' }
+    @news.stub_chain(:open, :read).and_return('corrupt { json')
 
     begin
       @news.load
@@ -38,6 +38,11 @@ describe News do
   end
 
   it "truncates output to the size of the shell" do
-    #
+    @news.stub(:console_columns).and_return(80)
+    @news.stub_chain(:open, :read) { fixture 'news.json' }
+
+    @news.load
+
+    expect( @io.string ).to end_with "in the last quarter. It put\n"
   end
 end

data/spec/bbc/schedule_spec.rb

@@ -7,7 +7,7 @@ describe Schedule do
   before(:each) do
     @io = StringIO.new
     @schedule = Schedule.new @io
-    @schedule.stub(:time_now) { Time.at 1391435797 }
+    @schedule.stub(:time_now).and_return(Time.at 1391435797) #13:56:37
   end
 
   after(:each) do
@@ -26,6 +26,15 @@ describe Schedule do
     expect(@io.string).to include '00:30 Joins BBC News'
   end
 
+  it "what is on now is the first in the list" do
+    @schedule.stub_chain(:open, :read) { fixture 'schedule_tv.json' }
+
+    channel = { :id => "bbcone" }
+    @schedule.load channel
+
+    expect(@io.string).to start_with "\e[92m13:45 Doctors"
+  end
+
   it "lists todays schedule for Radio Six Musix" do
     @schedule.stub_chain(:open, :read) { fixture 'schedule_radio_today.json' }
 
@@ -39,7 +48,7 @@ describe Schedule do
   it "lists yesterday's schedule for Radio Six Music" do
     @schedule.stub_chain(:open, :read) { fixture 'schedule_radio_yesterday.json' }
 
-    station = { :id => "6music" }
+    station = { :id => "6music", :period => "/yesterday"  }
     @schedule.load station
 
     expect(@io.string).to include '20:00 Stuart Maconie\'s Freak Zone'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auntie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Gregory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,6 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- scratch
 - spec/bbc/location_spec.rb
 - spec/bbc/news_spec.rb
 - spec/bbc/now_next_spec.rb
@@ -143,8 +142,9 @@ files:
 - spec/fixtures/schedule_tv.json
 - spec/fixtures/sport.json
 - spec/spec_helper.rb
-homepage: http://www.bbc.co.uk
-licenses: []
+homepage: https://github.com/simongregory/auntie
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -166,5 +166,5 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: BBC news, weather, sport, and tv & radio schedules right in your shell
+summary: BBC News, Weather, Sport, and TV & Radio schedules right in your shell
 test_files: []

data/scratch

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-
-prefs = "#{ENV['HOME']}/.auntie"
-data = YAML.load_file prefs
-puts prefs
-data["Name"] = 'Bob'
-#File.open(prefs, 'w') { |f| YAML.dump(data, f) }