vimgolf 0.2.0 → 0.3.0

data/lib/vimgolf.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'net/http'
 require 'strscan'
-require 'json'
+require 'yaml'
 require 'thor'
 
 require 'vimgolf/version'

data/lib/vimgolf/cli.rb

@@ -2,7 +2,8 @@ module VimGolf
 
   GOLFHOST  = ENV['GOLFHOST'] || "http://vimgolf.com"
   GOLFDEBUG = ENV['GOLFDEBUG'].to_sym rescue false
-  DIFF      = ENV['DIFF'] || 'diff'
+  GOLFDIFF  = ENV['GOFLDIFF'] || 'diff'
+  GOLFVIM   = ENV['GOLFVIM'] || 'vim'
   PROXY     = ENV['http_proxy'] || ''
 
   class Error
@@ -32,23 +33,23 @@ module VimGolf
     desc "setup", "configure your VimGolf credentials"
     long_desc <<-DESC
     To participate in the challenge please go to vimgolf.com and register an
-    account. Once signed in, you will get your API token, which you need to
+    account. Once signed in, you will get your API key, which you need to
     setup the command client.
 
-      If you have the token, simply run the setup and paste in your token.
+      If you have the key, simply run the setup and paste in your key.
       DESC
 
     def setup
-      token = VimGolf.ui.ask "Please specify your VimGolf API token (register on vimgolf.com to get it):"
+      key = VimGolf.ui.ask "Please specify your VimGolf API key (register on vimgolf.com to get it):"
 
-      if token =~ /[\w\d]{32}/
+      if key =~ /[\w\d]{32}/
         FileUtils.mkdir_p Config.path
         FileUtils.mkdir_p Config.put_path
-        Config.save({:key => token})
+        Config.save({'key' => key})
 
         VimGolf.ui.info "Saved. Happy golfing!"
       else
-        VimGolf.ui.error "Invalid token, please double check your token on vimgolf.com"
+        VimGolf.ui.error "Invalid key, please double check your key on vimgolf.com"
       end
     end
 
@@ -69,23 +70,23 @@ module VimGolf
         # - --noplugin - don't load any plugins, lets be fair!
         # -i NONE - don't load .viminfo (for saved macros and the like)
         # - u - load vimgolf .vimrc to level the playing field
-        vimcmd = "vim -n --noplugin -i NONE +0 -u #{vimrc(id)} -W #{log(id)} #{input(id, type)}"
+        vimcmd = "#{GOLFVIM} -n --noplugin -i NONE +0 -u \"#{vimrc(id)}\" -W \"#{log(id)}\" \"#{input(id, type)}\""
         debug(vimcmd)
         system(vimcmd)
 
         if $?.exitstatus.zero?
-          diff = `#{DIFF} #{input(id, type)} #{output(id)}`
+          diff = `#{GOLFDIFF} \"#{input(id, type)}\" \"#{output(id)}\"`
+          score = Keylog.score(IO.read(log(id)))
 
           if diff.size > 0
             VimGolf.ui.warn "Uh oh, looks like your entry does not match the desired output:"
             VimGolf.ui.warn "#"*50
             puts diff
             VimGolf.ui.warn "#"*50
-            VimGolf.ui.warn "Please try again!"
+            VimGolf.ui.warn "Please try again! Your score for this (failed) attempt was: #{score}"
             return
           end
 
-          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)"
@@ -120,16 +121,19 @@ module VimGolf
     no_tasks do
       def download(id)
         begin
-          url = URI.parse("#{GOLFHOST}/challenges/#{id}.json")
+          url = URI.parse("#{GOLFHOST}/challenges/#{id}.yaml")
           req = Net::HTTP::Get.new(url.path)
 
           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)
+          data = YAML.load(res.body)
+
+          if !data.is_a? Hash
+            raise
 
-          if data['client'] != Vimgolf::VERSION
+          elsif data['client'] != Vimgolf::VERSION
             VimGolf.ui.error "Client version mismatch. Installed: #{Vimgolf::VERSION}, Required: #{data['client']}."
             VimGolf.ui.error "\t gem install vimgolf"
             raise "Bad Version"
@@ -149,7 +153,7 @@ module VimGolf
 
       def upload(id)
         begin
-          url = URI.parse("#{GOLFHOST}/entry.json")
+          url = URI.parse("#{GOLFHOST}/entry.yaml")
 
           proxy_url, proxy_user, proxy_pass = get_proxy
           proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
@@ -157,10 +161,14 @@ module VimGolf
           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"
+            request["Accept"] = "text/yaml"
 
             res = http.request(request)
-            JSON.parse(res.body)['status'].to_sym
+            res = YAML.load(res.body)
+
+            raise if !res.is_a? Hash
+            res['status'].to_sym
+
           end
         rescue Exception => e
           debug(e)

data/lib/vimgolf/config.rb

@@ -10,14 +10,14 @@ module VimGolf
       end
 
       def save(conf)
-        File.open(path + '/config.json', 'w') do |f|
-          f.puts JSON.generate(conf)
+        File.open(path + '/config.yaml', 'w') do |f|
+          YAML.dump(conf, f)
         end
       end
 
       def load
-        File.open(path + '/config.json', 'r') do |f|
-          JSON.parse(f.read)
+        File.open(path + '/config.yaml', 'r') do |f|
+          YAML.load(f)
         end
       end
     end

data/lib/vimgolf/version.rb

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

data/vimgolf.gemspec

@@ -30,6 +30,9 @@ 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
+0.3.0: improve windows support, switch to YAML to remove c-ext dependency
+
+*NOTE*: please re-run "vimgolf setup" prior to playing!
 
 For more information, rules & updates: http://vimgolf.com/about
 ------------------------------------------------------------------------------

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -05:00
+date: 2011-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,9 +109,11 @@ licenses: []
 
 post_install_message: "\n\
   ------------------------------------------------------------------------------\n\
-  Thank you for installing vimgolf-0.2.0. \n\n\
+  Thank you for installing vimgolf-0.3.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\
+  0.2.0: proxy support, custom diffs + proper vimscript parser/scoring\n\
+  0.3.0: improve windows support, switch to YAML to remove c-ext dependency\n\n\
+  *NOTE*: please re-run \"vimgolf setup\" prior to playing!\n\n\
   For more information, rules & updates: http://vimgolf.com/about\n\
   ------------------------------------------------------------------------------\n"
 rdoc_options: []