vim-flavor 1.0.3 → 1.1.0

data/README.md

@@ -17,7 +17,6 @@
       # * kana/vim-textobj-indent requires kana/vim-textobj-user.
       #   Such dependencies are automatically installed
       #   if the flavored plugin declares its dependencies with VimFlavor file.
-      #   (FIXME: Resolving dependencies will be implemented later.)
       flavor 'kana/vim-textobj-indent'
 
       # * Declare using git://github.com/vim-scripts/fakeclip.git

data/features/command_line/version.feature

@@ -0,0 +1,11 @@
+Feature: `version` command
+  In order to know the current version of `vim-flavor`,
+  as a lazy Vim user,
+  I want to show it from command-line.
+
+  Scenario: Show the current version
+    When I run `vim-flavor version`
+    Then it should pass with template:
+      """
+      $version
+      """

data/features/philosophy.md

@@ -65,8 +65,7 @@ exception is
 doesn't take care about required versions).  The configuration file formats of
 vim-flavor are also used to describe dependencies of plugins with required
 versions.  This means that vim-flavor installs plugins and their dependencies
-automatically (unfortunately this feature is not implemented yet, but it'll be
-available soon).
+automatically.
 
 Any software should have enough and reproducible test cases.
 But existing implementations such as

data/features/resolve_dependencies/README.md

@@ -0,0 +1,27 @@
+Vim plugins sometimes require other plugins as libraries.  For example,
+[vim-textobj-entire](https://github.com/kana/vim-textobj-entire) provides text
+objects to deal with the entire text in the current buffer.  But it is hard to
+properly implement text objects because of many pitfalls and repetitive
+routines.  So that vim-textobj-entire uses
+[vim-textobj-user](https://github.com/kana/vim-textobj-user) to define text
+objects in a simplified and declarative way.  Therefore, if user wants to use
+vim-textobj-entire, he or she must install both vim-textobj-entire and
+vim-textobj-user.
+
+But it is a boring task to install dependencies by hand.  Even if the authors
+of a plugin noted about dependencies in its document, such notes are often
+overlooked.
+
+So that `vim-flavor` automatically resolves dependencies of Vim plugins.  If
+a plugin declares its dependencies as a [flavorfile](flavorfile) and saves it
+as `VimFlavor`, `vim-flavor` reads the file and automatically installs
+dependencies according to the file.
+
+`vim-flavor` also takes care about versions of Vim plugins.  If two plugins
+require the same plugin but required versions are not compatible to others,
+installation will be stopped to avoid using Vim with a broken configuration.
+
+
+
+
+<!-- vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=78 : -->

data/features/resolve_dependencies/basics.feature

@@ -0,0 +1,150 @@
+Feature: Resolve dependencies of Vim plugins
+  In order to hide details of dependencies,
+  as a lazy Vim user,
+  I want to resolve and install dependencies of Vim plugins automatically.
+
+  Scenario: Resolve 2-level dependencies
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1"
+    And a repository "qux" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 1.0'
+      flavor '$bar_uri', '>= 1.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$qux_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $qux_uri ... 2.1
+          Use $bar_uri ... 2.1
+          Use $foo_uri ... 1.1
+      Deploying plugins...
+        $bar_uri 2.1 ... done
+        $foo_uri 1.1 ... done
+        $qux_uri 2.1 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $bar_uri (2.1)
+      $foo_uri (1.1)
+      $qux_uri (2.1)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.1" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "2.1" is deployed to "$home/.vim"
+    And a flavor "$qux_uri" version "2.1" is deployed to "$home/.vim"
+
+  Scenario: Resolve 3-level dependencies
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 1.0'
+      """
+    And a repository "qux" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$bar_uri', '~> 2.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$qux_uri', '~> 1.0'
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $qux_uri ... 1.1
+          Use $bar_uri ... 2.1
+            Use $foo_uri ... 1.1
+      Deploying plugins...
+        $bar_uri 2.1 ... done
+        $foo_uri 1.1 ... done
+        $qux_uri 1.1 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $bar_uri (2.1)
+      $foo_uri (1.1)
+      $qux_uri (1.1)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.1" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "2.1" is deployed to "$home/.vim"
+    And a flavor "$qux_uri" version "1.1" is deployed to "$home/.vim"
+
+  Scenario: Resolve dependencies of a plugin required by two or more plugins
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '>= 1.0'
+      """
+    And a repository "qux" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 2.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$bar_uri'
+      flavor '$qux_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $bar_uri ... 2.1
+          Use $foo_uri ... 2.1
+        Use $qux_uri ... 2.1
+          Use $foo_uri ... 2.1
+      Deploying plugins...
+        $bar_uri 2.1 ... done
+        $foo_uri 2.1 ... done
+        $qux_uri 2.1 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $bar_uri (2.1)
+      $foo_uri (2.1)
+      $qux_uri (2.1)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "2.1" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "2.1" is deployed to "$home/.vim"
+    And a flavor "$qux_uri" version "2.1" is deployed to "$home/.vim"
+
+  Scenario: Resolve dependencies of a plugin required by plugins and user
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '>= 1.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      flavor '$bar_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $bar_uri ... 2.1
+          Use $foo_uri ... 2.1
+        Use $foo_uri ... 2.1
+      Deploying plugins...
+        $bar_uri 2.1 ... done
+        $foo_uri 2.1 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $bar_uri (2.1)
+      $foo_uri (2.1)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "2.1" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "2.1" is deployed to "$home/.vim"

data/features/resolve_dependencies/version_conflict.feature

@@ -0,0 +1,64 @@
+Feature: Version conflict
+  In order to avoid using Vim with a broken configuration,
+  as a lazy Vim user,
+  I want to stop installation as soon as possible.
+
+  Scenario: Two or more plugins require incompatible versions of the same plugin
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 1.0'
+      """
+    And a repository "qux" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 2.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$bar_uri'
+      flavor '$qux_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $bar_uri ... 2.1
+          Use $foo_uri ... 1.1
+        Use $qux_uri ... 2.1
+          Use $foo_uri ... 2.1
+      Found incompatible declarations:
+        $foo_uri ~> 1.0 is required by $bar_uri
+        $foo_uri ~> 2.0 is required by $qux_uri
+      Please resolve the conflict.
+      """
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$foo_uri" is not deployed to "$home/.vim"
+    And a flavor "$bar_uri" is not deployed to "$home/.vim"
+    And a flavor "$qux_uri" is not deployed to "$home/.vim"
+
+  Scenario: Flavorfile and a plugin require incompatible versions of the same plugin
+    Given a repository "foo" with versions "1.0 1.1 2.0 2.1"
+    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
+      """ruby
+      flavor '$foo_uri', '~> 1.0'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$bar_uri'
+      flavor '$foo_uri', '>= 2.0'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $bar_uri ... 2.1
+          Use $foo_uri ... 1.1
+        Use $foo_uri ... 2.1
+      Found incompatible declarations:
+        $foo_uri ~> 1.0 is required by $bar_uri
+        $foo_uri >= 2.0 is required by you
+      Please resolve the conflict.
+      """
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$foo_uri" is not deployed to "$home/.vim"
+    And a flavor "$bar_uri" is not deployed to "$home/.vim"

data/features/step_definitions/bootstrap_script_steps.rb

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

data/features/step_definitions/flavor_steps.rb

@@ -1,42 +1,50 @@
-Given /^a (?:(?:GitHub|local) )?repository "(.+)" with versions "(.+)"$/ do |basename, versions|
+Given /^a (?:(?:GitHub|local) )?repository "([^"]*)"$/ do |basename|
   repository_path = make_repo_path(basename)
-  doc_name = basename.split('/').last.sub(/^vim-/, '')
   variable_table["#{basename}_uri"] = make_repo_uri(basename)
   sh <<-"END"
     {
       mkdir -p '#{repository_path}' &&
       cd '#{repository_path}' &&
       git init &&
-      mkdir doc &&
-      for v in #{versions}
-      do
-        echo "*#{doc_name}* $v" >'doc/#{doc_name}.txt'
-        git add doc
-        git commit -m "Version $v"
-        git tag -m "Version $v" "$v"
-      done
+      echo 'README' >README.md &&
+      git add README.md &&
+      git commit -m 'Write README'
     } >/dev/null
   END
 end
 
-Given /^"(.+)" version "(.+)" is released$/ do |basename, version|
-  repository_path = make_repo_path(basename)
-  doc_name = basename.split('/').last.sub(/^vim-/, '')
-  sh <<-"END"
-    {
-      cd '#{repository_path}' &&
-      for v in #{version}
-      do
-        echo "*#{doc_name}* $v" >'doc/#{doc_name}.txt'
-        git add doc
-        git commit -m "Version $v"
-        git tag -m "Version $v" "$v"
-      done
-    } >/dev/null
-  END
+Given /^the repository "([^"]*)" has versions "([^"]*)"$/ do |basename, versions|
+  add_new_versions_to_repo(basename, versions)
+end
+
+Given /^the repository "([^"]*)" has versions "([^"]*)" and a flavorfile:$/ do |basename, versions, flavorfile_content|
+  add_new_versions_to_repo(basename, versions, flavorfile_content)
+end
+
+Given /^a (?:(?:GitHub|local) )?repository "([^"]*)" with versions "([^"]*)"$/ do |basename, versions|
+  steps %Q{
+    Given a repository "#{basename}"
+    And the repository "#{basename}" has versions "#{versions}"
+  }
+end
+
+Given /^a (?:(?:GitHub|local) )?repository "([^"]*)" with versions "([^"]*)" and a flavorfile:$/ do |basename, versions, flavorfile_content|
+  steps %Q{
+    Given a repository "#{basename}"
+    And the repository "#{basename}" has versions "#{versions}" and a flavorfile:
+      """
+      #{flavorfile_content}
+      """
+  }
+end
+
+Given /^"([^"]*)" version "([^"]*)" is released$/ do |basename, version|
+  steps %Q{
+    Given the repository "#{basename}" has versions "#{version}"
+  }
 end
 
-Given /^a repository "(.+)" from offline cache$/ do |repo_name|
+Given /^a repository "([^"]*)" from offline cache$/ do |repo_name|
   repository_path = make_repo_path(repo_name).sub(expand('$tmp/'), '')
   sh <<-"END"
     {
@@ -45,13 +53,13 @@ Given /^a repository "(.+)" from offline cache$/ do |repo_name|
   END
 end
 
-Given /^I disable network to the original repository of "(.+)"$/ do |basename|
+Given /^I disable network to the original repository of "([^"]*)"$/ do |basename|
   steps %Q{
     Given I remove the directory "#{make_repo_path(basename)}"
   }
 end
 
-When /^I create a file named "(.+?)" in "(.+?)" deployed to "(.+?)"$/ do |file_name, v_repo_name, v_vimfiles_path|
+When /^I create a file named "([^"]*)" in "([^"]*)" deployed to "([^"]*)"$/ do |file_name, v_repo_name, v_vimfiles_path|
   flavor_path = make_flavor_path(expand(v_vimfiles_path), expand(v_repo_name))
   steps %Q{
     When I write to "#{flavor_path}/#{file_name}" with:
@@ -60,7 +68,7 @@ When /^I create a file named "(.+?)" in "(.+?)" deployed to "(.+?)"$/ do |file_n
   }
 end
 
-Then /^a flavor "(.+)" version "(.+)" is deployed to "(.+)"$/ do |v_repo_name, version, v_vimfiles_path|
+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-/, '')
   steps %Q{
@@ -72,14 +80,14 @@ Then /^a flavor "(.+)" version "(.+)" is deployed to "(.+)"$/ do |v_repo_name, v
   }
 end
 
-Then /^a flavor "(.+)" is not deployed to "(.+)"$/ do |v_repo_name, v_vimfiles_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
 
-Then /^"(.+)" version "(.+)" is (?:(not) )?cached$/ do |v_repo_name, version, p|
+Then /^"([^"]*)" version "([^"]*)" is (?:(not) )?cached$/ do |v_repo_name, version, p|
   d = make_cached_repo_path(expand(v_repo_name), expand('$home').to_stash_path)
   (system <<-"END").should == (p != 'not')
     {
@@ -89,7 +97,7 @@ Then /^"(.+)" version "(.+)" is (?:(not) )?cached$/ do |v_repo_name, version, p|
   END
 end
 
-Then /^a file named "(.+?)" (should(?: not)?) exist in "(.+?)" deployed to "(.+?)"$/ do |file_name, should, v_repo_name, v_vimfiles_path|
+Then /^a file named "([^"]*)" (should(?: not)?) exist in "([^"]*)" deployed to "([^"]*)"$/ do |file_name, should, v_repo_name, v_vimfiles_path|
   flavor_path = make_flavor_path(expand(v_vimfiles_path), expand(v_repo_name))
   steps %Q{
     Then a file named "#{flavor_path}/#{file_name}" #{should} exist

data/features/support/env.rb

@@ -6,6 +6,32 @@ require 'vim-flavor'
 class FakeUserEnvironment
   include Vim::Flavor::ShellUtility
 
+  def add_new_versions_to_repo(basename, versions, flavorfile_content = nil)
+    repository_path = make_repo_path(basename)
+    doc_name = basename.split('/').last.sub(/^vim-/, '')
+    sh <<-"END"
+      {
+        cd '#{repository_path}' &&
+        mkdir -p doc &&
+        for v in #{versions}
+        do
+          echo "*#{doc_name}* $v" >'doc/#{doc_name}.txt'
+          git add doc
+          #{
+            %Q{
+              cat <<'FF' >#{'.'.to_flavorfile_path}
+#{expand(flavorfile_content)}
+FF
+              git add #{'.'.to_flavorfile_path}
+            } if flavorfile_content
+          }
+          git commit -m "Version $v"
+          git tag -m "Version $v" "$v"
+        done
+      } >/dev/null
+    END
+  end
+
   def expand(virtual_path)
     virtual_path.gsub(/\$([a-z_]+)/) {
       variable_table[$1]
@@ -34,12 +60,16 @@ class FakeUserEnvironment
 end
 
 Before do
+  variable_table['version'] = Vim::Flavor::VERSION
+
   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']))
+
+  @aruba_timeout_seconds = 5
 end
 
 Aruba.configure do |config|

data/features/testing_vim_plugins/dependencies.feature

@@ -41,6 +41,7 @@ Feature: Dependencies
       Deploying plugins...
         kana/vim-textobj-user 0.3.12 ... done
         kana/vim-vspec 1.1.0 ... done
+      Completed.
       -------- Testing a Vim plugin
       Files=0, Tests=0,  \d+ wallclock secs .*
       Result: NOTESTS

data/features/testing_vim_plugins/failures.feature

@@ -32,6 +32,7 @@ Feature: Failures
         Use kana/vim-vspec ... 1.1.0
       Deploying plugins...
         kana/vim-vspec 1.1.0 ... done
+      Completed.
       -------- Testing a Vim plugin
       Files=0, Tests=0,  0 wallclock secs (.*)
       Result: NOTESTS

data/features/testing_vim_plugins/typical_usage.feature

@@ -41,6 +41,7 @@ Feature: Typical usage
         Use kana/vim-vspec ... 1.1.0
       Deploying plugins...
         kana/vim-vspec 1.1.0 ... done
+      Completed.
       -------- Testing a Vim plugin
       t/sh.t .. ok
       All tests successful.

data/lib/vim-flavor/cli.rb

@@ -30,6 +30,11 @@ module Vim
         Facade.new().test()
       end
 
+      desc 'version', 'Show the current version.'
+      def version
+        puts VERSION
+      end
+
       no_tasks do
         def default_vimfiles_path
           ENV['HOME'].to_vimfiles_path

data/lib/vim-flavor/facade.rb

@@ -3,15 +3,60 @@ require 'fileutils'
 module Vim
   module Flavor
     class Facade
-      include ShellUtility
+      def install(vimfiles_path)
+        install_or_upgrade(:install, vimfiles_path)
+      end
 
-      def trace message
-        print message
+      def upgrade(vimfiles_path)
+        install_or_upgrade(:upgrade, vimfiles_path)
+      end
+
+      def test()
+        trace "-------- Preparing dependencies\n"
+
+        flavorfile = FlavorFile.load_or_new(Dir.getwd().to_flavorfile_path)
+        flavorfile.flavor 'kana/vim-vspec', '~> 1.0', :group => :development unless
+          flavorfile.flavor_table.has_key?('kana/vim-vspec')
+        lockfile = LockFile.load_or_new(Dir.getwd().to_lockfile_path)
+
+        refresh_flavors(
+          :install,
+          flavorfile,
+          lockfile,
+          [:runtime, :development],
+          Dir.getwd().to_stash_path.to_deps_path
+        )
+
+        trace "-------- Testing a Vim plugin\n"
+
+        prove_options = '--comments --failure --directives'
+        deps_path = Dir.getwd().to_stash_path.to_deps_path
+        vspec = "#{deps_path}/#{'kana/vim-vspec'.zap}/bin/vspec"
+        plugin_paths = lockfile.flavors.map {|f|
+          "#{deps_path}/#{f.repo_name.zap}"
+        }
+        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
 
-      def refresh_flavors(mode, vimfiles_path)
+      def install_or_upgrade(mode, vimfiles_path)
         flavorfile = FlavorFile.load(Dir.getwd().to_flavorfile_path)
         lockfile = LockFile.load_or_new(Dir.getwd().to_lockfile_path)
+        refresh_flavors(
+          mode,
+          flavorfile,
+          lockfile,
+          [:runtime],
+          vimfiles_path.to_flavors_path
+        )
+      end
+
+      def refresh_flavors(mode, flavorfile, lockfile, groups, flavors_path)
+        trace "Checking versions...\n"
 
         lockfile.update(
           complete(
@@ -23,53 +68,79 @@ module Vim
         lockfile.save()
 
         deploy_flavors(
-          lockfile.flavors.select {|f| f.group == :runtime},
-          File.absolute_path(vimfiles_path).to_flavors_path
+          lockfile.flavors.select {|f| groups.include?(f.group)},
+          File.absolute_path(flavors_path)
         )
 
         trace "Completed.\n"
       end
 
-      def install(vimfiles_path)
-        refresh_flavors(:install, vimfiles_path)
+      def complete(current_flavor_table, locked_flavor_table, mode, level = 1)
+        nfs = complete_flavors(current_flavor_table, locked_flavor_table, mode, level, 'you')
+        nfgs = nfs.group_by {|nf| nf.repo_name}
+
+        Hash[
+          nfgs.keys.map {|repo_name|
+            nfg = nfgs[repo_name]
+            vs = nfg.group_by {|nf| nf.locked_version}.values
+            if 2 <= vs.length
+              ss = []
+              ss << 'Found incompatible declarations:'
+              nfg.each do |nf|
+                ss << "  #{nf.repo_name} #{nf.version_constraint} is required by #{nf.requirer}"
+              end
+              ss << 'Please resolve the conflict.'
+              abort ss.join("\n")
+            end
+            [repo_name, nfg.first]
+          }
+        ]
       end
 
-      def upgrade(vimfiles_path)
-        refresh_flavors(:upgrade, vimfiles_path)
+      def complete_flavors(current_flavor_table, locked_flavor_table, mode, level, requirer)
+        current_flavor_table.values.map(&:dup).sort_by(&:repo_name).
+        on_failure {trace " failed\n"}.
+        flat_map {|nf|
+          complete_a_flavor(nf, locked_flavor_table, mode, level, requirer)
+        }
       end
 
-      def complete(current_flavor_table, locked_flavor_table, mode)
-        completed_flavor_table = {}
+      def complete_a_flavor(nf, locked_flavor_table, mode, level, requirer)
+        lf = locked_flavor_table[nf.repo_name]
+        [complete_a_flavor_itself(nf, lf, mode, level, requirer)] +
+          complete_a_flavor_dependencies(nf, locked_flavor_table, mode, level)
+      end
 
-        trace "Checking versions...\n"
+      def complete_a_flavor_itself(nf, lf, mode, level, requirer)
+        trace "#{'  ' * level}Use #{nf.repo_name} ..."
 
-        current_flavor_table.values.map(&:dup).sort_by(&:repo_name).
-        before_each {|nf| trace "  Use #{nf.repo_name} ..."}.
-        after_each {|nf| trace " #{nf.locked_version}\n"}.
-        on_failure {trace " failed\n"}.
-        each do |nf|
-          lf = locked_flavor_table[nf.repo_name]
-
-          already_cached = nf.cached?
-          nf.clone() unless already_cached
+        already_cached = nf.cached?
+        nf.clone() unless already_cached
 
-          if mode == :install and lf and nf.satisfied_with?(lf)
+        if mode == :install and lf and nf.satisfied_with?(lf)
+          if not nf.cached_version?(lf.locked_version)
+            nf.fetch()
             if not nf.cached_version?(lf.locked_version)
-              nf.fetch()
-              if not nf.cached_version?(lf.locked_version)
-                raise RuntimeError, "#{nf.repo_name} is locked to #{lf.locked_version}, but no such version exists"
-              end
+              raise RuntimeError, "#{nf.repo_name} is locked to #{lf.locked_version}, but no such version exists"
             end
-            nf.use_specific_version(lf.locked_version)
-          else
-            nf.fetch() if already_cached
-            nf.use_appropriate_version()
           end
-
-          completed_flavor_table[nf.repo_name] = nf
+          nf.use_specific_version(lf.locked_version)
+        else
+          nf.fetch() if already_cached
+          nf.use_appropriate_version()
         end
 
-        completed_flavor_table
+        nf.requirer = requirer
+
+        trace " #{nf.locked_version}\n"
+
+        nf
+      end
+
+      def complete_a_flavor_dependencies(nf, locked_flavor_table, mode, level)
+        nf.checkout()
+        ff = FlavorFile.load_or_new(nf.cached_repo_path.to_flavorfile_path)
+        complete_flavors(ff.flavor_table, locked_flavor_table, mode, level + 1, nf.repo_name)
       end
 
       def deploy_flavors(flavors, flavors_path)
@@ -155,43 +226,8 @@ module Vim
         end
       end
 
-      def test()
-        trace "-------- Preparing dependencies\n"
-
-        flavorfile = FlavorFile.load_or_new(Dir.getwd().to_flavorfile_path)
-        flavorfile.flavor 'kana/vim-vspec', '~> 1.0', :group => :development unless
-          flavorfile.flavor_table.has_key?('kana/vim-vspec')
-        lockfile = LockFile.load_or_new(Dir.getwd().to_lockfile_path)
-
-        lockfile.update(
-          complete(
-            flavorfile.flavor_table,
-            lockfile.flavor_table,
-            :install
-          )
-        )
-        lockfile.save()
-
-        # FIXME: It's somewhat wasteful to refresh flavors every time.
-        deploy_flavors(
-          lockfile.flavors,
-          Dir.getwd().to_stash_path.to_deps_path
-        )
-
-        trace "-------- Testing a Vim plugin\n"
-
-        prove_options = '--comments --failure --directives'
-        deps_path = Dir.getwd().to_stash_path.to_deps_path
-        vspec = "#{deps_path}/#{'kana/vim-vspec'.zap}/bin/vspec"
-        plugin_paths = lockfile.flavors.map {|f|
-          "#{deps_path}/#{f.repo_name.zap}"
-        }
-        succeeded = system %Q{
-          prove --ext '.t' #{prove_options} &&
-          prove --ext '.vim' #{prove_options} \
-            --exec '#{vspec} #{Dir.getwd()} #{plugin_paths.join(' ')}'
-        }
-        exit(1) unless succeeded
+      def trace message
+        print message
       end
     end
   end

data/lib/vim-flavor/flavor.rb

@@ -16,6 +16,9 @@ module Vim
       # A version of a plugin to be installed.
       attr_accessor :locked_version
 
+      # repo_name of a flavor which requires this flavor.
+      attr_accessor :requirer
+
       # Return true if this flavor's repository is already cloned.
       def cached?
         Dir.exists?(cached_repo_path)
@@ -78,6 +81,15 @@ module Vim
         }
       end
 
+      def checkout()
+        sh %Q[
+          {
+            cd '#{cached_repo_path}' &&
+            git checkout -f '#{locked_version}'
+          } 2>&1
+        ]
+      end
+
       def deploy(flavors_path)
         deployment_path = make_deployment_path(flavors_path)
         sh %Q[

data/lib/vim-flavor/version.rb

@@ -1,5 +1,5 @@
 module Vim
   module Flavor
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -116,6 +116,7 @@ files:
 - features/caching/edge_cases.feature
 - features/command_line/README.md
 - features/command_line/progress_messages.feature
+- features/command_line/version.feature
 - features/flavorfile/README.md
 - features/flavorfile/comments.feature
 - features/flavorfile/groups.feature
@@ -123,7 +124,9 @@ files:
 - features/flavorfile/version_constraint.feature
 - features/install_vim_flavor.md
 - features/philosophy.md
-- features/resolve_dependencies.feature
+- features/resolve_dependencies/README.md
+- features/resolve_dependencies/basics.feature
+- features/resolve_dependencies/version_conflict.feature
 - features/step_definitions/bootstrap_script_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/dependency_steps.rb
@@ -197,6 +200,7 @@ test_files:
 - features/caching/edge_cases.feature
 - features/command_line/README.md
 - features/command_line/progress_messages.feature
+- features/command_line/version.feature
 - features/flavorfile/README.md
 - features/flavorfile/comments.feature
 - features/flavorfile/groups.feature
@@ -204,7 +208,9 @@ test_files:
 - features/flavorfile/version_constraint.feature
 - features/install_vim_flavor.md
 - features/philosophy.md
-- features/resolve_dependencies.feature
+- features/resolve_dependencies/README.md
+- features/resolve_dependencies/basics.feature
+- features/resolve_dependencies/version_conflict.feature
 - features/step_definitions/bootstrap_script_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/step_definitions/dependency_steps.rb

data/features/resolve_dependencies.feature

@@ -1,16 +0,0 @@
-Feature: Resolve dependencies of Vim plugins
-  In order to hide details of dependencies,
-  as a lazy Vim user,
-  I want to resolve and install dependencies of Vim plugins automatically.
-
-  # TODO
-  Scenario: Resolve 2-level dependencies
-
-  # TODO
-  Scenario: Resolve 3-level dependencies
-
-  # TODO
-  Scenario: Resolve dependencies of a plugin required by two or more plugins
-
-  # TODO
-  Scenario: Resolve dependencies of a plugin required by plugins and user