vim-flavor 1.1.5 → 2.0.0

data/spec/versionconstraint_spec.rb

@@ -3,52 +3,107 @@ require 'spec_helper'
 module Vim
   module Flavor
     describe VersionConstraint do
+      def v(s)
+        Version.create(s)
+      end
+
+      describe '.parse' do
+        def p(*args)
+          described_class.parse(*args)
+        end
+
+        it 'accepts ">= $version"' do
+          expect(p('>= 1.2.3')).to be == [v('1.2.3'), '>=']
+        end
+
+        it 'accepts "~> $version"' do
+          expect(p('~> 1.2.3')).to be == [v('1.2.3'), '~>']
+        end
+
+        it 'accepts "branch: $branch"' do
+          expect(p('branch: master')).to be == [v(branch: 'master'), 'branch:']
+        end
+
+        it 'ignores extra spaces' do
+          expect(p('  ~>  1.2.3  ')).to be == p('~> 1.2.3')
+        end
+
+        it 'fails with an unknown qualifier' do
+          expect {
+            p('!? 1.2.3')
+          }.to raise_error('Invalid version constraint: "!? 1.2.3"')
+        end
+
+        it 'fails with an invalid format' do
+          expect {
+            p('1.2.3')
+          }.to raise_error('Invalid version constraint: "1.2.3"')
+
+          expect {
+            p('>= 2.0 beta')
+          }.to raise_error('Invalid version constraint: ">= 2.0 beta"')
+        end
+      end
+
       describe '#compatible?' do
-        describe '>=' do
+        context 'with ">= 1.2.3"' do
           subject {VersionConstraint.new('>= 1.2.3')}
 
-          it {should be_compatible '1.2.3'}
+          it {is_expected.to be_compatible v('1.2.3')}
 
-          it {should be_compatible '1.2.4'}
-          it {should be_compatible '1.3.3'}
-          it {should be_compatible '2.2.3'}
+          it {is_expected.to be_compatible v('1.2.4')}
+          it {is_expected.to be_compatible v('1.3.3')}
+          it {is_expected.to be_compatible v('2.2.3')}
 
-          it {should be_compatible '1.3'}
+          it {is_expected.to be_compatible v('1.3')}
 
-          it {should_not be_compatible '1.2.2'}
-          it {should_not be_compatible '1.1.3'}
-          it {should_not be_compatible '0.2.3'}
+          it {is_expected.not_to be_compatible v('1.2.2')}
+          it {is_expected.not_to be_compatible v('1.1.3')}
+          it {is_expected.not_to be_compatible v('0.2.3')}
 
-          it {should_not be_compatible '1.2'}
+          it {is_expected.not_to be_compatible v('1.2')}
         end
 
-        describe '~>' do
+        context 'with "~> 1.2.3"' do
           subject {VersionConstraint.new('~> 1.2.3')}
 
-          it {should be_compatible '1.2.3'}
+          it {is_expected.to be_compatible v('1.2.3')}
+
+          it {is_expected.to be_compatible v('1.2.4')}
+          it {is_expected.not_to be_compatible v('1.3.3')}
+          it {is_expected.not_to be_compatible v('2.2.3')}
+
+          it {is_expected.not_to be_compatible v('1.3')}
 
-          it {should be_compatible '1.2.4'}
-          it {should_not be_compatible '1.3.3'}
-          it {should_not be_compatible '2.2.3'}
+          it {is_expected.not_to be_compatible v('1.2.2')}
+          it {is_expected.not_to be_compatible v('1.1.3')}
+          it {is_expected.not_to be_compatible v('0.2.3')}
 
-          it {should_not be_compatible '1.3'}
+          it {is_expected.not_to be_compatible v('1.2')}
+        end
+
+        context 'with "branch: master"' do
+          subject {VersionConstraint.new('branch: master')}
 
-          it {should_not be_compatible '1.2.2'}
-          it {should_not be_compatible '1.1.3'}
-          it {should_not be_compatible '0.2.3'}
+          it {is_expected.to be_compatible v(branch: 'master')}
+          it {is_expected.to be_compatible v(branch: 'master', revision: '1' * 40)}
+          it {is_expected.to be_compatible v(branch: 'master', revision: '2' * 40)}
 
-          it {should_not be_compatible '1.2'}
+          it {is_expected.not_to be_compatible v(branch: 'experimental')}
         end
       end
 
       describe '#find_the_best_version' do
         it 'returns the best version from given versions' do
-          VersionConstraint.new('>= 1.2.3').
-            find_the_best_version(['1.2.2', '1.2.3', '1.2.4', '1.3.3', '2.0']).
-            should == '2.0'
-          VersionConstraint.new('~> 1.2.3').
-            find_the_best_version(['1.2.2', '1.2.3', '1.2.4', '1.3.3', '2.0']).
-            should == '1.2.4'
+          versions = ['1.2.2', '1.2.3', '1.2.4', '1.3.3', '2.0'].map {|s| v(s)}
+          expect(
+            VersionConstraint.new('>= 1.2.3').
+            find_the_best_version(versions)
+          ).to be == v('2.0')
+          expect(
+            VersionConstraint.new('~> 1.2.3').
+            find_the_best_version(versions)
+          ).to be == v('1.2.4')
         end
 
         it 'fails if no version is given' do

data/vim-flavor.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('aruba', '~> 0.5')
   gem.add_development_dependency('cucumber', '~> 1.2')
+  gem.add_development_dependency('pry')
   gem.add_development_dependency('rspec', '~> 2.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Kana Natsuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +113,11 @@ files:
 - bin/vim-flavor
 - features/.nav
 - features/README.md
+- features/branches/README.md
+- features/branches/changing_tracking_branches.feature
+- features/branches/detect_incompatible_declarations.feature
+- features/branches/install.feature
+- features/branches/upgrade.feature
 - features/caching/README.md
 - features/caching/basics.feature
 - features/caching/deployment.feature
@@ -112,6 +131,7 @@ files:
 - features/flavorfile/repository_name.feature
 - features/flavorfile/version_constraint.feature
 - features/install_vim_flavor.md
+- features/news.md
 - features/philosophy.md
 - features/resolve_dependencies/README.md
 - features/resolve_dependencies/basics.feature
@@ -140,6 +160,7 @@ files:
 - features/version_lock.feature
 - features/version_tag_format.feature
 - lib/vim-flavor.rb
+- lib/vim-flavor/branchversion.rb
 - lib/vim-flavor/cli.rb
 - lib/vim-flavor/enumerableextension.rb
 - lib/vim-flavor/env.rb
@@ -148,15 +169,18 @@ files:
 - lib/vim-flavor/flavorfile.rb
 - lib/vim-flavor/lockfile.rb
 - lib/vim-flavor/lockfileparser.rb
+- lib/vim-flavor/plainversion.rb
 - lib/vim-flavor/shellutility.rb
 - lib/vim-flavor/stringextension.rb
 - lib/vim-flavor/version.rb
 - lib/vim-flavor/versionconstraint.rb
+- spec/branchversion_spec.rb
 - spec/enumerableextension_spec.rb
 - spec/facade_spec.rb
 - spec/flavor_spec.rb
 - spec/flavorfile_spec.rb
 - spec/lockfile_spec.rb
+- spec/plainversion_spec.rb
 - spec/spec_helper.rb
 - spec/stringextension_spec.rb
 - spec/version_spec.rb
@@ -181,12 +205,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool to manage your favorite Vim plugins
 test_files:
 - features/README.md
+- features/branches/README.md
+- features/branches/changing_tracking_branches.feature
+- features/branches/detect_incompatible_declarations.feature
+- features/branches/install.feature
+- features/branches/upgrade.feature
 - features/caching/README.md
 - features/caching/basics.feature
 - features/caching/deployment.feature
@@ -200,6 +229,7 @@ test_files:
 - features/flavorfile/repository_name.feature
 - features/flavorfile/version_constraint.feature
 - features/install_vim_flavor.md
+- features/news.md
 - features/philosophy.md
 - features/resolve_dependencies/README.md
 - features/resolve_dependencies/basics.feature
@@ -227,11 +257,13 @@ test_files:
 - features/uninstall_vim_flavor.md
 - features/version_lock.feature
 - features/version_tag_format.feature
+- spec/branchversion_spec.rb
 - spec/enumerableextension_spec.rb
 - spec/facade_spec.rb
 - spec/flavor_spec.rb
 - spec/flavorfile_spec.rb
 - spec/lockfile_spec.rb
+- spec/plainversion_spec.rb
 - spec/spec_helper.rb
 - spec/stringextension_spec.rb
 - spec/version_spec.rb