whee 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae47499005066bd2f7972e45d154d2cc7aee5825f7d642577a5b4632064aba6e
-  data.tar.gz: '08dcfa8319fe3e17b3cc8474a72ed83f11d6cb98276350fe3ac3691954ebb9a3'
+  metadata.gz: 31d6c5100e2dcd46a7afcafc93f89c54431fd52b823b5b22a9ba7d095758c97d
+  data.tar.gz: 4aef7eb4bdb25cccafc333453ecf21863466e659096c627ab40f8e14b4b30237
 SHA512:
-  metadata.gz: 89ebc82e7fb75d08d7708a457c29eda5c71df00b50f97ad7a0d87c72fe38ff08acecc88788f73b7600539ecf16aa226c1b6fdf8877a512a3b829c2ec9bbe4541
-  data.tar.gz: ef5679070676f46b80322ff90cfc664d06fca61d6a0b102f97e47691cae5e7bf0865c06b6782bf2c576c21cb3134c98043f0ef7baf57c069b8db65b0d64a600e
+  metadata.gz: 5ceb0010433f37a430e941479d23c2b570647aa55264af7bf4e6b6fe253a6b32a69ed50478d227e757388154efa0109a5f23dac4ad8a1d79803ede9ca4cf7705
+  data.tar.gz: e6858ec92921d0a36e7e78628b8b8a282a84374ee8654de1805fe4f5db69ad97a520e64eaf8bd1a3845c623852f56f6869c800288b61b8e958cd6b09726c71ad

data/lib/whee.rb

@@ -25,10 +25,47 @@ class Main
     end.parse!(into: @@options)
   end
 
+  # checks whether current directory is a wpilib project
+  def wpilib_proj? 
+    File.exist?(".\\.wpilib\\wpilib_preferences.json")
+  end
+
+  # sets default options based on ./.wpilib/wpilib_preferences.json
+  def wpilib_pref
+    require 'json'
+    
+    # no error checking because this method is only called after `wpilib_proj?`
+    preferences = JSON.parse(File.read(".\\.wpilib\\wpilib_preferences.json"))
+
+    @@options[:year] = preferences["projectYear"]
+    @@options[:team] = preferences["teamNumber"]
+  end
+
+  # refresh list of networks available
+  def netsh_refresh
+    # disconnect from current to force refresh
+    %x(netsh wlan disconnect)
+    
+    # sleep until refresh
+    sleep 3
+  end
+
   def run
+    # ensure wpilib project
+    if !wpilib_proj?
+      puts "File '.\\.wpilib\\wpilib_preferences.json' not found."
+      exit(1)
+    else
+      # set options from wpilib proj
+      wpilib_pref 
+    end
+
     # run command line options parser
     parse_options
 
+    # refresh list of networks
+    netsh_refresh
+
     # output of netsh
     networks = %x(netsh wlan show networks).lines.filter do |line|
       # check if line is a network ssid
@@ -60,7 +97,7 @@ class Main
     # exit if no robot network to connect to
     if networks.empty?
       puts "No robot network found to connect to."
-      exit(2)
+      exit(1)
     end
 
     # index of desired network
@@ -103,7 +140,7 @@ class Main
     end
 
     # year for jdk location
-    year = (@@options[:year].nil?) ? Time.now.year.to_s : @@options[:year]
+    year = @@options[:year] || Time.now.year.to_s
     dir = "C:\\Users\\Public\\wpilib\\#{year}\\jdk"
 
     # check if jdk exists

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whee
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ell Torek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies: []
 description: |2
       whee is a command-line program to accelerate the GradleRIO deploy process used in the