vimgolf 0.1.3 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vimgolf (0.1.1)
+    vimgolf (0.2.0)
       highline
       json
       thor (>= 0.14.6)

data/lib/vimgolf.rb

@@ -1,9 +1,11 @@
 require 'fileutils'
 require 'net/http'
+require 'strscan'
 require 'json'
 require 'thor'
 
 require 'vimgolf/version'
 require 'vimgolf/config'
+require 'vimgolf/keylog'
 require 'vimgolf/cli'
 require 'vimgolf/ui'

data/lib/vimgolf/cli.rb

@@ -1,7 +1,9 @@
 module VimGolf
 
-  GOLFHOST =  ENV['GOLFHOST'] || "http://vimgolf.com"
+  GOLFHOST  = ENV['GOLFHOST'] || "http://vimgolf.com"
   GOLFDEBUG = ENV['GOLFDEBUG'].to_sym rescue false
+  DIFF      = ENV['DIFF'] || 'diff'
+  PROXY     = ENV['http_proxy'] || ''
 
   class Error
   end
@@ -72,7 +74,7 @@ module VimGolf
         system(vimcmd)
 
         if $?.exitstatus.zero?
-          diff = `diff --strip-trailing-cr #{input(id, type)} #{output(id)}`
+          diff = `#{DIFF} #{input(id, type)} #{output(id)}`
 
           if diff.size > 0
             VimGolf.ui.warn "Uh oh, looks like your entry does not match the desired output:"
@@ -83,7 +85,7 @@ module VimGolf
             return
           end
 
-          score = File.size(log(id))
+          score = Keylog.score(IO.read(log(id)))
           VimGolf.ui.info "Success! Your output matches. Your score: #{score}"
 
           if VimGolf.ui.yes? "Upload result to VimGolf? (yes / no)"
@@ -93,7 +95,7 @@ module VimGolf
               VimGolf.ui.info "Uploaded entry, thanks for golfing!"
               VimGolf.ui.info "View the leaderboard: #{GOLFHOST}/challenges/#{id}"
             else
-              VimGolf.ui.error "Uh oh, upload filed. You're not cheating are you? :-)"
+              VimGolf.ui.error "Uh oh, upload failed. You're not cheating are you? :-)"
             end
 
           else
@@ -110,7 +112,7 @@ module VimGolf
         end
 
       rescue Exception => e
-        VimGolf.ui.error "Uh oh, something wen't wrong! Error: #{e}"
+        VimGolf.ui.error "Uh oh, something went wrong! Error: #{e}"
         VimGolf.ui.error "If the error persists, please report it to github.com/igrigorik/vimgolf"
       end
     end
@@ -120,7 +122,11 @@ module VimGolf
         begin
           url = URI.parse("#{GOLFHOST}/challenges/#{id}.json")
           req = Net::HTTP::Get.new(url.path)
-          res = Net::HTTP.start(url.host, url.port) {|http| http.request(req)}
+
+          proxy_url, proxy_user, proxy_pass = get_proxy
+          proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
+          res = proxy.start(url.host, url.port) { |http| http.request(req) }
+
           data = JSON.parse(res.body)
 
           if data['client'] != Vimgolf::VERSION
@@ -144,15 +150,18 @@ module VimGolf
       def upload(id)
         begin
           url = URI.parse("#{GOLFHOST}/entry.json")
-          http = Net::HTTP.new(url.host, url.port)
 
-          request = Net::HTTP::Post.new(url.request_uri)
-          request.set_form_data({"challenge_id" => id, "apikey" => Config.load['key'], "entry" => IO.read(log(id))})
-          request["Accept"] = "application/json"
+          proxy_url, proxy_user, proxy_pass = get_proxy
+          proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
 
-          res = http.request(request)
-          JSON.parse(res.body)['status'].to_sym
+          proxy.start(url.host, url.port) do |http|
+            request = Net::HTTP::Post.new(url.request_uri)
+            request.set_form_data({"challenge_id" => id, "apikey" => Config.load['key'], "entry" => IO.read(log(id))})
+            request["Accept"] = "application/json"
 
+            res = http.request(request)
+            JSON.parse(res.body)['status'].to_sym
+          end
         rescue Exception => e
           debug(e)
           raise "Uh oh, entry upload has failed, please check your key."
@@ -170,6 +179,20 @@ module VimGolf
         Config.put_path + "/#{id}"
       end
 
+      def get_proxy
+        begin
+          proxy_url = URI.parse(PROXY)
+        rescue Exception => e
+          VimGolf.ui.error "Invalid proxy uri in http_proxy environment variable - will try to run with out proxy"
+          proxy_url = URI.parse("");
+        end
+
+        proxy_url.port ||= 80
+        proxy_user, proxy_pass = proxy_url.userinfo.split(/:/) if proxy_url.userinfo
+
+        return proxy_url, proxy_user, proxy_pass
+      end
+
       def debug(msg)
         p [caller.first, msg] if GOLFDEBUG
       end

data/lib/vimgolf/keylog.rb

@@ -0,0 +1,105 @@
+module VimGolf
+  class Session < Array
+    def to_s(sep = '')
+      @log.join(sep)
+    end
+  end
+
+  class Keylog
+    def self.parse(input)
+      session = Session.new
+      scan(input) {|s| session << s }
+      session
+    end
+
+    def self.convert(input)
+      parse(input).join('')
+    end
+
+    def self.score(input)
+      keys = 0
+      scan(input) {|s| keys += 1 }
+      keys
+    end
+
+    def self.scan(input)
+      scanner = StringScanner.new(input)
+      output = ""
+
+      until scanner.eos?
+        c = scanner.get_byte
+        n = c.unpack('C').first
+
+        out_char = \
+        case n
+
+          # Special platform-independent encoding stuff
+          when 0x80
+            code = scanner.get_byte + scanner.get_byte
+
+            # This list has been populated by experimentation so far,
+            # because I haven't bothered looking for a more authoritative
+            # source.
+            case code
+              when "k1"; "<F1>"
+              when "k2"; "<F2>"
+              when "k3"; "<F3>"
+              when "k4"; "<F4>"
+              when "k5"; "<F5>"
+              when "k6"; "<F6>"
+              when "k7"; "<F7>"
+              when "k8"; "<F8>"
+              when "k9"; "<F9>"
+              when "k;"; "<F10>"
+              when "F1"; "<F11>"
+              when "F2"; "<F12>"
+
+              when "kP"; "<PageUp>"
+              when "kN"; "<PageDown>"
+              when "kh"; "<Home>"
+              when "@7"; "<End>"
+              when "kI"; "<Insert>"
+              when "kD"; "<Del>"
+              when "kb"; "<BS>"
+
+              when "ku"; "<Up>"
+              when "kd"; "<Down>"
+              when "kl"; "<Left>"
+              when "kr"; "<Right>"
+              when "#4"; "<S-Left>"
+              when "%i"; "<S-Right>"
+
+              when "kB"; "<S-Tab>"
+              when "\xffX"; "<C-Space>"
+
+              else
+                #puts "Unknown Vim code: #{code.inspect}"
+                '<%02x-%02x>' % code.unpack('CC')
+            end
+
+            # Control characters with special names
+          when 0; "<Nul>"
+          when 9; "<Tab>"
+          when 10; "<NL>"
+          when 13; "<CR>"
+          when 27; "<Esc>"
+
+          when 127; "<Del>"
+
+            # Otherwise, use <C-x> format
+          when 0..31; "<C-#{(n + 64).chr}>"
+
+            # The rest of ANSI is printable
+          when 32..126; c
+
+          else
+            #puts "Unexpected extended ASCII: #{'%#04x' % n}"
+            '<%#04x>' % n
+
+        end
+
+        yield out_char
+      end
+    end
+  end
+end

data/lib/vimgolf/version.rb

@@ -1,3 +1,3 @@
 module Vimgolf
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/cli_spec.rb

@@ -30,7 +30,7 @@ describe VimGolf do
     end
 
     it "should return type of challenge on success" do
-      c.download('4d1a21e88ae121365c00000e').should == "rb"
+      c.download('4d1a1c36567bac34a9000002').should == "rb"
     end
 
     it "should raise error on invalid upload id" do

data/spec/fixtures/4d19832d8ae121365c00000b.log

@@ -0,0 +1 @@
+��5ibbb�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb�kb:wq

data/spec/fixtures/4d1a1c36567bac34a9000002.log

@@ -0,0 +1 @@
+�kdd3di�kb�kb�kd�kr�kr�kb�kb �kd�kl�kb�ku�kr�kb�ku�kl�kr�kr�kb�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr*�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kl�kb�kb�kb�kb�kb�kb�kba�kd.join(',')�kr�krd$i�kr":wq

data/spec/fixtures/4d1a1c69567bac34a9000004.log

@@ -0,0 +1 @@
+��5�kd�kd�kd�kdA "Vi IMproved"�kd�kd�kd�kdAa�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kli�kb�kb�kb�kb�kb�kb�kb�kb�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kroriginally �kd�kd�kdyyp�kddd:wq

data/spec/fixtures/4d1a21e88ae121365c00000e.log

@@ -0,0 +1 @@
+��5�kdd3di�kb�kb�kd�kd�ku�ku�kb�ku�kr�kd�kd�kr�kb�kb�kd�kr�kb�ku�ku�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kl�kl*�kr�kr�kr�kr�kr�kr�kr�kb�kb�kb�kb�kb�kb�kd.join(',')�kr�krd$i"�kb�kr":wq

data/spec/fixtures/4d1a34ccfa85f32065000004.log

@@ -0,0 +1 @@
+��5�kd�kd�kd�kdAi �kb�kb "Vi IMproved"�kd�kd�kd�kd�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kl�kr�kr�kr�kr�kr�kr originallyG�ku�ku�ku�kudwdw�kd�kd�kd�kd�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kld$:wq

data/spec/keylog_spec.rb

@@ -0,0 +1,15 @@
+require "helper"
+
+describe VimGolf::Keylog do
+  include VimGolf
+
+  Dir['spec/fixtures/*'].each do |f|
+    it "should parse #{f} logfile" do
+      lambda { Keylog.convert(IO.read(f)) }.should_not raise_error
+    end
+
+    it "should score #{f} logfile" do
+      lambda { Keylog.score(IO.read(f)) }.should_not raise_error
+    end
+  end
+end

data/vimgolf.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |s|
 
    s.post_install_message = %{
 ------------------------------------------------------------------------------
-Thank you for installing vimgolf-#{Vimgolf::VERSION}. As of 0.1.3, we are shipping a custom
-vimgolf .vimrc file for each challenge to help level the playing field.
+Thank you for installing vimgolf-#{Vimgolf::VERSION}. 
+
+0.1.3: custom vimgolf .vimrc file to help level the playing field
+0.2.0: proxy support, custom diffs + proper vimscript parser/scoring
 
 For more information, rules & updates: http://vimgolf.com/about
 ------------------------------------------------------------------------------

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -05:00
+date: 2010-12-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,10 +91,17 @@ files:
 - lib/vimgolf.rb
 - lib/vimgolf/cli.rb
 - lib/vimgolf/config.rb
+- lib/vimgolf/keylog.rb
 - lib/vimgolf/ui.rb
 - lib/vimgolf/version.rb
 - spec/cli_spec.rb
+- spec/fixtures/4d19832d8ae121365c00000b.log
+- spec/fixtures/4d1a1c36567bac34a9000002.log
+- spec/fixtures/4d1a1c69567bac34a9000004.log
+- spec/fixtures/4d1a21e88ae121365c00000e.log
+- spec/fixtures/4d1a34ccfa85f32065000004.log
 - spec/helper.rb
+- spec/keylog_spec.rb
 - vimgolf.gemspec
 has_rdoc: true
 homepage: http://github.com/igrigorik/vimgolf
@@ -102,8 +109,9 @@ licenses: []
 
 post_install_message: "\n\
   ------------------------------------------------------------------------------\n\
-  Thank you for installing vimgolf-0.1.3. As of 0.1.3, we are shipping a custom\n\
-  vimgolf .vimrc file for each challenge to help level the playing field.\n\n\
+  Thank you for installing vimgolf-0.2.0. \n\n\
+  0.1.3: custom vimgolf .vimrc file to help level the playing field\n\
+  0.2.0: proxy support, custom diffs + proper vimscript parser/scoring\n\n\
   For more information, rules & updates: http://vimgolf.com/about\n\
   ------------------------------------------------------------------------------\n"
 rdoc_options: []
@@ -135,4 +143,10 @@ specification_version: 3
 summary: CLI client for vimgolf.com
 test_files: 
 - spec/cli_spec.rb
+- spec/fixtures/4d19832d8ae121365c00000b.log
+- spec/fixtures/4d1a1c36567bac34a9000002.log
+- spec/fixtures/4d1a1c69567bac34a9000004.log
+- spec/fixtures/4d1a21e88ae121365c00000e.log
+- spec/fixtures/4d1a34ccfa85f32065000004.log
 - spec/helper.rb
+- spec/keylog_spec.rb