vimmer 0.1.0 → 0.2.0

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 tmp/
+log

data/.rspec

@@ -1,2 +1 @@
 --color
---format Fuubar

data/Gemfile.lock

@@ -1,25 +1,29 @@
 PATH
   remote: .
   specs:
-    vimmer (0.0.1)
+    vimmer (0.1.0)
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.2.6)
+    addressable (2.2.2)
+    aruba (0.2.7)
       background_process
-      cucumber (~> 0.9.4)
-    autotest (4.4.2)
+      cucumber (~> 0.10.0)
+    autotest (4.4.5)
     autotest-fsevent (0.2.3)
       sys-uname
     autotest-growl (0.2.6)
     background_process (1.2)
-    builder (2.1.2)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    bourne (1.0)
+      mocha (= 0.9.8)
+    builder (3.0.0)
+    crack (0.1.8)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
@@ -28,40 +32,45 @@ GEM
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
       ruby-progressbar (~> 0.0.9)
-    gherkin (2.2.9)
+    gherkin (2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     json (1.4.6)
-    rr (1.0.2)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
+    mocha (0.9.8)
+      rake
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
     rspec-instafail (0.1.4)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rspec-mocks (2.3.0)
     ruby-progressbar (0.0.9)
     sys-uname (0.8.4)
     term-ansicolor (1.0.5)
-    thor (0.14.4)
+    thor (0.14.6)
+    webmock (1.6.1)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (= 0.2.7)
   autotest
   autotest-fsevent
   autotest-growl
+  bourne
   bundler (>= 1.0.0)
-  cucumber
+  cucumber (= 0.10.0)
   fakefs
   fuubar
-  rr
-  rspec (~> 2.0.0)
+  mocha
+  rspec (~> 2.3.0)
   thor
   vimmer!
+  webmock

data/README.mdown

@@ -5,7 +5,7 @@ Vimmer makes it easy to install, remove and update Vim plugins from the followin
 - Github
 - Vim.org (coming soon)
 
-N.B. Vimmer is a work in process. This is an early alpha release for those who want to give it a try and are willing to submit feedback. I am offering it with NO GUARANTEES. If you're still with me, you can submit your feedback at [https://github.com/densitypop/Vimmer/issues](https://github.com/densitypop/Vimmer/issues). Thank you!
+N.B. Vimmer is a work in progress. This is an early alpha release for those who are willing to try it and submit feedback. I am offering it with NO GUARANTEES. If you're still with me, please submit your feedback at [https://github.com/densitypop/Vimmer/issues](https://github.com/densitypop/Vimmer/issues). Thank you!
 
 ## Installation and Usage ##
 
@@ -21,11 +21,15 @@ Vimmer depends on the Pathogen plugin for managing Vim's runtime path. Using Pat
 
 Restart Vim and you're done! For details on installing Pathogen see [Pathogen on Vim.org](http://www.vim.org/scripts/script.php?script_id=2332). Note: I am planning to automatically setup Pathogen during the Vimmer install process.
 
+### Documentation ###
+
+Vimmer is documented using Cucumber features and hosted on [Relish](http://www.relishapp.com). [View the documentation.](http://relishapp.com/joefiorini/vimmer)
+
 ## Contributing to Vimmer ##
 
 1. Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 2. Check out the [issue tracker](http://github.com/densitypop/Vimmer/issues) to make sure someone already hasn't requested it and/or contributed it
-3. Fork the project
-4. Write some tests/Cukes; implement until you're happy. This is important to make sure I don't accidentally break your fix in the future
+3. Fork the project; make sure you're working in your own branch off the develop branch
+4. Write some tests/Cukes; implement until you're happy and the tests pass. This is important to make sure I don't accidentally break your fix in the future
 5. Send me a pull request
 

data/cucumber.yml

@@ -1,4 +1,4 @@
-default: --format progress features
+default: --format progress features --tags ~@wip
 html_report: --format progress --format html --out=features_report.html features  
 wip: --tags @wip:1 --wip
 autotest: --color

data/features/fixtures/script_ids.json

@@ -0,0 +1 @@
+{"2975":"fugitive.vim"}

data/features/install.feature

@@ -3,15 +3,14 @@ Feature: Install plugin
   Background:
     Given a directory named ".vimmer"
     And a bundle path set for my system
+    And I have no plugins installed
 
   Scenario: Install from Github
-    Given I have no plugins installed
     When I successfully run "vimmer install 'https://github.com/tpope/vim-awesomemofo.git'"
     Then a plugin named "vim-awesomemofo" should be installed
     And the stdout should contain "vim-awesomemofo has been installed"
 
   Scenario: Install from Github with bad URL
-    Given I have no plugins installed
     When I run "vimmer install 'https://github.com/tpope/not-found.git'"
     Then I should still not have any plugins installed
     And it should fail with:
@@ -20,10 +19,32 @@ Feature: Install plugin
     """
 
   Scenario: Install from Github with a non-Github URL
-    Given I have no plugins installed
     When I run "vimmer install 'http://example.com/bad'"
     Then I should still not have any plugins installed
     And it should fail with:
     """
     The URL http://example.com/bad is invalid.
     """
+
+  Scenario Outline: Install from Github with a front-end Github URL
+    When I successfully run "vimmer install '<URL>'"
+    Then a plugin named "vim-awesomemofo" should be installed
+    And the stdout should contain "vim-awesomemofo has been installed"
+
+    Examples:
+      | URL                                      |
+      | http://github.com/tpope/vim-awesomemofo  |
+      | https://github.com/tpope/vim-awesomemofo |
+
+  Scenario: Accept URLs with a "."
+    When I run "vimmer install 'http://github.com/tpope/awesomemofo.vim'"
+    Then it should pass with:
+    """
+    awesomemofo.vim has been installed
+    """
+
+  @wip
+  Scenario: Install from vim.org
+    When I successfully run "vimmer install http://www.vim.org/scripts/script.php?script_id=2975"
+    Then a plugin named "fugitive.vim" should be installed
+    And the stdout should contain "fugitive.vim has been installed"

data/features/step_definitions/plugin_assertion_steps.rb

@@ -1,6 +1,6 @@
 Then /^a plugin named "([^"]*)" should be installed$/ do |name|
   @vimmer.installed_plugins.should include(name)
-  @vimmer.plugin_store[name].should =~ %r{https://github.com/tpope/vim-awesomemofo.git}
+  @vimmer.plugin_store[name].should =~ %r{https://github.com/.*/#{name}\.git}
 end
 
 Then /^I should still not have any plugins installed$/ do

data/features/support/hooks.rb

@@ -1,3 +1,7 @@
+Before do
+  @aruba_timeout_seconds = 20
+end
+
 After do
   FileUtils.rm_rf("tmp/aruba/bundle")
 end

data/features/support/setup.rb

@@ -1,5 +1,7 @@
-require 'aruba'
+require 'aruba/cucumber'
+require 'webmock'
+require File.dirname(__FILE__) + '/stubbed_http_requests'
 
-ENV['PATH'] = File.expand_path(File.dirname(__FILE__)) + ":" + ENV['PATH']
+ENV['RUBYOPT'] = "-r#{File.expand_path(File.join(File.dirname(__FILE__), 'stub-commands.rb'))} -rwebmock -r#{File.expand_path(File.join(File.dirname(__FILE__), 'stubbed_http_requests'))} #{ENV['RUBYOPT']}"
 ENV['VIMMER_HOME'] = File.expand_path(File.join(File.dirname(__FILE__),
                                                 %w(.. .. tmp aruba .vimmer)))

data/features/support/stub-commands.rb

@@ -0,0 +1,29 @@
+# redefine ` to stub the curl and git commands
+module Kernel
+  alias_method :real_backtick, :`
+  def `(command)
+    case command
+    when /^curl (.+)/
+      if $1 =~ /\.git\b|not-found/
+        '404'
+      else
+        '200'
+      end 
+
+    when /^git (.+)/
+      git_arguments = $1
+      # git clone <url> (<dir>)
+      if git_arguments =~ /^clone \S+ (.+)/
+        require 'fileutils'
+        FileUtils.mkdir_p $1 
+      else
+        puts 'delegating to git'
+        real_backtick "git #{git_arguments}"
+      end
+    
+    else
+      real_backtick command
+    end
+  end
+end
+

data/features/support/stubbed_http_requests.rb

@@ -0,0 +1,6 @@
+include WebMock::API
+
+stub_request(:get, "http://www.vim-scripts.org/api/script_ids.json").
+  with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+  to_return(:status => 200, :body => File.read(File.dirname(__FILE__) + "/../fixtures/script_ids.json"))
+

data/lib/vimmer.rb

@@ -15,6 +15,16 @@ module Vimmer
 
   end
 
+  class InstallerNotFoundError < StandardError
+    attr_accessor :path
+
+    def initialize(path)
+      @path = path
+    end
+
+  end
+
+
   def bundle_path
     settings[:bundle_path]
   end

data/lib/vimmer/cli.rb

@@ -8,8 +8,15 @@ module Vimmer
     def install(path)
       setup
       begin
-        installer = Vimmer::Installers::Github.new(:path => path)
+        installer = Vimmer::Installers.for_url(path)
+        # TODO: Make this consistent with VimDotOrg installer
+        if installer == Vimmer::Installers::Github
+          installer = installer.new(:path => path)
+        end
         installer.install
+      rescue Vimmer::InstallerNotFoundError => e
+        $stderr.puts "The URL #{e.path} is invalid."
+        exit 1
       rescue Vimmer::InvalidPathError => e
         $stderr.puts "The URL #{e.path} is invalid."
         exit 1

data/lib/vimmer/installers.rb

@@ -1,7 +1,21 @@
 module Vimmer
   module Installers
+    extend self
+
+    autoload :Github,      'vimmer/installers/github'
+    autoload :VimDotOrg,   'vimmer/installers/vim_dot_org'
+
+
+    def for_url(url)
+      if Github.match?(url)
+        Github
+      elsif VimDotOrg.match?(url)
+        VimDotOrg.for_url(url)
+      else
+        raise Vimmer::InstallerNotFoundError.new(url)
+      end
+    end
 
-    autoload :Github,   'vimmer/installers/github'
 
   end
 end

data/lib/vimmer/installers/github.rb

@@ -1,5 +1,10 @@
 module Vimmer
   module Installers
+
+    GITHUB_GIT_PATH_TEMPLATE = "https://github.com/%s/%s.git"
+    GITHUB_GIT_URL_PATTERN = %r{^https://github.com/[a-zA-Z0-9\-_\+%]+/([a-zA-Z0-9\-_\+\.]+).git$}
+    GITHUB_PUBLIC_URL_PATTERN = %r{^https?://github.com/([a-zA-Z0-9\-_\+%]+)/([a-zA-Z0-9\-_\+\.]+[^.git])$}
+
     class Github
       attr_reader :path, :plugin_name
 
@@ -24,8 +29,14 @@ module Vimmer
 
 
       def uninstall
-        FileUtils.rm_rf(File.join(Vimmer.bundle_path, plugin_name))
-        Vimmer.remove_plugin(plugin_name)
+        plugin_path = File.join(Vimmer.bundle_path, plugin_name)
+        if File.directory? plugin_path
+          FileUtils.rm_rf(plugin_path)
+          Vimmer.remove_plugin(plugin_name)
+          puts "#{plugin_name} has been uninstalled"
+        else
+          raise Vimmer::PluginNotFoundError
+        end
       end
 
 
@@ -34,6 +45,16 @@ module Vimmer
       end
 
 
+      def self.match?(url)
+        is_github_url?(url)
+      end
+
+      def self.is_github_url?(url)
+        !(GITHUB_PUBLIC_URL_PATTERN.match(url) ||
+          GITHUB_GIT_URL_PATTERN.match(url)).nil?
+      end
+
+
       private
 
       def git_clone(path, install_to)
@@ -42,7 +63,11 @@ module Vimmer
 
 
       def initialize_with_path(path)
-        raise Vimmer::InvalidPathError.new(path) unless path =~ %r{^https://github.com/[a-zA-Z0-9\-_\+%]+/([a-zA-Z0-9\-_\+]+).git$}
+
+        path = public_path_to_git_path($1, $2) if path =~ GITHUB_PUBLIC_URL_PATTERN
+
+        raise Vimmer::InvalidPathError.new(path) unless path =~ GITHUB_GIT_URL_PATTERN
+
         @plugin_name = $1
         @path = path
       end
@@ -53,10 +78,16 @@ module Vimmer
         @plugin_name = name
       end
 
+
       def remove_extension(path)
         path.gsub(/\.git$/, '')
       end
 
+
+      def public_path_to_git_path(user, repo)
+        GITHUB_GIT_PATH_TEMPLATE % [user, repo]
+      end
+
     end
   end
 end

data/lib/vimmer/installers/vim_dot_org.rb

@@ -0,0 +1,46 @@
+require 'net/http'
+require 'json'
+
+module Vimmer
+  module Installers
+
+    VIM_DOT_ORG_URL_PATTERN = %r{https?://(?:www\.)?vim\.org/scripts/script.php\?script_id=(\d{1,5})}
+
+    class VimDotOrg
+      attr_reader :path, :plugin_name, :script_id
+
+
+      def self.match?(url)
+        !(url =~ VIM_DOT_ORG_URL_PATTERN).nil?
+      end
+
+      def self.for_url(path)
+
+        m = VIM_DOT_ORG_URL_PATTERN.match(path)
+        script_id = m[1]
+
+        raise Vimmer::PluginNotFoundError unless repository.key?(script_id)
+
+        script_name = repository[script_id]
+        github_path_template = "https://github.com/vim-scripts/%s.git"
+
+        github_path = github_path_template % [script_name]
+
+        Github.new(:path => github_path)
+      end
+
+      private
+
+      def self.repository
+        @repository ||= JSON.parse(Net::HTTP.get(repository_uri))
+      end
+
+      def self.repository_uri
+        URI.parse("http://vim-scripts.org/api/script_ids.json")
+      end
+
+
+    end
+
+  end
+end

data/lib/vimmer/settings.rb

@@ -6,13 +6,13 @@ module Vimmer
 
 
     def initialize
-      @config = load_config(config_file)
+      @config = defaults.merge(load_config(config_file))
     end
 
 
     def [](key)
-      value = @config[key.to_s]
-      if value && (File.directory?(value) || File.file?(value))
+      value = File.expand_path(@config[key.to_s])
+      if value && File.exists?(value)
         Pathname.new(value)
       else
         value
@@ -85,12 +85,18 @@ module Vimmer
     end
 
     def load_config(config_file)
-      if File.exist?(config_file)
+      config_file = File.expand_path(config_file)
+      if config_file && File.exist?(config_file.to_s)
         YAML.load_file(config_file)
       else
         {}
       end
     end
 
+
+    def defaults
+      { "bundle_path" => "~/.vim/bundle" }
+    end
+
   end
 end

data/lib/vimmer/version.rb

@@ -1,3 +1,3 @@
 module Vimmer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/script/run_until_failure

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+counter=1
+
+rake > /dev/null 2>&1
+
+while [[ $? -eq 0 ]]; do
+  echo "Count: $counter"
+  let counter=$counter+1
+  rake > /dev/null 2>&1
+done
+
+message="Ran $counter times before failure"
+
+if [[ $1 -eq "-s" ]]; then
+  say $message
+fi
+
+echo $message
+echo "$message\n" >> log/failures.log

data/spec/install/github_spec.rb

@@ -6,16 +6,25 @@ describe "When installing from Github" do
 
   FOUND_URL = "https://github.com/tpope/vim-awesomemofo.git"
   NOT_FOUND_URL = "https://github.com/tpope/not-found.git"
+  MALFORMED_URL = "https://foo.com/bar"
+
+  RSpec::Matchers.define :be_a_valid_github_url do |expected|
+    match do
+      Github.match?(expected) == true
+    end
+  end
 
   context "with a non-existant URL" do
 
     let(:installer) { Github.new(:path => NOT_FOUND_URL) }
 
     before do
-      stub(installer).path_exists? { false }
-      stub(installer).git_clone
+      installer.stubs(:path_exists?).returns(false)
+      installer.stubs(:git_clone)
     end
 
+    it { should be_a_valid_github_url(NOT_FOUND_URL) }
+
     specify "the installer should raise an exception" do
       lambda { installer.install }.should raise_error(Vimmer::PluginNotFoundError)
     end
@@ -27,10 +36,12 @@ describe "When installing from Github" do
     let(:installer) { Github.new(:path => FOUND_URL) }
 
     before do
-      stub(installer).git_clone
-      stub(installer).path_exists? { true }
+      installer.stubs(:git_clone)
+      installer.stubs(:path_exists?).returns(true)
     end
 
+    it { should be_a_valid_github_url(FOUND_URL) }
+
     specify "the installer should not raise an exception" do
       lambda { installer.install }.should_not raise_error
     end
@@ -43,10 +54,13 @@ describe "When installing from Github" do
 
   context "with a malformed URL" do
 
-    subject { Github.new(:path => "https://foo.com/bar") }
+    let(:installer) { Github.new(:path => MALFORMED_URL) }
+
+
+    it { should_not be_a_valid_github_url(MALFORMED_URL) }
 
     specify "the installer should raise an exception" do
-      lambda { subject }.should raise_error(Vimmer::InvalidPathError)
+      lambda { installer }.should raise_error(Vimmer::InvalidPathError)
     end
 
   end
@@ -60,8 +74,8 @@ describe "When installing from Github" do
 
     installer = Github.new(:path => FOUND_URL)
 
-    stub(installer).path_exists? { true }
-    stub(installer).git_clone
+    installer.stubs(:path_exists?).returns(true)
+    installer.stubs(:git_clone)
 
     installer.install
 
@@ -69,22 +83,14 @@ describe "When installing from Github" do
 
   end
 
-  def stub_for_install!(installer)
-
-    stub(Vimmer).bundle_path do
-      Pathname.new("tmp/bundle")
-    end
+  context "with a public facing Github url" do
 
-    stub(installer).git_clone do
-      FileUtils.mkdir_p(Vimmer.bundle_path.join("vim-awesomemofo", "plugins"))
-      FileUtils.touch(Vimmer.bundle_path.join("vim-awesomemofo", "plugins", "vim-awesomemofo.vim"))
-    end
+    subject { Github.new(:path => "http://github.com/tpope/vim-awesomemofo") }
 
-    stub(installer).path_exists? { true }
+    its(:path) { should == FOUND_URL }
 
   end
 
-
   it "installs the plugin" do
 
     installer = Github.new(:path => FOUND_URL)
@@ -94,15 +100,19 @@ describe "When installing from Github" do
     installer.install
 
     plugin_path = Vimmer.bundle_path.join("vim-awesomemofo")
+
+
     File.directory?(plugin_path.to_s).should be_true
     File.directory?(plugin_path.join("plugins").to_s).should be_true
     File.file?(plugin_path.join("plugins", "vim-awesomemofo.vim")).should be_true
+
   end
 
   it "uninstalls the plugin" do
 
     installer = Github.new(:name => "vim-awesomemofo")
 
+
     stub_for_install! installer
 
     installer.install
@@ -115,4 +125,22 @@ describe "When installing from Github" do
   end
 
 
+  private
+
+  def stub_for_install!(installer)
+
+    Vimmer.stubs(:bundle_path).returns(Pathname.new("tmp/bundle"))
+
+    class << installer
+      def git_clone(arg1, arg2)
+        FileUtils.mkdir_p(Vimmer.bundle_path.join("vim-awesomemofo", "plugins"))
+        FileUtils.touch(Vimmer.bundle_path.join("vim-awesomemofo", "plugins", "vim-awesomemofo.vim"))
+      end
+    end
+
+    installer.stubs(:path_exists?).returns true
+
+  end
+
 end
+

data/spec/install/load_installer_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "When loading an installer by URL" do
+  include Vimmer
+
+  context "for a Github URL" do
+
+    subject { Installers.for_url("https://github.com/foo/bar.git") }
+
+    it { should == Installers::Github }
+
+  end
+
+
+  context "for a Vim.org URL" do
+
+    before do
+      Installers::VimDotOrg.stubs(:for_url).returns(Installers::VimDotOrg)
+    end
+
+    subject { Installers.for_url("http://vim.org/scripts/script.php?script_id=1234") }
+
+    it { should == Installers::VimDotOrg }
+
+  end
+
+
+  context "for an unrecognized URL" do
+
+    subject { Installers.for_url("http://foo.com/bar") }
+
+    it { lambda { subject }.should raise_error(Vimmer::InstallerNotFoundError) }
+
+  end
+
+
+end

data/spec/install/vim_dot_org_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+include Vimmer::Installers
+
+describe "When installing from vim.org" do
+
+  VDO_NOT_FOUND_URL = "http://www.vim.org/scripts/script.php?script_id=0000"
+  VDO_MALFORMED_URL = "https://foo.com/bar"
+
+  RSpec::Matchers.define :be_a_valid_url do |expected|
+    match do
+      VimDotOrg.match?(expected) == true
+    end
+  end
+
+  context "with a non-existent URL" do
+
+    before do
+      VimDotOrg.stubs(:repository).returns({})
+    end
+
+    it { should be_a_valid_url(VDO_NOT_FOUND_URL) }
+
+    specify "the installer should raise an exception" do
+      lambda { VimDotOrg.for_url(VDO_NOT_FOUND_URL) }.should raise_error(Vimmer::PluginNotFoundError)
+    end
+
+  end
+
+
+  context "with a malformed URL" do
+
+    it { should_not be_a_valid_url(VDO_MALFORMED_URL) }
+
+  end
+
+  context "with a good URL" do
+
+    before do
+      VimDotOrg.stubs(:repository).returns({"2975" => "fugitive.vim"})
+    end
+
+    let(:installer) { VimDotOrg.for_url("http://www.vim.org/scripts/script.php?script_id=2975") }
+
+    context "using the vim-scripts mirror" do
+
+      it "should return a Github installer" do
+        installer.should be_a(Github)
+      end
+
+      it "uses the Github path" do
+        installer.path.should == "https://github.com/vim-scripts/fugitive.vim.git"
+      end
+
+    end
+
+    specify "the installer should not raise an exception" do
+
+      class << installer
+        def git_clone(arg1, arg2)
+        end
+      end
+
+      lambda { installer.install }.should_not raise_error
+    end
+
+    specify "the installer calculates the plugin's name" do
+      installer.plugin_name.should == "fugitive.vim"
+    end
+
+  end
+
+end

data/spec/settings_spec.rb

@@ -23,4 +23,19 @@ describe ".vimmer/" do
     File.read(settings.config_file).should =~ /bundle_path: ~\/.vim\/bundle/
   end
 
+
+  it "expands the path when calling bundle_path" do
+    ENV['VIMMER_HOME'] = vimmer_home.to_s
+
+    bundle_path = app_root.join("lib", "..", "tmp", "bundle")
+    File.open(vimmer_home.join("config").to_s, "w") do |f|
+      f << "bundle_path: #{bundle_path}"
+    end
+
+    Vimmer::Settings.new[:bundle_path].should == File.expand_path(bundle_path)
+
+    ENV['VIMMER_HOME'] = nil
+  end
+
+
 end

data/spec/spec_helper.rb

@@ -6,15 +6,25 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'vimmer'
 
 require 'fakefs/spec_helpers'
+require 'bourne'
 
-RSpec.configure do |config|
+require 'webmock/rspec'
+
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-  config.mock_with :rr
+RSpec.configure do |config|
 
   config.include FakeFS::SpecHelpers
+  config.include WebMock::API
+  config.mock_with :mocha
 
   def app_root
-    Pathname.new(File.join(__FILE__, "..", "tmp", ".vimmer"))
+    Pathname.new(File.join(File.dirname(__FILE__), ".."))
+  end
+
+  def vimmer_home
+    app_root.join("tmp", ".vimmer")
   end
 
 

data/vimmer.gemspec

@@ -17,13 +17,15 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
 
   s.add_development_dependency "bundler", ">=1.0.0"
-  s.add_development_dependency "rspec", "~> 2.0.0"
-  s.add_development_dependency "cucumber"
+  s.add_development_dependency "rspec", "~> 2.3.0"
+  s.add_development_dependency "cucumber", "= 0.10.0"
   s.add_development_dependency "autotest"
   s.add_development_dependency "fuubar"
   s.add_development_dependency "fakefs"
-  s.add_development_dependency "aruba"
-  s.add_development_dependency "rr"
+  s.add_development_dependency "aruba",  "= 0.2.7"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "bourne"
+  s.add_development_dependency "webmock"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joe Fiorini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -05:00
+date: 2010-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,9 +55,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 3
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.3.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -66,11 +66,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 0
+        version: 0.10.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -118,15 +120,17 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 7
+        version: 0.2.7
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: mocha
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -138,6 +142,32 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: bourne
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Install, update and remove Vim plugins without changing directories using this simple command line utility.
 email: 
 - joe@densitypop.com
@@ -156,27 +186,31 @@ files:
 - Gemfile.lock
 - README.mdown
 - Rakefile
-- autotest/discover.rb
 - bin/vimmer
 - cucumber.yml
+- features/fixtures/script_ids.json
 - features/install.feature
 - features/setup.feature
 - features/step_definitions/environment_context_steps.rb
 - features/step_definitions/plugin_assertion_steps.rb
 - features/step_definitions/plugin_context_steps.rb
-- features/support/curl
-- features/support/git
 - features/support/hooks.rb
 - features/support/setup.rb
+- features/support/stub-commands.rb
+- features/support/stubbed_http_requests.rb
 - features/support/vimmer_stub.rb
 - features/uninstall_plugin.feature
 - lib/vimmer.rb
 - lib/vimmer/cli.rb
 - lib/vimmer/installers.rb
 - lib/vimmer/installers/github.rb
+- lib/vimmer/installers/vim_dot_org.rb
 - lib/vimmer/settings.rb
 - lib/vimmer/version.rb
+- script/run_until_failure
 - spec/install/github_spec.rb
+- spec/install/load_installer_spec.rb
+- spec/install/vim_dot_org_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - vimmer.gemspec
@@ -213,17 +247,20 @@ signing_key:
 specification_version: 3
 summary: Automated Vim plugin management
 test_files: 
+- features/fixtures/script_ids.json
 - features/install.feature
 - features/setup.feature
 - features/step_definitions/environment_context_steps.rb
 - features/step_definitions/plugin_assertion_steps.rb
 - features/step_definitions/plugin_context_steps.rb
-- features/support/curl
-- features/support/git
 - features/support/hooks.rb
 - features/support/setup.rb
+- features/support/stub-commands.rb
+- features/support/stubbed_http_requests.rb
 - features/support/vimmer_stub.rb
 - features/uninstall_plugin.feature
 - spec/install/github_spec.rb
+- spec/install/load_installer_spec.rb
+- spec/install/vim_dot_org_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }

data/features/support/curl

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-args=$#
-url=${!args}
-
-if echo $url | grep ".git$"
-then
-  echo 404
-elif echo $url | grep "not-found"
-then
-  echo 404
-else
-  echo 200
-fi

data/features/support/git

@@ -1,10 +0,0 @@
-#!/bin/bash
-# $1    $2                                           $3
-# clone https://github.com/tpope/vim-awesomemofo.git tmp/aruba/bundle
-
-if [ $1 == "clone" ]; then
-  mkdir -p $3
-else
-  echo "delegating to git"
-  /usr/local/git/bin/git $*
-fi