vim-flavor 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a818d197eec161218d1c58cd0fd414a3938c7db
-  data.tar.gz: c2afd93c592d5944354ed61e1a8cf8b7abd756bc
+  metadata.gz: 3af3445611a09f669898cdd66a43f7591dc17b1a
+  data.tar.gz: 1ded87c558b1572b3f7a8099e71c9d64ac84126f
 SHA512:
-  metadata.gz: ba27a0c96e51e0fe5b98d68e8ef493632dcbc48f95555bdaa390bc0aaa3ca197c8830d054cd6d0334e56d490b2a04f13283f0e358a3cff74f50ed75f37a49f7b
-  data.tar.gz: afcb9952d6fb377449a6a634d758bacf1118ebdec02b806ea85479ab310643ea99f27c1104baa99c94ec5bd4cbe96691fb6a8374cbcf9e0f1b4c7e4daee8b516
+  metadata.gz: 01a5437a08c3acf45fa9f071099d1cd4f5e7bb1af8bd710f7e0fb9533fc5995ed126d7391b3cd50b3be277e3d9124ad65a667a5e6735f5c503dcbe7cb089b330
+  data.tar.gz: aa9837dd97da4f11979b9762dcf443a55526e62bceee3edaad4aeedf9981350b5c6abbc655fa6a046c1902e6c6034da8e9e88ae278e15fcff4fdd4bac028467c

data/features/resolve_dependencies/upgrade_outdated_dependencies.feature

@@ -0,0 +1,88 @@
+Feature: Upgrade outdated dependencies of Vim plugins
+  In order to smoothly install Vim plugins,
+  as a lazy Vim user,
+  I want to automatically upgrade outdated dependencies of Vim plugins.
+
+  Scenario: Some plugins use outdated dependencies
+    Given a repository "L" with versions "0.1 0.2 0.3 0.4"
+    And a repository "A" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', '~> 0.3'
+      """
+    And a repository "B" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', '~> 0.3'
+      """
+    And a flavorfile with:
+      """ruby
+      flavor '$A_uri'
+      flavor '$B_uri'
+      flavor '$L_uri'
+      """
+    And I run `vim-flavor install`
+    And it should pass with template:
+      """
+      Checking versions...
+        Use $A_uri ... 0.0
+          Use $L_uri ... 0.4
+        Use $B_uri ... 0.0
+          Use $L_uri ... 0.4
+        Use $L_uri ... 0.4
+      Deploying plugins...
+        $A_uri 0.0 ... done
+        $B_uri 0.0 ... done
+        $L_uri 0.4 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $A_uri (0.0)
+      $B_uri (0.0)
+      $L_uri (0.4)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$A_uri" version "0.0" is deployed to "$home/.vim"
+    And a flavor "$B_uri" version "0.0" is deployed to "$home/.vim"
+    And a flavor "$L_uri" version "0.4" is deployed to "$home/.vim"
+    When "L" version "0.5" is released
+    And a repository "X" with versions "0.0" and a flavorfile:
+      """ruby
+      flavor '$L_uri', '~> 0.5'
+      """
+    And I edit the flavorfile as:
+      """ruby
+      flavor '$A_uri'
+      flavor '$B_uri'
+      flavor '$L_uri'
+      flavor '$X_uri'
+      """
+    And I run `vim-flavor install`
+    Then it should pass with template:
+      """
+      Checking versions...
+        Use $A_uri ... 0.0
+          Use $L_uri ... 0.4
+        Use $B_uri ... 0.0
+          Use $L_uri ... 0.4
+        Use $L_uri ... 0.4
+        Use $X_uri ... 0.0
+          Use $L_uri ... 0.5
+      Deploying plugins...
+        $A_uri 0.0 ... skipped (already deployed)
+        $B_uri 0.0 ... skipped (already deployed)
+        $L_uri 0.5 ... done
+        $X_uri 0.0 ... done
+      Completed.
+      """
+    And a lockfile is created with:
+      """
+      $A_uri (0.0)
+      $B_uri (0.0)
+      $L_uri (0.5)
+      $X_uri (0.0)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$A_uri" version "0.0" is deployed to "$home/.vim"
+    And a flavor "$B_uri" version "0.0" is deployed to "$home/.vim"
+    And a flavor "$L_uri" version "0.5" is deployed to "$home/.vim"
+    And a flavor "$X_uri" version "0.0" is deployed to "$home/.vim"

data/features/support/env.rb

@@ -33,7 +33,7 @@ FF
   end
 
   def expand(virtual_path)
-    virtual_path.gsub(/\$([a-z_]+)/) {
+    virtual_path.gsub(/\$([A-Za-z_]+)/) {
       variable_table[$1]
     }
   end

data/lib/vim-flavor/facade.rb

@@ -89,26 +89,40 @@ module Vim
 
       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]
+          nfs.group_by {|nf| nf.repo_name}.map {|repo_name, nfg|
+            [repo_name, choose_a_flavor(nfg)]
           }
         ]
       end
 
+      def choose_a_flavor(nfg)
+        vs = nfg.map {|nf| nf.locked_version}.uniq
+        if vs.length == 1
+          nfg.first
+        else
+          latest_version = vs.max()
+          if nfg.all? {|nf| nf.satisfied_with?(latest_version)}
+            nf = nfg.first
+            nf.use_specific_version(latest_version)
+            nf
+          else
+            stop_by_incompatible_declarations(nfg)
+          end
+        end
+      end
+
+      def stop_by_incompatible_declarations(nfg)
+        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
+
       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"}.
@@ -129,7 +143,7 @@ module Vim
         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.locked_version)
           if not nf.cached_version?(lf.locked_version)
             nf.fetch()
             if not nf.cached_version?(lf.locked_version)

data/lib/vim-flavor/flavor.rb

@@ -135,9 +135,8 @@ module Vim
         versions_from_tags(list_tags())
       end
 
-      def satisfied_with?(locked_flavor)
-        repo_name == locked_flavor.repo_name &&
-          version_constraint.compatible?(locked_flavor.locked_version)
+      def satisfied_with?(version)
+        version_constraint.compatible?(version)
       end
     end
   end

data/lib/vim-flavor/lockfileparser.rb

@@ -57,7 +57,7 @@ module Vim
         ) {
           f = Flavor.new()
           f.repo_name = repo_name.to_s
-          f.locked_version = locked_version.to_s
+          f.locked_version = Version.create(locked_version.to_s)
           f
         }
       end

data/lib/vim-flavor/version.rb

@@ -1,6 +1,6 @@
 module Vim
   module Flavor
-    VERSION = '1.1.4'
+    VERSION = '1.1.5'
 
     class Version < Gem::Version
       attr_accessor :original_tag_name

data/spec/flavor_spec.rb

@@ -30,24 +30,19 @@ module Vim
           f
         }
 
-        def locked_flavor(repo_name, locked_version)
-          f = Flavor.new()
-          f.repo_name = repo_name
-          f.locked_version = locked_version
-          f
+        def version(s)
+          Version.create(s)
         end
 
-        it {should be_satisfied_with locked_flavor('foo', '1.2.3')}
-
-        it {should be_satisfied_with locked_flavor('foo', '1.2.4')}
-        it {should be_satisfied_with locked_flavor('foo', '1.3.3')}
-        it {should be_satisfied_with locked_flavor('foo', '2.2.3')}
+        it {should be_satisfied_with version('1.2.3')}
 
-        it {should_not be_satisfied_with locked_flavor('foo', '0.2.3')}
-        it {should_not be_satisfied_with locked_flavor('foo', '1.1.3')}
-        it {should_not be_satisfied_with locked_flavor('foo', '1.2.2')}
+        it {should be_satisfied_with version('1.2.4')}
+        it {should be_satisfied_with version('1.3.3')}
+        it {should be_satisfied_with version('2.2.3')}
 
-        it {should_not be_satisfied_with locked_flavor('bar', '1.2.3')}
+        it {should_not be_satisfied_with version('0.2.3')}
+        it {should_not be_satisfied_with version('1.1.3')}
+        it {should_not be_satisfied_with version('1.2.2')}
       end
     end
   end

data/spec/lockfile_spec.rb

@@ -14,10 +14,14 @@ module Vim
       def flavor(repo_name, locked_version)
         f = Flavor.new()
         f.repo_name = repo_name
-        f.locked_version = locked_version
+        f.locked_version = version(locked_version)
         f
       end
 
+      def version(s)
+        Version.create(s)
+      end
+
       it 'has flavors sorted by repo_name' do
         l = LockFile.new(@tmp_path.to_lockfile_path)
         foo = flavor('foo', '1.2.3')
@@ -52,11 +56,11 @@ module Vim
 
           l.load()
           l.flavor_table['foo'].repo_name.should == 'foo'
-          l.flavor_table['foo'].locked_version.should == '1.2.3'
+          l.flavor_table['foo'].locked_version.should == version('1.2.3')
           l.flavor_table['bar'].repo_name.should == 'bar'
-          l.flavor_table['bar'].locked_version.should == '2.3.4'
+          l.flavor_table['bar'].locked_version.should == version('2.3.4')
           l.flavor_table['baz'].repo_name.should == 'baz'
-          l.flavor_table['baz'].locked_version.should == '3.4.5'
+          l.flavor_table['baz'].locked_version.should == version('3.4.5')
         end
       end
 
@@ -70,7 +74,7 @@ module Vim
 
           l = LockFile.load_or_new(@tmp_path.to_lockfile_path)
           l.flavor_table['foo'].repo_name.should == 'foo'
-          l.flavor_table['foo'].locked_version.should == '1.2.3'
+          l.flavor_table['foo'].locked_version.should == version('1.2.3')
         end
 
         it 'only creates a new instance if a given path does not exist' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Kana Natsuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -115,6 +115,7 @@ files:
 - features/philosophy.md
 - features/resolve_dependencies/README.md
 - features/resolve_dependencies/basics.feature
+- features/resolve_dependencies/upgrade_outdated_dependencies.feature
 - features/resolve_dependencies/version_conflict.feature
 - features/step_definitions/bootstrap_script_steps.rb
 - features/step_definitions/cli_steps.rb
@@ -202,6 +203,7 @@ test_files:
 - features/philosophy.md
 - features/resolve_dependencies/README.md
 - features/resolve_dependencies/basics.feature
+- features/resolve_dependencies/upgrade_outdated_dependencies.feature
 - features/resolve_dependencies/version_conflict.feature
 - features/step_definitions/bootstrap_script_steps.rb
 - features/step_definitions/cli_steps.rb