run 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c488bdc8ebd612e4dd4189178fba5ae9ba8b2a09c4c191908f35b8265e01b9
-  data.tar.gz: 0a7396df5efdd6374b59b3634b7cc6cdf326a4e1e5f5716ce6ba8d5a3d81414b
+  metadata.gz: 8f9c6f6ba4fc26aaf2318d02898e7bde47f74c71ae2f17c656b9877f939ddedc
+  data.tar.gz: 66c092630626dfbe12a8bce7531f1e890cd1825d2093193521fffccec71a8333
 SHA512:
-  metadata.gz: 2d60cc84910d67f91573406c64785631675e8fbd605bb17ff297c2c4a225be60eb0b5458a868ebd9f0c050112175dc5f4e8803f58d7f0b0edc9df8a2c7b077bb
-  data.tar.gz: d171c28a705c8ca5646b5f70e161e9ecd26e04ac94170f90f83114367d10cb0638675af1bfb3d008585d1934ebce62eecb9470055bc79c261a43206df9b84564
+  metadata.gz: a43e218dd3b40650c767d03baaef6dd0ff067ecd14eaaef034604a64bb516f1f826fe202f2e613b081db0bc518185ecdfb70a57dad0e941e8dd6ca4bbb7e21c1
+  data.tar.gz: 648ba6b86743aafb8d0a9c4d579d2a119aed9aaefc467fdb16235933c315d38a341b6d1b0ad48660bd63e7c082d8f1b18f10b6d8e1bfed01c045a16cd590afd9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    run (0.1.1)
+    run (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -42,4 +42,4 @@ DEPENDENCIES
   run!
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/lib/run/version.rb

@@ -1,3 +1,3 @@
 module Run
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/run.rb

@@ -1,6 +1,7 @@
+require 'io/console'
 require 'run/version'
-require 'byebug'
 require 'yaml'
+require 'byebug'
 
 class RunError < StandardError; end
 
@@ -12,26 +13,24 @@ module Run
 
     parse_options(args) unless args.empty?
 
-    trap('INT') { bye }
-    trap('TERM') { bye }
+    @max_length||=4000
 
+    @eot=0x03
     @eof=0x04
-    @max_length||=4000
 
     if quotes.empty?
       puts "No quotes with less than #{@max_length} characters found"
       exit
     end
 
-    @text=quotes[rand(quotes.size)]
-
     @color="\e[4;32m"
     @no_color="\e[m"
 
+    @lines=quotes[rand(quotes.size)].chars.each_slice(term_width).map(&:join)
+    @line=0
     @pos=0
-    max_pos=text.size
 
-    # average English word length
+    # average length of English words
     @word_length=5
 
     @start_time=time
@@ -39,7 +38,7 @@ module Run
 
     loop do
       update_text
-      break if pos==max_pos
+      break if @line==@lines.size-1 and pos==@lines.last.size
     end
 
     puts "\nWPM: #{wpm}"
@@ -88,7 +87,7 @@ module Run
   end
 
   def wpm
-    text.size*60/((time-@start_time)*@word_length)
+    @lines.join(' ').size*60/((time-@start_time)*@word_length)
   end
 
   def quotes
@@ -104,20 +103,32 @@ module Run
   end
 
   def print_text
-    print "\r"+text.sub(/(.{#{pos}})/,"#{@color}\\1#{@no_color}")
+    print "\r"+text.sub(/(.{#{pos}})/,"#{@color}\\1#{@no_color}")+"\r"
+  end
+
+  # width of the terminal
+  def term_width
+    IO.console.winsize.last
   end
 
   def update_text
     system('stty raw -echo')
-    bye if (c=STDIN.getc)==@eof.chr
+    c=STDIN.getc
+    bye if c==@eof.chr or c==@eot.chr
+    carriage_return if @pos>=term_width-1
     @pos+=1 if c==text[pos]
   ensure
     system('stty -raw echo')
     print_text
   end
 
+  def carriage_return
+    @pos=0
+    @line+=1
+  end
+
   def text
-    @text
+    @lines[@line]
   end
 
   def pos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sergioro
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Increase your typing speed