typingtutor 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5696067963b2ee5de9aeeff804074fd4bebff0be
-  data.tar.gz: 89383a076e3b71244b0aa54b938ab576d3903047
+  metadata.gz: 076b2445ce5e631d240564095aaf06e7b44f4bde
+  data.tar.gz: 91356f29bb94e37ba90c467a921ad07b16d78626
 SHA512:
-  metadata.gz: f57820a556542fcb36e2630ce28490df28941d3d1b0dccdb9eb4e81af18d84af4ae6cbcd24a949105575ace1775e7919f099c537b096d39eadccf5a719468e6f
-  data.tar.gz: 4bef0c9629250f12214c91dac86dcd13aa11ad355c893e3439adc1850072ade7743b8b7b4c76b79192c64b5e0d04d8e479b9123362e3af7b81b347a8baeecdd8
+  metadata.gz: d4dff1bc62eb3683d27ed59822e38301e47a0fcf63e0e38e3d7e512c8879c5ab2b27c839a04bf945f7066d45e2bd5779a731633d3776ba6b30cb41f23ac615dd
+  data.tar.gz: aa8e90442ddf0f05d00a6d720b4f3770a17038aa79d65f2593af0e94d810f0bceb7c76de8eced9d42d6f69e85ee603cfc0780331e30bca5ca8ac81a8d33f434e

data/exercises/biglebowski.txt

@@ -0,0 +1,30 @@
+Way out west there was this fella. Fella I wanna tell you about.
+Fella by the name of Jeff Lebowski.
+At least that was the handle that his loving parents gave him.
+But he never had much use for it himself.
+This Lebowski, he called himself the Dude.
+Now Dude, that's a name no one would self-apply where I come from.
+But then there was a lot about the Dude that didn't make a whole lot of sense to me,
+and a lot about where he lived likewise.
+But then again, maybe that's why I found the place so darned interesting.
+They call Los Angeles the City of Angels.
+I didn't find it to be that, exactly.
+But I'll allow there are some nice folks there.
+Course, I can't say I seen London, and I never been to France,
+and I ain't never seen no queen in her damned undies, as the fella says.
+But I'll tell you what, after seeing Los Angeles and this here story I'm about to unfold, well,
+I guess I've seen something every bit as stupefying as you can see in any of those other places, and in English, too.
+So I can die with a smile on my face without feeling like the good Lord gypped me.
+Now, this here story I'm about to unfold took place back in the early 90s,
+just about the time of our conflict with Saddam and the Iraqis.
+I only mention it 'cause sometimes there's a man... I won't say a hero.
+'Cause what's a hero? But sometimes there's a man...
+And I'm talking about the Dude here.
+Sometimes there's a man... Well, he's the man for his time and place.
+He fits right in there. And that's the Dude in Los Angeles.
+And even if he is a lazy man, and the Dude was most certainly that,
+quite possibly the laziest in Los Angeles county,
+which would place him high in the running for laziest worldwide.
+But sometimes there's a man...
+Sometimes there's a man...
+Well, I lost my train of thought here.

data/lib/typingtutor/line.rb

@@ -13,7 +13,9 @@ module Typingtutor
       while(true) do
         char = STDIN.getch
         case char.ord
-        when 3 then exit(1) # CTRL-C
+        when 3 # CTRL-C
+          puts
+          exit(1)
         when 13 then break # enter
         when 127 # backspace
           @actual.chop!
@@ -49,7 +51,7 @@ module Typingtutor
       { total_chars: @original.length,
         correct_chars: @original.length.times.select {|i| @original[i] == @actual[i] }.size,
         keystrokes: @keystrokes,
-        total_words: @original.split(' ').size
+        total_words: @actual.split(' ').size
       }
     end
 

data/lib/typingtutor/runner.rb

@@ -3,7 +3,7 @@ module Typingtutor
     include HighLine::SystemExtensions
 
     def run(exercise_name)
-      exercise = load_exercise(exercise_name)
+      exercise = load_exercise(exercise_name) unless exercise_name.nil?
       if exercise
         setup_color_scheme
         play_intro
@@ -12,9 +12,14 @@ module Typingtutor
         print_stats(stats)
       else
         puts "Typingtutor v#{Typingtutor::VERSION}"
-        puts "usage: typingtutor <exercise>"
-        puts "available:"
+        puts
+        puts "$ typingtutor <exercise>"
+        puts "$ typingtutor path/to/localfile.txt"
+        puts
+        puts "built in exercises:"
         exercises.each {|e| puts "- #{e}"}
+        puts
+        puts "eg: typingtutor biglebowski"
       end
     end
 
@@ -36,10 +41,13 @@ module Typingtutor
     end
 
     def load_exercise(name)
-      file_name = File.join(File.dirname(__FILE__), '..', '..', "exercises", "#{name}.txt")
+      gem_file_name = File.join(File.dirname(__FILE__), '..', '..', "exercises", "#{name}.txt")
 
       # load from exercise folder in the gem
-      lines = IO.read(file_name).lines if File.exists?(file_name)
+      lines ||= IO.read(name).lines if File.exists?(name)
+      lines ||= IO.read("#{name}.txt").lines if File.exists?("#{name}.txt")
+      lines ||= IO.read(gem_file_name).lines if File.exists?(gem_file_name)
+
       return if lines.nil?
 
       lines.each {|line| line.strip!}    # remove extra spaces

data/lib/typingtutor/version.rb

@@ -1,3 +1,3 @@
 module Typingtutor
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typingtutor
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Paolo Dona
@@ -46,6 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -53,6 +54,7 @@ files:
 - README.md
 - Rakefile
 - bin/typingtutor
+- exercises/biglebowski.txt
 - exercises/fox.txt
 - exercises/haikurb.txt
 - exercises/lorem.txt