netgeo 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570b73ac609c08dd02afcacbf2583d56177cfd63
-  data.tar.gz: ff37a1367636d75a1b440e2401cda7f24ae74cfa
+  metadata.gz: d2bcbbf15c62f2edc3c53616f423a0eb764ee2c0
+  data.tar.gz: dec319db743a3e8da000e9237e928fec3dddf47d
 SHA512:
-  metadata.gz: adee6a17384f533d26eda8dce4177188e8d15c190e1d05b2e961306ed7eb434a5d57cd4f4c9c5465f9d76bfe74b6939b67d35d4de66490b720da69f7eda12f9e
-  data.tar.gz: 7700714e87c33551465963301b50b246900b04eb4187ea04a3a625491af1e3effb0ee5945a75b2d032101b1bf087005a8b1c6570a218a49a8111d22cc85dc2c3
+  metadata.gz: ef277a42424e76900b6ddab8e7624545021ee8132d7fb7eedea9b6ecfc0b655228e14e1ed808906df8c7c3722d828168395dae531a211d6027e7727a70698554
+  data.tar.gz: 8ac2ad5fc0ca7d99068e5b3632b6e711c5f2309ec6d9b8a30d654a07f44536c5e4756734e388a29987a7f5d96cc3573b970cd6cafd98ba2edaae1330ed33e6df

data/.gitignore

@@ -10,3 +10,31 @@
 
 # rspec failure tracking
 .rspec_status
+
+# General
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

data/exe/netgeo

@@ -6,14 +6,12 @@
 # to make all your piping dreams come true.
 #
 
-
 require 'slop'
 require 'rest-client'
 require 'json'
 require 'os'
 require 'socket'
 
-
 # Contains option parsing logic
 def netgeo
   opts = Slop.parse suppress_errors: true do |o|
@@ -21,25 +19,30 @@ def netgeo
 
     # Gets WAN address
     o.on '-w', '--wan', 'Returns WAN IP' do
-      url = "https://api.ipify.org"
-      response = RestClient.get(url)
+      begin
+        url = 'https://api.ipify.org'
+        response = RestClient.get(url)
+      rescue RestClient::SSLCertificateNotVerified
+        puts 'SSL Error'
+        exit(1)
+      end
       puts response
     end
 
     # Gets LAN(s)
     o.on '-l', '--lan', 'Returns LAN IP(s)' do
-      lans = Socket.ip_address_list.select{|intf| intf.ipv4_private?}.map { |intf| intf.ip_address }
+      lans = Socket.ip_address_list.select(&:ipv4_private?).map(&:ip_address)
       puts lans.join(', ')
     end
 
     # Gets Router IP
     o.on '-r', '--router', 'Returns Router IP' do
       if OS.linux?
-        router = %x[ip route | grep default | head -1 | awk '{print$3}']
+        router = `ip route | grep default | head -1 | awk '{print$3}'`
       elsif OS.mac?
-        router = %x[netstat -rn | grep default | head -1 | awk '{print$2}']
+        router = `netstat -rn | grep default | head -1 | awk '{print$2}'`
       else
-        puts "OS not supported!"
+        puts 'OS not supported!'
         exit(1)
       end
       puts router
@@ -48,11 +51,11 @@ def netgeo
     # Gets DNS nameserver
     o.on '-d', '--dns', 'Returns DNS Nameserver' do
       if OS.linux?
-        dns = %x[cat /etc/resolv.conf | grep nameserver | head -1 | awk '{print$2}']
+        dns = `cat /etc/resolv.conf | grep nameserver | head -1 | awk '{print$2}'`
       elsif OS.mac?
-        dns = %x[scutil --dns | grep nameserver | head -1 | awk '{print$3}']
+        dns = `scutil --dns | grep nameserver | head -1 | awk '{print$3}'`
       else
-        puts "OS not supported!"
+        puts 'OS not supported!'
         exit(1)
       end
       puts dns
@@ -60,9 +63,8 @@ def netgeo
 
     o.string '-m', '--mac [interface]', 'Returns MAC address for interface. Ex. eth0'
 
-
     o.on '-g', '--geo', 'Returns Current IP Geodata' do
-      url = "http://ip-api.com/json/"
+      url = 'http://ip-api.com/json/'
       response = RestClient.get(url)
       info = JSON.parse(response)
       puts info['query']
@@ -77,13 +79,12 @@ def netgeo
     o.separator '[all] [ip] [city] [region] [country] [zip] [isp]'
     o.separator 'Example: netgeo -s ip,city,isp 8.8.8.8'
     o.array '-s', '[options] [ip address]', 'Specific Geodata'
-    o.on '-h', '--help', 'version 1.0.2' do
+    o.on '-h', '--help', 'version 0.1.2' do
       puts o
       exit
     end
   end
 
-
   # Logic for specific geodata
   options = opts[:s]
   ip = opts.arguments || ''
@@ -107,12 +108,10 @@ def netgeo
     puts info['isp'] if options.include? 'isp'
   end
 
-
   # Logic for specific MAC address
   options = opts[:m]
-  unless options == nil
-  puts %x[ifconfig #{options} | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}']
-  end
+  return if options.nil?
+  puts `ifconfig #{options} | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}'`
 end
 
 netgeo

data/lib/netgeo/version.rb

@@ -1,3 +1,3 @@
 module Netgeo
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netgeo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jake Meyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler