vim-flavor 0.0.4 → 1.0.0

data/spec/flavor_spec.rb

@@ -1,255 +1,55 @@
-require 'bundler/setup'
-require 'fileutils'
 require 'spec_helper'
-require 'vim-flavor'
 
-describe Vim::Flavor::Flavor do
-  describe '#==' do
-    it 'should return true only for equivalent flavors' do
-      f0 = {:x => :y}
-      f1 = described_class.new()
-      f2 = described_class.new()
-      f3 = described_class.new()
-      f3.groups = [:test]
-
-      f1.should_not == f0
-      f1.should == f1
-      f1.should == f2
-      f1.should_not == f3
-    end
-  end
-
-  describe '#clone' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = Gem::Version.create('1.0.0')
-    end
-
-    it 'should clone the repository into a given path' do
-      create_a_test_repo(@test_repo_path)
-
-      File.exists?(@flavor.cached_repo_path).should be_false
-
-      @flavor.clone().should be_true
-
-      File.exists?(@flavor.cached_repo_path).should be_true
-    end
-  end
-
-  describe '#fetch' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = Gem::Version.create('1.0.0')
-    end
-
-    it 'should fail if the repository is not cloned yet' do
-      expect {
-        @flavor.fetch()
-      }.to raise_error(RuntimeError)
-    end
-
-    it 'should fetch recent changes from the repository' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-      cloned_id = %x{
-        cd #{@flavor.cached_repo_path.inspect}
-        git rev-list -n1 HEAD
-      }
-
-      update_a_test_repo(@test_repo_path)
-
-      @flavor.fetch()
-      %x{
-        cd #{@flavor.cached_repo_path.inspect}
-        git rev-list -n1 HEAD
-      }.should == cloned_id
-      fetch_id = %x{
-        cd #{@flavor.cached_repo_path.inspect}
-        git rev-list -n1 FETCH_HEAD
-      }.should_not == cloned_id
-    end
-  end
-
-  describe '#deploy' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = Gem::Version.create('1.0.0')
-
-      @vimfiles_path = "#{@tmp_path}/vimfiles"
-      @deploy_path = @flavor.make_deploy_path(@vimfiles_path)
-    end
-
-    it 'should deploy files of a locked version to a given path' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-
-      File.exists?(@deploy_path).should be_false
-
-      @flavor.deploy(@vimfiles_path)
-
-      File.exists?(@deploy_path).should be_true
-      File.exists?("#{@deploy_path}/autoload/foo.vim").should be_true
-      File.exists?("#{@deploy_path}/doc/foo.txt").should be_true
-      File.exists?("#{@deploy_path}/plugin/foo.vim").should be_true
-
-      head_id = %x{
-        cd #{@flavor.cached_repo_path.inspect} &&
-        git rev-list -n1 HEAD
-      }
-      $?.should == 0
-      tag_id = %x{
-        cd #{@flavor.cached_repo_path.inspect} &&
-        git rev-list -n1 '#{@flavor.locked_version}'
-      }
-      $?.should == 0
-      head_id.should == tag_id
-    end
-
-    it 'should :helptags automatically' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-
-      File.exists?("#{@deploy_path}/doc/tags").should be_false
-
-      @flavor.deploy(@vimfiles_path)
-
-      File.exists?("#{@deploy_path}/doc/tags").should be_true
-    end
-
-    it 'should not :helptags if the plugin does not contain any document' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-      system(<<-"END")
-        {
-          cd '#{@flavor.cached_repo_path}' &&
-          rm -r doc &&
-          git commit -am 'Remove the document' &&
-          git tag -f '#{@flavor.locked_version}'
-        } >/dev/null 2>&1
-      END
-
-      File.exists?("#{@deploy_path}/doc").should be_false
-      File.exists?("#{@deploy_path}/doc/tags").should be_false
-
-      @flavor.deploy(@vimfiles_path)
-
-      File.exists?("#{@deploy_path}/doc").should be_false
-      File.exists?("#{@deploy_path}/doc/tags").should be_false
-    end
-
-    it 'should not care about existing content' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-
-      @flavor.deploy(@vimfiles_path)
-      system(<<-"END")
-        touch '#{@deploy_path}/plugin/oldname.vim'
-      END
-
-      File.exists?("#{@deploy_path}/plugin/oldname.vim").should be_true
-
-      @flavor.deploy(@vimfiles_path)
-
-      File.exists?("#{@deploy_path}/plugin/oldname.vim").should be_true
-    end
-  end
-
-  describe '#undeploy' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = Gem::Version.create('1.0.0')
-
-      @vimfiles_path = "#{@tmp_path}/vimfiles"
-      @deploy_path = @flavor.make_deploy_path(@vimfiles_path)
-    end
-
-    it 'should remove deployed files' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-      @flavor.deploy(@vimfiles_path)
-
-      File.exists?(@deploy_path).should be_true
-
-      @flavor.undeploy(@vimfiles_path)
-
-      File.exists?(@deploy_path).should be_false
-    end
-  end
-
-  describe '#list_versions' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = Gem::Version.create('1.0.0')
-    end
-
-    it 'should list tags as versions' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-      @flavor.list_versions().should == [
-        '1.0.0',
-        '1.1.1',
-        '1.1.2',
-        '1.2.1',
-        '1.2.2',
-      ].map {|vs| Gem::Version.create(vs)}
-    end
-  end
-
-  describe '#update_locked_version' do
-    with_temporary_directory
-
-    before :each do
-      @test_repo_path = "#{@tmp_path}/test/origin"
-
-      @flavor = described_class.new()
-      @flavor.repo_name = '@test_repo_path'
-      @flavor.repo_uri = @test_repo_path
-      @flavor.locked_version = nil
-    end
-
-    it 'should update locked_version according to version_contraint' do
-      create_a_test_repo(@test_repo_path)
-      @flavor.clone()
-
-      @flavor.version_contraint =
-        Vim::Flavor::VersionConstraint.new('>= 0')
-      @flavor.update_locked_version()
-      @flavor.locked_version.should == Gem::Version.create('1.2.2')
-
-      @flavor.version_contraint =
-        Vim::Flavor::VersionConstraint.new('~> 1.1.0')
-      @flavor.update_locked_version()
-      @flavor.locked_version.should == Gem::Version.create('1.1.2')
+module Vim
+  module Flavor
+    describe Flavor do
+      describe '#versions_from_tags' do
+        def example tags, versions
+          f = Flavor.new()
+          f.versions_from_tags(tags).sort.map(&:version).should == versions
+        end
+
+        it 'converts tags into versions' do
+          example ['1.2', '2.4.6', '3.6'], ['1.2', '2.4.6', '3.6']
+        end
+
+        it 'accepts also prelerease tags' do
+          example ['1.2a', '2.4.6b', '3.6c'], ['1.2a', '2.4.6b', '3.6c']
+        end
+
+        it 'drops non-version tags' do
+          example ['1.2', '2.4.6_', 'test', '2.9'], ['1.2', '2.9']
+        end
+      end
+
+      describe '#satisfied_with?' do
+        subject {
+          f = Flavor.new()
+          f.repo_name = 'foo'
+          f.version_constraint = VersionConstraint.new('>= 1.2.3')
+          f
+        }
+
+        def locked_flavor(repo_name, locked_version)
+          f = Flavor.new()
+          f.repo_name = repo_name
+          f.locked_version = locked_version
+          f
+        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_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_not be_satisfied_with locked_flavor('bar', '1.2.3')}
+      end
     end
   end
 end
+

data/spec/flavorfile_spec.rb

@@ -1,122 +1,46 @@
-require 'bundler/setup'
 require 'spec_helper'
-require 'vim-flavor'
 
-describe Vim::Flavor::FlavorFile do
-  describe 'flavor' do
-    before :each do
-      @ff = described_class.new()
-    end
-
-    it 'should treat "$USER/$REPO" as a GitHub repository' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-indent'
-      end
-
-      f = @ff.flavors.values[0]
-      f.repo_name.should == 'kana/vim-textobj-indent'
-      f.repo_uri.should == 'git://github.com/kana/vim-textobj-indent.git'
-    end
-
-    it 'should treat "$REPO" as a repository under vim-scripts.org' do
-      @ff.interpret do
-        flavor 'fakeclip'
-      end
-
-      f = @ff.flavors.values[0]
-      f.repo_name.should == 'fakeclip'
-      f.repo_uri.should == 'git://github.com/vim-scripts/fakeclip.git'
-    end
-
-    it 'should treat "git://..." as an arbitrary Git repository' do
-      @ff.interpret do
-        flavor 'git://github.com/kana/vim-smartinput.git'
-      end
-
-      f = @ff.flavors.values[0]
-      f.repo_name.should == 'git://github.com/kana/vim-smartinput.git'
-      f.repo_uri.should == 'git://github.com/kana/vim-smartinput.git'
-    end
-
-    it 'should treat "https://..." as an arbitrary Git repository' do
-      @ff.interpret do
-        flavor 'https://kana@github.com/kana/vim-smartinput.git'
-      end
-
-      f = @ff.flavors.values[0]
-      f.repo_name.should == 'https://kana@github.com/kana/vim-smartinput.git'
-      f.repo_uri.should == 'https://kana@github.com/kana/vim-smartinput.git'
-    end
-
-    it 'should use no version constraint by default' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-indent'
-      end
-
-      f = @ff.flavors.values[0]
-      f.version_contraint.base_version.version.should == '0'
-      f.version_contraint.operator.should == '>='
-    end
-
-    it 'should use a given version contraint' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-indent', '~> 0.1.0'
-      end
-
-      f = @ff.flavors.values[0]
-      f.version_contraint.base_version.version.should == '0.1.0'
-      f.version_contraint.operator.should == '~>'
-    end
-
-    it 'should categorize the given plugin into the :default group' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-indent'
-      end
-
-      f = @ff.flavors.values[0]
-      f.groups.should == [:default]
-    end
+module Vim
+  module Flavor
+    describe FlavorFile do
+      describe '#flavor' do
+        it 'registers a flavor' do
+          ff = FlavorFile.new()
+          ff.flavor 'kana/vim-altr', '>= 1.2.3'
+          f = ff.flavor_table['kana/vim-altr']
+          f.repo_name.should == 'kana/vim-altr'
+          f.version_constraint.should == VersionConstraint.new('>= 1.2.3')
+        end
 
-    it 'should categorize the given plugin into the specified groups' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-entire'
-        flavor 'kana/vim-textobj-indent', :groups => [:development]
-        flavor 'kana/vim-textobj-syntax', :groups => [:test]
+        it 'completes version constraint if it is not given' do
+          ff = FlavorFile.new()
+          ff.flavor 'kana/vim-altr'
+          f = ff.flavor_table['kana/vim-altr']
+          f.repo_name.should == 'kana/vim-altr'
+          f.version_constraint.should == VersionConstraint.new('>= 0')
+        end
       end
 
-      fe = @ff.flavors['git://github.com/kana/vim-textobj-entire.git']
-      fe.groups.should == [:default]
-      fi = @ff.flavors['git://github.com/kana/vim-textobj-indent.git']
-      fi.groups.should == [:default, :development]
-      fs = @ff.flavors['git://github.com/kana/vim-textobj-syntax.git']
-      fs.groups.should == [:default, :test]
-    end
-  end
-
-  describe 'group' do
-    before :each do
-      @ff = described_class.new()
-    end
-
-    it 'should categorize inner flavors into the specified groups' do
-      @ff.interpret do
-        flavor 'kana/vim-textobj-entire'
-
-        group :development do
-          flavor 'kana/vim-textobj-indent'
+      describe '.load' do
+        around(:each) do |example|
+          Dir.mktmpdir do |dir|
+            @tmp_path = dir
+            example.run
+          end
         end
 
-        group :test do
-          flavor 'kana/vim-textobj-syntax', :groups => [:development]
+        it 'loads a given flavorfile' do
+          flavorfile_path = @tmp_path.to_flavorfile_path
+          File.open(flavorfile_path, 'w') do |io|
+            io.write("flavor 'kana/vim-altr', '~> 1.2'\n")
+          end
+          ff = FlavorFile.load(flavorfile_path)
+          f = ff.flavor_table['kana/vim-altr']
+          f.repo_name.should == 'kana/vim-altr'
+          f.version_constraint.should == VersionConstraint.new('~> 1.2')
         end
       end
-
-      fe = @ff.flavors['git://github.com/kana/vim-textobj-entire.git']
-      fe.groups.should == [:default]
-      fi = @ff.flavors['git://github.com/kana/vim-textobj-indent.git']
-      fi.groups.should == [:default, :development]
-      fs = @ff.flavors['git://github.com/kana/vim-textobj-syntax.git']
-      fs.groups.should == [:default, :test, :development]
     end
   end
 end
+