wettr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed26cce4af9102599f116655473be96271414b0fb8f87d22a9f07f032e01a098
-  data.tar.gz: e2a7dcb6b21479a8e6735962dd56e6d10c4717df4f315653f2ec7b185e315e7d
+  metadata.gz: d06916e7600ff91c086a3757749b9f7a9c732ab519c0ca34f3694b03a3b9f605
+  data.tar.gz: e695734140df54f1b7b6865a73443302f1a4294d5a02e5a93c343924f372fede
 SHA512:
-  metadata.gz: 24ff53e6e4927068778a3b734284a93b5fff13338d261a9ba15ce29ccd85b5c8cf3af5c3cc2c83eb2a4eafad80d6b9e8c43a44328f7630e5d20924a4da5fcf07
-  data.tar.gz: d649f1041d56ff09ad1b825305136b4e60332050ee667838689b0e3e0265b06a41d429a19aa3299db8f9e4290f9454101c9a9df3ce518cb73afe84b7c966dcad
+  metadata.gz: 0ba8cafb6e11c6526f08f08a8a00675af0294b72a8d58bbd1a8b9f132115f7fb734b54e54f1216e44ac8c13ba4c389ac54b231af63e5a640e98943ac7ecc12c7
+  data.tar.gz: 57aa7781a484a0e55e161ce6fa6d9f52756d2272c2887fbc6ff6209fc9d1a0e66bda8da6ad2c27100384bc17d2388c2577ed52552641c2f6ff40330116987e60

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    wettr (0.1.2)
-      dotenv (~> 2.1)
+    wettr (0.1.3)
       httparty (~> 0.18.1)
 
 GEM
@@ -10,7 +9,6 @@ GEM
   specs:
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    dotenv (2.7.6)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)

data/README.md

@@ -8,9 +8,17 @@ wettr can get current weather data using either a zip/postal code or an IP addre
 
     $ gem install wettr
 
+wettr also requires an API key for OpenWeatherMap's Current Weather API to be located in ~/.wettr.yml.
+To get a key sign up for an account on [their website](https://home.openweathermap.org/users/sign_up).
+Once you have a key, create the `.wettr.yml` file in your home directory.
+Add the following line to the file:
+```yaml
+API_KEY: <YOUR_API_KEY_HERE>
+```
+
 ## Usage
 
-wettr does not need to be invoked with any parameters to work. Simply type `wettr` and you will get current weather information based on your public IP address.
+Once installed, wettr does not need to be invoked with any parameters to work. Simply type `wettr` and you will get current weather information based on your public IP address.
 Below are some examples of the way wettr can be used:
 ```bash
 wettr
@@ -29,15 +37,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 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).
 
-wettr requires an API key for OpenWeatherMap's Current Weather API.
-To get a key sign up for an account on [their website](https://home.openweathermap.org/users/sign_up).
-Once you have a key, create a `.env` file in the project's root directory.
-Add the following line to the `.env` file:
-
-```bash
-API_KEY=<YOUR_API_KEY_HERE>
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/JWDonovan/wettr. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/JWDonovan/wettr/blob/master/CODE_OF_CONDUCT.md).

data/exe/wettr

@@ -3,4 +3,5 @@
 require "bundler/setup"
 require "wettr"
 
+Wettr::Config.start
 Wettr::CLI.new(ARGV).run

data/lib/wettr.rb

@@ -1,11 +1,11 @@
-require "dotenv/load"
-Dotenv.require_keys("API_KEY")
 require "httparty"
+require "yaml"
 
 module Wettr
   class Error < StandardError; end
 end
 
+require_relative "./wettr/config"
 require_relative "./wettr/version"
 require_relative "./wettr/cli"
 require_relative "./wettr/weather"

data/lib/wettr/config.rb

@@ -0,0 +1,38 @@
+class Wettr::Config
+  @@API_KEY = nil
+  @@config_hash = {}
+
+  def self.start
+    self.read_config_file
+    self.set_api_key
+  end
+
+  def self.API_KEY
+    @@API_KEY
+  end
+
+  private
+  
+  def self.set_api_key
+    if @@config_hash["API_KEY"]
+      @@API_KEY = @@config_hash["API_KEY"]
+    else
+      puts "Cannot find API_KEY in .wettr.yml"
+      puts "An OpenWeatherMap Current Weather API key is required to use wettr"
+      puts "Create an account here to sign up for a key: https://home.openweathermap.org/users/sign_up"
+      puts "See https://github.com/JWDonovan/wettr for more info"
+      exit
+    end
+  end
+
+  def self.read_config_file
+    begin
+      @@config_hash = YAML.load(File.read(ENV["HOME"] + "/.wettr.yml")) || {}
+    rescue Errno::ENOENT => exception
+      puts "Cannot find the wettr config file"
+      puts "Please create a .wettr.yml config file in your home directory in order to use wettr"
+      puts "See https://github.com/JWDonovan/wettr for more info"
+      exit
+    end
+  end
+end

data/lib/wettr/ip_api.rb

@@ -1,6 +1,5 @@
 class Wettr::IPAPI
   include HTTParty
-  # debug_output STDOUT
 
   base_uri "https://ipapi.co"
   # https://ipapi.co/1.1.1.1/json

data/lib/wettr/version.rb

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

data/lib/wettr/weather_api.rb

@@ -1,9 +1,7 @@
 class Wettr::WeatherAPI
   include HTTParty
-  # debug_output STDOUT
 
   base_uri "https://api.openweathermap.org"
-  default_params appid: ENV["API_KEY"], units: "imperial"
 
   def self.call_with_lat_and_lon(lat:, lon:)
     @options = { query: { lat: lat, lon: lon } }
@@ -18,7 +16,17 @@ class Wettr::WeatherAPI
   private
   
   def self.call
+    default_params appid: Wettr::Config.API_KEY, units: "imperial"
+    
     response = self.get("/data/2.5/weather", @options)
+
+    if response["cod"] != 200
+      puts "Encountered an error contacting OpenWeatherMap"
+      puts "Returned the following response: #{ response['cod'] }"
+      puts "Message: #{ response['message'] }"
+      exit
+    end
+
     response
   end
 end

data/wettr.gemspec

@@ -1,5 +1,3 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require_relative "lib/wettr/version"
 
 Gem::Specification.new do |spec|
@@ -23,13 +21,11 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  spec.files << ".env"
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.executables << "wettr"
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dotenv", "~> 2.1"
   spec.add_dependency "httparty", "~> 0.18.1"
   
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wettr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - JWDonovan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +74,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env"
-- ".env.production"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -106,6 +90,7 @@ files:
 - exe/wettr
 - lib/wettr.rb
 - lib/wettr/cli.rb
+- lib/wettr/config.rb
 - lib/wettr/ip.rb
 - lib/wettr/ip_api.rb
 - lib/wettr/version.rb