vim-flavor 0.0.4 → 1.0.0

data/spec/lockfile_spec.rb

@@ -1,93 +1,83 @@
-require 'bundler/setup'
-require 'fileutils'
 require 'spec_helper'
-require 'vim-flavor'
-
-describe Vim::Flavor::LockFile do
-  with_temporary_directory
-
-  before :each do
-    @lockfile_path = "#{@tmp_path}/VimFlavor.lock"
-  end
-
-  it 'should be initialized with a given path and no flavor' do
-    lf = described_class.new(@lockfile_path)
-
-    lf.path.should == @lockfile_path
-    lf.flavors.should be_empty
-  end
-
-  it 'should be able to persist its content' do
-    @flavor1 = Vim::Flavor::Flavor.new()
-    @flavor1.groups = [:default]
-    @flavor1.locked_version = Gem::Version.create('1.2.3')
-    @flavor1.repo_name = 'kana/vim-smartinput'
-    @flavor1.repo_uri = 'git://github.com/kana/vim-smartinput.git'
-    @flavor1.version_contraint = Vim::Flavor::VersionConstraint.new('>= 0')
-
-    FileUtils.mkdir_p(File.dirname(@lockfile_path))
-    lf = described_class.new("#{@lockfile_path}.1")
-
-    lf.flavors.should be_empty
-
-    File.exists?(lf.path).should be_false
-
-    lf.save()
-
-    File.exists?(lf.path).should be_true
-
-    lf.flavors[@flavor1.repo_uri] = @flavor1
-    lf.load()
-
-    lf.flavors.should be_empty
-
-    lf.flavors[@flavor1.repo_uri] = @flavor1
-    lf.save()
-    lf.load()
-
-    lf.flavors.should == {@flavor1.repo_uri => @flavor1}
-  end
-
-  describe '::poro_from_flavors and ::flavors_from_poro' do
-    before :each do
-      @flavor1 = Vim::Flavor::Flavor.new()
-      @flavor1.groups = [:default]
-      @flavor1.locked_version = Gem::Version.create('1.2.3')
-      @flavor1.repo_name = 'kana/vim-smartinput'
-      @flavor1.repo_uri = 'git://github.com/kana/vim-smartinput.git'
-      @flavor1.version_contraint = Vim::Flavor::VersionConstraint.new('>= 0')
-      @flavor2 = Vim::Flavor::Flavor.new()
-      @flavor2.groups = [:default]
-      @flavor2.locked_version = Gem::Version.create('4.5.6')
-      @flavor2.repo_name = 'kana/vim-smarttill'
-      @flavor2.repo_uri = 'git://github.com/kana/vim-smarttill.git'
-      @flavor2.version_contraint = Vim::Flavor::VersionConstraint.new('>= 0')
-      @flavors = {
-        @flavor1.repo_uri => @flavor1,
-        @flavor2.repo_uri => @flavor2,
-      }
-      @flavors_in_poro = {
-        @flavor1.repo_uri => {
-          :groups => @flavor1.groups,
-          :locked_version => @flavor1.locked_version.to_s(),
-          :repo_name => @flavor1.repo_name,
-          :version_contraint => @flavor1.version_contraint.to_s(),
-        },
-        @flavor2.repo_uri => {
-          :groups => @flavor2.groups,
-          :locked_version => @flavor2.locked_version.to_s(),
-          :repo_name => @flavor2.repo_name,
-          :version_contraint => @flavor2.version_contraint.to_s(),
-        },
-      }
-    end
-
-    it 'should create PORO from flavors' do
-      described_class.poro_from_flavors(@flavors).should == @flavors_in_poro
-    end
-
-    it 'should create flavors from PORO' do
-      described_class.flavors_from_poro(@flavors_in_poro).should == @flavors
+require 'tmpdir'
+
+module Vim
+  module Flavor
+    describe LockFile do
+      around :each do |example|
+        Dir.mktmpdir do |tmp_path|
+          @tmp_path = tmp_path
+          example.run
+        end
+      end
+
+      def flavor(repo_name, locked_version)
+        f = Flavor.new()
+        f.repo_name = repo_name
+        f.locked_version = locked_version
+        f
+      end
+
+      it 'has flavors sorted by repo_name' do
+        l = LockFile.new(@tmp_path.to_lockfile_path)
+        foo = flavor('foo', '1.2.3')
+        bar = flavor('bar', '2.3.4')
+        baz = flavor('baz', '3.4.5')
+        [foo, bar, baz].each do |f|
+          l.flavor_table[f.repo_name] = f
+        end
+
+        l.flavors.should == [bar, baz, foo]
+      end
+
+      describe '::serialize_lock_status' do
+        it 'converts a flavor into an array of lines' do
+          LockFile.serialize_lock_status(flavor('foo', '1.2.3')).should ==
+            ['foo (1.2.3)']
+        end
+      end
+
+      describe '#load' do
+        it 'loads locked information from a lockfile' do
+          File.open(@tmp_path.to_lockfile_path, 'w') do |io|
+            io.write(<<-'END')
+              foo (1.2.3)
+              bar (2.3.4)
+              baz (3.4.5)
+            END
+          end
+
+          l = LockFile.new(@tmp_path.to_lockfile_path)
+          l.flavor_table.should be_empty
+
+          l.load()
+          l.flavor_table['foo'].repo_name.should == 'foo'
+          l.flavor_table['foo'].locked_version.should == '1.2.3'
+          l.flavor_table['bar'].repo_name.should == 'bar'
+          l.flavor_table['bar'].locked_version.should == '2.3.4'
+          l.flavor_table['baz'].repo_name.should == 'baz'
+          l.flavor_table['baz'].locked_version.should == '3.4.5'
+        end
+      end
+
+      describe '::load_or_new' do
+        it 'creates a new instance then loads a lockfile' do
+          File.open(@tmp_path.to_lockfile_path, 'w') do |io|
+            io.write(<<-'END')
+              foo (1.2.3)
+            END
+          end
+
+          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'
+        end
+
+        it 'only creates a new instance if a given path does not exist' do
+          l = LockFile.load_or_new(@tmp_path.to_lockfile_path)
+          l.flavor_table.should be_empty
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,67 +1,2 @@
 require 'bundler/setup'
-require 'fileutils'
-require 'spec_helper'
-require 'tmpdir'
 require 'vim-flavor'
-
-def create_a_test_repo(path)
-  system(<<-"END")
-    {
-      mkdir -p #{path.inspect}
-      cd #{path.inspect}
-      git init
-      mkdir autoload doc plugin
-      touch autoload/foo.vim doc/foo.txt plugin/foo.vim
-      git add autoload doc plugin
-      git commit -am 'Commit foo'
-      for version in '1.0.0' '1.1.1' '1.1.2' '1.2.1' '1.2.2'
-      do
-        echo "*foo* $version" >doc/foo.txt
-        git commit -am 'Update foo'
-        git tag -a -m "Version $version" "$version"
-      done
-      for non_version in 'foo' 'bar' 'baz'
-      do
-        git tag -a -m "Non-version $non_version" "$non_version"
-      done
-    } >/dev/null
-  END
-end
-
-def update_a_test_repo(path)
-  system(<<-"END")
-    {
-      cd #{path.inspect} &&
-      for version in '1.0.9' '1.1.9' '1.2.9' '1.3.9'
-      do
-        echo "*foo* $version" >doc/foo.txt
-        git commit -am 'Update foo'
-        git tag -a -m "Version $version" "$version"
-      done
-    } >/dev/null
-  END
-end
-
-def create_temporary_directory()
-  Dir.mktmpdir()
-end
-
-def remove_temporary_directory(path)
-  FileUtils.remove_entry_secure(path)
-end
-
-def with_temporary_directory()
-  before :each do
-    @tmp_path = create_temporary_directory()
-
-    @original_dot_path = Vim::Flavor.dot_path
-    @dot_path = "#{@tmp_path}/.vim-flavor"
-    Vim::Flavor.dot_path = @dot_path
-  end
-
-  after :each do
-    Vim::Flavor.dot_path = @original_dot_path
-
-    remove_temporary_directory(@tmp_path)
-  end
-end

data/spec/stringextension_spec.rb

@@ -1,11 +1,15 @@
-require 'bundler/setup'
 require 'spec_helper'
-require 'vim-flavor'
 
-describe Vim::Flavor::StringExtension do
-  describe '#to_flavors_path' do
-    it 'should return a flavors path from a vimfiles path' do
-      '~/.vim'.to_flavors_path().should == '~/.vim/flavors'
+module Vim
+  module Flavor
+    describe StringExtension do
+      describe '#zap' do
+        it 'replace unsafe characters with "_"' do
+          'fakeclip'.zap.should == 'fakeclip'
+          'kana/vim-altr'.zap.should == 'kana_vim-altr'
+          'git://example.com/foo.git'.zap.should == 'git___example.com_foo.git'
+        end
+      end
     end
   end
 end

data/spec/versionconstraint_spec.rb

@@ -1,138 +1,56 @@
-require 'bundler/setup'
 require 'spec_helper'
-require 'vim-flavor'
 
-describe Vim::Flavor::VersionConstraint do
-  before :all do
-    @base_version_s = '1.2'
-    @backward_compatible_versions = [
-      '1.2.4',
-      '1.2.10',
-      '1.3.5',
-      '1.10.100',
-    ]
-    @backward_incompatible_versions = [
-      '2.0',
-      '3000',
-    ]
-    @old_versions = [
-      '1.1.1',
-      '1.1',
-      '0.2.4',
-    ]
-  end
+module Vim
+  module Flavor
+    describe VersionConstraint do
+      describe '#compatible?' do
+        describe '>=' do
+          subject {VersionConstraint.new('>= 1.2.3')}
 
-  it 'should accept ">=" operator' do
-    vc = described_class.new('>= 0.0.0')
-    vc.base_version.should == Gem::Version.create('0.0.0')
-    vc.operator.should == '>='
-  end
+          it {should be_compatible '1.2.3'}
 
-  it 'should accept "~>" operator' do
-    vc = described_class.new('~> 1.2.3')
-    vc.base_version.should == Gem::Version.create('1.2.3')
-    vc.operator.should == '~>'
-  end
+          it {should be_compatible '1.2.4'}
+          it {should be_compatible '1.3.3'}
+          it {should be_compatible '2.2.3'}
 
-  it 'should not accept unknown operators' do
-    expect {
-      described_class.new('?? 6.6.6')
-    }.to raise_error(RuntimeError)
-  end
+          it {should be_compatible '1.3'}
 
-  it 'should not accept invalid format' do
-    expect {
-      described_class.new('6.6.6')
-    }.to raise_error(RuntimeError)
-  end
+          it {should_not be_compatible '1.2.2'}
+          it {should_not be_compatible '1.1.3'}
+          it {should_not be_compatible '0.2.3'}
 
-  describe '#==' do
-    it 'should compare instances by their properties' do
-      vc_gc1 = described_class.new('~> 1')
-      vc_ge1 = described_class.new('>= 1')
-      vc_ge1d = described_class.new('>= 1')
-      vc_ge2 = described_class.new('>= 2')
+          it {should_not be_compatible '1.2'}
+        end
 
-      vc_ge1.should == vc_ge1d
-      vc_ge1.should_not == vc_gc1
-      vc_ge1.should_not == vc_ge2
-    end
-  end
+        describe '~>' do
+          subject {VersionConstraint.new('~> 1.2.3')}
 
-  describe '>=' do
-    it 'should be compatible with backward-compatible versions' do
-      vc = described_class.new('>= ' + @base_version_s)
-      @backward_compatible_versions.each do |v|
-        vc.compatible?(v).should be_true
-      end
-    end
+          it {should be_compatible '1.2.3'}
 
-    it 'should be compatible with backward-incompatible versions' do
-      vc = described_class.new('>= ' + @base_version_s)
-      @backward_incompatible_versions.each do |v|
-        vc.compatible?(v).should be_true
-      end
-    end
+          it {should be_compatible '1.2.4'}
+          it {should_not be_compatible '1.3.3'}
+          it {should_not be_compatible '2.2.3'}
 
-    it 'should not be compatible with any older versions' do
-      vc = described_class.new('>= ' + @base_version_s)
-      @old_versions.each do |v|
-        vc.compatible?(v).should be_false
-      end
-    end
-  end
+          it {should_not be_compatible '1.3'}
 
-  describe '~>' do
-    it 'should be compatible with backward-compatible versions' do
-      vc = described_class.new('~> ' + @base_version_s)
-      @backward_compatible_versions.each do |v|
-        vc.compatible?(v).should be_true
-      end
-    end
+          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 'should not be compatible with backward-incompatible versions' do
-      vc = described_class.new('~> ' + @base_version_s)
-      @backward_incompatible_versions.each do |v|
-        vc.compatible?(v).should be_false
+          it {should_not be_compatible '1.2'}
+        end
       end
-    end
 
-    it 'should not be compatible with any older versions' do
-      vc = described_class.new('~> ' + @base_version_s)
-      @old_versions.each do |v|
-        vc.compatible?(v).should be_false
+      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'
+        end
       end
     end
   end
-
-  describe 'find_the_best_version' do
-    it 'should find the best version from given versions' do
-      described_class.new('~> 1.2.3').find_the_best_version([
-        '1.2.3',
-        '1.2.6',
-        '1.2.9',
-        '1.3.0',
-        '2.0.0',
-      ].map {|vs| Gem::Version.create(vs)}).should ==
-        Gem::Version.create('1.2.9')
-
-      described_class.new('>= 0').find_the_best_version([
-        '1.2.3',
-        '1.2.6',
-        '1.2.9',
-        '1.3.0',
-        '2.0.0',
-      ].map {|vs| Gem::Version.create(vs)}).should ==
-        Gem::Version.create('2.0.0')
-    end
-  end
-
-  describe '#to_s' do
-    it 'should convert into a string representation' do
-      vc1 = described_class.new('~> 1.2.3')
-      described_class.new(vc1.to_s()).should == vc1
-      vc2 = described_class.new('>= 0')
-      described_class.new(vc2.to_s()).should == vc2
-    end
-  end
 end

data/vim-flavor.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Vim::Flavor::VERSION
 
-  gem.add_dependency('thor', '~> 0.14.6')
+  gem.add_dependency('parslet', '~> 1.0')
+  gem.add_dependency('thor', '~> 0.14')
 
+  gem.add_development_dependency('cucumber', '~> 1.2')
   gem.add_development_dependency('rspec', '~> 2.8')
 end