in_our_time 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c440df705ea2afb85d4c4ea6caa5fa03b67732
-  data.tar.gz: c61b39babdf2dbd70ea44df6656cfb108b829d42
+  metadata.gz: de87e4265e1b9d635849b956423654b7757c1909
+  data.tar.gz: a030c2d3ad061950dab3163fe6b7875a9436538d
 SHA512:
-  metadata.gz: aff9aa5de8973ea63ed168df39bf1e540dd7de222e7fcc4bf4c90551659eb74a17432893ad89aaf8ec6f9b7defcdc79ce5b059e1981d89134ab3d0489ee3f05c
-  data.tar.gz: 94d19d14be5efafcdb409b82f5765cc263308aac43052804812ca3df7cce1ce3f97a55caae14d0ca35139c89da2d5c09e576179a24ee8e6dfd41bc06d8f481fd
+  metadata.gz: 7f91d8ae75f12e7ea71448b45f451063b865ad1799e3f38cb60a3bb36654d4018696056ca07ed3fc592c35be447935a2c9bd3b98f1b85df0d0070fc593ac1564
+  data.tar.gz: 4f9d01aa37e96d6416b16b37f7e5a11f4e281aee87a55646f6a4e5722d028cb9d738de4b704535fab8b673e261896f7150307a934d92d97d11cfd451cb21c345

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/in_our_time.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.name        = 'in_our_time'
   spec.version     = File.read('VERSION')
-  spec.date        = '2016-09-26'
+  spec.date        = '2016-09-28'
   spec.authors     = ["Martyn Jago"]
   spec.email       = ["martyn.jago@btinternet.com"]
   spec.description = "In Our Time Player"

data/lib/iot/iot.rb

@@ -457,10 +457,11 @@ class InOurTime
   end
 
   def justify info
-    collect, top, bottom = [], 0, @config[:page_width]
+    pages = [[],[]]
+    page, top, bottom = 0, 0, @config[:page_width]
     loop do
       if(bottom >= info.length)
-        collect << info[top..-1].strip
+        pages[page] << info[top..-1].strip
         break
       end
       loop do
@@ -469,26 +470,25 @@ class InOurTime
       end
       loop do
         if idx = info[top..bottom].index("\n")
-          collect << info[top..top + idx]
-          bottom, top = top + idx + @config[:page_width] + 1, top + idx + 1
+          pages[page] << info[top..top + idx]
+          page,bottom,top = 1,top + idx + @config[:page_width] + 1, top + idx + 1
           next
         else
           break if (info[bottom] == ' ')
           bottom -= 1
         end
       end
-      collect << info[top..bottom]
+      pages[page] << info[top..bottom]
       bottom, top = bottom + @config[:page_width], bottom
     end
-    collect
+    pages
   end
 
   def info
     if @info.nil?
       prg = select_program @sorted_titles[@selected]
       system 'clear'
-      iot_puts ''
-      justify(prg[:subtitle].gsub(/\s+/, ' ')).map{|x| iot_puts x}
+      justify(prg[:subtitle].gsub(/\s+/, ' '))[0].map{|x| iot_puts x}
       iot_puts ''
       iot_puts "Date Broadcast: #{prg[:date]}"
       iot_puts "Duration:       #{prg[:duration].to_i/60} mins"
@@ -499,8 +499,13 @@ class InOurTime
       prg = select_program @sorted_titles[@selected]
       info = prg[:summary].gsub(/\s+/, ' ')
       system 'clear'
-      iot_puts ''
-      justify(reformat(info)).map{|x| iot_puts x}
+      justify(reformat(info))[0].map{|x| iot_puts x}
+      @info = 2
+    elsif @info == 2
+      prg = select_program @sorted_titles[@selected]
+      info = prg[:summary].gsub(/\s+/, ' ')
+      system 'clear'
+      justify(reformat(info))[1].map{|x| iot_puts x}
       @info = -1
     else
       display_list :same_page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martyn Jago
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri