whee 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcc44010a78f03c0ce36daecdde822f0bd1fb69d8ca26654bbeee694825df0c
-  data.tar.gz: 0ad36cca810c1a98f934ad89b71b3b33ad0041c31dffb38cf36f0090eecd1e36
+  metadata.gz: ae47499005066bd2f7972e45d154d2cc7aee5825f7d642577a5b4632064aba6e
+  data.tar.gz: '08dcfa8319fe3e17b3cc8474a72ed83f11d6cb98276350fe3ac3691954ebb9a3'
 SHA512:
-  metadata.gz: 8cd8162f0619ad79d042c41c1e6b19af13b52e483d276e2ed10b96ad9e3de9d2170f196d6a438c314988320458b472fc5d11208cf732b98e5a425d84cac85023
-  data.tar.gz: cf0401b0179e7a48cb9014ea76c21a63df325891fe70be23188989d38c2725bc59507d5f56fe6d6575497c25e7c85eb560f29d8ed63e30ab0338fdc1f084d4ec
+  metadata.gz: 89ebc82e7fb75d08d7708a457c29eda5c71df00b50f97ad7a0d87c72fe38ff08acecc88788f73b7600539ecf16aa226c1b6fdf8877a512a3b829c2ec9bbe4541
+  data.tar.gz: ef5679070676f46b80322ff90cfc664d06fca61d6a0b102f97e47691cae5e7bf0865c06b6782bf2c576c21cb3134c98043f0ef7baf57c069b8db65b0d64a600e

data/README.md

@@ -1,6 +1,8 @@
 # whee
 
-a faster deploy tool for FRC
+whee is a command-line program to accelerate the GradleRIO deploy process used in the FIRST Robotics Competition. It automatically connects to available robot WiFi networks and deploys code.
+
+> whee is still largely untested and is not approved or endorsed by FIRST in any way.
 
 ### known issues
 

data/lib/whee.rb

@@ -5,26 +5,24 @@ class Main
   @@options = {
     :team => nil,
     :name => nil,
-    :year => nil
+    :year => nil,
+    :connect => false
   }
 
   def parse_options
     OptionParser.new do |opts|
       # team number
-      opts.on("-t", "--team=TEAM", Integer, "Team number to connect to") do |team|
-        @@options[:team] = team
-      end
+      opts.on("-t", "--team=TEAM", Integer, "Team number to connect to")
     
       # network name
-      opts.on("-n", "--name=NAME", String, "Network name excluding team number") do |name|
-        @@options[:name] = name.strip
-      end
+      opts.on("-n", "--name=NAME", String, "Network name excluding team number")
     
       # year for wpilib jdk
-      opts.on("-y", "--year=YEAR", Integer, "WPILib version to use JDK from") do |year|
-        @@options[:year] = year
-      end
-    end.parse!
+      opts.on("-y", "--year=YEAR", Integer, "WPILib version to use JDK from")
+
+      # only connect to robot
+      opts.on("-c", "--connect", "Only connect and not deploy")
+    end.parse!(into: @@options)
   end
 
   def run
@@ -51,7 +49,7 @@ class Main
 
     # team and name are set by options if present otherwise default regex
     team = (@@options[:team].nil?) ? '^[\d]{3,4}' : "^(#{@@options[:team].to_s[0..3]})"
-    name = (@@options[:name].nil?) ? '[\w]*$' : "_(#{@@options[:name]})$"
+    name = (@@options[:name].nil?) ? '[\w]*$' : "_(#{@@options[:name].strip})$"
     frc_regexp = Regexp.new(team + name)
 
     # check which networks match the frc radio name regex
@@ -94,13 +92,28 @@ class Main
 
     if !error
       puts "Successfully connected to robot network."
+
+      # exit if connect-only mode is set
+      if @@options[:connect]
+        exit(0)
+      end
     else
       puts "Failed to connect to robot network."
       exit(1)
     end
 
-    # set jdk home for gradle wrapper
-    ENV['JAVA_HOME'] = "C:\\Users\\Public\\wpilib\\#{Time.now.year.to_s}\\jdk"
+    # year for jdk location
+    year = (@@options[:year].nil?) ? Time.now.year.to_s : @@options[:year]
+    dir = "C:\\Users\\Public\\wpilib\\#{year}\\jdk"
+
+    # check if jdk exists
+    if !Dir.exists?(dir)
+      puts "Invalid year provided. JDK not found."
+      exit(1)
+    end
+
+    # set gradle wrapper java home
+    ENV['JAVA_HOME'] = dir
     
     # run gradle deploy
     begin
@@ -113,7 +126,6 @@ class Main
     end
    
     puts deploy
-    puts %x(echo %ERRORLEVEL%)
   end
 end
 

metadata

@@ -1,16 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: whee
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ell Torek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: |2
+      whee is a command-line program to accelerate the GradleRIO deploy process used in the
+      FIRST Robotics Competition. It automatically connects to available robot WiFi networks
+      and deploys code.
+
+      whee is still largely untested and is not approved or endorsed by FIRST in any way.
 email: ctorek@proton.me
 executables:
 - whee
@@ -33,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="