vim-flavor 2.2.2 → 4.0.2

data/lib/vim-flavor/lockfile.rb

@@ -1,12 +1,26 @@
+require 'fileutils'
+
 module Vim
   module Flavor
     class LockFile
       def self.load_or_new(lockfile_path)
         l = new(lockfile_path)
-        l.load() if File.exists?(lockfile_path)
+        l.load() if File.exist?(lockfile_path)
         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.exist?(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 = '4.0.2'
 
     class Version
       def self.create(arg)

data/lib/vim-flavor.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'vim-flavor/enumerableextension'
 
 module Vim
@@ -6,6 +5,7 @@ module Vim
     [
       :BranchVersion,
       :CLI,
+      :Console,
       :Env,
       :Facade,
       :Flavor,

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,12 +3,43 @@ 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'
           expect('kana/vim-altr'.zap).to be == 'kana_vim-altr'
-          expect('git://example.com/foo.git'.zap).to be ==
-            'git___example.com_foo.git'
+          expect('https://example.com/foo.git'.zap).to be ==
+            'https___example.com_foo.git'
         end
       end
     end

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 = '~> 3.0'
 
-  spec.add_dependency('parslet', '~> 1.7')
-  spec.add_dependency('thor', '~> 0.19')
+  spec.add_dependency('parslet', '>= 1.8', '< 3.0')
+  spec.add_dependency('pastel', '~> 0.7')
+  spec.add_dependency('thor', '>= 0.20', '< 2.0')
 
-  spec.add_development_dependency('aruba', '~> 0.6.0')
-  spec.add_development_dependency('cucumber', '~> 1.3.0')
+  spec.add_development_dependency('aruba', '~> 2.0')
+  spec.add_development_dependency('cucumber', '~> 7.0')
   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,71 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 4.0.2
 platform: ruby
 authors:
 - Kana Natsuno
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.20'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +106,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
@@ -102,17 +142,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/vim-flavor
+- config/cucumber.yml
 - 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 +183,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 +207,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 +222,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
@@ -190,29 +235,30 @@ homepage: https://github.com/kana/vim-flavor
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.27
+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 +283,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 +306,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/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.5
-before_script:
-  - git config --global 'user.name' 'Travis CI'
-  - git config --global 'user.email' 'user@example.com'
-script: rake test

data/features/news.md

@@ -1,65 +0,0 @@
-## vim-flavor 2.2.2
-
-### Bug Fixes
-
-* Fix `install`, `update` and `test` to work even if these commands are invoked
-  from non-bash shell.
-
-
-
-
-## vim-flavor 2.2.1
-
-### Bug Fixes
-
-* Fix not to fail fetching repositories which have non-fastforward updates.
-
-
-
-
-## vim-flavor 2.2.0
-
-### Enhancements
-
-* `test` runs `*.vim` and `*.t` in a single step, to get a simplified result.
-* `test` uses [vim-vspec](https://github.com/kana/vim-vspec) 1.5 or later by
-  default.
-* `test` supports `--update-dependencies` to update dependencies before running
-  tests.
-
-
-
-
-## vim-flavor 2.1.1
-
-### Enhancements
-
-* `install` and `update` skip checking versions of plugins which are
-  development dependencies.
-
-
-
-
-## vim-flavor 2.1.0
-
-### Enhancements
-
-* `update` command is added.  It is an alias of existing `upgrade` command.
-  Now it is recommended to use `update` rather than `upgrade`.
-  `upgrade` will be removed in a future version.
-* `update` and `upgrade` learned to update specific plugins if repository names
-  are given as command-line arguments.
-
-
-
-
-## vim-flavor 2.0.0
-
-### Enhancements
-
-* [Branches](./branches) are supported.
-
-
-### Incompatible changes
-
-* Ruby 2.0.0 or later is required to run vim-flavor.

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