billboard_hot_100_CLI 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901700f808d1eb35b739c4702cbb4ad2d83bb4d2d246a614e2b584cfa697b64e
-  data.tar.gz: 7bdb21f1f4e523920c8c51368d5e580e938d12bab9e6f67b72abc6ee044ac67d
+  metadata.gz: af48475772c793ff5de2aab60f2636f022e84a6ed19cd496fce93470c4b4a75a
+  data.tar.gz: 5e5c8a207604f7a288c5656acd5e241615b020939e9ef7e05081b353644e27fd
 SHA512:
-  metadata.gz: f0af41eaa04ca2d91551f843ad1b31f623add316fcfb6617fb4ee99c8c052aba59b56a3d496ce4ecf4fb943858d0ffb685a1472ca6ebc9eecff5e7a2bcf57d3a
-  data.tar.gz: 0c89ea87c961c13e5ec4ff9a0e4427297c7724eb0f2dbd06bb560f4d8398088e63dec6a3a47c73c7ae5359ceaaa0dcee49938372de2b1daeb9f545c1087a275f
+  metadata.gz: 28f8dafa86532aae4aba103e2d720ec6f0a81d5f2049bc14449fa5b922e106f3041df5b1d1c65ed6a109967a53805f6b4f0ece23df98e7dbfe38986f58d986a8
+  data.tar.gz: 365649ae1175076083b943e08fc32d0717986f9dc41da11e0e86c0026f41935688851a8a5025d3df41beb9b94d4399b2cc1aab733c95ad714258b39725d5b49e

data/lib/billboard_hot_100/command_line_interface.rb

@@ -3,93 +3,117 @@ class BillboardHot100::CommandLineInteface
   def run
     BillboardHot100::Scraper.scrape_songs
     welcome
-    list_ranges
-    more_info
-    goodbye
   end
 
   def welcome 
     puts "\nWelcome to the this weeks Billboard Hot 100!\n"
+    ranges
   end
 
-  def list_ranges
-    puts "\nPlease enter the rankings you wish to see...\n"
-    puts "\nEnter 1-10, 11-20, 21-30, 31-40, 41-50, 51-60, 61-70, 71-80, 81-90 or 91-100\n"
-    input = gets.strip.to_i
-    display_songs(input)
+  def ranges
+    puts "\nPlease enter the rankings you wish to see...\n\n"
+
+    total = BillboardHot100::Song.all.size
+    increment = 10
+    ranges = total/increment
+    ranking = 1
+    ranges_s = ""
+  
+    ranges.times do
+      ranges_s << "#{ranking}-#{ranking+increment-1}, "
+      ranking += increment
+    end
+    puts ranges_s[0...-2]
+  
+    quantize_input(increment, total)
   end
 
-  def display_songs(input)
-    case input
-      when 1..100
-        increment = 10
-        quantize(input, increment)
+  def quantize_input(increment, total)    
+    input = gets.strip
+    case  
+      when input.to_i.between?(1,total)
+        low_num = ((input.to_i-1)/increment).floor*increment
+        display_songs(increment, input, low_num)
+      when input.downcase == "exit"
+        exit 
       else
         invalid_choice
+        ranges
     end
   end
 
-  def quantize(input, increment)
-    low_num = ((input-1)/increment).floor*increment
-    display_ten_songs(low_num)
-  end
-
-  def display_ten_songs(low_num)
-    puts "\nDisplaying songs #{low_num+1} through #{low_num+10}\n\n"
-    BillboardHot100::Song.all[low_num,10].each do |song|
+  def display_songs(increment, input, low_num) 
+    puts  "\nDisplaying songs #{low_num+1} through #{low_num+increment}\n\n"
+    BillboardHot100::Song.all[low_num,increment].each do |song|
       puts "#{song.rank}. #{song.title} by #{song.artist}"
     end
+    
+    more_info(increment, input, low_num)
   end
   
-  def more_info
-      puts "\nPlease enter the song you want more information on.\n"
-      input = gets.strip
-      
-      song = BillboardHot100::Song.all[input.to_i-1]
-
-      display_song(song)
+  def more_info(increment, input, low_num)
+    puts "\nPlease enter the song you want more information on, or type LIST to select a new range of songs.\n"
+    input = gets.strip
+    
+    case
+      when input.to_i.between?(low_num+1,low_num+increment)
+        song = BillboardHot100::Song.all[input.to_i-1]
+        display_song(song)
+      when input.downcase == "list"
+        ranges
+      when input.downcase == "exit"
+        exit
+      else
+        puts "\nPlease enter a number between #{low_num+1} and #{low_num+increment}, or type LIST to select a new range of songs.\n".colorize(:red)
+        display_songs(increment, input, low_num)
+    end
+    continue
+  end
 
-      puts "\nWould you like information on another song? Enter Y or N\n"
+  def continue
+    puts "\nWould you like information on another song? Enter Y or N\n"
 
-      input = gets.strip.downcase
-      if input == "y"
-        run
-      elsif input == "n"
-        goodbye
+    input = gets.strip.downcase
+    case input
+      when "y"
+        ranges
+      when "n", "exit"
+        exit
       else
         invalid_choice
-      end
+        continue
+    end
   end
 
   def display_song(song)
     puts "\n#{song.rank}. #{song.title} by #{song.artist}"
-      if song.last_week.length > 0 && !song.last_week.include?("-")
-        puts "Last Week: #{song.last_week}"
-      else
-        puts "New To Chart!".colorize(:red)
-      end
-      if song.peak_position.length > 0 
-        puts "Peak Position: #{song.peak_position}"
-      end
-      if song.weeks_on_chart.length > 0 
-        puts "Weeks On Chart: #{song.weeks_on_chart}"
-      end
-      if song.lyrics.length > 0
-        puts "Lyrics: #{song.lyrics}"
-      end
-      if song.award.length > 0 
-        puts "Award: #{song.award}".colorize(:red)
-      end
-  end
-
-  def goodbye
-    puts "\nCheck back next week for the latest Billboard Hot 100!"
-    exit
+    
+    if song.last_week.length > 0 && !song.last_week.include?("-")
+      puts "Last Week: #{song.last_week}"
+    else
+      puts "New To Chart!".colorize(:blue)
+    end
+    if song.peak_position.length > 0 
+      puts "Peak Position: #{song.peak_position}"
+    end
+    if song.weeks_on_chart.length > 0 
+      puts "Weeks On Chart: #{song.weeks_on_chart}"
+    end
+    if song.lyrics.length > 0
+      puts "Lyrics: #{song.lyrics}"
+    end
+    if song.award.length > 0 
+      puts "Award: #{song.award}".colorize(:blue)
+    end
   end
 
   def invalid_choice
-    puts "\nInvalid Choice!"
-    run
+    puts "\nInvalid Choice, Please Try Again!".colorize(:red)
+  end
+  
+  def exit
+    puts "\nCheck back next week for the latest Billboard Hot 100!"
+    exit!
   end
 
-end
+end

data/lib/billboard_hot_100/version.rb

@@ -1,3 +1,3 @@
 module BillboardHot100
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: billboard_hot_100_CLI
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stephen Olson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,10 +90,8 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
-- billboard_hot_100_CLI-0.1.0.gem
 - billboard_hot_100_CLI.gemspec
 - bin/billboard_hot_100
 - bin/console

data/Gemfile.lock

@@ -1,11 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-
-BUNDLED WITH
-   1.17.3