rubiks-cli 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31d0f5c4d03e00788128265b7dbb190583673563adce67252c202f9e114f0a5
-  data.tar.gz: 046d15a7724fa53739edf3c5dde5b226c925ab8ef419f50238b4b85515d732ff
+  metadata.gz: 94d7e949c32e1c1a2d7bb2b31da2e6ff4f99a54fcd61e1b2e973787501c7ccf3
+  data.tar.gz: b44f919f1db21605a46bf69809da069e8b322aa4ceda216dc94fe6d9a074c45f
 SHA512:
-  metadata.gz: 47d2f102cd05f55b0fc4cd36f47c1e3830c9541ec79e57b10121690a96f969b2a3fd1a50cd3975d2e2e5fe20b75dbce05989bb78097ff26b071f2f66a37a8f07
-  data.tar.gz: dc0b0fb6338108e15a47cb28752db0783ddd873ab71186c2ab8fdb33d41961780bc730217a28013207f68dc9232d8d1777a2393651a001402c8cf1aeb0e3d4b9
+  metadata.gz: cd3db42e118df490e9336e9261da8a164ab574b0683117cd49fceb75d2a20876ce0b97d0bf593ed7de7214268dbcaaa37cef27d379e25b58a213bb2065db2a07
+  data.tar.gz: a7675552b1ed9c8734876fd37889bce8c500b7ec9fe5a4c18e1fe122a03e0aee3231d6165ac3581ddf327553955eb09e3cc65f215a738d74154f49ccba711bde

data/bin/rubiks

@@ -3,15 +3,28 @@ require 'optparse'
 require 'rubiks_cli'
 
 options = {
+  clear: false,
+  inspection: false,
+  loop: true,
   scramble: false,
   time: false,
-  loop: true,
-  clear: false,
   wipe: false,
 }
 OptionParser.new do |opts|
   opts.banner = "Usage: rubiks [options]"
 
+  opts.on("-c", "--clear", "Clear the screen before starting") do
+    options[:clear] = true
+  end
+
+  opts.on("-i", "--inspection", "Include inspection time") do
+    options[:inspection] = true
+  end
+
+  opts.on("-l", "--loop", "Loop forever") do
+    options[:loop] = true
+  end
+
   opts.on("-s", "--scramble", "Generate scramble") do
     options[:scramble] = true
   end
@@ -20,30 +33,21 @@ OptionParser.new do |opts|
     options[:time] = true
   end
 
-  opts.on("-l", "--loop", "Loop forever (default)") do
-    options[:loop] = true
-  end
-
   opts.on("-w", "--wipe", "Wipe output each loop iteration") do
     options[:wipe] = true
   end
 
-  opts.on("-c", "--clear", "Clear the screen before starting (default for --loop)") do
-    options[:clear] = true
-  end
 end.parse!
 
-if options[:clear]
-  RubiksCli::Clear.screen
-end
+RubiksCli::Clear.screen if options[:clear]
 
 if options[:scramble] && options[:time]
-  RubiksCli::Solve.solve
+  RubiksCli::Solve.solve(options[:inspection])
 elsif options[:scramble]
   puts RubiksCli::Scrambler.get_scramble
 elsif options[:time]
-  RubiksCli::Timer.time
+  RubiksCli::Timer.start(options[:inspection])
 else
   RubiksCli::Clear.screen
-  RubiksCli::Solve.loop(options[:wipe])
+  RubiksCli::Solve.loop(options[:wipe], options[:inspection])
 end

data/lib/rubiks_cli/clear.rb

@@ -4,8 +4,12 @@ module RubiksCli
       system("clear") || system("cls")
     end
 
+    def self.current_line
+      print "\r\e[K"
+    end
+
     def self.line_above
-      print "\e[1A\e[K\n"
+      print "\e[1A\r\e[K\n"
     end
   end
 end

data/lib/rubiks_cli/solve.rb

@@ -5,20 +5,20 @@ require_relative 'scrambler'
 
 module RubiksCli
   class Solve
-    def self.solve
+    def self.solve(inspection)
         puts Scrambler.get_scramble
         gets
         Clear.line_above
-        Timer.show
+        Timer.start(inspection)
     end
 
-    def self.loop(clear_screen)
+    def self.loop(clear_screen, inspection)
       Help.loop
       Kernel.loop do
         begin
           input = gets.chomp
           clear_screen ? Clear.screen : Clear.line_above
-          process_input(input)
+          process_input(input, inspection)
         rescue SystemExit
           exit
         end
@@ -26,7 +26,7 @@ module RubiksCli
     end
 
     private
-    def self.process_input(cmd)
+    def self.process_input(cmd, inspection)
       case cmd.downcase
       when 'n'
         puts Scrambler.get_scramble
@@ -37,7 +37,7 @@ module RubiksCli
       when 'q'
         raise SystemExit
       else
-        Timer.show
+        Timer.start(inspection)
         puts "\n#{Scrambler.get_scramble}"
       end
     end
@@ -45,5 +45,5 @@ module RubiksCli
 end
 
 if __FILE__ == $0
-  RubiksCli::Solve.solve
+  RubiksCli::Solve.loop(true, false)
 end

data/lib/rubiks_cli/timer.rb

@@ -3,7 +3,13 @@ require_relative 'clear'
 
 module RubiksCli
   class Timer
-    def self.show
+    INSPECTION_TIME = 15
+
+    def self.start(inspection)
+      if inspection
+        self.inspection
+      end
+      Clear.current_line
       puts "\r#{self.time.round(3)}"
     end
 
@@ -12,13 +18,35 @@ module RubiksCli
 
       STDIN.raw do
         loop do
-          print "\r#{(Time.now - start).round(1)}"
-          break if STDIN.wait_readable(0.01)
+          elapsed = Time.now - start
+          print "\r#{elapsed.round(1)}"
+          return elapsed if STDIN.wait_readable(0.1)
         end
-        STDIN.read_nonblock(1) rescue nil
+      ensure
+        STDIN.getch rescue nil
       end
+    end
+
+    def self.inspection
+      STDIN.raw do
+        (0...INSPECTION_TIME).each do |i|
+          print "\rInspection: #{i}"
+          return if STDIN.wait_readable(1)
+        end
 
-      return Time.now - start
+        print "\r+2"
+        2.times do
+          return if STDIN.wait_readable(1)
+        end
+        
+        print "\rDNF"
+      ensure
+        STDIN.getch rescue nil
+      end
     end
   end
 end
+
+if __FILE__ == $0
+  RubiksCli::Timer.start(true)
+end

data/lib/rubiks_cli/version.rb

@@ -1,3 +1,3 @@
 module RubiksCli
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubiks-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Noah Scott