vimgolf 0.4.5 → 0.4.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 245e3a61f0627829065d771884195716aaa714ec
+  data.tar.gz: e8439584ea6e438dbe76b55cff4feea1c9412dd1
+SHA512:
+  metadata.gz: 11fb7f11d157e664c09101f8496247a3d928126a88397954680271968705d4e1592e5a4609a5889e29dbc0e3b1b059acefc33935ba5de3f6fe2f413773ef4c02
+  data.tar.gz: 10733f77b5228a25ba7f8ed0d3288dbf54b48b94be89d6a7dfb36f594287d1865e55111b97965d558cb9dd4edd1b4c052cf3af483998cd29e7beaf76d42babb8

data/emacs/CHANGELOG.md

@@ -0,0 +1,58 @@
+## 0.10.0
+
+2014-08-12 Siddhanathan Shanmugam <siddhanathan@gmail.com>
+
+	* vimgolf.el (vimgolf-setup): Enable JSON parsing
+	- Allow Emacs to parse JSON content from the site
+	- Replace yaml parser with json parser
+	- Use 'identitiy' accept encoding header to get uncompressed data from server
+
+	* vimgolf.el (vimgolf-get-text): Add function
+	- Extracts input and output text, used in vimgolf-setup
+
+	* vimgolf.el (vimgolf-retrieve-challenge): Add function
+	- Gets JSON data from server and reads it using a buffer
+
+	* vimgolf.el (vimgolf-read-next-data-chunk): Removed function
+
+## 0.9.3
+
+2012-07-29 Brian Zwahr (github: @echosa)
+
+	* vimgolf.el
+	- Added challenge browser
+	- Better description
+	- Truncated titles
+	- Basic handling of HTML entities
+	- Fixed showing browse list after url-retrieve
+
+	* features/*
+	- Added documentation
+
+	* util/*
+	- Added tests via ecukes
+
+## 0.9.2
+
+2012-02-28 Steve Purcell (@sanityinc)
+
+	* vimgolf.el
+	- changes for adding to melpa
+
+## 0.9.1
+
+2012-02-27 Tim Visher (@timvisher)
+
+	* vimgolf.el
+	- Use vimgolf-continue to get messages when buffers are setup
+	- Correct indentation and add local valiables
+	- Updating notes and adding a contributors section
+
+2012-01-08 Adam Collard (@acollard)
+
+	* vimgolf.el
+	- Simplify vimgolf-solution-correct-p to use buffer-string
+
+## 0.9.0 and earlier
+
+Lots of changes by Tim Visher and Steve Purcell

data/emacs/vimgolf.el

@@ -4,7 +4,7 @@
 ;;; Author: Tim Visher <tim.visher@gmail.com>
 ;;; Maintainer: Tim Visher <tim.visher@gmail.com>
 ;;; Created: 2011-11-02
-;;; Version: 0.9.3
+;;; Version: 0.10.0
 ;;; Keywords: games vimgolf vim
 
 ;; This file is not part of GNU Emacs
@@ -45,9 +45,12 @@
 ;; Tim Visher (@timvisher)
 ;; Steve Purcell (@sanityinc)
 ;; Adam Collard (@acollard)
+;; Siddhanathan Shanmugam (@siddhanathan)
 
 ;;; Code:
 
+(require 'json)
+
 (defgroup vimgolf nil
   "Compete on VimGolf with the One True Editor."
   :prefix "vimgolf-"
@@ -268,7 +271,7 @@ unknown key sequence was entered).")
 ;; HTML to Haml ID: 4d3c51f1aabf526ed6000030
 ;; Assignment Allignment: 4d2c9d06eda6262e4e00007a
 
-(defvar vimgolf-challenge-extension ".yaml")
+(defvar vimgolf-challenge-extension ".json")
 
 (defun vimgolf-challenge-path (challenge-id)
   (concat "challenges/" challenge-id))
@@ -292,26 +295,27 @@ unknown key sequence was entered).")
     (when (get-buffer buf)
       (kill-buffer buf))))
 
-(defun vimgolf-read-next-data-chunk ()
-  "Return the next chunk of data as a string, leaving the point at the end of that chunk."
-  (let ((data-start-regexp "  data: |\\+\\{0,1\\}\n")
-        (data-end-regexp "\\([ 	]\\{4\\}\\|[ 	]\\{0\\}\\)\n  type: [-a-z]+"))
-    (unless (re-search-forward data-start-regexp nil t)
-      (error "Can't find data in response from vimgolf"))
-    (let ((start (point)))
-      (unless (re-search-forward data-end-regexp nil t)
-        (error "Unclosed data section in response from vimgolf"))
-      (let ((str (buffer-substring-no-properties start (match-beginning 0))))
-        (replace-regexp-in-string "^    " "" str)))))
+(defun vimgolf-get-text (var response)
+  (format "%s" (assoc-default 'data (assq var response))))
+
+(defun vimgolf-retrieve-challenge (challenge-id)
+  (interactive)
+  (with-current-buffer
+      (url-retrieve-synchronously (vimgolf-challenge-url challenge-id))
+    (goto-char url-http-end-of-headers)
+    (json-read)))
 
 (defun vimgolf-setup (status challenge-id)
+  (let ((url-mime-encoding-string "identity"))
+    (setq vimgolf-response (vimgolf-retrieve-challenge challenge-id)))
+
   (vimgolf-clear-keystrokes)
   (setq vimgolf-prior-window-configuration (current-window-configuration)
         vimgolf-challenge challenge-id)
   (goto-char (point-min))
-  (let* ((start-text (vimgolf-read-next-data-chunk))
-         (end-text (vimgolf-read-next-data-chunk)))
 
+  (let* ((start-text (vimgolf-get-text 'in vimgolf-response))
+         (end-text   (vimgolf-get-text 'out vimgolf-response)))
     (vimgolf-kill-existing-session)
 
     (let ((vimgolf-start-buffer (get-buffer-create vimgolf-start-buffer-name))

data/lib/vimgolf/cli.rb

@@ -1,7 +1,7 @@
 module VimGolf
 
   GOLFDEBUG    = ENV['GOLFDEBUG'].to_sym rescue false
-  GOLFHOST     = ENV['GOLFHOST']     || "http://vimgolf.com"
+  GOLFHOST     = ENV['GOLFHOST']     || "http://www.vimgolf.com"
   GOLFDIFF     = ENV['GOLFDIFF']     || 'diff'
   GOLFSHOWDIFF = ENV['GOLFSHOWDIFF'] || 'vim -d -n'
   GOLFVIM      = ENV['GOLFVIM']      || 'vim'
@@ -139,8 +139,9 @@ module VimGolf
 
         else
           error = <<-MSG
-          Uh oh, Vim did not exit properly. If the problem persists, please
-          report the error on github.com/igrigorik/vimgolf
+	  Uh oh, Vim did not exit properly. 
+	  Please ensure you can execute 'Vim' from the commandline.
+	  If the problem persists, please report the error on github.com/igrigorik/vimgolf
           MSG
 
           VimGolf.ui.error error

data/lib/vimgolf/version.rb

@@ -1,3 +1,3 @@
 module Vimgolf
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vimgolf
 version: !ruby/object:Gem::Version
-  version: 0.4.5
-  prerelease: 
+  version: 0.4.6
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: CLI client for vimgolf.com
@@ -107,6 +96,7 @@ files:
 - README.md
 - Rakefile
 - bin/vimgolf
+- emacs/CHANGELOG.md
 - emacs/README.md
 - emacs/ROADMAP.md
 - emacs/features/emacs.feature
@@ -133,50 +123,39 @@ files:
 - vimgolf.gemspec
 homepage: http://github.com/igrigorik/vimgolf
 licenses: []
-post_install_message: ! '
+metadata: {}
+post_install_message: |2
 
   ------------------------------------------------------------------------------
-
-  Thank you for installing vimgolf-0.4.5.
-
+  Thank you for installing vimgolf-0.4.6.
 
   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
-
   0.4.0: improved diff/retry CLI, emacs support: http://bit.ly/yHgOPF
 
-
   *NOTE*: please re-run "vimgolf setup" prior to playing!
 
-
   For more information, rules & updates: http://vimgolf.com/about
-
   ------------------------------------------------------------------------------
-
-'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: vimgolf
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI client for vimgolf.com
 test_files:
 - spec/challenge_spec.rb
@@ -188,4 +167,3 @@ test_files:
 - spec/fixtures/4d1a34ccfa85f32065000004.log
 - spec/helper.rb
 - spec/keylog_spec.rb
-has_rdoc: