vimgolf 0.3.0 → 0.4.0

data/lib/vimgolf/ui.rb

@@ -1,7 +1,14 @@
+require 'highline'
+
 module VimGolf
   class CLI
     class UI < Thor::Base.shell
 
+      def initialize
+          super
+          @hl = HighLine.new($stdin)
+      end
+
       def error(name, message = nil)
         begin
           orig_out, $stdout = $stdout, $stderr
@@ -43,22 +50,31 @@ module VimGolf
         end
       end
 
-      def ask(message, password = false)
+      def ask_question(message, options = {})
         begin
-          require 'highline'
-          @hl ||= HighLine.new($stdin)
-          if not $stdin.tty?
-            @hl.ask(message)
-          elsif password
-            @hl.ask(message) {|q| q.echo = "*" }
-          else
-            @hl.ask(message) {|q| q.readline = true }
+          message = color_string(message, options[:type])
+          details = Proc.new do |q|
+            q.readline = !$stdin.tty?
           end
+          @hl.ask(message, options[:choices] || [], &details)
         rescue EOFError
           return ''
         end
       end
 
+      def color_string(str, type)
+        @hl.color(
+          str,
+          case type
+          when :info  then :green
+          when :warn  then :yellow
+          when :error then :red
+          when :debug then :cyan
+          else nil
+          end
+        )
+      end
+
       def print_envs(apps, default_env_name = nil, simple = false)
         if simple
           envs = apps.map{ |a| a.environments }
@@ -113,4 +129,4 @@ module VimGolf
 
     end
   end
-end
+end

data/lib/vimgolf/version.rb

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

data/spec/challenge_spec.rb

@@ -0,0 +1,31 @@
+require "helper"
+require "tmpdir"
+require "fileutils"
+
+describe VimGolf::Challenge do
+
+  before :each do
+    @dir = Dir.mktmpdir("vimgolf_test_")
+    VimGolf::Challenge.path(@dir)
+  end
+
+  after :each do
+    FileUtils.remove_entry_secure(@dir)
+  end
+
+  it "should raise error on invalid challenge" do
+    lambda { VimGolf::Challenge.new('invalidID').download }.should raise_error
+  end
+
+  it "should return type of challenge on success" do
+    challenge = VimGolf::Challenge.new('4d1a1c36567bac34a9000002')
+    challenge.download
+    challenge.type.should == "rb"
+  end
+
+  it "should raise error on invalid upload id" do
+    lambda { VimGolf::Challenge.new('invalidID').upload }.should raise_error
+  end
+end
+
+

data/spec/cli_spec.rb

@@ -22,20 +22,4 @@ 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
+end

data/spec/helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'rspec'
-require 'lib/vimgolf'
+require 'vimgolf'
 
 require 'stringio'
 

data/spec/keylog_spec.rb

@@ -1,15 +1,16 @@
 require "helper"
 
+include VimGolf
+
 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
+      lambda { Keylog.new(IO.read(f)).convert }.should_not raise_error
     end
 
     it "should score #{f} logfile" do
-      lambda { Keylog.score(IO.read(f)) }.should_not raise_error
+      lambda { Keylog.new(IO.read(f)).convert }.should_not raise_error
     end
   end
 end

data/vimgolf.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "vimgolf"
   s.add_dependency "thor", ">= 0.14.6"
-  s.add_dependency "json"
   s.add_dependency "highline"
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,11 +26,12 @@ Gem::Specification.new do |s|
 
    s.post_install_message = %{
 ------------------------------------------------------------------------------
-Thank you for installing vimgolf-#{Vimgolf::VERSION}. 
+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
+0.4.0: improved diff/retry CLI, emacs support: http://bit.ly/yHgOPF
 
 *NOTE*: please re-run "vimgolf setup" prior to playing!
 

metadata

@@ -1,86 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vimgolf
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-06 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153464140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153464140
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2153463680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153463680
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2153463180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153463180
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153462600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2153462600
 description: CLI client for vimgolf.com
-email: 
+email:
 - ilya@igvita.com
-executables: 
+executables:
 - vimgolf
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -88,12 +70,17 @@ files:
 - README.md
 - Rakefile
 - bin/vimgolf
+- emacs/README.md
+- emacs/ROADMAP.md
+- emacs/vimgolf.el
 - lib/vimgolf.rb
+- lib/vimgolf/challenge.rb
 - lib/vimgolf/cli.rb
 - lib/vimgolf/config.rb
 - lib/vimgolf/keylog.rb
 - lib/vimgolf/ui.rb
 - lib/vimgolf/version.rb
+- spec/challenge_spec.rb
 - spec/cli_spec.rb
 - spec/fixtures/4d19832d8ae121365c00000b.log
 - spec/fixtures/4d1a1c36567bac34a9000002.log
@@ -103,47 +90,55 @@ files:
 - spec/helper.rb
 - spec/keylog_spec.rb
 - vimgolf.gemspec
-has_rdoc: true
 homepage: http://github.com/igrigorik/vimgolf
 licenses: []
+post_install_message: ! '
 
-post_install_message: "\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\
-  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: []
+  ------------------------------------------------------------------------------
 
-require_paths: 
+  Thank you for installing vimgolf-0.4.0.
+
+
+  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 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: vimgolf
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CLI client for vimgolf.com
-test_files: 
+test_files:
+- spec/challenge_spec.rb
 - spec/cli_spec.rb
 - spec/fixtures/4d19832d8ae121365c00000b.log
 - spec/fixtures/4d1a1c36567bac34a9000002.log
@@ -152,3 +147,4 @@ test_files:
 - spec/fixtures/4d1a34ccfa85f32065000004.log
 - spec/helper.rb
 - spec/keylog_spec.rb
+has_rdoc: