countries_cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2050fe1a4e0b494c19b10d3e3012b08252655184
-  data.tar.gz: 792c7edd5c30702b5245cb9d957e693d3e2da4e3
+  metadata.gz: 0e4fe91fa1cc1758dd9f5b65556abd1f33d98598
+  data.tar.gz: a3324a90bdd6b57b933aa9e063b21d3f2b91d636
 SHA512:
-  metadata.gz: 862c49ca41e6b71373083ce373bdc49f134f510da29bd744d663838f39b07d92bee34eace557cccddf9ebb07c7d0e4996806b26cdfaf965b066b459d74065c43
-  data.tar.gz: 61a056599c7ba808fbc4cd4ad40dda52e92b2d912b973f9608f6bf25b8e5364abaecbeec758bcf2b80a554ed56c4cca727e1e23be27f7b8c36470285b5d2f086
+  metadata.gz: 65c06e1f51f62f5def5f7a9672ba88557f68baa6b123d18af094803fb3eced80293b0613e121ff866eb90174a35e965462019276560f63c69b11c2a023db91bd
+  data.tar.gz: 426c9b77df96057edf66b65ba3c36188c37d698f42183a5e3a7a32a646741c6534fd3f184b558fa3d039d946420d42ccfffdb33707623d4aa8acea08a186cf74

data/Country.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "gem-release"
   
 end

data/Gemfile.lock

@@ -1,18 +1,13 @@
 PATH
   remote: .
   specs:
-    countries_cli (0.1.2)
+    countries_cli (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
     diff-lcs (1.3)
     gem-release (2.0.1)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -35,7 +30,6 @@ DEPENDENCIES
   bundler (~> 1.17)
   countries_cli!
   gem-release
-  pry
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/README.md

@@ -1,43 +1,87 @@
-# Country
+# countries_cli
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/Country`. To experiment with that code, run `bin/console` for an interactive prompt.
+A CLI of countries based on the REST Countries API. It allows you to look for information on countries based on population, region, currency, subregion, name, capital, and language.
 
-TODO: Delete this and the text above, and describe your gem
+## Getting Started
 
-## Installation
+These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
 
-Add this line to your application's Gemfile:
+### Prerequisites
 
-```ruby
-gem 'Country'
+What things you need to install the software and how to install them
+
+```
+Give examples
 ```
 
-And then execute:
+### Installing
 
-    $ bundle
+A step by step series of examples that tell you how to get a development env running
 
-Or install it yourself as:
+Say what the step will be
 
-    $ gem install Country
+```
+Give the example
+```
 
-## Usage
+And repeat
+
+```
+until finished
+```
 
-TODO: Write usage instructions here
+End with an example of getting some data out of the system or using it for a little demo
 
-## Development
+## Running the tests
+
+Explain how to run the automated tests for this system
+
+### Break down into end to end tests
+
+Explain what these tests test and why
+
+```
+Give an example
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+### And coding style tests
 
-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](https://rubygems.org).
+Explain what these tests test and why
+
+```
+Give an example
+```
+
+## Deployment
+
+Add additional notes about how to deploy this on a live system
+
+## Built With
+
+* [Dropwizard](http://www.dropwizard.io/1.0.2/docs/) - The web framework used
+* [Maven](https://maven.apache.org/) - Dependency Management
+* [ROME](https://rometools.github.io/rome/) - Used to generate RSS Feeds
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/Country. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Please read [CONTRIBUTING.md](https://gist.github.com/PurpleBooth/b24679402957c63ec426) for details on our code of conduct, and the process for submitting pull requests to us.
+
+## Versioning
+
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/your/project/tags). 
+
+## Authors
+
+* **Billie Thompson** - *Initial work* - [PurpleBooth](https://github.com/PurpleBooth)
+
+See also the list of [contributors](https://github.com/your/project/contributors) who participated in this project.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
 
-## Code of Conduct
+## Acknowledgments
 
-Everyone interacting in the Country project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/Country/blob/master/CODE_OF_CONDUCT.md).
+* Hat tip to anyone whose code was used
+* Inspiration
+* etc

data/lib/Country/cli.rb

@@ -1,5 +1,4 @@
 require_relative 'country'
-require 'pry'
 require 'open-uri'
 require 'json'
 # CLI Controller
@@ -55,14 +54,14 @@ class Country::CLI
     
     def display_options 
         puts "Enter an option (1-12): "
-        puts "1. All country names"
+        puts "1. Display all country names"
         puts "2. Search country by name"
-        puts "3. Search countries that start with given letter"
+        puts "3. Search country by suffix"
         puts "4. Search countries with given currency name"
         puts "5. Search countries with given currency symbol"
         puts "6. Search countries with given language"
         puts "7. Search countries with certain population"
-        puts "8. All countries sorted by population(ascending or descending)"
+        puts "8. Display all countries sorted by population(ascending or descending)"
         puts "9. Search by capital"
         puts "10. Search by region"
         puts "11. Search by subregion"
@@ -79,6 +78,7 @@ class Country::CLI
         country = Country::COUNTRY.search_by_name(input)
         if country
             country.info
+            puts "\n"
         else 
             puts "Invalid name. Please list all the countries and choose a name from there."
         end 
@@ -90,6 +90,7 @@ class Country::CLI
         country = Country::COUNTRY.search_by_suffix(input)
         if country
             country.info
+            puts "\n"
         else 
             puts "Country with given suffix not found."
         end 
@@ -141,8 +142,8 @@ class Country::CLI
         puts "Greater(g) than or lower(l) than?"
         input = gets.chomp
         
-        if input.downcase == "l" || input.downcase == "lower" || input.downcase == "g" || input.downcase == "greater" || input.downcase == "h" || input.downcoase == "higher"
-            puts "Enter population: "
+        if input.downcase == "l" || input.downcase == "lower" || input.downcase == "g" || input.downcase == "greater" || input.downcase == "h" || input.downcase == "higher"
+            puts "Enter population (ex: 10000): "
             population = gets.chomp.to_i
             countries = Country::COUNTRY.search_all_with_population(input, population)
             if countries.count > 0
@@ -151,7 +152,7 @@ class Country::CLI
                     puts "\n"
                 end 
             else 
-                puts "No countries with given language were found."
+                puts "No countries with the specified population were found."
             end
         else
             puts "Wrong input. Please try again.\n"
@@ -166,6 +167,7 @@ class Country::CLI
             countries_sorted = Country::COUNTRY.all.sort{|country1, country2| country2.population <=> country1.population}
             countries_sorted.each do |country|
                 country.info
+                puts "\n"
             end 
         elsif input == "a" 
             countries_sorted = Country::COUNTRY.all.sort{|country1, country2| country1.population <=> country2.population}
@@ -185,6 +187,7 @@ class Country::CLI
         country = Country::COUNTRY.search_by_capital(input)
         if country
             country.info
+            puts "\n"
         else 
             puts "Invalid capital. Please enter a valid capital."
         end

data/lib/Country/country.rb

@@ -6,7 +6,6 @@ class Country::COUNTRY
     
     def initialize(attr_hash)
         attr_hash.each do |attribute, value|
-            # binding.pry
             if self.respond_to?(attribute)
                 self.send(("#{attribute}="), value)
             end
@@ -28,14 +27,13 @@ class Country::COUNTRY
     end 
     
     def self.all_country_names
-        # binding.pry
         self.all.each_with_index do |country, i|
             puts "#{i+1}. #{country.name}" 
         end
     end
     
     def self.search_by_name(name)
-        self.all.detect{|country| country.name == name}
+        self.all.detect{|country| country.name.downcase == name.downcase}
     end 
     
     def info
@@ -50,7 +48,7 @@ class Country::COUNTRY
     end 
     
     def self.search_by_suffix(suffix)
-        self.all.detect{|country| country.name.match(/^(#{suffix})/)}
+        self.all.detect{|country| country.name.downcase.match(/^(#{suffix.downcase})/)}
     end 
     
     def self.search_all_with_currency_symbol(currency_symbol)

data/lib/Country/version.rb

@@ -1,3 +1,3 @@
 module Country
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/Country.rb

@@ -3,7 +3,6 @@ require_relative "./Country/cli"
 require_relative "./Country/country"
 require "open-uri"
 require "json"
-require "pry"
 
 module Country
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: countries_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kenneth Young Castro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement