nswparks 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525bc1aca1308de0f3d4318941237c89012f1b2a
-  data.tar.gz: 49bb75b21ac026197465df8cf2969c24ea8a2a03
+  metadata.gz: 479751f7d898254d9eda04ff4119df805d76c945
+  data.tar.gz: 897d08b002a56a135e671ca3981669de9fd47308
 SHA512:
-  metadata.gz: 1dbc4de67a6f37a8ea0df9c10238341325f43ae8fa55f252618c64c3b0b2b98646fb9a4a5c10d28f0ee88bc7f41288f116c21b596de7d55acc0a24c38a6d5f90
-  data.tar.gz: 279fb23b1d36cbf5cc2dbfdfe5a26dea040f942ed27b4527f7937da45089e74fab56f001d8c794fa479f67583756e0653ebc0490581f6ed7fec5ea60de5a9121
+  metadata.gz: bc9076b43cb0dd4c5aed3f6feb08922c9750de3acebdd88ce837cc707c5fc5d701f442cee9cc10e5f309af896648f4378ef8e36105b47c59db3d7a520f21dca9
+  data.tar.gz: f99523d8ebc16b523735271361f8e1a6712fe2e22d0ddbb17c7f4603cab3a699b82f48ddcd924b8956d93a0e27d8c79e48fe9649066ab8424ccd768fb46c5dbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nswparks (1.0.0)
+    nswparks (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -28,15 +28,17 @@ State Government.
 * It allows you to request information on each national park from the main list 
   and from the region list
 
-
-
 ## Installation
 
-You can install this gem via gem install NSWParks. The NSWParks CLI will be installed and you can run NSWParks to get a list and information on NSW National Parks right in your command line.
+You can install this gem via `gem install nswparks`. The nswparks CLI will be installed and you can run `nswparks` to get a list and information on NSW National Parks right in your command line.
 
 ## Usage
 
-Run: NSWParks after installing the gem.
+Run: `nswparks` after installing the gem.
+
+## Contributors
+
+Malki Davis for the hint to use system open
 
 ## Development
 
@@ -44,7 +46,7 @@ After checking out the repo, run `bundle exec bin/setup` to install dependencies
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to rubygems.org.
 
-To run the development version of the CLI run `bundle exec bin/NSWParks`.
+To run the development version of the CLI run `bundle exec bin/nswparks`.
 
 ## Contributing
 

data/bin/nswparks

@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
 
-module NSWParks
-  
-end
-
+require_relative "../lib/nswparks"
 require_relative '../lib/nswparks/nsw_parks'
 require_relative '../lib/nswparks/cli'
-require_relative "../lib/nswparks"
 
 NSWParks::CLI.new.call

data/lib/nswparks.rb

@@ -7,8 +7,9 @@ require 'open-uri'
 require 'bundler'
 Bundler.require
 
+require './lib/nswparks/version'
 require_relative '../lib/nswparks/nsw_parks'
 require_relative '../lib/nswparks/cli'
-require './lib/nswparks/version'
+
 
 

data/lib/nswparks/cli.rb

@@ -27,11 +27,7 @@ class NSWParks::CLI
     # Validate user input - input must be an integer and exist in the list
     while !(park_no.is_a? Integer) || park_no < 1 || park_no > NSWParks::Nsw_parks.all.length
       park_list
-      puts ""
-      puts "-----------------------------------------------"
-      puts "Please enter a park number from the list above:"  # Prompt user to enter again
-      puts "-----------------------------------------------"
-      park_no = gets.strip.to_i
+      park_no = NSWParks::Nsw_parks.valid_input
     end  
     puts ""
     puts NSWParks::Nsw_parks.all[park_no - 1].name  # Gives returned park info a heading of the park name
@@ -50,17 +46,13 @@ class NSWParks::CLI
   def park_region
     region_no = 0
     input = 0
-    areas = park_area  # Use #park_area to output list of NSW Regions
+    areas = park_area  # Use #park_area to output list of NSW Regions and select a region
     puts "Enter the number for the region you are interested in:"
     region_no = gets.strip.to_i 
     # Validate user input - input must be numerical and exist in the list   
     while !(region_no.is_a? Integer) || region_no < 1 || region_no > areas.length
       park_area
-      puts ""
-      puts "--------------------------------------------------"
-      puts "Please enter one of the regions in the list above:"  # Prompt user to enter again
-      puts "--------------------------------------------------"      
-      region_no = gets.strip.to_i
+      region_no = NSWParks::Nsw_parks.valid_input
     end
     puts ""
     puts "The parks in the #{areas[region_no.to_i - 1]} region are:"
@@ -73,11 +65,7 @@ class NSWParks::CLI
     while !(input.is_a? Integer) || input < 1 || input > array.length
       array = NSWParks::Nsw_parks.park_region(region_no.to_s)
       array.each.with_index(1) {|a,i| puts "#{i}. #{a}"}
-      puts ""
-      puts "---------------------------------------------------------"
-      puts "Please enter one of the park numbers from the list above:"  # Prompt user to enter again
-      puts "---------------------------------------------------------"
-      input = gets.strip.to_i
+      input = NSWParks::Nsw_parks.valid_input
     end
     puts ""
     puts "Information for #{array[input - 1]}:"  # Puts out heading of park name
@@ -106,13 +94,13 @@ class NSWParks::CLI
 
   # Starts the app and gives users the available options for the app
   def start
-    answer = 0 
+    answer = nil
     while answer != "exit"
       puts ""
-      puts "For a list of NSW National Parks and information on a park enter 'info"
+      puts "For a list of NSW National Parks and information on a park enter 'info'"
       puts "To exit the program enter 'exit'"
       puts "To see the National Park regions in NSW and choose a park by its region enter 'region'"
-      puts "To access a interactive map of all National Parks in NSW enter 'map'"
+      puts "To access an interactive map of all National Parks in NSW enter 'map'"
       puts "To download a free pocket guide for NSW National Park Regions enter 'guide'"
       puts "To visit the website for a National Park enter 'url'"
       puts ""

data/lib/nswparks/nsw_parks.rb

@@ -1,7 +1,7 @@
 
 class NSWParks::Nsw_parks
 
-	attr_accessor :name, :park_url, :park_region
+	attr_accessor :name, :park_url
 
 	@@all = []  # Collects all NSW National Parks 
 
@@ -23,14 +23,6 @@ class NSWParks::Nsw_parks
 	    park.collect {|a| new(a.text.strip, a.attribute("href").value)}
   	end 	
 
-  	# Instructions to the user on how to use the provided website links
-  	def self.url_use
-  		puts "<------------------------------------------------------------------------------->"
-   		puts " Right-click or Control-click on the website address above and select 'open url'" 
-   		puts "  from the dropdown menu!! This will open the website in your default browser  "
-   		puts "<------------------------------------------------------------------------------->"
-  	end
-
   	# Allow users to access information on any NSW National Park
   	def self.park_overview(park_no)
   		check = ""
@@ -124,12 +116,19 @@ class NSWParks::Nsw_parks
  				park_overview(i + 1) 
  			end
 		end	
-	end				
+	end	
+
+	 def self.valid_input
+    puts ""
+      puts "---------------------------------------------------------"
+      puts "Please enter one of the numbers from the list above:"  # Prompt user to enter again
+      puts "---------------------------------------------------------"
+      gets.strip.to_i
+  end			
 
    # Accesses the website information for a selected NSW National Park
    def self.park_url
    		input = 0
-   		array = 0
    		@@all.each.with_index(1) {|a,i| puts "#{i}. #{a.name}"} # Puts outs list of National Parks
    		puts ""
    		puts "Select the park number from above and enter the number to access the website address"
@@ -137,34 +136,21 @@ class NSWParks::Nsw_parks
    		# Validate user input - input must be numerical and exist in the list
    		while !(input.is_a? Integer) || input < 1 || input > @@all.length  
    			@@all.each.with_index(1) {|a,i| puts "#{i}. #{a.name}"}  # Puts outs list of National Parks
-   			puts ""
-   			puts "----------------------------------------------"
-   			puts "Please enter a park number from the list above:"  # Prompt user to enter again
-   			puts "----------------------------------------------"
-   			input = gets.strip.to_i
+   			input = valid_input
    		end	
-   		puts ""
-   		puts "The website address for #{@@all[input - 1].name} is:"  # Puts a heading of the park name
-   		puts ""
-   		puts @@all[input - 1].park_url  # Puts out the park website address
-   		puts ""  
-   		url_use  # Instructions to the user on how to use the provided website links
+   		system("open #{@@all[input - 1].park_url}")  # Puts out the park website address
    end
 
    # Provides user with a link to the map and instructions to open the link in their browser
    def self.park_map
-   		puts "http://www.nationalparks.nsw.gov.au/nsw-state-map" # No url to scrape - hidden
-   		puts ""
-   		url_use  # Instructions to the user on how to use the provided website links
+   		system("open http://www.nationalparks.nsw.gov.au/nsw-state-map") # No url to scrape - hidden
    end
 
    # Provides user with a link to guides and instructions to open the link in their browser
    def self.park_guide
    		page = Nokogiri::HTML(open("http://www.nationalparks.nsw.gov.au"))	
    		link = page.css("#headerNavBottom nav ul li#mainNav__about .box ul li[5] a")
-   		puts link.attribute("href").value  # Puts out the website address forthe park guides
-   		puts ""
-   		url_use  # Instructions to the user on how to use the provided website links
+   		system("open #{link.attribute("href").value}")  # Puts out the website address forthe park guides
    	end	
  end 	
 

data/lib/nswparks/version.rb

@@ -1,3 +1,3 @@
 module NSWParks
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nswparks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Annette Drapalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler