vimgolf 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    vimgolf (0.0.1)
+    vimgolf (0.1.0)
+      json
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
+    json (1.4.6)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -22,6 +24,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  json
   rspec
   thor
   vimgolf!

data/lib/vimgolf/cli.rb

@@ -1,6 +1,7 @@
 module VimGolf
 
-  GOLFHOST = ENV['GOLFHOST'] || "http://vimgolf.com"
+  GOLFHOST =  ENV['GOLFHOST'] || "http://vimgolf.com"
+  GOLFDEBUG = ENV['GOLFDEBUG'].to_sym rescue false
 
   class Error
   end
@@ -38,7 +39,7 @@ module VimGolf
     def setup
       token = VimGolf.ui.ask "Please specify your VimGolf API token (register on vimgolf.com to get it):"
 
-      if token =~ /[\w\d]{1,32}/
+      if token =~ /[\w\d]{32}/
         FileUtils.mkdir_p Config.path
         FileUtils.mkdir_p Config.put_path
         Config.save({:key => token})
@@ -58,13 +59,15 @@ module VimGolf
     def put(id = nil)
       VimGolf.ui.warn "Launching VimGolf session for challenge: #{id}"
 
-      type = download(id)
+      begin
+        type = download(id)
 
-      if !type.nil? && !type.empty?
         # - n - no swap file, memory only editing
         # - --noplugin - don't load any plugins, lets be fair!
+        # -u NONE and -U none - don't load .vimrc or .gvimrc
+        # -i NONE - don't load .viminfo (for saved macros and the like)
         # - +0 - always start on line 0
-        system("vim -n --noplugin +0 -W #{log(id)} #{input(id, type)}")
+        system("vim -n --noplugin -i NONE +0 -W #{log(id)} #{input(id, type)}")
 
         if $?.exitstatus.zero?
           diff = `diff --strip-trailing-cr #{input(id, type)} #{output(id)}`
@@ -88,7 +91,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 to VimGolf failed, please check your key."
+              VimGolf.ui.error "Uh oh, upload filed. You're not cheating are you? :-)"
             end
 
           else
@@ -103,10 +106,14 @@ module VimGolf
 
           VimGolf.ui.error error
         end
+
+      rescue Exception => e
+        VimGolf.ui.error "Uh oh, something wen't wrong! Error: #{e}"
+        VimGolf.ui.error "If the error persists, please report it to github.com/igrigorik/vimgolf"
       end
     end
 
-    private
+    no_tasks do
       def download(id)
         begin
           url = URI.parse("#{GOLFHOST}/challenges/#{id}.json")
@@ -126,8 +133,8 @@ module VimGolf
           data['in']['type']
 
         rescue Exception => e
-          VimGolf.ui.error "Uh oh, couldn't download or parse challenge, please verify your challenge id and client version."
-          nil
+          debug(e)
+          raise "Uh oh, couldn't download or parse challenge, please verify your challenge id & client version."
         end
       end
 
@@ -146,10 +153,13 @@ module VimGolf
           JSON.parse(res.body)['status'].to_sym
 
         rescue Exception => e
-          VimGolf.ui.error "Uh oh, entry upload has failed, please check your key."
+          debug(e)
+          raise "Uh oh, entry upload has failed, please check your key."
         end
       end
+    end
 
+    private
       def input(id, type);  challenge(id) + ".#{type}"; end
       def output(id); challenge(id) + ".output"; end
       def log(id);    challenge(id) + ".log"; end
@@ -157,5 +167,9 @@ module VimGolf
       def challenge(id)
         Config.put_path + "/#{id}"
       end
+
+      def debug(msg)
+        p [caller.first, msg] if GOLFDEBUG
+      end
   end
 end

data/lib/vimgolf/version.rb

@@ -1,3 +1,3 @@
 module Vimgolf
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/cli_spec.rb

@@ -22,4 +22,20 @@ describe VimGolf do
     out.should include("launch")
   end
 
+  describe "download / upload challenge" do
+    let(:c) { VimGolf::CLI.new }
+
+    it "should raise error on invalid challenge" do
+      lambda { c.download('invalidID') }.should raise_error
+    end
+
+    it "should return type of challenge on success" do
+      c.download('4d1a1c36567bac34a9000002').should == "rb"
+    end
+
+    it "should raise error on invalid upload id" do
+      lambda { c.upload('invalidID') }.should raise_error
+    end
+  end
+
 end

data/vimgolf.gemspec

@@ -13,8 +13,9 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.rubyforge_project = "vimgolf"
-  s.add_dependency "thor"
+  s.add_dependency "thor", ">= 0.14.6"
   s.add_dependency "json"
+  s.add_dependency "highline"
 
   s.add_development_dependency "rspec"
 
@@ -22,4 +23,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -27,7 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 14
+        - 6
+        version: 0.14.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: highline
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -54,8 +56,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: CLI client for vimgolf.com
 email: 
 - ilya@igvita.com