vim-flavor 1.1.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af3445611a09f669898cdd66a43f7591dc17b1a
-  data.tar.gz: 1ded87c558b1572b3f7a8099e71c9d64ac84126f
+  metadata.gz: ed8e9b52605c8aaa5285aa081653824e1f4c0e1b
+  data.tar.gz: c300452d28a9bdebeaa480d40d85c5a641ebda59
 SHA512:
-  metadata.gz: 01a5437a08c3acf45fa9f071099d1cd4f5e7bb1af8bd710f7e0fb9533fc5995ed126d7391b3cd50b3be277e3d9124ad65a667a5e6735f5c503dcbe7cb089b330
-  data.tar.gz: aa9837dd97da4f11979b9762dcf443a55526e62bceee3edaad4aeedf9981350b5c6abbc655fa6a046c1902e6c6034da8e9e88ae278e15fcff4fdd4bac028467c
+  metadata.gz: d4ae143d043e5426572b17b09e9d5006cbaadd7ba787fac00afcbed39b1b2c915ddff92519e5c66f48e4dbea89c4b91fec712f666c06ac1881a6b29a2571201e
+  data.tar.gz: ca4552878793038715ca13b5eb46a1641dec9d7b9b99473a103548c8380ec2fcd0cf39a09785c195c27323f6cbe9e82d1c88a539bfca1741853b7c3f62f73ae1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
 before_script:
   - git config --global 'user.name' 'Travis CI'
   - git config --global 'user.email' 'user@example.com'

data/features/.nav

@@ -1,3 +1,4 @@
+- news.md
 - philosophy.md
 - install_vim_flavor.md (Install vim-flavor)
 - uninstall_vim_flavor.md (Uninstall vim-flavor)
@@ -17,3 +18,8 @@
   - failures.feature
   - specifying_test_scripts.feature
 - version_tag_format.feature
+- branches:
+  - install.feature
+  - upgrade.feature
+  - changing_tracking_branches.feature
+  - detect_incompatible_declarations.feature

data/features/branches/README.md

@@ -0,0 +1,12 @@
+Sometimes it's necessary to try out proposed changes of a Vim plugin which are
+not released as a proper version.  So that `vim-flavor` can also track the
+latest revision of a specific branch of a Vim plugin.
+
+Unlike plain versions, branches are not comparable.  So that it's not possible
+to detect incompatible plugins before installing.  It's not recommended for
+daily use.  Use branches at your own risk.
+
+
+
+
+<!-- vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=78 : -->

data/features/branches/changing_tracking_branches.feature

@@ -0,0 +1,78 @@
+Feature: Changing tracking branches
+  In order to try out another branch instead of the currently used one,
+  as a lazy Vim user,
+  I want to use the latest revision of the new branch.
+
+  Background:
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+
+  Scenario: Changing tracking branches
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', branch: 'master'
+      """
+    And a lockfile with:
+      """
+      $foo_uri ($foo_rev_101 at experimental)
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... $foo_rev_102 at master
+      Deploying plugins...
+        $foo_uri $foo_rev_102 at master ... done
+      Completed.
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+
+  Scenario: Use a branch instead of a version
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', branch: 'master'
+      """
+    And a lockfile with:
+      """
+      $foo_uri (1.0.1)
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... $foo_rev_102 at master
+      Deploying plugins...
+        $foo_uri $foo_rev_102 at master ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $foo_uri ($foo_rev_102 at master)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+
+  Scenario: Use a version instead of a branch
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', '~> 1.0.1'
+      """
+    And a lockfile with:
+      """
+      $foo_uri ($foo_rev_100 at master)
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... 1.0.2
+      Deploying plugins...
+        $foo_uri 1.0.2 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $foo_uri (1.0.2)
+      """
+    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/branches/detect_incompatible_declarations.feature

@@ -0,0 +1,72 @@
+Feature: Detect incompatible declarations
+  In order to avoid using Vim with inconsistent configurations,
+  as a lazy Vim user,
+  I want to detect incompatible declaratios before installing Vim plugins.
+
+  Scenario: Detect incompatible branches
+    Given a repository "L" with versions "0.1 0.2 0.3 0.4"
+    And "L" has "experimental" branch
+    And a repository "A" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', branch: 'master'
+      """
+    And a repository "B" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', branch: 'experimental'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$A_uri'
+      flavor '$B_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $A_uri ... 0.0
+          Use $L_uri ... $L_rev_04 at master
+        Use $B_uri ... 0.0
+          Use $L_uri ... $L_rev_04 at experimental
+      Found incompatible declarations:
+        $L_uri branch: master is required by $A_uri
+        $L_uri branch: experimental is required by $B_uri
+      Please resolve the conflict.
+      """
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$A_uri" is not deployed to "$home/.vim"
+    And a flavor "$B_uri" is not deployed to "$home/.vim"
+    And a flavor "$L_uri" is not deployed to "$home/.vim"
+
+  Scenario: Detect mixed use of branchs and versions
+    Given a repository "L" with versions "0.1 0.2 0.3 0.4"
+    And "L" has "experimental" branch
+    And a repository "A" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', branch: 'master'
+      """
+    And a repository "B" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', '~> 0.2'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$A_uri'
+      flavor '$B_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $A_uri ... 0.0
+          Use $L_uri ... $L_rev_04 at master
+        Use $B_uri ... 0.0
+          Use $L_uri ... 0.4
+      Found incompatible declarations:
+        $L_uri branch: master is required by $A_uri
+        $L_uri ~> 0.2 is required by $B_uri
+      Please resolve the conflict.
+      """
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$A_uri" is not deployed to "$home/.vim"
+    And a flavor "$B_uri" is not deployed to "$home/.vim"
+    And a flavor "$L_uri" is not deployed to "$home/.vim"

data/features/branches/install.feature

@@ -0,0 +1,51 @@
+Feature: Install Vim plugins with specific branches
+  In order to try out proposed changes which are not released yet,
+  as a lazy Vim user,
+  I want to track the latest revision of a specific branch.
+
+  Background:
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+
+  Scenario: Install a new plugin from scratch
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', branch: 'master'
+      """
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... $foo_rev_102 at master
+      Deploying plugins...
+        $foo_uri $foo_rev_102 at master ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $foo_uri ($foo_rev_102 at master)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+
+  Scenario: Install a plugin according to a lockfile
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', branch: 'master'
+      """
+    And I run `vim-flavor install`
+    And a lockfile is created with:
+      """
+      $foo_uri ($foo_rev_102 at master)
+      """
+    And "foo" version "1.0.3" is released
+    When I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... $foo_rev_102 at master
+      Deploying plugins...
+        $foo_uri $foo_rev_102 at master ... skipped (already deployed)
+      Completed.
+      """
+    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/branches/upgrade.feature

@@ -0,0 +1,30 @@
+Feature: Upgrade Vim plugins with specific branches
+  In order to try out proposed changes which are not released yet,
+  as a lazy Vim user,
+  I want to track the latest revision of a specific branch.
+
+  Background:
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+
+  Scenario: Upgrade a plugin
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri', branch: 'master'
+      """
+    And I run `vim-flavor install`
+    And a lockfile is created with:
+      """
+      $foo_uri ($foo_rev_102 at master)
+      """
+    And "foo" version "1.0.3" is released
+    When I run `vim-flavor upgrade`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $foo_uri ... $foo_rev_103 at master
+      Deploying plugins...
+        $foo_uri $foo_rev_103 at master ... done
+      Completed.
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.3" is deployed to "$home/.vim"

data/features/install_vim_flavor.md

@@ -1,7 +1,7 @@
 ## Required softwares
 
 * [Git](http://git-scm.com/) 1.7.9 or later
-* [Ruby](http://www.ruby-lang.org/) 1.9.2 or later
+* [Ruby](http://www.ruby-lang.org/) 2.0.0 or later
   * Recommendation: Use [RVM](http://beginrescueend.com/) or other tools
     for ease of installation across different envinronments.
 * [Vim](http://www.vim.org/) 7.3 or later

data/features/news.md

@@ -0,0 +1,10 @@
+## vim-flavor 2.0.0
+
+### Feature additions
+
+* [Branches](./branches) are supported.
+
+
+### Incompatible changes
+
+* Ruby 2.0.0 or later is required to run vim-flavor.

data/features/philosophy.md

@@ -1,6 +1,6 @@
 ## Installable plugins
 
-Not all Vim plugins can be installed with vim-flavor.
+Basically, not all Vim plugins can be installed with vim-flavor.
 vim-flavor can install plugins which meet the following conditions:
 
 * Plugins must have dedicated Git repositories.
@@ -41,6 +41,27 @@ vim-flavor can install plugins which meet the following conditions:
     Such plugins are not ready to use for everyone.
     So that it should not be installable.
 
+Though the above principle is not changed, nowadays (2014)
+
+* www.vim.org becomes less popular as a central repository of Vim plugins.
+  Because:
+  * It's a tedious task to publish plugins at www.vim.org because there is no
+    standard tool to automate the process to publish plugins.
+  * As GitHub becomes more popular, many plugin authors seem to choose only
+    GitHub to publish plugins because it is easy and fast.
+* As a result, vim-scripts.org's mirrors are mostly outdated.  Latest versions
+  are not usually found in the mirrors.  So that GitHub repositories rather
+  than vim-scripts.org's mirrors are specified in [flavorfile](./flavorfile)
+  in most cases.
+* But unlike vim-scripts.org's mirrors, "version" tags might not exist in wild
+  repositories.
+* And sometimes it's necessary to track a brach with proposed changes which
+  are not ready to release as a proper version.
+
+So that [branches](./branches) are also supported.  But branches are not
+comparable and it's not possible to detect incompatibility before installing
+plugins.  It's not recommended for daily use.  Use branches at your own risk.
+
 
 
 

data/features/resolve_dependencies/basics.feature

@@ -148,35 +148,3 @@ Feature: Resolve dependencies of Vim plugins
     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"
-
-  Scenario: Resolve dependencies with different style version tags
-    Given a repository "foo" with versions "v4.5 v6.7 v8.9"
-    And a repository "bar" with versions "1.0 1.1 2.0 2.1" and a flavorfile:
-      """ruby
-      flavor '$foo_uri', '>= 6.7'
-      """
-    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 ... v8.9
-        Use $foo_uri ... v8.9
-      Deploying plugins...
-        $bar_uri 2.1 ... done
-        $foo_uri v8.9 ... done
-      Completed.
-      """
-    And a lockfile is created with:
-      """
-      $bar_uri (2.1)
-      $foo_uri (v8.9)
-      """
-    And a bootstrap script is created in "$home/.vim"
-    And a flavor "$foo_uri" version "v8.9" is deployed to "$home/.vim"
-    And a flavor "$bar_uri" version "2.1" is deployed to "$home/.vim"

data/features/step_definitions/flavor_steps.rb

@@ -44,6 +44,16 @@ Given /^"([^"]*)" version "([^"]*)" is released$/ do |basename, version|
   }
 end
 
+Given /^"([^"]*)" has "([^"]*)" branch$/ do |basename, branch|
+  repository_path = make_repo_path(basename)
+  sh <<-"END"
+    {
+      cd '#{repository_path}' &&
+      git branch '#{branch}'
+    } >/dev/null
+  END
+end
+
 Given /^a repository "([^"]*)" from offline cache$/ do |repo_name|
   repository_path = make_repo_path(repo_name).sub(expand('$tmp/'), '')
   sh <<-"END"

data/features/support/env.rb

@@ -30,10 +30,16 @@ FF
         done
       } >/dev/null
     END
+    versions.split.each do |v|
+      variable_table["#{basename}_rev_#{v.gsub('.', '')}"] = sh(<<-"END").chomp
+        cd '#{repository_path}' &&
+        git rev-list -n1 '#{v}' --
+      END
+    end
   end
 
   def expand(virtual_path)
-    virtual_path.gsub(/\$([A-Za-z_]+)/) {
+    virtual_path.gsub(/\$([A-Za-z0-9_]+)/) {
       variable_table[$1]
     }
   end

data/features/version_lock.feature

@@ -3,7 +3,7 @@ Feature: Version lock
   as a lazy Vim user,
   I want to keep versions of Vim plugins which I installed before.
 
-  Scenario: Install with a lockfile including "X.Y.Z" style tags
+  Scenario: Install with a lockfile
     Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
     And a flavorfile with:
       """ruby
@@ -21,22 +21,3 @@ Feature: Version lock
       """
     And a bootstrap script is created in "$home/.vim"
     And a flavor "$foo_uri" version "1.0.0" is deployed to "$home/.vim"
-
-  Scenario: Install with a lockfile including "vX.Y.Z" style tags
-    Given a repository "foo" with versions "v4.5.6 v8.8 v9.0"
-    And a flavorfile with:
-      """ruby
-      flavor '$foo_uri'
-      """
-    And a lockfile with:
-      """
-      $foo_uri (v8.8)
-      """
-    When I run `vim-flavor install`
-    Then it should pass
-    And the lockfile is updated with:
-      """
-      $foo_uri (v8.8)
-      """
-    And a bootstrap script is created in "$home/.vim"
-    And a flavor "$foo_uri" version "v8.8" is deployed to "$home/.vim"