vim-flavor 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ef7a20f9342dd512e0718eb6a151212432fcec
-  data.tar.gz: 73942ac396f29a6f278822676295da7b00099b23
+  metadata.gz: 73cbe32362402bf8daa1f6951a8048e11dacf480
+  data.tar.gz: 14b6eee41cb928926aba70453825a08862471b67
 SHA512:
-  metadata.gz: a06fb5d0199475b0ae4bbaadf70dd8bd7e241a2d3e55276abba9dcbcbe10dfa66103121d15491d1ac6a24fa25dbad9d2670b0d7e6f287458dae058a556ea23c3
-  data.tar.gz: caad9086bf9c57fd5897d3203bb68724292b5d0a7dacc1929765e8634605f154a112e46d4f8b8374581327137de1e360e606e63c2a3e3b4e1714acbb117d3059
+  metadata.gz: 2f3b0ddc0fad3d8efcbddbced648050759c0b1fbb9ab8d0bf44ce7851da32b8df91a28611f829faca401f607710f2c45e66b4abc674f22c4e5b6f61f376b65fa
+  data.tar.gz: 95d6f8c557062bb1403affe71deb2bd187a0f29a1ffc7c329d40287ab2d2470360977072d2c341a3d42ed79047c8de13017a0113a85e3248b36398ddaadadf70

data/features/caching/basics.feature

@@ -13,7 +13,7 @@ Feature: Basics
     And I disable network to the original repository of "foo"
 
   Scenario: Install plugins - locked and compatible with new flavorfile
-    Given I remove the directory "home/.vim"
+    Given I delete the directory "home/.vim"
     When I run `vim-flavor install`
     Then it should pass
     And a lockfile is created with:

data/features/news.md

@@ -1,3 +1,16 @@
+## 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

data/features/step_definitions/directory_steps.rb

@@ -1,6 +1,8 @@
-When /^I remove the directory "([^"]*)"$/ do |dir_name|
+When /^I delete the directory "([^"]*)"$/ do |dir_name|
   in_current_dir do
     # FileUtils#rmdir cannot delete non-empty directories.
+    # TODO: Use aruba's "I remove the directory" step.
+    #       Currently its implementation cannot delete git repositories.
     FileUtils.rm_r(dir_name)
   end
 end

data/features/step_definitions/flavor_steps.rb

@@ -65,7 +65,7 @@ end
 
 Given /^I disable network to the original repository of "([^"]*)"$/ do |basename|
   steps %Q{
-    Given I remove the directory "#{make_repo_path(basename)}"
+    Given I delete the directory "#{make_repo_path(basename)}"
   }
 end
 

data/features/testing_vim_plugins/dependencies.feature

@@ -43,8 +43,6 @@ Feature: Dependencies
         kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
-      Files=0, Tests=0,  \d+ wallclock secs .*
-      Result: NOTESTS
       t/basics.vim .. ok
       All tests successful.
       Files=1, Tests=1,  \d+ wallclock secs .*
@@ -57,3 +55,55 @@ Feature: Dependencies
       """
     And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"
     And a dependency "kana/vim-textobj-user" is stored in ".vim-flavor/deps"
+
+  Scenario: Update dependencies for testing
+    Given a flavorfile with:
+      """ruby
+      flavor 'kana/vim-textobj-user', '~> 0.3.0'
+      """
+    And a lockfile with:
+      """ruby
+      kana/vim-textobj-user (0.3.5)
+      """
+    And a directory named "t"
+    And I run `vim-flavor test`
+    And it should pass with regexp:
+      """
+      -------- Preparing dependencies
+      Checking versions...
+        Use kana/vim-textobj-user ... 0\.3\.5
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
+      Deploying plugins...
+        kana/vim-textobj-user 0\.3\.5 ... done
+        kana/vim-vspec 1\.\d+(\.\d+)? ... done
+      Completed.
+      -------- Testing a Vim plugin
+      Files=0, Tests=0,  \d+ wallclock secs .*
+      Result: NOTESTS
+      """
+    And a lockfile is updated and matches with:
+      """
+      kana/vim-textobj-user \(0\.3\.5\)
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
+      """
+    When I run `vim-flavor test --update-dependencies`
+    Then it should pass with regexp:
+      """
+      .*
+      -------- Preparing dependencies
+      Checking versions...
+        Use kana/vim-textobj-user ... 0\.3\.13
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
+      Deploying plugins...
+        kana/vim-textobj-user 0\.3\.13 ... done
+        kana/vim-vspec 1\.\d+(\.\d+)? ... skipped \(already deployed\)
+      Completed.
+      -------- Testing a Vim plugin
+      Files=0, Tests=0,  \d+ wallclock secs .*
+      Result: NOTESTS
+      """
+    And a lockfile is updated and matches with:
+      """
+      kana/vim-textobj-user \(0\.3\.13\)
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
+      """

data/features/testing_vim_plugins/failures.feature

@@ -34,8 +34,6 @@ Feature: Failures
         kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
-      Files=0, Tests=0,  0 wallclock secs (.*)
-      Result: NOTESTS
       t/basics.vim ..\s
       not ok 1 - g:foo is equal to 5
       # Expected g:foo == 5

data/features/testing_vim_plugins/specifying_test_scripts.feature

@@ -42,13 +42,10 @@ Feature: Specifying test scripts
         kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
-      spec/sh.t .. ok
-      All tests successful.
-      Files=1, Tests=1,  \d+ wallclock secs .*
-      Result: PASS
       spec/basics.vim .. ok
+      spec/sh.t ........ ok
       All tests successful.
-      Files=1, Tests=1,  \d+ wallclock secs .*
+      Files=2, Tests=2,  \d+ wallclock secs .*
       Result: PASS
       """
     And a lockfile is created and matches with:

data/features/testing_vim_plugins/typical_usage.feature

@@ -43,13 +43,10 @@ Feature: Typical usage
         kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
-      t/sh.t .. ok
-      All tests successful.
-      Files=1, Tests=1,  \d+ wallclock secs .*
-      Result: PASS
       t/basics.vim .. ok
+      t/sh.t ........ ok
       All tests successful.
-      Files=1, Tests=1,  \d+ wallclock secs .*
+      Files=2, Tests=2,  \d+ wallclock secs .*
       Result: PASS
       """
     And a lockfile is created and matches with:

data/lib/vim-flavor/cli.rb

@@ -35,9 +35,12 @@ module Vim
       end
 
       desc 'test [FILES or DIRS]',
-        'Test a Vim plugin in the current working directory.'
+        'Run tests on a Vim plugin in the current working directory.'
+      method_option :update_dependencies,
+        :desc => 'Update dependencies for testing',
+        :type => :boolean
       def test(*files_or_dirs)
-        Facade.new().test(files_or_dirs)
+        Facade.new().test(files_or_dirs, options)
       end
 
       desc 'version', 'Show the current version.'

data/lib/vim-flavor/facade.rb

@@ -17,16 +17,16 @@ module Vim
         install_or_update(:update, vimfiles_path)
       end
 
-      def test(files_or_dirs)
+      def test(files_or_dirs, options)
         trace "-------- Preparing dependencies\n"
 
         flavorfile = FlavorFile.load_or_new(Dir.getwd().to_flavorfile_path)
-        flavorfile.flavor 'kana/vim-vspec', '~> 1.0', :group => :development unless
+        flavorfile.flavor 'kana/vim-vspec', '~> 1.5', :group => :development unless
           flavorfile.flavor_table.has_key?('kana/vim-vspec')
         lockfile = LockFile.load_or_new(Dir.getwd().to_lockfile_path)
 
         refresh_flavors(
-          :install,
+          options[:update_dependencies] ? :update : :install,
           flavorfile,
           lockfile,
           [:runtime, :development],
@@ -35,28 +35,18 @@ module Vim
 
         trace "-------- Testing a Vim plugin\n"
 
-        prove_options = '--comments --failure --directives'
-        deps_path = Dir.getwd().to_stash_path.to_deps_path
-        vspec = "#{deps_path}/#{'kana/vim-vspec'.zap}/bin/vspec"
+        this_path = Dir.getwd()
+        deps_path = this_path.to_stash_path.to_deps_path
+        runner = "#{deps_path}/#{'kana/vim-vspec'.zap}/bin/prove-vspec"
         plugin_paths = lockfile.flavors.map {|f|
           "#{deps_path}/#{f.repo_name.zap}"
         }
-        dirs = files_or_dirs.select {|p| File.directory?(p)}
-        t_files = files_or_dirs.select {|p| File.file?(p) &&
-                                            File.extname(p) == '.t'}
-        vim_files = files_or_dirs.select {|p| File.file?(p) &&
-                                              File.extname(p) == '.vim'}
-        commands = []
-        commands <<
-          %Q{ prove --ext '.t' #{prove_options} \
-                #{(dirs + t_files).shelljoin} } if files_or_dirs.none? or
-                                                   dirs.any? or t_files.any?
-        commands <<
-          %Q{ prove --ext '.vim' #{prove_options} \
-                --exec '#{vspec} #{Dir.getwd()} #{plugin_paths.join(' ')}' \
-                #{(dirs + vim_files).shelljoin} } if files_or_dirs.none? or
-                                                     dirs.any? or vim_files.any?
-        succeeded = system(commands.join('&&'))
+        runtime_paths = ([this_path] + plugin_paths).flat_map {|p| ['-d', p]}
+        command =
+          %Q{ '#{runner}' \
+              #{runtime_paths.flat_map {|p| ['-d', p]}.shelljoin} \
+              #{files_or_dirs.shelljoin} }
+        succeeded = system(command)
         exit(1) unless succeeded
       end
 

data/lib/vim-flavor/version.rb

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

data/spec/plainversion_spec.rb

@@ -25,15 +25,15 @@ module Vim
 
       describe '::correct?' do
         it 'accept "X.Y.Z" style tags' do
-          expect(v.correct?('1')).to be_true
-          expect(v.correct?('1.2')).to be_true
-          expect(v.correct?('1.2.3')).to be_true
+          expect(v.correct?('1')).to be_truthy
+          expect(v.correct?('1.2')).to be_truthy
+          expect(v.correct?('1.2.3')).to be_truthy
         end
 
         it 'accept "vX.Y.Z" style tags' do
-          expect(v.correct?('v1')).to be_true
-          expect(v.correct?('v1.2')).to be_true
-          expect(v.correct?('v1.2.3')).to be_true
+          expect(v.correct?('v1')).to be_truthy
+          expect(v.correct?('v1.2')).to be_truthy
+          expect(v.correct?('v1.2.3')).to be_truthy
         end
       end
 

data/spec/version_spec.rb

@@ -34,13 +34,13 @@ module Vim
 
       describe '::correct?' do
         it 'is an alias of PlainVersion::correct?' do
-          expect(v.correct?('1')).to be_true
-          expect(v.correct?('1.2')).to be_true
-          expect(v.correct?('1.2.3')).to be_true
-          expect(v.correct?('v1')).to be_true
-          expect(v.correct?('v1.2')).to be_true
-          expect(v.correct?('v1.2.3')).to be_true
-          expect(v.correct?('vim7.4')).to be_false
+          expect(v.correct?('1')).to be_truthy
+          expect(v.correct?('1.2')).to be_truthy
+          expect(v.correct?('1.2.3')).to be_truthy
+          expect(v.correct?('v1')).to be_truthy
+          expect(v.correct?('v1.2')).to be_truthy
+          expect(v.correct?('v1.2.3')).to be_truthy
+          expect(v.correct?('vim7.4')).to be_falsey
         end
       end
     end

data/vim-flavor.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency('parslet', '~> 1.0')
-  spec.add_dependency('thor', '~> 0.14')
+  spec.add_dependency('parslet', '~> 1.7')
+  spec.add_dependency('thor', '~> 0.19')
 
-  spec.add_development_dependency('aruba', '~> 0.5')
-  spec.add_development_dependency('cucumber', '~> 1.2')
+  spec.add_development_dependency('aruba', '~> 0.6')
+  spec.add_development_dependency('cucumber', '~> 1.3')
   spec.add_development_dependency('pry')
-  spec.add_development_dependency('rspec', '~> 2.8')
+  spec.add_development_dependency('rspec', '~> 2.99')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Kana Natsuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.99'
 description: A tool to manage your favorite Vim plugins
 email:
 - dev@whileimautomaton.net