vim-flavor 1.1.0 → 1.1.1

data/features/.nav

@@ -15,3 +15,4 @@
   - typical_usage.feature
   - dependencies.feature
   - failures.feature
+- version_tag_format.feature

data/features/flavorfile/version_constraint.feature

@@ -5,7 +5,8 @@ Feature: Version constraint
 
   Note that vim-flavor assumes that plugins follow [the versioning pocilies of
   RubyGems](http://docs.rubygems.org/read/chapter/7#page26), to determine
-  compatibility of plugins.  See also [Philosophy](philosophy) for the details.
+  compatibility of plugins.  See also [Philosophy](../philosophy) for the
+  details.
 
   Background:
     Given a repository "foo" with versions "1.0 1.1 1.2 2.0"

data/features/resolve_dependencies/basics.feature

@@ -148,3 +148,35 @@ 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/lockfile_steps.rb

@@ -40,3 +40,9 @@ Then /^(?:a|the) lockfile is (?:created|updated) with:$/ do |content|
       """
   }
 end
+
+Then /^(?:a|the) lockfile is not created$/ do
+  steps %Q{
+    Then a file named "#{'.'.to_lockfile_path}" should not exist
+  }
+end

data/features/version_lock.feature

@@ -3,11 +3,9 @@ Feature: Version lock
   as a lazy Vim user,
   I want to keep versions of Vim plugins which I installed before.
 
-  Background:
+  Scenario: Install with a lockfile including "X.Y.Z" style tags
     Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
-
-  Scenario: Install with lockfile
-    Given a flavorfile with:
+    And a flavorfile with:
       """ruby
       flavor '$foo_uri'
       """
@@ -23,3 +21,22 @@ 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"

data/features/version_tag_format.feature

@@ -0,0 +1,74 @@
+Feature: Version tag format
+  In order to use proper versions of Vim plugins,
+  as a lazy Vim user,
+  I want to use only tags which are formatted as versions.
+
+  Scenario: With tags in the style of "X.Y.Z"
+    Given a repository "foo" with versions "1 1.2 1.2.3"
+    And a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should pass
+    And a lockfile is created with:
+      """
+      $foo_uri (1.2.3)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.2.3" is deployed to "$home/.vim"
+
+  Scenario: With tags in the style of "vX.Y.Z"
+    Given a repository "foo" with versions "v4.5.6 v7 v8.9"
+    And a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should pass
+    And a lockfile is created with:
+      """
+      $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"
+
+  Scenario: Without valid tags
+    Given a repository "foo" with versions "abc def ghi"
+    And a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $foo_uri ... failed
+      """
+    And it should fail with regexp:
+      """
+      There is no valid version
+      """
+    And a lockfile is not created
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$foo_uri" is not deployed to "$home/.vim"
+
+  Scenario: Without tags
+    Given a repository "foo"
+    And a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      """
+    When I run `vim-flavor install`
+    Then it should fail with template:
+      """
+      Checking versions...
+        Use $foo_uri ... failed
+      """
+    And it should fail with regexp:
+      """
+      There is no valid version
+      """
+    And a lockfile is not created
+    And a bootstrap script is not created in "$home/.vim"
+    And a flavor "$foo_uri" is not deployed to "$home/.vim"

data/lib/vim-flavor/flavor.rb

@@ -129,8 +129,8 @@ module Vim
 
       def versions_from_tags(tags)
         tags.
-          select {|t| t != '' && Gem::Version.correct?(t)}.
-          map {|t| Gem::Version.create(t)}
+          select {|t| t != '' && Version.correct?(t)}.
+          map {|t| Version.create(t)}
       end
 
       def list_versions()

data/lib/vim-flavor/lockfileparser.rb

@@ -37,6 +37,7 @@ module Vim
         }
         rule(:locked_version) {
           (
+            str('v').maybe >>
             match('[\d.]').repeat(1)
           ).as(:locked_version)
         }

data/lib/vim-flavor/version.rb

@@ -1,5 +1,26 @@
 module Vim
   module Flavor
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
+
+    class Version < Gem::Version
+      attr_accessor :original_tag_name
+
+      def initialize(tag_name)
+        @original_tag_name = tag_name
+        super(self.class.normalize_tag_name(tag_name))
+      end
+
+      def self.normalize_tag_name(tag_name)
+        tag_name.sub(/^v/, '')
+      end
+
+      def self.correct?(tag_name)
+        super(normalize_tag_name(tag_name))
+      end
+
+      def to_s()
+        @original_tag_name
+      end
+    end
   end
 end

data/lib/vim-flavor/versionconstraint.rb

@@ -22,14 +22,14 @@ module Vim
       def self.parse(s)
         m = /^\s*(>=|~>)\s+(\S+)$/.match(s)
         if m
-          [Gem::Version.create(m[2]), m[1]]
+          [Version.create(m[2]), m[1]]
         else
           raise "Invalid version constraint: #{s.inspect}"
         end
       end
 
       def compatible?(other_version_or_s)
-        v = Gem::Version.create(other_version_or_s)
+        v = Version.create(other_version_or_s)
         if qualifier == '~>'
           self.base_version.bump() > v and v >= self.base_version
         elsif qualifier == '>='
@@ -42,7 +42,7 @@ module Vim
       def find_the_best_version(versions)
         versions.
           select {|v| compatible?(v)}.
-          max()
+          max() or raise 'There is no valid version'
       end
     end
   end

data/spec/version_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+module Vim
+  module Flavor
+    describe Version do
+      describe '::create' do
+        it 'accept "X.Y.Z" style tags' do
+          expect {
+            Version.create('1')
+            Version.create('1.2')
+            Version.create('1.2.3')
+          }.not_to raise_error
+        end
+
+        it 'accept "vX.Y.Z" style tags' do
+          expect {
+            Version.create('v1')
+            Version.create('v1.2')
+            Version.create('v1.2.3')
+          }.not_to raise_error
+        end
+      end
+
+      describe '::correct?' do
+        it 'accept "X.Y.Z" style tags' do
+          Version.correct?('1').should be_true
+          Version.correct?('1.2').should be_true
+          Version.correct?('1.2.3').should be_true
+        end
+
+        it 'accept "vX.Y.Z" style tags' do
+          Version.correct?('v1').should be_true
+          Version.correct?('v1.2').should be_true
+          Version.correct?('v1.2.3').should be_true
+        end
+      end
+
+      describe '#<=>' do
+        it 'can comapre "X.Y.Z" tags' do
+          Version.create('1.2.3').should be <= Version.create('1.3')
+          Version.create('1.2.3').should be == Version.create('1.2.3')
+          Version.create('1.2.3').should be >= Version.create('1.1')
+        end
+
+        it 'can comapre "vX.Y.Z" tags' do
+          Version.create('v1.2.3').should be <= Version.create('v1.3')
+          Version.create('v1.2.3').should be == Version.create('v1.2.3')
+          Version.create('v1.2.3').should be >= Version.create('v1.1')
+        end
+
+        it 'can comapre "X.Y.Z" tag with "vX.Y.Z" tag' do
+          Version.create('1.2.3').should be <= Version.create('v1.3')
+          Version.create('1.2.3').should be == Version.create('v1.2.3')
+          Version.create('1.2.3').should be >= Version.create('v1.1')
+        end
+      end
+
+      describe '#to_s' do
+        it 'is converted into the original string' do
+          Version.create('1.2.3').to_s.should == '1.2.3'
+          Version.create('v1.2.3').to_s.should == 'v1.2.3'
+        end
+      end
+    end
+  end
+end

data/spec/versionconstraint_spec.rb

@@ -50,6 +50,13 @@ module Vim
             find_the_best_version(['1.2.2', '1.2.3', '1.2.4', '1.3.3', '2.0']).
             should == '1.2.4'
         end
+
+        it 'fails if no version is given' do
+          expect {
+            VersionConstraint.new('>= 1.2.3').
+              find_the_best_version([]).tap {|v| p v}
+          }.to raise_error(RuntimeError, 'There is no valid version')
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -147,6 +147,7 @@ files:
 - features/typical_usage/upgrade_vim_plugins.feature
 - features/uninstall_vim_flavor.md
 - features/version_lock.feature
+- features/version_tag_format.feature
 - lib/vim-flavor.rb
 - lib/vim-flavor/cli.rb
 - lib/vim-flavor/enumerableextension.rb
@@ -166,6 +167,7 @@ files:
 - spec/lockfile_spec.rb
 - spec/spec_helper.rb
 - spec/stringextension_spec.rb
+- spec/version_spec.rb
 - spec/versionconstraint_spec.rb
 - vim-flavor.gemspec
 homepage: https://github.com/kana/vim-flavor
@@ -231,6 +233,7 @@ test_files:
 - features/typical_usage/upgrade_vim_plugins.feature
 - features/uninstall_vim_flavor.md
 - features/version_lock.feature
+- features/version_tag_format.feature
 - spec/enumerableextension_spec.rb
 - spec/facade_spec.rb
 - spec/flavor_spec.rb
@@ -238,4 +241,5 @@ test_files:
 - spec/lockfile_spec.rb
 - spec/spec_helper.rb
 - spec/stringextension_spec.rb
+- spec/version_spec.rb
 - spec/versionconstraint_spec.rb