rubiks-cli 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f41af5a9687e0f977719e8e7caf798d8de975ad9c601df389bc8224a3b48d29
-  data.tar.gz: 8bafea416886b9f1d4025f327e6120e159af25ffd333fef53426ec7bc2c5ac4f
+  metadata.gz: 0ceaacd6955da01007e67211b267f1ba59c18a9dfb0f4dbd1de7e3605094970c
+  data.tar.gz: 77475704b630f2b0a4b4fb46e22fc886a448c2b7f69688b272aee3f8f88a9dd7
 SHA512:
-  metadata.gz: bca1184b5817581fff9d9d0f38b1b0409f6f46bc9f81d91b286d2ada09ed4d0cf6e06cb5ec174fd4a8c73f1ec00a335a9c92c176570a8a0e682043e13877cc12
-  data.tar.gz: 7a741690d3d96c8878fc03d341b5b63855761ec34c0e127fb1c81bd4c22c1263ea515811834e5bea0816d9714bb74282201fad5a04ca86470a6fa488665748b8
+  metadata.gz: bf1164df262f77e08377a2959b73b0e0d160bb25c72dc1f5e15f522a89a1e310f57268d5cd0bbcb8a5798a190a4be468a804bc131faa992c6ebd35d2820ec8d3
+  data.tar.gz: 5157e6e885f6f293a21e37426e7ee8e110859c6897aac8fbb35b8bb18918ecfa5c0c3913e07bfbe9727288e21a03ea14470f36c088cbcc0dbeff081933e7a45c

data/README.md

@@ -1,6 +1,6 @@
 # Rubiks CLI
 
-A command-line Rubik's Cube timer.
+A command-line Rubik's Cube timer
 
 ## Installation
 
@@ -10,12 +10,13 @@ gem install rubiks-cli
 
 ## Usage
 
-```bash
-rubiks
 ```
-
-- Press Enter to start timing
-- Press any key to stop timing
-- Type 'n' for a new scramble  
-- Type 'q' to quit
-- Type 'h' or '?' for help (this message)
+rubiks [options]
+    -c, --clear                      Clear the screen before starting
+    -i, --inspection                 Include inspection time
+    -l, --loop                       Loop forever
+    -s, --scramble                   Generate scramble
+    -t, --time                       Start timer
+    -h, --help                       Show this help message
+```
+Defaults: `--scramble, --time`

data/bin/rubiks

@@ -27,6 +27,18 @@ OptionParser.new do |opts|
     options[:time] = true
   end
 
+  # opts.on("-o", "--overwrite", "Overwrite loop output") do
+  #   options[:time] = true
+  # end
+  opts.on("-v", "--version", "Print version") do
+    puts "rubiks-cli #{RubiksCli::VERSION}"
+    exit
+  end
+  opts.on("-h", "--help", "Show this help message") do
+    puts opts
+    puts "\nDefaults: --scramble, --time"
+    exit
+  end
 end.parse!
 
 if options.values.none?
@@ -47,19 +59,19 @@ if options[:loop]
 
   if options[:time] && options[:scramble]
     RubiksCli::Loop.build(
-      RubiksCli::Loop.create_action('', start_timer_then_output_scramble, "start solve"),
+      start_timer_then_output_scramble,
       [ RubiksCli::Loop.create_action('n', output_scramble, "generate new scramble"), ]
     ).start
 
   elsif options[:scramble]
     RubiksCli::Loop.build(
-      RubiksCli::Loop.create_action('', output_scramble, "generate a scramble"),
+      output_scramble,
       [ RubiksCli::Loop.create_action('t', start_timer_then_output_scramble, "start timer"), ]
     ).start
 
   elsif options[:time]
     RubiksCli::Loop.build(
-      RubiksCli::Loop.create_action('', start_timer, "start timer"),
+      start_timer,
       [ RubiksCli::Loop.create_action('n', output_scramble, "generate a scramble"), ]
     ).start
 

data/lib/rubiks_cli/loop/engine.rb

@@ -5,13 +5,13 @@ module RubiksCli
     class Engine
       private_class_method :new
 
-      def initialize(action_on_enter, other_actions)
+      def initialize(on_enter, other_actions)
         commands = other_actions.map { |action| action.command }
         if commands.uniq.size != commands.size
           raise ArgumentError, "Duplicate command"
         end
 
-        @actions = Hash.new(action_on_enter.function)
+        @actions = Hash.new(on_enter)
         other_actions.each { |action| @actions[action.command] = action.function }
       end
 
@@ -26,15 +26,3 @@ module RubiksCli
     end
   end
 end
-
-if __FILE__ == $0
-  require_relative 'builder'
-
-  on_enter = lambda { puts "You pressed Enter!" }
-  actions = [
-    RubiksCli::Loop.build_action('x', -> { puts "Action X executed" }, "execute action X"),
-    RubiksCli::Loop.build_action('y', -> { puts "Action Y executed" }, "execute action Y"),
-  ]
-  loop_instance = RubiksCli::Loop.build_loop(on_enter, actions)
-  loop_instance.start
-end

data/lib/rubiks_cli/timer.rb

@@ -3,7 +3,7 @@ require_relative 'clear'
 
 module RubiksCli
   module Timer
-    INSPECTION_TIME = 15
+    INSPECTION_TIME = 5
 
     def self.start(inspection)
       if inspection
@@ -34,12 +34,14 @@ module RubiksCli
           return if STDIN.wait_readable(1)
         end
 
-        print "\r+2"
+        Clear.current_line
+        print "+2"
         2.times do
           return if STDIN.wait_readable(1)
         end
         
-        print "\rDNF"
+        Clear.current_line
+        print "DNF"
       ensure
         STDIN.getch rescue nil
       end

data/lib/rubiks_cli/version.rb

@@ -1,3 +1,3 @@
 module RubiksCli
-  VERSION = "1.4.1"
+  VERSION = "1.4.4"
 end

metadata

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