vim-flavor 1.1.2 → 1.1.3

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+before_script:
+  - git config --global 'user.name' 'Travis CI'
+  - git config --global 'user.email' 'user@example.com'
 script: rake test

data/features/.nav

@@ -15,4 +15,5 @@
   - typical_usage.feature
   - dependencies.feature
   - failures.feature
+  - specifying_test_scripts.feature
 - version_tag_format.feature

data/features/step_definitions/flavor_steps.rb

@@ -48,7 +48,7 @@ Given /^a repository "([^"]*)" from offline cache$/ do |repo_name|
   repository_path = make_repo_path(repo_name).sub(expand('$tmp/'), '')
   sh <<-"END"
     {
-      git clone 'vendor/#{repo_name}' '#{current_dir}/#{repository_path}'
+      git clone --quiet --no-checkout 'vendor/#{repo_name}' '#{current_dir}/#{repository_path}'
     } >/dev/null
   END
 end

data/features/step_definitions/lockfile_steps.rb

@@ -41,6 +41,10 @@ Then /^(?:a|the) lockfile is (?:created|updated) with:$/ do |content|
   }
 end
 
+Then /^(?:a|the) lockfile is (?:created|updated) and matches with:$/ do |content|
+  check_file_content('.'.to_lockfile_path, /#{content}/, true)
+end
+
 Then /^(?:a|the) lockfile is not created$/ do
   steps %Q{
     Then a file named "#{'.'.to_lockfile_path}" should not exist

data/features/support/env.rb

@@ -74,7 +74,7 @@ end
 
 Aruba.configure do |config|
   config.before_cmd do |cmd|
-    set_env 'HOME', variable_table['home']
+    set_env 'VIM_FLAVOR_HOME', variable_table['home']
     set_env 'VIM_FLAVOR_GITHUB_URI_PREFIX', expand('file://$tmp/repos/')
     set_env 'VIM_FLAVOR_GITHUB_URI_SUFFIX', ''
   end

data/features/testing_vim_plugins/dependencies.feature

@@ -36,11 +36,11 @@ Feature: Dependencies
       """
       -------- Preparing dependencies
       Checking versions...
-        Use kana/vim-textobj-user ... 0.3.12
-        Use kana/vim-vspec ... 1.1.0
+        Use kana/vim-textobj-user ... 0\.\d+(\.\d+)?
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
       Deploying plugins...
-        kana/vim-textobj-user 0.3.12 ... done
-        kana/vim-vspec 1.1.0 ... done
+        kana/vim-textobj-user 0\.\d+(\.\d+)? ... done
+        kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
       Files=0, Tests=0,  \d+ wallclock secs .*
@@ -50,10 +50,10 @@ Feature: Dependencies
       Files=1, Tests=1,  \d+ wallclock secs .*
       Result: PASS
       """
-    And a lockfile is created with:
+    And a lockfile is created and matches with:
       """
-      kana/vim-textobj-user (0.3.12)
-      kana/vim-vspec (1.1.0)
+      kana/vim-textobj-user \(0\.\d+(\.\d+)?\)
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
       """
     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"

data/features/testing_vim_plugins/failures.feature

@@ -29,18 +29,18 @@ Feature: Failures
       """
       -------- Preparing dependencies
       Checking versions...
-        Use kana/vim-vspec ... 1.1.0
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
       Deploying plugins...
-        kana/vim-vspec 1.1.0 ... done
+        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\r
-      # Expected g:foo == 5\r
-      #       Actual value: 3\r
-      #     Expected value: 5\r
+      not ok 1 - g:foo is equal to 5
+      # Expected g:foo == 5
+      #       Actual value: 3
+      #     Expected value: 5
       Failed 1/1 subtests 
 
       Test Summary Report
@@ -54,8 +54,8 @@ Feature: Failures
       """
       :in `test':
       """
-    And a lockfile with:
+    And a lockfile is created and matches with:
       """
-      kana/vim-vspec (1.1.0)
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
       """
     And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"

data/features/testing_vim_plugins/specifying_test_scripts.feature

@@ -0,0 +1,57 @@
+Feature: Specifying test scripts
+  In order to run test scripts not in the standard `t` directory,
+  As a lazy Vim user,
+  I want to specify test scripts to be run,
+  like `vim-flavor test FILES-OR-DIRECTOREIS`.
+
+  Background:
+    Given a repository "kana/vim-vspec" from offline cache
+
+  Scenario: Running test scripts in non-standard location
+    Given a flavorfile with:
+      """ruby
+      # No dependency
+      """
+    And a file named "plugin/foo.vim" with:
+      """vim
+      let g:foo = 3
+      """
+    And a file named "spec/basics.vim" with:
+      """vim
+      runtime! plugin/foo.vim
+      describe 'g:foo'
+        it 'is equal to 3'
+          Expect g:foo == 3
+        end
+      end
+      """
+    And an executable file named "spec/sh.t" with:
+      """bash
+      #!/bin/bash
+      echo 'ok 1'
+      echo '1..1'
+      """
+    When I run `vim-flavor test spec`
+    Then it should pass with regexp:
+      """
+      -------- Preparing dependencies
+      Checking versions...
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
+      Deploying plugins...
+        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
+      All tests successful.
+      Files=1, Tests=1,  \d+ wallclock secs .*
+      Result: PASS
+      """
+    And a lockfile is created and matches with:
+      """
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
+      """
+    And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"

data/features/testing_vim_plugins/typical_usage.feature

@@ -38,9 +38,9 @@ Feature: Typical usage
       """
       -------- Preparing dependencies
       Checking versions...
-        Use kana/vim-vspec ... 1.1.0
+        Use kana/vim-vspec ... 1\.\d+(\.\d+)?
       Deploying plugins...
-        kana/vim-vspec 1.1.0 ... done
+        kana/vim-vspec 1\.\d+(\.\d+)? ... done
       Completed.
       -------- Testing a Vim plugin
       t/sh.t .. ok
@@ -52,8 +52,8 @@ Feature: Typical usage
       Files=1, Tests=1,  \d+ wallclock secs .*
       Result: PASS
       """
-    And a lockfile is created with:
+    And a lockfile is created and matches with:
       """
-      kana/vim-vspec (1.1.0)
+      kana/vim-vspec \(1\.\d+(\.\d+)?\)
       """
     And a dependency "kana/vim-vspec" is stored in ".vim-flavor/deps"

data/lib/vim-flavor/cli.rb

@@ -25,9 +25,10 @@ module Vim
         )
       end
 
-      desc 'test', 'Test a Vim plugin in the current working directory.'
-      def test
-        Facade.new().test()
+      desc 'test [FILES or DIRS]',
+        'Test a Vim plugin in the current working directory.'
+      def test(*files_or_dirs)
+        Facade.new().test(files_or_dirs)
       end
 
       desc 'version', 'Show the current version.'
@@ -37,7 +38,7 @@ module Vim
 
       no_tasks do
         def default_vimfiles_path
-          ENV['HOME'].to_vimfiles_path
+          Env::home.to_vimfiles_path
         end
       end
 

data/lib/vim-flavor/env.rb

@@ -0,0 +1,26 @@
+module Vim
+  module Flavor
+    class Env
+      class << self
+        def home
+          @home ||=
+            ENV['VIM_FLAVOR_HOME'] ||
+            ENV['HOME']
+        end
+
+        def github_uri_prefix
+          @github_uri_prefix ||=
+            ENV['VIM_FLAVOR_GITHUB_URI_PREFIX'] ||
+            'git://github.com/'
+        end
+
+        def github_uri_suffix
+          @github_uri_suffix ||=
+            ENV['VIM_FLAVOR_GITHUB_URI_SUFFIX'] ||
+            '.git'
+        end
+      end
+    end
+  end
+end
+

data/lib/vim-flavor/facade.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'shellwords'
 
 module Vim
   module Flavor
@@ -11,7 +12,7 @@ module Vim
         install_or_upgrade(:upgrade, vimfiles_path)
       end
 
-      def test()
+      def test(files_or_dirs)
         trace "-------- Preparing dependencies\n"
 
         flavorfile = FlavorFile.load_or_new(Dir.getwd().to_flavorfile_path)
@@ -36,9 +37,10 @@ module Vim
           "#{deps_path}/#{f.repo_name.zap}"
         }
         succeeded = system %Q{
-          prove --ext '.t' #{prove_options} &&
+          prove --ext '.t' #{prove_options} #{files_or_dirs.shelljoin} &&
           prove --ext '.vim' #{prove_options} \
-            --exec '#{vspec} #{Dir.getwd()} #{plugin_paths.join(' ')}'
+            --exec '#{vspec} #{Dir.getwd()} #{plugin_paths.join(' ')}' \
+             #{files_or_dirs.shelljoin}
         }
         exit(1) unless succeeded
       end

data/lib/vim-flavor/flavor.rb

@@ -35,7 +35,7 @@ module Vim
 
       def cached_repo_path
         @cached_repo_path ||=
-          "#{ENV['HOME'].to_stash_path}/repos/#{@repo_name.zap}"
+          "#{Env::home.to_stash_path}/repos/#{@repo_name.zap}"
       end
 
       def make_deployment_path(flavors_path)
@@ -43,9 +43,7 @@ module Vim
       end
 
       def self.github_repo_uri(user, repo)
-        p = (ENV['VIM_FLAVOR_GITHUB_URI_PREFIX'] ||= 'git://github.com/')
-        s = (ENV['VIM_FLAVOR_GITHUB_URI_SUFFIX'] ||= '.git')
-        "#{p}#{user}/#{repo}#{s}"
+        "#{Env::github_uri_prefix}#{user}/#{repo}#{Env::github_uri_suffix}"
       end
 
       def repo_uri

data/lib/vim-flavor/version.rb

@@ -1,6 +1,6 @@
 module Vim
   module Flavor
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
 
     class Version < Gem::Version
       attr_accessor :original_tag_name
@@ -11,7 +11,7 @@ module Vim
       end
 
       def self.normalize_tag_name(tag_name)
-        tag_name.sub(/^v/, '')
+        tag_name.to_s.sub(/^v/, '')
       end
 
       def self.correct?(tag_name)

data/lib/vim-flavor.rb

@@ -5,6 +5,7 @@ module Vim
   module Flavor
     [
       :CLI,
+      :Env,
       :Facade,
       :Flavor,
       :FlavorFile,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -139,6 +139,7 @@ files:
 - features/testing_vim_plugins/README.md
 - features/testing_vim_plugins/dependencies.feature
 - features/testing_vim_plugins/failures.feature
+- features/testing_vim_plugins/specifying_test_scripts.feature
 - features/testing_vim_plugins/typical_usage.feature
 - features/typical_usage/README.md
 - features/typical_usage/deploy_to_arbitrary_place.feature
@@ -151,6 +152,7 @@ files:
 - lib/vim-flavor.rb
 - lib/vim-flavor/cli.rb
 - lib/vim-flavor/enumerableextension.rb
+- lib/vim-flavor/env.rb
 - lib/vim-flavor/facade.rb
 - lib/vim-flavor/flavor.rb
 - lib/vim-flavor/flavorfile.rb
@@ -225,6 +227,7 @@ test_files:
 - features/testing_vim_plugins/README.md
 - features/testing_vim_plugins/dependencies.feature
 - features/testing_vim_plugins/failures.feature
+- features/testing_vim_plugins/specifying_test_scripts.feature
 - features/testing_vim_plugins/typical_usage.feature
 - features/typical_usage/README.md
 - features/typical_usage/deploy_to_arbitrary_place.feature