vim-flavor 2.2.2 → 3.0.0

data/lib/vim-flavor/flavorfile.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Vim
   module Flavor
     class FlavorFile
@@ -16,7 +18,7 @@ module Vim
 
       def self.load_or_new(flavorfile_path)
         ff = new()
-        ff.load(flavorfile_path) if File.exists?(flavorfile_path)
+        ff.load(flavorfile_path) if FileTest.exists?(flavorfile_path)
         ff
       end
 
@@ -26,6 +28,27 @@ module Vim
         ff
       end
 
+      def self.path_from(dir_path, warn)
+        flavorfile_path = dir_path.to_flavorfile_path
+        new_path = Pathname.new(flavorfile_path).relative_path_from(Pathname.getwd())
+        old_path = new_path.dirname() / 'VimFlavor'
+
+        path = if FileTest.exists?(new_path)
+          if warn and FileTest.exists?(old_path)
+            Console::warn "Delete #{old_path}.  #{new_path} is being read instead."
+          end
+          new_path
+        elsif FileTest.exists?(old_path)
+          if warn
+            Console::warn "Rename #{old_path} to #{new_path}.  #{old_path} wll be ignored in future version."
+          end
+          old_path
+        else
+          new_path
+        end
+        path.to_s
+      end
+
       def load(flavorfile_path)
         instance_eval(
           File.open(flavorfile_path, 'r').read(),

data/lib/vim-flavor/lockfile.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vim
   module Flavor
     class LockFile
@@ -7,6 +9,18 @@ module Vim
         l
       end
 
+      def self.path_from(dir_path, error)
+        lockfile_path = dir_path.to_lockfile_path
+        new_path = Pathname.new(lockfile_path).relative_path_from(Pathname.getwd())
+        old_path = new_path.dirname() / 'VimFlavor.lock'
+
+        if error and FileTest.exists?(old_path)
+          Console::error "#{old_path} is no longer used.  Rename it to #{new_path}."
+        end
+
+        new_path.to_s
+      end
+
       def initialize(path)
         @path = path
       end
@@ -38,6 +52,7 @@ module Vim
       end
 
       def save()
+        FileUtils.mkdir_p(File.dirname(@path))
         File.open(@path, 'w') do |io|
           lines = flavors.flat_map {|f| self.class.serialize_lock_status(f)}
           lines.each do |line|

data/lib/vim-flavor/stringextension.rb

@@ -1,24 +1,16 @@
 module Vim
   module Flavor
     module StringExtension
-      def to_bootstrap_path
-        "#{self}/bootstrap.vim"
-      end
-
-      def to_deps_path
-        "#{self}/deps"
-      end
-
       def to_flavorfile_path
-        "#{self}/VimFlavor"
+        "#{self}/Flavorfile"
       end
 
       def to_flavors_path
-        "#{self}/flavors"
+        "#{self}/pack/flavors/start"
       end
 
       def to_lockfile_path
-        "#{self}/VimFlavor.lock"
+        "#{self}/Flavorfile.lock"
       end
 
       def to_stash_path

data/lib/vim-flavor/version.rb

@@ -1,6 +1,6 @@
 module Vim
   module Flavor
-    VERSION = '2.2.2'
+    VERSION = '3.0.0'
 
     class Version
       def self.create(arg)

data/spec/branchversion_spec.rb

@@ -18,10 +18,10 @@ module Vim
       end
 
       it 'is not comparable' do
-        expect {v1 < v2}.to raise_error
-        expect {v1 <= v2}.to raise_error
-        expect {v1 > v2}.to raise_error
-        expect {v1 >= v2}.to raise_error
+        expect {v1 < v2}.to raise_error(NoMethodError)
+        expect {v1 <= v2}.to raise_error(NoMethodError)
+        expect {v1 > v2}.to raise_error(NoMethodError)
+        expect {v1 >= v2}.to raise_error(NoMethodError)
         expect(v1 <=> v2).to be_nil
       end
 

data/spec/stringextension_spec.rb

@@ -3,6 +3,37 @@ require 'spec_helper'
 module Vim
   module Flavor
     describe StringExtension do
+      describe '#to_flavorfile_path' do
+        it 'extends a given path to a flavorfile' do
+          expect('cwd'.to_flavorfile_path).to be == 'cwd/Flavorfile'
+        end
+      end
+
+      describe '#to_flavors_path' do
+        it 'extends a given path to a flavors path' do
+          expect('home/.vim'.to_flavors_path).to be == 'home/.vim/pack/flavors/start'
+        end
+      end
+
+      describe '#to_lockfile_path' do
+        it 'extends a given path to a lockfile' do
+          expect('cwd'.to_lockfile_path).to be == 'cwd/Flavorfile.lock'
+        end
+      end
+
+      describe '#to_stash_path' do
+        it 'extends a given path to a stash path' do
+          expect('home'.to_stash_path).to be == 'home/.vim-flavor'
+          expect('cwd'.to_stash_path).to be == 'cwd/.vim-flavor'
+        end
+      end
+
+      describe '#to_vimfiles_path' do
+        it 'extends a given path to a vimfiles path' do
+          expect('home'.to_vimfiles_path).to be == 'home/.vim'
+        end
+      end
+
       describe '#zap' do
         it 'replace unsafe characters with "_"' do
           expect('fakeclip'.zap).to be == 'fakeclip'

data/vim-flavor.gemspec

@@ -17,12 +17,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '~> 2.5'
 
-  spec.add_dependency('parslet', '~> 1.7')
-  spec.add_dependency('thor', '~> 0.19')
+  spec.add_dependency('parslet', '~> 1.8')
+  spec.add_dependency('pastel', '~> 0.7')
+  spec.add_dependency('thor', '~> 0.20')
 
-  spec.add_development_dependency('aruba', '~> 0.6.0')
-  spec.add_development_dependency('cucumber', '~> 1.3.0')
+  spec.add_development_dependency('aruba', '~> 0.14')
+  spec.add_development_dependency('cucumber', '~> 3.1')
   spec.add_development_dependency('pry')
-  spec.add_development_dependency('rspec', '~> 2.99')
+  spec.add_development_dependency('relish', '~> 0.7')
+  spec.add_development_dependency('rspec', '~> 3.7')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Kana Natsuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: relish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.7'
 description: A tool to manage your favorite Vim plugins
 email:
 - dev@whileimautomaton.net
@@ -113,6 +141,8 @@ files:
 - bin/vim-flavor
 - features/.nav
 - features/README.md
+- features/backward_compatibilities/flavorfile.feature
+- features/backward_compatibilities/lockfile.feature
 - features/branches/README.md
 - features/branches/changing_tracking_branches.feature
 - features/branches/detect_incompatible_declarations.feature
@@ -137,7 +167,6 @@ files:
 - 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
 - features/step_definitions/dependency_steps.rb
 - features/step_definitions/directory_steps.rb
@@ -162,6 +191,7 @@ files:
 - lib/vim-flavor.rb
 - lib/vim-flavor/branchversion.rb
 - lib/vim-flavor/cli.rb
+- lib/vim-flavor/console.rb
 - lib/vim-flavor/enumerableextension.rb
 - lib/vim-flavor/env.rb
 - lib/vim-flavor/facade.rb
@@ -176,7 +206,6 @@ files:
 - 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
@@ -196,9 +225,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,13 +235,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A tool to manage your favorite Vim plugins
 test_files:
 - features/.nav
 - features/README.md
+- features/backward_compatibilities/flavorfile.feature
+- features/backward_compatibilities/lockfile.feature
 - features/branches/README.md
 - features/branches/changing_tracking_branches.feature
 - features/branches/detect_incompatible_declarations.feature
@@ -237,7 +268,6 @@ test_files:
 - 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
 - features/step_definitions/dependency_steps.rb
 - features/step_definitions/directory_steps.rb
@@ -261,7 +291,6 @@ test_files:
 - 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

data/features/step_definitions/bootstrap_script_steps.rb

@@ -1,6 +0,0 @@
-Then /^a bootstrap script (is|is not) created in "(.+)"$/ do |mode, v_vimfiles_path|
-  p = expand(v_vimfiles_path).to_flavors_path.to_bootstrap_path
-  steps %Q{
-    Then a file named "#{p}" #{mode == 'is' ? 'should' : 'should not'} exist
-  }
-end

data/spec/facade_spec.rb

@@ -1,57 +0,0 @@
-require 'fileutils'
-require 'spec_helper'
-require 'tmpdir'
-
-module Vim
-  module Flavor
-    describe Facade do
-      describe '#create_vim_script_for_bootstrap' do
-        around :each do |example|
-          Dir.mktmpdir do |tmp_path|
-            @tmp_path = tmp_path
-            example.run
-          end
-        end
-
-        it 'creates a bootstrap script to configure runtimepath for flavors' do
-          flavors_path = @tmp_path.to_vimfiles_path.to_flavors_path
-          Facade.new().create_vim_script_for_bootstrap(flavors_path)
-
-          expect(File).to exist(flavors_path.to_bootstrap_path)
-
-          _rtp = %x{
-            for plugin_name in 'foo' 'bar' 'baz'
-            do
-              mkdir -p "#{flavors_path}/$plugin_name"
-            done
-            HOME='#{@tmp_path}' vim -u NONE -i NONE -n -N -e -s -c '
-              set verbose=1
-              let vimfiles_path = split(&runtimepath, ",")[0]
-              runtime flavors/bootstrap.vim
-              for path in split(&runtimepath, ",")
-                if stridx(path, vimfiles_path) == 0
-                  echo substitute(path, vimfiles_path, "!", "")
-                endif
-              endfor
-              qall!
-            ' 2>&1
-          }
-          rtps =
-            _rtp.
-            split(/[\r\n]/).
-            select {|p| p != ''}
-          expect(rtps).to be == [
-            '!',
-            '!/flavors/bar',
-            '!/flavors/baz',
-            '!/flavors/foo',
-            '!/flavors/foo/after',
-            '!/flavors/baz/after',
-            '!/flavors/bar/after',
-            '!/after',
-          ]
-        end
-      end
-    end
-  end
-end