jake-scripts 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac1d1aa064066c6bdf9048e1c65338f5c8a58c3
-  data.tar.gz: 5b59e447a3919042e5ab7100536d025f9212a4e6
+  metadata.gz: a34cbe9ea9e4d0c3cbf59685f02af4c2ba6b14dd
+  data.tar.gz: 306ef359ea24a32a13be29da2048020a60511a71
 SHA512:
-  metadata.gz: d23ece199568384abce630ec7adcfb54506ca619c17e3bd9fa952e54ec1230d136adfc7c23fc3e9e9864352072d70a2549c3d2896647da05b6281ff9fa3c5581
-  data.tar.gz: 9471abba95dae9a4d2f2aa57c8fc8ce423fdee73117f8499596bd9774fa604969e4634801246b0cb5210b58c2d7c7f4e421c35f39ca07ffdb4955734365f8cb9
+  metadata.gz: 33e086690d360bff5046d2c684f0194fa3e9c4047156f830c3e9d99ae27a043115adde8ad5c2dada212b974c098e74cc010ed8cadcbe0c2df035fdb6fb6fa8a8
+  data.tar.gz: fa1274919729323079da81ec5a327727ee3f03bd57c217ac0428b53e6439ae4ca3d99ea59c2cc77393f8f935390c7e570bf277c09b8993869c4966ebea7d8fba

data/exe/ip_list

@@ -4,6 +4,7 @@
 
 require 'rest-client'
 require 'socket'
+require 'os'
 
 def network_info
   # Grabs public WAN address.
@@ -23,29 +24,43 @@ def network_info
     exit(1)
   end
 
-  # Greps scutil for DNS server.
+  # Greps either scutil or resolv.conf for DNS server.
   begin
-    dns = %x[scutil --dns | grep nameserver | head -1 | awk '{print$3}']
+    if OS.linux?
+      dns = %x[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}']
+    else
+      puts "OS not supported!"
+      exit(1)
+    end
   rescue
     puts "Can't find DNS"
     exit(1)
   end
 
-  # Greps netstat for router address.
+  # Greps netstat or ip route for router address.
   begin
-    router = %x[netstat -rn | grep default | head -1 | awk '{print$2}']
+    if OS.linux?
+      router = %x[ip route | grep default | head -1 | awk '{print$3}']
+    elsif OS.mac?
+      router = %x[netstat -rn | grep default | head -1 | awk '{print$2}']
+    else
+      puts "OS not supported!"
+      exit(1)
+    end
   rescue
     puts "Can't find Router"
     exit(1)
   end
 
   puts
-  puts "======================"
+  puts "======================="
   puts "| WAN: #{response}"
   puts "| LAN(s): #{lans.join(', ')}"
   puts "| ROUTER: #{router}"
   puts "| DNS: #{dns}"
-  puts "======================"
+  puts "======================="
   puts
 end
 

data/jake-scripts.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "money", "~> 6.9.0"
   spec.add_runtime_dependency "monetize", "~> 1.7.0"
+  spec.add_runtime_dependency "os"
 end

data/lib/jake/scripts/version.rb

@@ -1,5 +1,5 @@
 module Jake
   module Scripts
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jake-scripts
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Jake Meyer
@@ -136,11 +136,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - jakewmeyer@gmail.com
 executables:
-- ".DS_Store"
 - currency
 - decrypt
 - encrypt
@@ -153,7 +166,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -162,7 +174,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/.DS_Store
 - exe/currency
 - exe/decrypt
 - exe/encrypt