romloader 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 447d07953556ab02a8e8ef0556a89809ba8277f8
-  data.tar.gz: 5b2aec9a0b2cc5a3e3c8fbd6ba5a0278d8027f50
+  metadata.gz: a27354c3fb5cbce3b0bb3fe2290caba0e6110ae5
+  data.tar.gz: db4f48e16aa01cd4ee3c83889a343b549a56a790
 SHA512:
-  metadata.gz: b5827a960f1ba204b627f9395912575da64ef6a64017d601b9c1f4ee2689405e81846b6d479f7f8fa0c6d884249306f8e3e10e494f6fbba961c190e2ec77d444
-  data.tar.gz: 6cd992084b3b65d03d418900189d980df064380bc1865f492979705daa8f2299a11c75bdbc7de8d0e322e41d2b78473faf3ddbb5584eab93565ac6a36cbd255c
+  metadata.gz: f76c3079cecdd46b4649961f5658e44ee436b3614c0f0385017b7cd9672c5360e4b2f78f011f1cf057737a99a771a6717069130a19c6bb5e4d5cd1e6226c8fbc
+  data.tar.gz: 0367b2ba71e4c1be0f402f48c1eb43b37e5b758dd8e2a78c9ceddcc5ba01de3f30ca236769e8a4c43a23ea6c97787f420ea8d63fd77081ece89da8f4dadcf908

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
-
+source "https://rubygems.org"
+
 gemspec

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2016 Efrain Perez Jr
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2016 Efrain Perez Jr
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,42 +1,43 @@
-# RomLoader
-
-A Ruby Gem for downloading videogame roms, powered by freeroms.com.
-
-## Installation
-
-    $ gem install romloader
-
-## Usage
-
-Type the command below into your shell and follow the on screen prompts.
-
-    $ romloader
-
-## Development
-
-To develop further upon this gem, fork and clone the repository located at https://github.com/jinstrider2000/romloader-cli-gem.
-Be sure to have the Bundler gem installed, and run:
-
-    $ bundle install
-
-This will download any dependencies for development. Rspec is among the dependencies, however, there are no tests included in the repo. I intend to add some eventually.
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/jinstrider2000/romloader-cli-gem.
-
-## Version Changes
-
-v. 1.2.2: Updated web scraping function
-
-v. 1.2: Added basic file managment capability for Windows (requires Powershell v 3.0 or higher). Also updated UI slightly.
-
-v. 1.1: Added basic rom download capability for Windows (requires Powershell v 3.0 or higher)
-
-v. 1.0: Changed the namespacing of classes, added zip/7-zip extraction and rom download directory management. Also, added the ability to open the newly downloaded game from the command line (requires a emulator)
-
-v. 0.0: Basic rom listing from Freeroms.com, and rom download feature
-
-## License
-
+# RomLoader
+
+A Ruby Gem for downloading videogame roms, powered by freeroms.com.
+
+## Installation
+
+    $ gem install romloader
+
+## Usage
+
+Type the command below into your shell and follow the on screen prompts.
+
+    $ romloader
+
+## Development
+
+To develop further upon this gem, fork and clone the repository located at https://github.com/jinstrider2000/romloader-cli-gem.
+Be sure to have the Bundler gem installed, and run:
+
+    $ bundle install
+
+This will download any dependencies for development. Rspec is among the dependencies, however, there are no tests included in the repo. I intend to add some eventually.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/jinstrider2000/romloader-cli-gem.
+
+## Version Changes
+v. 1.2.3: Updated error handling and scraping of file sizes from Freeroms.com
+
+v. 1.2.2: Updated web scraping function
+
+v. 1.2: Added basic file managment capability for Windows (requires Powershell v 3.0 or higher). Also updated UI slightly.
+
+v. 1.1: Added basic rom download capability for Windows (requires Powershell v 3.0 or higher)
+
+v. 1.0: Changed the namespacing of classes, added zip/7-zip extraction and rom download directory management. Also, added the ability to open the newly downloaded game from the command line (requires a emulator)
+
+v. 0.0: Basic rom listing from Freeroms.com, and rom download feature
+
+## License
+
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/romloader

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
-require_relative "../lib/romloader.rb"
+#!/usr/bin/env ruby
+require_relative "../lib/romloader.rb"
 run

data/lib/romloader.rb

@@ -1,23 +1,23 @@
-module RomLoader
-
-end
-
-require 'open-uri'
-require 'nokogiri'
-require 'cgi'
-unless /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-  require 'zip'
-  require 'seven_zip_ruby'
-end
-require 'fileutils'
-require_relative 'romloader/game_rom.rb'
-require_relative 'romloader/game_system.rb'
-require_relative 'romloader/archive_extractor.rb'
-require_relative 'romloader/freeroms_scraper.rb'
-require_relative 'romloader/scraping_error/errors.rb'
-require_relative 'romloader/romloader_cli.rb'
-
-def run
-  Dir.mkdir(File.join(Dir.home,"videogame_roms")) unless Dir.exist?(File.join(Dir.home,"videogame_roms"))
-  RomLoader::RomLoaderCli.new.start
+module RomLoader
+
+end
+
+require 'open-uri'
+require 'nokogiri'
+require 'cgi'
+unless /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+  require 'zip'
+  require 'seven_zip_ruby'
+end
+require 'fileutils'
+require_relative 'romloader/game_rom.rb'
+require_relative 'romloader/game_system.rb'
+require_relative 'romloader/archive_extractor.rb'
+require_relative 'romloader/freeroms_scraper.rb'
+require_relative 'romloader/scraping_error/errors.rb'
+require_relative 'romloader/romloader_cli.rb'
+
+def run
+  Dir.mkdir(File.join(Dir.home,"videogame_roms")) unless Dir.exist?(File.join(Dir.home,"videogame_roms"))
+  RomLoader::RomLoaderCli.new.start
 end

data/lib/romloader/archive_extractor.rb

@@ -1,62 +1,62 @@
-
-class RomLoader::ArchiveExtractor
-
-  #Extracts zip or 7-zip rom files, manages the extracted dirs, then deletes archive files
-  def self.extract(archive_dir,extract_dir,game_obj)
-    file_or_dir_to_open = nil
-    dir_game_name = game_obj.filename.split(game_obj.file_ext)[0]
-      
-    if game_obj.file_ext == ".zip"
-      puts "Extracting #{game_obj.filename}"
-      Zip::File.open(archive_dir) do |zip_archive|
-        zip_archive.glob("*htm").each { |entry| zip_archive.remove(entry) }
-        Dir.mkdir(File.join(extract_dir,dir_game_name)) if zip_archive.size > 1 && !Dir.exist?(File.join(extract_dir,dir_game_name))
-        zip_archive.each_entry do |rom|
-          if Dir.exist?(File.join(extract_dir,dir_game_name))
-            rom.extract(File.join(extract_dir,dir_game_name,rom.name)) unless File.exist?(File.join(extract_dir,dir_game_name,rom.name))
-          else
-            rom.extract(File.join(extract_dir,rom.name)) unless File.exist?(File.join(extract_dir,rom.name))
-          end
-          zip_archive.size == 1 ? file_or_dir_to_open = File.join(extract_dir,"\"#{rom.name}\"") : file_or_dir_to_open = File.join(extract_dir,dir_game_name)
-        end
-      end
-    elsif game_obj.file_ext == ".7z"
-      puts "Extracting #{game_obj.filename}"
-      File.open(archive_dir, "rb") do |seven_zip_archive|
-        SevenZipRuby::Reader.open(seven_zip_archive) do |szr|
-          if szr.entries.size > 2
-            Dir.mkdir(File.join(extract_dir,dir_game_name)) unless Dir.exist?(File.join(extract_dir,dir_game_name))
-            szr.extract_if(File.join(extract_dir,dir_game_name)) { |entry| !/\.htm/.match(entry.inspect) }
-            file_or_dir_to_open = File.join(extract_dir,dir_game_name)
-          else
-            szr.extract_if(extract_dir) do |entry|
-              game_name = /(?<=file, |dir, |anti, )[.[^\.]]+\..+(?=>)/.match(entry.inspect)[0] unless /\.htm/.match(entry.inspect)
-              !/\.htm/.match(entry.inspect)
-            end
-            file_or_dir_to_open = File.join(extract_dir,"\"#{game_name}\"")
-          end
-        end
-      end
-    else
-      puts "NOTE: No archive extraction. Only Zip and 7-Zip extraction is supported."
-      file_or_dir_to_open = extract_dir
-    end
-    file_or_dir_to_open
-  end
-
-  def self.create_extract_dir(game_obj)
-    /(?<=\().+(?=\))/.match(game_obj.system.name) ? system_name = /(?<=\().+(?=\))/.match(game_obj.system.name)[0].downcase : system_name = game_obj.system.name.rstrip.gsub(/[[[:space:]]\/]/, "_").downcase
-    dir_w_system = File.join(Dir.home,"videogame_roms",system_name)
-    Dir.mkdir(dir_w_system) unless Dir.exist?(dir_w_system)
-    dir_w_system
-  end
-
-  def self.move_archive(src,dest)
-    FileUtils.move src, dest
-  end
-
-  def self.delete_archive(dir)
-    File.delete(dir)
-  end
-  
+
+class RomLoader::ArchiveExtractor
+
+  #Extracts zip or 7-zip rom files, manages the extracted dirs, then deletes archive files
+  def self.extract(archive_dir,extract_dir,game_obj)
+    file_or_dir_to_open = nil
+    dir_game_name = game_obj.filename.split(game_obj.file_ext)[0]
+      
+    if game_obj.file_ext == ".zip"
+      puts "Extracting #{game_obj.filename}"
+      Zip::File.open(archive_dir) do |zip_archive|
+        zip_archive.glob("*htm").each { |entry| zip_archive.remove(entry) }
+        Dir.mkdir(File.join(extract_dir,dir_game_name)) if zip_archive.size > 1 && !Dir.exist?(File.join(extract_dir,dir_game_name))
+        zip_archive.each_entry do |rom|
+          if Dir.exist?(File.join(extract_dir,dir_game_name))
+            rom.extract(File.join(extract_dir,dir_game_name,rom.name)) unless File.exist?(File.join(extract_dir,dir_game_name,rom.name))
+          else
+            rom.extract(File.join(extract_dir,rom.name)) unless File.exist?(File.join(extract_dir,rom.name))
+          end
+          zip_archive.size == 1 ? file_or_dir_to_open = File.join(extract_dir,"\"#{rom.name}\"") : file_or_dir_to_open = File.join(extract_dir,dir_game_name)
+        end
+      end
+    elsif game_obj.file_ext == ".7z"
+      puts "Extracting #{game_obj.filename}"
+      File.open(archive_dir, "rb") do |seven_zip_archive|
+        SevenZipRuby::Reader.open(seven_zip_archive) do |szr|
+          if szr.entries.size > 2
+            Dir.mkdir(File.join(extract_dir,dir_game_name)) unless Dir.exist?(File.join(extract_dir,dir_game_name))
+            szr.extract_if(File.join(extract_dir,dir_game_name)) { |entry| !/\.htm/.match(entry.inspect) }
+            file_or_dir_to_open = File.join(extract_dir,dir_game_name)
+          else
+            szr.extract_if(extract_dir) do |entry|
+              game_name = /(?<=file, |dir, |anti, )[.[^\.]]+\..+(?=>)/.match(entry.inspect)[0] unless /\.htm/.match(entry.inspect)
+              !/\.htm/.match(entry.inspect)
+            end
+            file_or_dir_to_open = File.join(extract_dir,"\"#{game_name}\"")
+          end
+        end
+      end
+    else
+      puts "NOTE: No archive extraction. Only Zip and 7-Zip extraction is supported."
+      file_or_dir_to_open = extract_dir
+    end
+    file_or_dir_to_open
+  end
+
+  def self.create_extract_dir(game_obj)
+    /(?<=\().+(?=\))/.match(game_obj.system.name) ? system_name = /(?<=\().+(?=\))/.match(game_obj.system.name)[0].downcase : system_name = game_obj.system.name.rstrip.gsub(/[[[:space:]]\/]/, "_").downcase
+    dir_w_system = File.join(Dir.home,"videogame_roms",system_name)
+    Dir.mkdir(dir_w_system) unless Dir.exist?(dir_w_system)
+    dir_w_system
+  end
+
+  def self.move_archive(src,dest)
+    FileUtils.move src, dest
+  end
+
+  def self.delete_archive(dir)
+    File.delete(dir)
+  end
+  
 end

data/lib/romloader/freeroms_scraper.rb

@@ -1,107 +1,106 @@
-# The class which facilitates scraping freeroms.com. Uses the nokogiri gem to scrape the site
-class RomLoader::FreeromsScraper
-  
-  def self.system_scrape(url)
-    
-    system_list = Nokogiri::HTML(open(url)).css("dt.leftside > a")
-    [].tap do |game_system|
-      system_list.each do |system_info|
-        if system_info.text != "Links" && system_info.text != "Flash Games" && system_info.text != ""
-          system_name = system_info.text
-          begin
-            system_rom_url = system_info.attribute("href").value
-          rescue NoMethodError
-            
-          else
-            game_system << {name: system_name, rom_index_url: system_rom_url}
-          end
-        end
-      end
-    end
-  end
-  
-  # To retrieve the names and main rom urls of the individual games currently begin served by freeroms.com.
-  # Returns this information in the form of an array of hashes
-  def self.rom_scrape(url)
-    
-    game_list = Nokogiri::HTML(open(url)).css("tr[class^=\"game\"] > td[align=\"left\"]")
-    [].tap do |rom_list|
-      game_list.each do |game_info|
-        begin
-          download_link = game_info.css("a").attribute("href").value
-        rescue NoMethodError
-          
-        else
-          game_name = game_info.css("span").text
-          unless game_name == ""
-            game_name.gsub!(/[[:space:]]{2,}/) {|white_spaces| " "} 
-            download_link.gsub!(/[[:space:]]/) {|white_space| CGI::escape(white_space)} unless download_link.ascii_only?
-            rom_list << {name: game_name, rom_detail_url: download_link}
-          end 
-        end
-      end 
-    end
-  end
-
-  # To retrieve the detailed information of individual games currently begin served by freeroms.com.
-  # Returns this information in the form of a hash
-  def self.rom_details(url)
-    
-    direct_download = Nokogiri::HTML(open(url))
-
-    {}.tap do |game|
-      if !direct_download.css("td#rom > script").empty?
-        begin
-          game_url = /http:\/\/.+(\.zip|\.7z)/.match(direct_download.css("td#rom > script").first.children.first.text)
-        rescue NoMethodError
-          
-        else
-          if game_url
-            game[:download_url] = game_url[0]
-            game[:file_ext] = game_url[1]
-            game[:filename] = /[.[^\/]]+(\.zip|\.7z)\Z/.match(game_url[0])[0]
-            begin
-              game[:size] = direct_download.css("td#rom + td[colspan=\"2\"]").first.children.first.text.strip
-            rescue NoMethodError
-              game[:size] = "N/A"
-            end    
-          end      
-        end
-      elsif !direct_download.css("script").empty?
-        begin
-          direct_download.css("script").each { |script| game_url = /http:\/\/.+(\.zip|\.7z)/.match(script.children.text) if /http:\/\/.+(\.zip|\.7z)/.match(script.children.text) }
-        rescue NoMethodError
-          
-        else
-          if game_url
-            game[:download_url] = game_url[0]
-            game[:file_ext] = game_url[1]
-            game[:filename] = /[.[^\/]]+(\.zip|\.7z)\Z/.match(game_url[0])[0]
-            begin
-              game[:size] = direct_download.css("td#rom + td[colspan=\"2\"]").first.children.first.text.strip
-            rescue NoMethodError
-              game[:size] = "N/A"
-            end    
-          end
-        end  
-      end
-    end
-  end
-
-  # To retrieve the letter indices for the roms of the game systems currently begin served by freeroms.com.
-  # Returns this information in the form of a hash
-  def self.rom_index_scrape(url)
-    
-    rom_letter_list = Nokogiri::HTML(open(url)).css("tr.letters > td[align=\"center\"] > font > a")
-    {}.tap do |letter_hash|
-      rom_letter_list.each do |letter_list|
-        letter = letter_list.text.strip
-        begin
-          letter_hash[letter] = letter_list.attribute("href").value if letter =~ /\A[A-Z#]\Z/
-        rescue NoMethodError
-
-        end
-      end
-    end
-  end
-end
+# The class which facilitates scraping freeroms.com. Uses the nokogiri gem to scrape the site
+class RomLoader::FreeromsScraper
+  
+  def self.system_scrape(url)
+    
+    system_list = Nokogiri::HTML(open(url)).css("dt.leftside > a")
+    [].tap do |game_system|
+      system_list.each do |system_info|
+        if system_info.text != "Links" && system_info.text != "Flash Games" && system_info.text != ""
+          system_name = system_info.text
+          begin
+            system_rom_url = system_info.attribute("href").value
+          rescue NoMethodError
+            
+          else
+            game_system << {name: system_name, rom_index_url: system_rom_url}
+          end
+        end
+      end
+    end
+  end
+  
+  # To retrieve the names and main rom urls of the individual games currently begin served by freeroms.com.
+  # Returns this information in the form of an array of hashes
+  def self.rom_scrape(url)
+    
+    game_list = Nokogiri::HTML(open(url)).css("tr[class^=\"game\"] > td[align=\"left\"]")
+    [].tap do |rom_list|
+      game_list.each do |game_info|
+        begin
+          download_link = game_info.css("a").attribute("href").value
+        rescue NoMethodError
+          
+        else
+          game_name = game_info.css("span").text
+          unless game_name == ""
+            game_name.gsub!(/[[:space:]]{2,}/) {|white_spaces| " "} 
+            download_link.gsub!(/[[:space:]]/) {|white_space| CGI::escape(white_space)} unless download_link.ascii_only?
+            rom_list << {name: game_name, rom_detail_url: download_link}
+          end 
+        end
+      end 
+    end
+  end
+
+  # To retrieve the detailed information of individual games currently begin served by freeroms.com.
+  # Returns this information in the form of a hash
+  def self.rom_details(url)
+    
+    direct_download = Nokogiri::HTML(open(url))
+    {}.tap do |game|
+      if !direct_download.css("td#rom > script").empty?
+        begin
+          game_url = /http:\/\/.+(\.zip|\.7z)/.match(direct_download.css("td#rom > script").first.children.first.text)
+        rescue NoMethodError
+          
+        else
+          if game_url
+            game[:download_url] = game_url[0]
+            game[:file_ext] = game_url[1]
+            game[:filename] = /[.[^\/]]+(\.zip|\.7z)\Z/.match(game_url[0])[0]
+            begin
+              game[:size] = direct_download.css("div.system-rom-tr-wrap > div.file-size").first.children.first.text.strip
+            rescue NoMethodError
+              game[:size] = "N/A"
+            end    
+          end      
+        end
+      elsif !direct_download.css("script").empty?
+        begin
+          direct_download.css("script").each { |script| game_url = /http:\/\/.+(\.zip|\.7z)/.match(script.children.text) if /http:\/\/.+(\.zip|\.7z)/.match(script.children.text) }
+        rescue NoMethodError
+          
+        else
+          if game_url
+            game[:download_url] = game_url[0]
+            game[:file_ext] = game_url[1]
+            game[:filename] = /[.[^\/]]+(\.zip|\.7z)\Z/.match(game_url[0])[0]
+            begin
+              game[:size] = direct_download.css("div.system-rom-tr-wrap > div.file-size").first.children.first.text.strip
+            rescue NoMethodError
+              game[:size] = "N/A"
+            end    
+          end
+        end  
+      end
+    end
+  end
+
+  # To retrieve the letter indices for the roms of the game systems currently begin served by freeroms.com.
+  # Returns this information in the form of a hash
+  def self.rom_index_scrape(url)
+    
+    rom_letter_list = Nokogiri::HTML(open(url)).css("tr.letters > td[align=\"center\"] > font > a")
+    {}.tap do |letter_hash|
+      rom_letter_list.each do |letter_list|
+        letter = letter_list.text.strip
+        begin
+          letter_hash[letter] = letter_list.attribute("href").value if letter =~ /\A[A-Z#]\Z/
+        rescue NoMethodError
+
+        end
+      end
+    end
+  end
+end

data/lib/romloader/game_rom.rb

@@ -1,30 +1,30 @@
-
-# The class whose instances represent an individual game rom
-# (e.g. Chrono Trigger object)
-class RomLoader::GameRom
-  
-  attr_accessor :name, :system
-  attr_reader :rom_detail_url ,:download_url, :size, :file_ext, :filename
-
-  # Create individual game rom objects from information scraped from freeroms.com,
-  # then sets the required name and rom_detail_url instance variables
-  def initialize(name:, rom_detail_url:)
-    @name = name
-    @rom_detail_url = rom_detail_url
-  end
-
-  # Creates an array of GameRom objects from an array
-  def self.create_collection(game_array)
-    game_array.collect {|game_details| self.new(game_details)}    
-  end
-
-  # Sets all additional, optional rom details
-  def set_rom_details(download_url: nil, size: nil, file_ext: nil, filename: nil)
-    @download_url = download_url
-    @size = size
-    @file_ext = file_ext
-    @filename = filename
-    nil
-  end
-  
+
+# The class whose instances represent an individual game rom
+# (e.g. Chrono Trigger object)
+class RomLoader::GameRom
+  
+  attr_accessor :name, :system
+  attr_reader :rom_detail_url ,:download_url, :size, :file_ext, :filename
+
+  # Create individual game rom objects from information scraped from freeroms.com,
+  # then sets the required name and rom_detail_url instance variables
+  def initialize(name:, rom_detail_url:)
+    @name = name
+    @rom_detail_url = rom_detail_url
+  end
+
+  # Creates an array of GameRom objects from an array
+  def self.create_collection(game_array)
+    game_array.collect {|game_details| self.new(game_details)}    
+  end
+
+  # Sets all additional, optional rom details
+  def set_rom_details(download_url: nil, size: nil, file_ext: nil, filename: nil)
+    @download_url = download_url
+    @size = size
+    @file_ext = file_ext
+    @filename = filename
+    nil
+  end
+  
 end

data/lib/romloader/game_system.rb

@@ -1,56 +1,56 @@
-
-# The class whose instances represent an individual game system
-# (e.g. Sega Genesis object) 
-class RomLoader::GameSystem
-  
-  attr_accessor :name, :rom_index_url
-  attr_writer :rom_indices
-
-  @@all = []
-  
-  # Create individual game system objects from information scraped from http://freeroms.com, sets all instance variables
-  def initialize(name:, rom_index_url:)
-    @name = name
-    @rom_index_url = rom_index_url
-    @rom_indices = {}
-    @roms = {}
-    @@all << self
-  end
-
-  # Creates multiple GameSystem objects from information scraped from http://freeroms.com
-  def self.create_from_collection(system_array)
-    system_array.each { |system_details| self.new(system_details)}
-    nil
-  end
-
-  # Retrieves an array of all GameSystem objects
-  def self.all
-    @@all    
-  end
-
-  # Retrieves an array of all GameRom objects starting which the provided letter index
-  # (e.g. [Sonic the Hedgehog, Streets of Rage,...])
-  def get_roms_by_letter(letter_index)
-    @roms[letter_index]
-  end
-
-  # Retrieves an array of the indicies for the roms
-  # (i.e. ["A","B","C"...])
-  def get_rom_indices
-    @rom_indices.keys
-  end
-
-  # Retrieves the url for roms of a particular letter index
-  # (e.g. "A" => "http://freeroms.com/genesis_games_that_start_with_a.html")
-  def get_rom_collection_url(letter_index)
-    @rom_indices[letter_index]
-  end
-
-  # Add the game collection scraped from http://freeroms.com to the GameSystem object to the roms Hash
-  def add_roms_to_collection_by_letter(letter_index, game_obj_array)
-
-    game_obj_array.each { |game| game.system = self }
-    @roms[letter_index] = game_obj_array
-  end
-
+
+# The class whose instances represent an individual game system
+# (e.g. Sega Genesis object) 
+class RomLoader::GameSystem
+  
+  attr_accessor :name, :rom_index_url
+  attr_writer :rom_indices
+
+  @@all = []
+  
+  # Create individual game system objects from information scraped from http://freeroms.com, sets all instance variables
+  def initialize(name:, rom_index_url:)
+    @name = name
+    @rom_index_url = rom_index_url
+    @rom_indices = {}
+    @roms = {}
+    @@all << self
+  end
+
+  # Creates multiple GameSystem objects from information scraped from http://freeroms.com
+  def self.create_from_collection(system_array)
+    system_array.each { |system_details| self.new(system_details)}
+    nil
+  end
+
+  # Retrieves an array of all GameSystem objects
+  def self.all
+    @@all    
+  end
+
+  # Retrieves an array of all GameRom objects starting which the provided letter index
+  # (e.g. [Sonic the Hedgehog, Streets of Rage,...])
+  def get_roms_by_letter(letter_index)
+    @roms[letter_index]
+  end
+
+  # Retrieves an array of the indicies for the roms
+  # (i.e. ["A","B","C"...])
+  def get_rom_indices
+    @rom_indices.keys
+  end
+
+  # Retrieves the url for roms of a particular letter index
+  # (e.g. "A" => "http://freeroms.com/genesis_games_that_start_with_a.html")
+  def get_rom_collection_url(letter_index)
+    @rom_indices[letter_index]
+  end
+
+  # Add the game collection scraped from http://freeroms.com to the GameSystem object to the roms Hash
+  def add_roms_to_collection_by_letter(letter_index, game_obj_array)
+
+    game_obj_array.each { |game| game.system = self }
+    @roms[letter_index] = game_obj_array
+  end
+
 end

data/lib/romloader/romloader_cli.rb

@@ -1,222 +1,228 @@
-
-# The CLI class
-class RomLoader::RomLoaderCli
-
-  def initialize
-    RomLoader::GameSystem.create_from_collection(RomLoader::FreeromsScraper.system_scrape("http://freeroms.com"))
-    raise RomLoader::ScrapingError::NoElementFound.exception("System index is currently unavailable. Exiting the program.") if RomLoader::GameSystem.all.size == 0
-  end
-
-  # Starts the CLI, called in romloader.rb
-  def start
-    input_stack = []
-    control_flow_level = 1
-
-    puts "Thanks for using RomLoader, powered by freeroms.com!\nNOTE: To play the games, please download an emulator for the desired system.\nConnecting to freeroms.com and retrieving the systems index...\n\n"
-    sleep 3
-    while control_flow_level > 0 
-      case control_flow_level
-      when 1
-        list_systems
-        input = input_prompt("Select a system (1-#{RomLoader::GameSystem.all.size}) [exit]:",1..RomLoader::GameSystem.all.size)
-        if input == "exit"
-          control_flow_level = 0
-        else
-          input_stack.unshift(input)
-          control_flow_level += 1
-        end
-      when 2
-        system = select_system(input_stack[0].to_i)
-        list_system_index(system)
-        if system.get_rom_indices.empty?
-          begin
-            raise RomLoader::ScrapingError::NoElementFound.exception("Requested system is currently unavailable. Try another one.")
-          rescue
-            control_flow_level -= 1
-            input_stack.shift
-          end 
-        else
-          input = input_prompt("Select a letter [back|exit]:", /[#{system.get_rom_indices.join.downcase}]/,control_flow_level)
-          control_flow_level = flow_controller(input,control_flow_level,input_stack)
-        end
-      when 3
-        game_collection = select_game_collection_by_index(system,input_stack[0].upcase)
-        if game_collection.empty?
-          begin
-            raise RomLoader::ScrapingError::NoElementFound.exception("Requested game index is currently unavailable. Try another one.")
-          rescue
-            control_flow_level -= 1
-            input_stack.shift
-          end
-        else
-          list_games(game_collection)
-          input = input_prompt("Select a game (1-#{game_collection.size}) [back|exit]", 1..game_collection.size,control_flow_level)
-          control_flow_level = flow_controller(input,control_flow_level,input_stack)
-        end
-      when 4
-        game = select_game(game_collection,input_stack[0].to_i)
-        if game.download_url == nil
-          begin
-            raise RomLoader::ScrapingError::NoElementFound.exception("Requested game is currently unavailable. Try another one.")
-          rescue
-            control_flow_level -= 1
-            input_stack.shift
-          end
-        else
-          display_rom_details(game)
-          input = input_prompt("Download? (Y/n) [exit]:", /[yn]/, control_flow_level)
-          if input == 'y' || input == ""
-            file_or_dir_to_open = download_rom(game)
-            if file_or_dir_to_open
-              if /\".+\"/.match(file_or_dir_to_open)
-                game_file = /\".+\"/.match(file_or_dir_to_open)[0]
-                input = input_prompt("Play #{game_file}? (y/N) [exit]:", /[yn]/,control_flow_level)
-              else
-                input = input_prompt("Open #{file_or_dir_to_open}? (y/N) [exit]:", /[yn]/,control_flow_level)
-              end
-              
-              if !isWindows?
-                system("open #{file_or_dir_to_open}") if input == 'y'
-              else
-                system("powershell -command \"& { Invoke-Item '#{file_or_dir_to_open}' }\"") if input == 'y'
-              end
-            end 
-          end
-          input_stack.shift
-          input == "exit" ? control_flow_level = 0 : control_flow_level -= 1
-        end
-      end
-    end
-
-    puts "Happy Gaming!"
-  end
-
-  # Sets control_flow_level in RomLoaderCli#start, manipulates input_stack in RomLoaderCli#start
-  def flow_controller(input,control_flow_level,input_stack)
-    if input == "exit"
-      0
-    elsif input == "back"
-      input_stack.shift
-      control_flow_level - 1
-    else
-      input_stack.unshift(input)
-      control_flow_level + 1
-    end
-  end
-
-  # Lists the game systems scraped from http://freeroms.com and saved in Romloader::GameSystem.all
-  # (e.g. 1. Amiga, 2. Atari, etc...)
-  def list_systems 
-    RomLoader::GameSystem.all.each_with_index { |game_system, index| puts "#{index+1}. #{game_system.name}"}
-    print "\n"
-  end
-
-  # Retrieves an individual Romloader::GameSystem object from Romloader::GameSystem.all
-  def select_system(index)
-    RomLoader::GameSystem.all[index-1]
-  end
-
-  # List game index for the selected system by letter
-  # (e.g. A B C D...)
-  def list_system_index(selected_system)
-    if selected_system.get_rom_indices.empty?
-      selected_system.rom_indices = RomLoader::FreeromsScraper.rom_index_scrape(selected_system.rom_index_url)
-    end
-    
-    puts "#{selected_system.name} index:"
-    selected_system.get_rom_indices.each {|letter| print letter + " "}
-    puts "\n\n"
-  end
-
-  # Retrieves all the games available for the selected system under the selected index
-  # (e.g. NES,"G")
-  def select_game_collection_by_index(system, letter)
-    puts "Loading roms...\n"
-    games_list = system.get_roms_by_letter(letter)
-    games_list ||= system.add_roms_to_collection_by_letter(letter,RomLoader::GameRom.create_collection(RomLoader::FreeromsScraper.rom_scrape(system.get_rom_collection_url(letter))))
-  end
-
-  # List all the games available for the selected index
-  # (e.g. "S": 1. Super Castlevania, 2. Super Mario World, etc...)
-  def list_games(games)
-    games.each_with_index {|game,index| puts "#{index+1}. #{game.name}"}
-    print "\n"
-  end
-
-  # Selects an individual game from the provided collection via index
-  def select_game(game_collection,index)
-    game_collection[index-1].set_rom_details(RomLoader::FreeromsScraper.rom_details(game_collection[index-1].rom_detail_url))
-    game_collection[index-1]
-  end
-
-  # List the details of the selected game
-  # (e.g. Chrono Trigger | SNES | 5.38 MB | .zip)
-  def display_rom_details(game)
-    puts "Rom details:"
-    puts "#{game.name} | System: #{game.system.name} | File size: #{game.size} | File type: #{game.file_ext}"
-    print "\n"
-  end
-
-  # Prints a custom message, takes user input, asesses whether the input is valid, and returns the input
-  def input_prompt(message,accepted_input,control_flow_level=nil)
-    valid = false
-    until valid 
-      print message + " "
-      input = gets.chomp.strip.downcase
-      if accepted_input.class == Regexp && accepted_input.match(input)
-        valid = true
-      elsif accepted_input.class == Range && /\A\d+\Z/.match(input) && accepted_input.include?(input.to_i)
-        valid = true
-      elsif input == "exit" || (input == "back" &&  control_flow_level && control_flow_level.between?(2,3))
-        valid = true
-      elsif input == "" && control_flow_level == 4
-        valid = true
-      else
-        print "Invalid input! "
-      end
-    end
-    print "\n"
-    input
-  end
-
-  def isWindows?
-    /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-  end
-
-  # Downloads the selected game to the local directory (~/videogame_roms)
-  def download_rom(game)
-    file_or_dir_to_open = nil
-    extract_dir = RomLoader::ArchiveExtractor.create_extract_dir(game)
-    if !File.exist?(File.join(extract_dir,game.filename))
-      puts "Downloading #{game.name} (#{game.size})..."
-      if isWindows?
-        result = Dir.chdir(extract_dir) { system("powershell -command \"& { Invoke-WebRequest '#{game.download_url}' -OutFile '#{game.filename}' }\"") }
-      else
-        result = Dir.chdir(extract_dir) { system("curl -Og# \"#{game.download_url}\"") }
-      end
-
-      if result && !isWindows? && game.system.name != "MAME"
-        puts "Finished downloading #{game.filename} to #{extract_dir}. Extracting..."
-        file_or_dir_to_open = RomLoader::ArchiveExtractor.extract(File.join(extract_dir,game.filename),extract_dir,game)
-        RomLoader::ArchiveExtractor.delete_archive(File.join(extract_dir,game.filename))
-      elsif result && !isWindows? && game.system.name == "MAME"
-        puts "Finished downloading #{game.filename} to #{extract_dir}."
-        puts "NOTE: No archive extraction. MAME roms must remain zipped to play."
-        file_or_dir_to_open = extract_dir
-      elsif result && isWindows?
-        puts "Finished downloading #{game.filename} to #{extract_dir}."
-        file_or_dir_to_open = extract_dir
-      else
-        puts "An error occured, the rom couldn't be downloaded.\n\n"
-      end
-    else
-      puts "File already exists.\n\n"
-    end
-
-    sleep 2
-    file_or_dir_to_open
-  end
-  
-end
-
-
+require 'pry'
+# The CLI class
+class RomLoader::RomLoaderCli
+
+  def initialize
+    RomLoader::GameSystem.create_from_collection(RomLoader::FreeromsScraper.system_scrape("http://freeroms.com"))
+    raise RomLoader::ScrapingError::NoElementFound.exception("ERROR: Systems index is currently unavailable. Exiting the program.") if RomLoader::GameSystem.all.size == 0
+  end
+
+  # Starts the CLI, called in romloader.rb
+  def start
+    input_stack = []
+    control_flow_level = 1
+
+    puts "\nThanks for using RomLoader, powered by freeroms.com!\nNOTE: To play the games, please download an emulator for the desired system.\nConnecting to freeroms.com and retrieving the systems index...\n\n"
+    sleep 3
+    while control_flow_level > 0 
+      case control_flow_level
+      when 1
+        list_systems
+        input = input_prompt("Select a system (1-#{RomLoader::GameSystem.all.size}) [exit]:",1..RomLoader::GameSystem.all.size)
+        if input == "exit"
+          control_flow_level = 0
+        else
+          input_stack.unshift(input)
+          control_flow_level += 1
+        end
+      when 2
+        system = select_system(input_stack[0].to_i)
+        list_system_index(system)
+        if system.get_rom_indices.empty?
+          begin
+            raise RomLoader::ScrapingError::NoElementFound.exception("ERROR: Requested system is currently unavailable. Try another one.")
+          rescue => e
+            puts "#{e.message}\n\n"
+            sleep 2
+            control_flow_level -= 1
+            input_stack.shift
+          end 
+        else
+          input = input_prompt("Select a letter [back|exit]:", /[#{system.get_rom_indices.join.downcase}]/,control_flow_level)
+          control_flow_level = flow_controller(input,control_flow_level,input_stack)
+        end
+      when 3
+        game_collection = select_game_collection_by_index(system,input_stack[0].upcase)
+        if game_collection.empty?
+          begin
+            raise RomLoader::ScrapingError::NoElementFound.exception("ERROR: Requested game index is currently unavailable. Try another one.")
+          rescue => e
+            puts "#{e.message}\n\n"
+            sleep 2
+            control_flow_level -= 1
+            input_stack.shift
+          end
+        else
+          list_games(game_collection)
+          input = input_prompt("Select a game (1-#{game_collection.size}) [back|exit]", 1..game_collection.size,control_flow_level)
+          control_flow_level = flow_controller(input,control_flow_level,input_stack)
+        end
+      when 4
+        game = select_game(game_collection,input_stack[0].to_i)
+        if game.download_url == nil
+          begin
+            raise RomLoader::ScrapingError::NoElementFound.exception("ERROR: Requested game is currently unavailable. Try another one.")
+          rescue => e
+            puts "#{e.message}\n\n"
+            sleep 2
+            control_flow_level -= 1
+            input_stack.shift
+          end
+        else
+          display_rom_details(game)
+          input = input_prompt("Download? (Y/n) [exit]:", /[yn]/, control_flow_level)
+          if input == 'y' || input == ""
+            file_or_dir_to_open = download_rom(game)
+            if file_or_dir_to_open
+              if /\".+\"/.match(file_or_dir_to_open)
+                game_file = /\".+\"/.match(file_or_dir_to_open)[0]
+                input = input_prompt("Play #{game_file}? (y/N) [exit]:", /[yn]/,control_flow_level)
+              else
+                input = input_prompt("Open #{file_or_dir_to_open}? (y/N) [exit]:", /[yn]/,control_flow_level)
+              end
+              
+              if !isWindows?
+                system("open #{file_or_dir_to_open}") if input == 'y'
+              else
+                system("powershell -command \"& { Invoke-Item '#{file_or_dir_to_open}' }\"") if input == 'y'
+              end
+            end 
+          end
+          input_stack.shift
+          input == "exit" ? control_flow_level = 0 : control_flow_level -= 1
+        end
+      end
+    end
+
+    puts "Happy Gaming!\n\n"
+  end
+
+  # Sets control_flow_level in RomLoaderCli#start, manipulates input_stack in RomLoaderCli#start
+  def flow_controller(input,control_flow_level,input_stack)
+    if input == "exit"
+      0
+    elsif input == "back"
+      input_stack.shift
+      control_flow_level - 1
+    else
+      input_stack.unshift(input)
+      control_flow_level + 1
+    end
+  end
+
+  # Lists the game systems scraped from http://freeroms.com and saved in Romloader::GameSystem.all
+  # (e.g. 1. Amiga, 2. Atari, etc...)
+  def list_systems 
+    RomLoader::GameSystem.all.each_with_index { |game_system, index| puts "#{index+1}. #{game_system.name}"}
+    print "\n"
+  end
+
+  # Retrieves an individual Romloader::GameSystem object from Romloader::GameSystem.all
+  def select_system(index)
+    RomLoader::GameSystem.all[index-1]
+  end
+
+  # List game index for the selected system by letter
+  # (e.g. A B C D...)
+  def list_system_index(selected_system)
+    if selected_system.get_rom_indices.empty?
+      selected_system.rom_indices = RomLoader::FreeromsScraper.rom_index_scrape(selected_system.rom_index_url)
+    end
+    
+    puts "#{selected_system.name} index:"
+    selected_system.get_rom_indices.each {|letter| print letter + " "}
+    puts "\n\n"
+  end
+
+  # Retrieves all the games available for the selected system under the selected index
+  # (e.g. NES,"G")
+  def select_game_collection_by_index(system, letter)
+    puts "Loading roms...\n"
+    games_list = system.get_roms_by_letter(letter)
+    games_list ||= system.add_roms_to_collection_by_letter(letter,RomLoader::GameRom.create_collection(RomLoader::FreeromsScraper.rom_scrape(system.get_rom_collection_url(letter))))
+  end
+
+  # List all the games available for the selected index
+  # (e.g. "S": 1. Super Castlevania, 2. Super Mario World, etc...)
+  def list_games(games)
+    games.each_with_index {|game,index| puts "#{index+1}. #{game.name}"}
+    print "\n"
+  end
+
+  # Selects an individual game from the provided collection via index
+  def select_game(game_collection,index)
+    game_collection[index-1].set_rom_details(RomLoader::FreeromsScraper.rom_details(game_collection[index-1].rom_detail_url))
+    game_collection[index-1]
+  end
+
+  # List the details of the selected game
+  # (e.g. Chrono Trigger | SNES | 5.38 MB | .zip)
+  def display_rom_details(game)
+    puts "Rom details:"
+    puts "#{game.name} | System: #{game.system.name} | File size: #{game.size} | File type: #{game.file_ext}"
+    print "\n"
+  end
+
+  # Prints a custom message, takes user input, asesses whether the input is valid, and returns the input
+  def input_prompt(message,accepted_input,control_flow_level=nil)
+    valid = false
+    until valid 
+      print message + " "
+      input = gets.chomp.strip.downcase
+      if accepted_input.class == Regexp && accepted_input.match(input)
+        valid = true
+      elsif accepted_input.class == Range && /\A\d+\Z/.match(input) && accepted_input.include?(input.to_i)
+        valid = true
+      elsif input == "exit" || (input == "back" &&  control_flow_level && control_flow_level.between?(2,3))
+        valid = true
+      elsif input == "" && control_flow_level == 4
+        valid = true
+      else
+        print "Invalid input! "
+      end
+    end
+    print "\n"
+    input
+  end
+
+  def isWindows?
+    /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+  end
+
+  # Downloads the selected game to the local directory (~/videogame_roms)
+  def download_rom(game)
+    file_or_dir_to_open = nil
+    extract_dir = RomLoader::ArchiveExtractor.create_extract_dir(game)
+    if !File.exist?(File.join(extract_dir,game.filename))
+      puts "Downloading #{game.name} (#{game.size})..."
+      if isWindows?
+        result = Dir.chdir(extract_dir) { system("powershell -command \"& { Invoke-WebRequest '#{game.download_url}' -OutFile '#{game.filename}' }\"") }
+      else
+        result = Dir.chdir(extract_dir) { system("curl -Og# \"#{game.download_url}\"") }
+      end
+
+      if result && !isWindows? && game.system.name != "MAME"
+        puts "Finished downloading #{game.filename} to #{extract_dir}. Extracting..."
+        file_or_dir_to_open = RomLoader::ArchiveExtractor.extract(File.join(extract_dir,game.filename),extract_dir,game)
+        RomLoader::ArchiveExtractor.delete_archive(File.join(extract_dir,game.filename))
+      elsif result && !isWindows? && game.system.name == "MAME"
+        puts "Finished downloading #{game.filename} to #{extract_dir}."
+        puts "NOTE: No archive extraction. MAME roms must remain zipped to play."
+        file_or_dir_to_open = extract_dir
+      elsif result && isWindows?
+        puts "Finished downloading #{game.filename} to #{extract_dir}."
+        file_or_dir_to_open = extract_dir
+      else
+        puts "An error occured, the rom couldn't be downloaded.\n\n"
+      end
+    else
+      puts "File already exists.\n\n"
+    end
+
+    sleep 2
+    file_or_dir_to_open
+  end
+  
+end
+
+

data/lib/romloader/scraping_error/errors.rb

@@ -1,8 +1,8 @@
-
-module RomLoader::ScrapingError
-
-  class NoElementFound < StandardError
-    
-  end
-
+
+module RomLoader::ScrapingError
+
+  class NoElementFound < StandardError
+    
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: romloader
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Efrain Perez Jr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -113,7 +113,7 @@ files:
 - lib/romloader/game_system.rb
 - lib/romloader/romloader_cli.rb
 - lib/romloader/scraping_error/errors.rb
-homepage: https://github.com/jinstrider2000/romloader-cli-gem
+homepage: https://github.com/jinstrider2000/romloader
 licenses:
 - MIT
 metadata: {}
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A videogame rom downloader powered by freeroms.com!