vim-flavor 1.0.1 → 1.0.2

data/features/.nav

@@ -12,3 +12,6 @@
 - caching.feature
 - resolve_dependencies.feature
 - testing_vim_plugins:
+  - typical_usage.feature
+  - dependencies.feature
+  - failures.feature

data/features/caching.feature

@@ -4,47 +4,46 @@ Feature: Caching
   I want to cache repositories of plugins which are installed before.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
-    And flavorfile
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+    And a flavorfile with:
       """ruby
       flavor '$foo_uri', '~> 1.0'
       """
     And I run `vim-flavor install`
-    And I disable network to the original repository of 'foo'
+    And I disable network to the original repository of "foo"
 
   Scenario: Install plugins - locked and compatible with new flavorfile
-    Given I delete '$home/.vim'
-    When I run `vim-flavor install` again
-    Then I get lockfile
+    Given I remove the directory "home/.vim"
+    When I run `vim-flavor install`
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (1.0.2)
       """
-    And I get flavor '$foo_uri' with '1.0.2' in '$home/.vim'
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
 
   Scenario: Install plugins - locked but incompatible with new flavorfile
-    Given I edit flavorfile as
+    Given I edit the flavorfile as:
       """ruby
       flavor '$foo_uri', '~> 2.0'
       """
-    When I run `vim-flavor install` but
-    Then it fails with messages like
+    When I run `vim-flavor install`
+    Then it should fail with regexp:
       """
       fatal: \S+ does not appear to be a git repository
       """
 
   Scenario: Install plugins - not locked
-    Given I delete lockfile
-    When I run `vim-flavor install` but
-    Then it fails with messages like
+    Given I delete the lockfile
+    When I run `vim-flavor install`
+    Then it should fail with regexp:
       """
       fatal: \S+ does not appear to be a git repository
       """
 
   Scenario: Upgrading plugins
-    When I run `vim-flavor upgrade` but
-    Then it fails with messages like
+    When I run `vim-flavor upgrade`
+    Then it should fail with regexp:
       """
       fatal: \S+ does not appear to be a git repository
       """

data/features/command_line/progress_messages.feature

@@ -3,20 +3,16 @@ Feature: Progress messages
   as a lazy Vim user,
   I want to see messages about the current progress.
 
-  Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-
   Scenario: Install Vim plugins successfully
-    Given a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
-    And a repository 'bar' with versions '2.0.0 2.0.1 2.0.2'
-    And flavorfile
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+    And a repository "bar" with versions "2.0.0 2.0.1 2.0.2"
+    And a flavorfile with:
       """ruby
       flavor '$foo_uri', '~> 1.0'
       flavor '$bar_uri'
       """
     When I run `vim-flavor install`
-    Then it outputs progress as follows
+    Then it should pass with template:
       """
       Checking versions...
         Use $bar_uri ... 2.0.2
@@ -28,17 +24,17 @@ Feature: Progress messages
       """
 
   Scenario: Install Vim plugins which are not existing
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
-      flavor 'no-such-plugin'
+      flavor 'file://$tmp/no-such-plugin'
       """
-    When I run `vim-flavor install` but
-    Then it fails with messages like
+    When I run `vim-flavor install`
+    Then it should fail with template:
       """
-      fatal: '\S+' does not appear to be a git repository
+      Checking versions...
+        Use file://$tmp/no-such-plugin ... failed
       """
-    And it outputs progress as follows
+    And it should fail with regexp:
       """
-      Checking versions...
-        Use no-such-plugin ... failed
+      fatal: '\S+' does not appear to be a git repository
       """

data/features/flavorfile/comments.feature

@@ -4,12 +4,10 @@ Feature: Comments
   I want to leave comments in my flavorfile.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0 1.1 1.2 2.0'
+    Given a repository "foo" with versions "1.0 1.1 1.2 2.0"
 
   Scenario: Comment out declarations
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       # Since flavorfile is parsed as a Ruby script,
       # you can comment out arbitrary lines like this.
@@ -17,8 +15,9 @@ Feature: Comments
       # flavor '$foo_uri', '~> 1.0'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       """
-    And I get a bootstrap script in '$home/.vim'
-    But I don't have flavor '$foo_uri' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    But a flavor "$foo_uri" is not deployed to "$home/.vim"

data/features/flavorfile/groups.feature

@@ -4,45 +4,45 @@ Feature: Groups
   I want to declare groups of flavors.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0 1.1 1.2'
-    And a repository 'bar' with versions '2.0 2.1 2.2'
+    Given a repository "foo" with versions "1.0 1.1 1.2"
+    And a repository "bar" with versions "2.0 2.1 2.2"
 
   Scenario: Install only runtime dependencies
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri', :group => :runtime
       flavor '$bar_uri', :group => :development
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $bar_uri (2.2)
       $foo_uri (1.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.2' in '$home/.vim'
-    But I don't have flavor '$bar_uri' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.2" is deployed to "$home/.vim"
+    But a flavor "$bar_uri" is not deployed to "$home/.vim"
 
   Scenario: The default group
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       flavor '$bar_uri', :group => :development
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $bar_uri (2.2)
       $foo_uri (1.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.2' in '$home/.vim'
-    But I don't have flavor '$bar_uri' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.2" is deployed to "$home/.vim"
+    But a flavor "$bar_uri" is not deployed to "$home/.vim"
 
   Scenario: Group a bunch of flavors at once
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       group :development do
         flavor '$foo_uri'
@@ -50,11 +50,12 @@ Feature: Groups
       end
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $bar_uri (2.2)
       $foo_uri (1.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    But I don't have flavor '$foo_uri' in '$home/.vim'
-    But I don't have flavor '$bar_uri' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    But a flavor "$foo_uri" is not deployed to "$home/.vim"
+    But a flavor "$bar_uri" is not deployed to "$home/.vim"

data/features/flavorfile/repository_name.feature

@@ -3,51 +3,50 @@ Feature: Repository name
   as a lazy Vim user,
   I also want to use shorthands for frequently used repositories.
 
-  Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-
   Scenario: Declare using a Vim plugin from www.vim.org
-    Given a repository 'vim-scripts/vspec' with versions '0.0.4 1.2.0'
-    And flavorfile
+    Given a GitHub repository "vim-scripts/vspec" with versions "0.0.4 1.2.0"
+    And a flavorfile with:
       """ruby
       # Fetch the plugin from git://github.com/vim-scripts/vspec.git
       flavor 'vspec', '~> 0.0'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       vspec (0.0.4)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor 'vspec' with '0.0.4' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "vspec" version "0.0.4" is deployed to "$home/.vim"
 
   Scenario: Declare using a Vim plugin from GitHub
-    Given a repository 'kana/vim-vspec' with versions '0.0.4 1.2.0'
-    And flavorfile
+    Given a GitHub repository "kana/vim-vspec" with versions "0.0.4 1.2.0"
+    And a flavorfile with:
       """ruby
       # Fetch the plugin from git://github.com/kana/vim-vspec.git
       flavor 'kana/vim-vspec', '~> 0.0'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       kana/vim-vspec (0.0.4)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor 'kana/vim-vspec' with '0.0.4' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "kana/vim-vspec" version "0.0.4" is deployed to "$home/.vim"
 
   Scenario: Declare using a Vim plugin from an arbitrary URI
-    Given a repository 'vspec' with versions '0.0.4 1.2.0'
-    And flavorfile
+    Given a local repository "vspec" with versions "0.0.4 1.2.0"
+    And a flavorfile with:
       """ruby
       # Fetch the plugin from the URI.
       flavor '$vspec_uri', '~> 0.0'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $vspec_uri (0.0.4)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$vspec_uri' with '0.0.4' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$vspec_uri" version "0.0.4" is deployed to "$home/.vim"

data/features/flavorfile/version_constraint.feature

@@ -8,45 +8,46 @@ Feature: Version constraint
   compatibility of plugins.  See also [Philosophy](philosophy) for the details.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0 1.1 1.2 2.0'
+    Given a repository "foo" with versions "1.0 1.1 1.2 2.0"
 
   Scenario: Declare using the latest version of a Vim plugin
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (2.0)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '2.0' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "2.0" is deployed to "$home/.vim"
 
   Scenario: Declare using a Vim plugin not older than a specific version
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri', '>= 1.1'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (2.0)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '2.0' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "2.0" is deployed to "$home/.vim"
 
   Scenario: Declare using the latest and compatible version of a Vim plugin
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri', '~> 1.0'
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (1.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.2' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.2" is deployed to "$home/.vim"

data/features/step_definitions/bootstrap_script_steps.rb

@@ -1,7 +1,6 @@
-Then /^I get a bootstrap script in '(.+)'$/ do |virtual_path|
-  File.should exist(
-    expand(virtual_path).
-    to_flavors_path.
-    to_bootstrap_path
-  )
+Then /^a bootstrap script is created in "(.+)"$/ do |v_vimfiles_path|
+  p = expand(v_vimfiles_path).to_flavors_path.to_bootstrap_path
+  steps %Q{
+    Then a file named "#{p}" should exist
+  }
 end

data/features/step_definitions/cli_steps.rb

@@ -1,43 +1,11 @@
-When /^I run `vim-flavor(.*)`(?: again)?(?:,? (but))?$/ do |args, mode|
-  begin
-    original_home = ENV['HOME']
-    ENV['HOME'] = expand('$home')
-    Dir.chdir(expand('$tmp')) do
-      original_stdout = $stdout
-      begin
-        $stdout = @output = StringIO.new()
-        Vim::Flavor::CLI.start(args.strip().split(/\s+/).map {|a| expand(a)})
-      rescue RuntimeError => e
-        @last_error = e
-      ensure
-        $stdout = original_stdout
-      end
-      if mode == 'but'
-        raise RuntimeError, 'Command succeeded unexpectedly' if not @last_error
-      else
-        raise @last_error if @last_error
-      end
-    end
-  ensure
-    ENV['HOME'] = original_home
-  end
+Then 'it should pass' do
+  steps %Q{
+    Then it should pass with:
+      """
+      """
+  }
 end
 
-Then /^it succeeds$/ do
-  @last_error.should be_nil
-end
-
-Then /^it fails with messages like$/ do |pattern|
-  @last_error.should_not be_nil
-  @last_error.message.should match Regexp.new(pattern.strip().gsub(/\s+/, '\s+'))
-end
-
-Then 'it outputs progress as follows' do |text|
-  # For some reason, Cucumber drops the last newline from every docstring...
-  @output.string.should include expand(text + "\n")
-end
-
-Then 'it outputs progress like' do |pattern|
-  # For some reason, Cucumber drops the last newline from every docstring...
-  @output.string.should match Regexp.new(expand(pattern + "\n"))
+Then /^it should (pass|fail) with template:$/ do |pass_fail, template|
+  self.__send__("assert_#{pass_fail}ing_with", expand(template))
 end

data/features/step_definitions/dependency_steps.rb

@@ -1,3 +1,5 @@
-Then /^it stores a dependency '(.*)' in '(.*)'$/ do |repo_name, vdir|
-  Dir.should exist expand("#{vdir}/#{repo_name.zap}")
+Then /^a dependency "(.*)" is stored in "(.*)"$/ do |repo_name, deps_path|
+  steps %Q{
+    Then a directory named "#{deps_path}/#{repo_name.zap}" should exist
+  }
 end

data/features/step_definitions/directory_steps.rb

@@ -1,23 +1,6 @@
-require 'tmpdir'
-
-Given /^a temporary directory called '(.+)'$/ do |name|
-  path = Dir.mktmpdir
-  at_exit do
-    delete_path path
+When /^I remove the directory "([^"]*)"$/ do |dir_name|
+  in_current_dir do
+    # FileUtils#rmdir cannot delete non-empty directories.
+    FileUtils.rm_r(dir_name)
   end
-  variable_table[name] = path
-end
-
-Given /^a home directory called '(.+)' in '(.+)'$/ do |name, virtual_path|
-  actual_path = expand(virtual_path)
-  Dir.mkdir actual_path, 0700
-  variable_table[name] = actual_path
-end
-
-Given /^I don't have a directory called '(.+)'$/ do |virtual_path|
-  Dir.should_not exist(expand(virtual_path))
-end
-
-Given /^I delete '(.+)'$/ do |virtual_path|
-  delete_path expand(virtual_path)
 end

data/features/step_definitions/file_steps.rb

@@ -1,9 +1,9 @@
-Given /^a file called '(.*)'$/ do |virtual_path, content|
-  create_file expand(virtual_path), expand(content)
-end
-
-Given /^an executable called '(.*)'$/ do |virtual_path, content|
-  path = expand(virtual_path)
-  create_file path, expand(content)
-  File.chmod(0755, path)
+Given /^an executable file named "(.*)" with:$/ do |file_path, content|
+  steps %Q{
+    Given a file named "#{file_path}" with:
+      """
+      #{content}
+      """
+  }
+  File.chmod(0755, File.join([current_dir, file_path]))
 end

data/features/step_definitions/flavor_steps.rb

@@ -1,4 +1,4 @@
-Given /^a repository '(.+)' with versions '(.+)'$/ do |basename, versions|
+Given /^a (?:(?:GitHub|local) )?repository "(.+)" with versions "(.+)"$/ do |basename, versions|
   repository_path = make_repo_path(basename)
   doc_name = basename.split('/').last.sub(/^vim-/, '')
   variable_table["#{basename}_uri"] = make_repo_uri(basename)
@@ -19,28 +19,36 @@ Given /^a repository '(.+)' with versions '(.+)'$/ do |basename, versions|
   END
 end
 
-Given /^a repository '(.+)' from offline cache$/ do |repo_name|
-  repository_path = make_repo_path(repo_name)
+Given /^a repository "(.+)" from offline cache$/ do |repo_name|
+  repository_path = make_repo_path(repo_name).sub(expand('$tmp/'), '')
   sh <<-"END"
     {
-      git clone 'vendor/#{repo_name}' '#{repository_path}'
+      git clone 'vendor/#{repo_name}' '#{current_dir}/#{repository_path}'
     } >/dev/null
   END
 end
 
-Given /^I disable network to the original repository of '(.+)'$/ do |basename|
-  delete_path make_repo_path(basename)
+Given /^I disable network to the original repository of "(.+)"$/ do |basename|
+  steps %Q{
+    Given I remove the directory "#{make_repo_path(basename)}"
+  }
 end
 
-Then /^I get flavor '(.+)' with '(.+)' in '(.+)'$/ do |v_repo_name, version, virtual_path|
-  flavor_path = make_flavor_path(expand(virtual_path), expand(v_repo_name))
+Then /^a flavor "(.+)" version "(.+)" is deployed to "(.+)"$/ do |v_repo_name, version, v_vimfiles_path|
+  flavor_path = make_flavor_path(expand(v_vimfiles_path), expand(v_repo_name))
   basename = expand(v_repo_name).split('/').last.sub(/^vim-/, '')
-  File.open("#{flavor_path}/doc/#{basename}.txt", 'r').read().should ==
-    "*#{basename}* #{version}\n"
-  File.should exist("#{flavor_path}/doc/tags")
+  steps %Q{
+    Then the file "#{flavor_path}/doc/#{basename}.txt" should contain:
+      """
+      *#{basename}* #{version}
+      """
+    Then a file named "#{flavor_path}/doc/tags" should exist
+  }
 end
 
-Then /^I don't have flavor '(.+)' in '(.+)'$/ do |v_repo_name, virtual_path|
-  flavor_path = make_flavor_path(expand(virtual_path), expand(v_repo_name))
-  Dir.should_not exist(flavor_path)
+Then /^a flavor "(.+)" is not deployed to "(.+)"$/ do |v_repo_name, v_vimfiles_path|
+  flavor_path = make_flavor_path(expand(v_vimfiles_path), expand(v_repo_name))
+  steps %Q{
+    Then a directory named "#{flavor_path}" should not exist
+  }
 end

data/features/step_definitions/flavorfile_steps.rb

@@ -1,12 +1,17 @@
-Given 'flavorfile' do |content|
-  create_file expand('$tmp').to_flavorfile_path, expand(content)
+Given 'a flavorfile with:' do |content|
+  steps %Q{
+    Given a file named "#{'.'.to_flavorfile_path}" with:
+      """
+      #{expand(content)}
+      """
+  }
 end
 
-When 'I edit flavorfile as' do |content|
+When 'I edit the flavorfile as:' do |content|
   steps %Q{
-    Given flavorfile
-    """
-    #{content}
-    """
+    Given a flavorfile with:
+      """
+      #{content}
+      """
   }
 end

data/features/step_definitions/lockfile_steps.rb

@@ -1,13 +1,24 @@
-Given 'lockfile' do |content|
-  create_file expand('$tmp').to_lockfile_path, expand(content)
+Given 'a lockfile with:' do |content|
+  steps %Q{
+    Given a file named "#{'.'.to_lockfile_path}" with:
+      """
+      #{expand(content)}
+      """
+  }
 end
 
-Given /^I delete lockfile$/ do
-  delete_path expand('$tmp').to_lockfile_path
+Given 'I delete the lockfile' do
+  steps %Q{
+    Given I remove the file "#{'.'.to_lockfile_path}"
+  }
 end
 
-Then 'I get lockfile' do |content|
+Then /^(?:a|the) lockfile is (?:created|updated) with:$/ do |content|
   # For some reason, Cucumber drops the last newline from every docstring...
-  File.open(expand('$tmp').to_lockfile_path, 'r').read().should ==
-    (content == '' ? '' : expand(content) + "\n")
+  steps %Q{
+    Then the file "#{'.'.to_lockfile_path}" should contain exactly:
+      """
+      #{content == '' ? '' : expand(content) + "\n"}
+      """
+  }
 end

data/features/support/env.rb

@@ -1,29 +1,11 @@
+require 'aruba/api'
+require 'aruba/cucumber'
 require 'fileutils'
 require 'vim-flavor'
 
 class FakeUserEnvironment
   include Vim::Flavor::ShellUtility
 
-  def initialize()
-    env = self
-    Vim::Flavor::Flavor.instance_eval do
-      @github_repo_uri = lambda {|user, repo|
-        "file://#{env.expand('$tmp')}/repos/#{user}/#{repo}"
-      }
-    end
-  end
-
-  def create_file path, content
-    FileUtils.mkdir_p(File.dirname(path))
-    File.open(path, 'w') do |f|
-      f.write(content)
-    end
-  end
-
-  def delete_path path
-    FileUtils.remove_entry_secure(path)
-  end
-
   def expand(virtual_path)
     virtual_path.gsub(/\$([a-z_]+)/) {
       variable_table[$1]
@@ -47,8 +29,23 @@ class FakeUserEnvironment
   end
 end
 
+Before do
+  variable_table['tmp'] = File.absolute_path(current_dir)
+
+  steps %Q{
+    Given a directory named "home"
+  }
+  variable_table['home'] = File.absolute_path(File.join([current_dir, 'home']))
+end
+
+Aruba.configure do |config|
+  config.before_cmd do |cmd|
+    set_env 'HOME', variable_table['home']
+    set_env 'VIM_FLAVOR_GITHUB_URI_PREFIX', expand('file://$tmp/repos/')
+    set_env 'VIM_FLAVOR_GITHUB_URI_SUFFIX', ''
+  end
+end
+
 World do
   FakeUserEnvironment.new
 end
-
-ENV['THOR_DEBUG'] = '1'  # To raise an exception as is.

data/features/testing_vim_plugins/dependencies.feature

@@ -4,18 +4,16 @@ Feature: Dependencies
   I want to hide details to do proper testing.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'kana/vim-vspec' from offline cache
-    And a repository 'kana/vim-textobj-user' from offline cache
+    Given a repository "kana/vim-vspec" from offline cache
+    And a repository "kana/vim-textobj-user" from offline cache
 
   Scenario: Testing a Vim plugin with dependencies
-    Given flavorfile
-      """
+    Given a flavorfile with:
+      """ruby
       flavor 'kana/vim-textobj-user', '~> 0.3'
       """
-    And a file called '$tmp/plugin/textobj/date.vim'
-      """
+    And a file named "plugin/textobj/date.vim" with:
+      """vim
       call textobj#user#plugin('date', {
       \   '-': {
       \     '*pattern*': '\v<\d{4}-\d{2}-\d{2}>',
@@ -23,8 +21,8 @@ Feature: Dependencies
       \   }
       \ })
       """
-    And a file called '$tmp/t/basics.vim'
-      """
+    And a file named "t/basics.vim" with:
+      """vim
       " Tests are written with vim-vspec.
       runtime! plugin/textobj/date.vim
       describe 'Text object: date'
@@ -34,8 +32,7 @@ Feature: Dependencies
       end
       """
     When I run `vim-flavor test`
-    Then it succeeds
-    And it outputs progress like
+    Then it should pass with regexp:
       """
       -------- Preparing dependencies
       Checking versions...
@@ -52,10 +49,10 @@ Feature: Dependencies
       Files=1, Tests=1,  \d+ wallclock secs .*
       Result: PASS
       """
-    And I get lockfile
+    And a lockfile is created with:
       """
       kana/vim-textobj-user (0.3.12)
       kana/vim-vspec (1.1.0)
       """
-    And it stores a dependency 'kana/vim-vspec' in '$tmp/.vim-flavor/deps'
-    And it stores a dependency 'kana/vim-textobj-user' in '$tmp/.vim-flavor/deps'
+    And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"
+    And a dependency "kana/vim-textobj-user" is stored in ".vim-flavor/deps"

data/features/testing_vim_plugins/failures.feature

@@ -0,0 +1,60 @@
+Feature: Failures
+  In order to automate varisous processes about testing Vim plugins,
+  As a lazy Vim user,
+  I want to get a proper exit status according to test results.
+
+  Background:
+    Given a repository "kana/vim-vspec" from offline cache
+
+  Scenario: Failed test cases
+    Given a flavorfile with:
+      """ruby
+      # No dependency
+      """
+    And a file named "plugin/foo.vim" with:
+      """vim
+      let g:foo = 3
+      """
+    And a file named "t/basics.vim" with:
+      """vim
+      runtime! plugin/foo.vim
+      describe 'g:foo'
+        it 'is equal to 5'
+          Expect g:foo == 5
+        end
+      end
+      """
+    When I run `vim-flavor test`
+    Then it should fail with regexp:
+      """
+      -------- Preparing dependencies
+      Checking versions...
+        Use kana/vim-vspec ... 1.1.0
+      Deploying plugins...
+        kana/vim-vspec 1.1.0 ... done
+      -------- Testing a Vim plugin
+      Files=0, Tests=0,  0 wallclock secs (.*)
+      Result: NOTESTS
+      t/basics.vim ..\s
+      not ok 1 - g:foo is equal to 5\r
+      # Expected g:foo == 5\r
+      #       Actual value: 3\r
+      #     Expected value: 5\r
+      Failed 1/1 subtests 
+
+      Test Summary Report
+      -------------------
+      t/basics.vim \(Wstat: 0 Tests: 1 Failed: 1\)
+        Failed test:  1
+      Files=1, Tests=1,  0 wallclock secs (.*)
+      Result: FAIL
+      """
+    And the output should not contain:
+      """
+      :in `test':
+      """
+    And a lockfile with:
+      """
+      kana/vim-vspec (1.1.0)
+      """
+    And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"

data/features/testing_vim_plugins/typical_usage.feature

@@ -4,21 +4,19 @@ Feature: Typical usage
   I want to hide details to do proper testing.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'kana/vim-vspec' from offline cache
+    Given a repository "kana/vim-vspec" from offline cache
 
   Scenario: Testing a Vim plugin without any dependency
-    Given flavorfile
-      """
+    Given a flavorfile with:
+      """ruby
       # No dependency
       """
-    And a file called '$tmp/plugin/foo.vim'
-      """
+    And a file named "plugin/foo.vim" with:
+      """vim
       let g:foo = 3
       """
-    And a file called '$tmp/t/basics.vim'
-      """
+    And a file named "t/basics.vim" with:
+      """vim
       " Tests are written with vim-vspec.
       runtime! plugin/foo.vim
       describe 'g:foo'
@@ -27,8 +25,8 @@ Feature: Typical usage
         end
       end
       """
-    And an executable called '$tmp/t/sh.t'
-      """
+    And an executable file named "t/sh.t" with:
+      """bash
       #!/bin/bash
       # It is also possible to write tests with arbitrary tools.
       # Such tests must output results in Test Anything Protocol.
@@ -36,8 +34,7 @@ Feature: Typical usage
       echo '1..1'
       """
     When I run `vim-flavor test`
-    Then it succeeds
-    And it outputs progress like
+    Then it should pass with regexp:
       """
       -------- Preparing dependencies
       Checking versions...
@@ -54,8 +51,8 @@ Feature: Typical usage
       Files=1, Tests=1,  \d+ wallclock secs .*
       Result: PASS
       """
-    And I get lockfile
+    And a lockfile is created with:
       """
       kana/vim-vspec (1.1.0)
       """
-    And it stores a dependency 'kana/vim-vspec' in '$tmp/.vim-flavor/deps'
+    And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"

data/features/typical_usage/deploy_to_arbitrary_place.feature

@@ -5,20 +5,19 @@ Feature: Deploy Vim plugins to a non-standard directory
   I want to deploy Vim plugins to arbitrary place.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
 
   Scenario: Install to specified vimfiles path which does not exist
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       """
-    And I don't have a directory called '$tmp/my-vimfiles'
-    When I run `vim-flavor install --vimfiles-path=$tmp/my-vimfiles`
-    Then I get lockfile
+    And a directory named "my-vimfiles" should not exist
+    When I run `vim-flavor install --vimfiles-path=my-vimfiles`
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (1.0.2)
       """
-    And I get a bootstrap script in '$tmp/my-vimfiles'
-    And I get flavor '$foo_uri' with '1.0.2' in '$tmp/my-vimfiles'
+    And a bootstrap script is created in "my-vimfiles"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "my-vimfiles"

data/features/typical_usage/install_vim_plugins.feature

@@ -5,22 +5,21 @@ Feature: Install Vim plugins
   I want to use a declarative way to start using new Vim plugins.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
 
   Scenario: Install from scratch
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       """
-    When I edit flavorfile as
+    When I edit the flavorfile as:
       """ruby
       flavor '$foo_uri'
       """
     And I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And a lockfile is created with:
       """
       $foo_uri (1.0.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.0.2' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"

data/features/typical_usage/uninstall_vim_plugins.feature

@@ -5,27 +5,27 @@ Feature: Uninstall Vim plugins
   I want to use a declarative way to delete Vim plugins from my configuration.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
-    And a repository 'bar' with versions '2.0.0 2.0.1 2.0.2'
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+    And a repository "bar" with versions "2.0.0 2.0.1 2.0.2"
 
   Scenario: Install after deleting some flavors in flavorfile
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       flavor '$bar_uri'
       """
     And I run `vim-flavor install`
-    When I edit flavorfile as
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+    When I edit the flavorfile as:
       """ruby
       flavor '$bar_uri'
       """
-    And I run `vim-flavor install` again
-    Then I get lockfile
+    And I run `vim-flavor install`
+    Then it should pass
+    And a lockfile is created with:
       """
       $bar_uri (2.0.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$bar_uri' with '2.0.2' in '$home/.vim'
-    But I don't have flavor '$foo_uri' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$bar_uri" version "2.0.2" is deployed to "$home/.vim"
+    But a flavor "$foo_uri" is not deployed to "$home/.vim"

data/features/typical_usage/upgrade_vim_plugins.feature

@@ -5,23 +5,22 @@ Feature: Upgrade Vim plugins
   I want to use a declarative way to upgrade my favorite Vim plugins.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
 
   Scenario: Upgrade with lockfile
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       """
-    And lockfile
+    And a lockfile with:
       """
       $foo_uri (1.0.0)
       """
     When I run `vim-flavor upgrade`
-    Then I get lockfile
+    Then it should pass
+    And the lockfile is updated with:
       """
       $foo_uri (1.0.2)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.0.2' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"

data/features/version_lock.feature

@@ -4,23 +4,22 @@ Feature: Version lock
   I want to keep versions of Vim plugins which I installed before.
 
   Background:
-    Given a temporary directory called 'tmp'
-    And a home directory called 'home' in '$tmp/home'
-    And a repository 'foo' with versions '1.0.0 1.0.1 1.0.2'
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
 
   Scenario: Install with lockfile
-    Given flavorfile
+    Given a flavorfile with:
       """ruby
       flavor '$foo_uri'
       """
-    And lockfile
+    And a lockfile with:
       """
       $foo_uri (1.0.0)
       """
     When I run `vim-flavor install`
-    Then I get lockfile
+    Then it should pass
+    And the lockfile is updated with:
       """
       $foo_uri (1.0.0)
       """
-    And I get a bootstrap script in '$home/.vim'
-    And I get flavor '$foo_uri' with '1.0.0' in '$home/.vim'
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.0" is deployed to "$home/.vim"

data/lib/vim-flavor/cli.rb

@@ -34,16 +34,10 @@ module Vim
         def default_vimfiles_path
           ENV['HOME'].to_vimfiles_path
         end
+      end
 
-        def normalize_groups(s)
-          groups =
-            (s || '').
-            split(/,/).
-            map(&:strip).
-            reject(&:empty?).
-            map(&:to_sym)
-          0 < groups.length ? groups : nil
-        end
+      def self.exit_on_failure?
+        true
       end
     end
   end

data/lib/vim-flavor/facade.rb

@@ -24,7 +24,7 @@ module Vim
 
         deploy_flavors(
           lockfile.flavors.select {|f| f.group == :runtime},
-          vimfiles_path.to_flavors_path
+          File.absolute_path(vimfiles_path).to_flavors_path
         )
 
         trace "Completed.\n"
@@ -69,19 +69,21 @@ module Vim
       def deploy_flavors(flavors, flavors_path)
         trace "Deploying plugins...\n"
 
+        a_flavors_path = File.absolute_path(flavors_path)
+
         FileUtils.rm_rf(
-          [flavors_path],
+          [a_flavors_path],
           :secure => true
         )
 
-        create_vim_script_for_bootstrap(flavors_path)
+        create_vim_script_for_bootstrap(a_flavors_path)
 
         flavors.
         before_each {|f| trace "  #{f.repo_name} #{f.locked_version} ..."}.
         after_each {|f| trace " done\n"}.
         on_failure {trace " failed\n"}.
         each do |f|
-          f.deploy(flavors_path)
+          f.deploy(a_flavors_path)
         end
       end
 
@@ -150,12 +152,12 @@ module Vim
         plugin_paths = lockfile.flavors.map {|f|
           "#{deps_path}/#{f.repo_name.zap}"
         }
-        # FIXME: Testing messages are not outputted in real time.
-        print sh %Q{
+        succeeded = system %Q{
           prove --ext '.t' #{prove_options} &&
           prove --ext '.vim' #{prove_options} \
             --exec '#{vspec} #{Dir.getwd()} #{plugin_paths.join(' ')}'
         }
+        exit(1) unless succeeded
       end
     end
   end

data/lib/vim-flavor/flavor.rb

@@ -27,10 +27,9 @@ module Vim
       end
 
       def self.github_repo_uri(user, repo)
-        @github_repo_uri ||= lambda {|user, repo|
-          "git://github.com/#{user}/#{repo}.git"
-        }
-        @github_repo_uri.call(user, repo)
+        p = (ENV['VIM_FLAVOR_GITHUB_URI_PREFIX'] ||= 'git://github.com/')
+        s = (ENV['VIM_FLAVOR_GITHUB_URI_SUFFIX'] ||= '.git')
+        "#{p}#{user}/#{repo}#{s}"
       end
 
       def repo_uri

data/lib/vim-flavor/version.rb

@@ -1,5 +1,5 @@
 module Vim
   module Flavor
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/vim-flavor.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('parslet', '~> 1.0')
   gem.add_dependency('thor', '~> 0.14')
 
+  gem.add_development_dependency('aruba', '~> 0.5')
   gem.add_development_dependency('cucumber', '~> 1.2')
   gem.add_development_dependency('rspec', '~> 2.8')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +132,7 @@ files:
 - features/support/env.rb
 - features/testing_vim_plugins/README.md
 - features/testing_vim_plugins/dependencies.feature
+- features/testing_vim_plugins/failures.feature
 - features/testing_vim_plugins/typical_usage.feature
 - features/typical_usage/README.md
 - features/typical_usage/deploy_to_arbitrary_place.feature
@@ -193,6 +210,7 @@ test_files:
 - features/support/env.rb
 - features/testing_vim_plugins/README.md
 - features/testing_vim_plugins/dependencies.feature
+- features/testing_vim_plugins/failures.feature
 - features/testing_vim_plugins/typical_usage.feature
 - features/typical_usage/README.md
 - features/typical_usage/deploy_to_arbitrary_place.feature