vim-flavor 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8e9b52605c8aaa5285aa081653824e1f4c0e1b
-  data.tar.gz: c300452d28a9bdebeaa480d40d85c5a641ebda59
+  metadata.gz: 230788107f3767739214c5a024592a77e548af00
+  data.tar.gz: 8cd90f9cf955a384778a8482134aef9bca326258
 SHA512:
-  metadata.gz: d4ae143d043e5426572b17b09e9d5006cbaadd7ba787fac00afcbed39b1b2c915ddff92519e5c66f48e4dbea89c4b91fec712f666c06ac1881a6b29a2571201e
-  data.tar.gz: ca4552878793038715ca13b5eb46a1641dec9d7b9b99473a103548c8380ec2fcd0cf39a09785c195c27323f6cbe9e82d1c88a539bfca1741853b7c3f62f73ae1
+  metadata.gz: 40cf56b32c21efd4bb6fd5db6e244b500dcf683e9426fec08f76ae9e2fd14cd13def4df3e19a43bda5d6c2bbfb9178c7e006bfc2a3a62bbb0f1502913525a02f
+  data.tar.gz: 4e93551f2c305ccb1dab29a6561cb17ea81787cab0db76c6dac5d994fd352d3bfbae1ea15f7af3fc13f32652e8339c3a4710355078e58b9bf1c15dbeb0065af0

data/README.md

@@ -61,7 +61,7 @@ See also
 
 ## License
 
-vim-flavor is released under the terms of so-called MIT/X license.
+vim-flavor is released under the terms of MIT license.
 See the LICENSE file for the details.
 
 

data/features/.nav

@@ -4,7 +4,7 @@
 - uninstall_vim_flavor.md (Uninstall vim-flavor)
 - typical_usage:
   - install_vim_plugins.feature
-  - upgrade_vim_plugins.feature
+  - update_vim_plugins.feature
   - uninstall_vim_plugins.feature
   - deploy_to_arbitrary_place.feature
 - command_line:
@@ -20,6 +20,6 @@
 - version_tag_format.feature
 - branches:
   - install.feature
-  - upgrade.feature
+  - update.feature
   - changing_tracking_branches.feature
   - detect_incompatible_declarations.feature

data/features/branches/{upgrade.feature → update.feature}

@@ -1,4 +1,4 @@
-Feature: Upgrade Vim plugins with specific branches
+Feature: Update Vim plugins with specific branches
   In order to try out proposed changes which are not released yet,
   as a lazy Vim user,
   I want to track the latest revision of a specific branch.
@@ -6,7 +6,7 @@ Feature: Upgrade Vim plugins with specific branches
   Background:
     Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
 
-  Scenario: Upgrade a plugin
+  Scenario: Update a plugin
     Given a flavorfile with:
       """ruby
       flavor '$foo_uri', branch: 'master'
@@ -17,7 +17,7 @@ Feature: Upgrade Vim plugins with specific branches
       $foo_uri ($foo_rev_102 at master)
       """
     And "foo" version "1.0.3" is released
-    When I run `vim-flavor upgrade`
+    When I run `vim-flavor update`
     Then it should pass with template:
       """
       Checking versions...

data/features/caching/README.md

@@ -1,4 +1,4 @@
-It would be better to install/upgrade Vim plugins as fast as possible.
+It would be better to install/update Vim plugins as fast as possible.
 Since `vim-flavor` manages Vim plugins with Git, it has to clone each plugin's
 repository at first, and it also has to fetch changes from time to time.
 But network access is typically time-consuming.

data/features/caching/basics.feature

@@ -41,8 +41,8 @@ Feature: Basics
       fatal: \S+ does not appear to be a git repository
       """
 
-  Scenario: Upgrading plugins
-    When I run `vim-flavor upgrade`
+  Scenario: Updating plugins
+    When I run `vim-flavor update`
     Then it should fail with regexp:
       """
       fatal: \S+ does not appear to be a git repository

data/features/news.md

@@ -1,3 +1,16 @@
+## vim-flavor 2.1.0
+
+### Feature additions
+
+* `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
 
 ### Feature additions

data/features/resolve_dependencies/upgrade_outdated_dependencies.feature

@@ -1,7 +1,7 @@
-Feature: Upgrade outdated dependencies of Vim plugins
+Feature: Update outdated dependencies of Vim plugins
   In order to smoothly install Vim plugins,
   as a lazy Vim user,
-  I want to automatically upgrade outdated dependencies of Vim plugins.
+  I want to automatically update outdated dependencies of Vim plugins.
 
   Scenario: Some plugins use outdated dependencies
     Given a repository "L" with versions "0.1 0.2 0.3 0.4"

data/features/step_definitions/cli_steps.rb

@@ -9,3 +9,9 @@ end
 Then /^it should (pass|fail) with template:$/ do |pass_fail, template|
   self.__send__("assert_#{pass_fail}ing_with", expand(template))
 end
+
+When /^I run `(.*)` \(variables expanded\)$/ do |command|
+  steps %Q{
+    When I run `#{expand(command)}`
+  }
+end

data/features/typical_usage/README.md

@@ -8,7 +8,7 @@ following:
 2. Copy source tree in the package into `~/.vim` etc.
 3. Generate the help tags file for the plugin.
 
-It is also exciting to upgrade favorite Vim plugins to the latest version,
+It is also exciting to update favorite Vim plugins to the latest version,
 but I don't want to repeat the steps for each plugin.  It's boring.
 
 Some plugins depend on other plugins, so that I have to install also

data/features/typical_usage/update_vim_plugins.feature

@@ -0,0 +1,88 @@
+@typical_usage
+Feature: Update Vim plugins
+  In order to automate boring steps,
+  as a lazy Vim user,
+  I want to use a declarative way to update my favorite Vim plugins.
+
+  Background:
+    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
+    Given a repository "bar" with versions "1.0.0 1.0.1 1.0.2"
+    Given a repository "baz" with versions "1.0.0 1.0.1 1.0.2"
+
+  Scenario: Update all plugins
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      flavor '$bar_uri'
+      flavor '$baz_uri'
+      """
+    And a lockfile with:
+      """
+      $bar_uri (1.0.0)
+      $baz_uri (1.0.0)
+      $foo_uri (1.0.0)
+      """
+    When I run `vim-flavor update`
+    Then it should pass
+    And the lockfile is updated with:
+      """
+      $bar_uri (1.0.2)
+      $baz_uri (1.0.2)
+      $foo_uri (1.0.2)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "1.0.2" is deployed to "$home/.vim"
+    And a flavor "$baz_uri" version "1.0.2" is deployed to "$home/.vim"
+
+  Scenario: Update specific plugins
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      flavor '$bar_uri'
+      flavor '$baz_uri'
+      """
+    And a lockfile with:
+      """
+      $bar_uri (1.0.0)
+      $baz_uri (1.0.0)
+      $foo_uri (1.0.0)
+      """
+    When I run `vim-flavor update $foo_uri $baz_uri` (variables expanded)
+    Then it should pass
+    And the lockfile is updated with:
+      """
+      $bar_uri (1.0.0)
+      $baz_uri (1.0.2)
+      $foo_uri (1.0.2)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "1.0.0" is deployed to "$home/.vim"
+    And a flavor "$baz_uri" version "1.0.2" is deployed to "$home/.vim"
+
+  Scenario: Update by "upgrade", an alias of "update" for backward compatibility
+    Given a flavorfile with:
+      """ruby
+      flavor '$foo_uri'
+      flavor '$bar_uri'
+      flavor '$baz_uri'
+      """
+    And a lockfile with:
+      """
+      $bar_uri (1.0.0)
+      $baz_uri (1.0.0)
+      $foo_uri (1.0.0)
+      """
+    When I run `vim-flavor upgrade`
+    Then it should pass
+    And the lockfile is updated with:
+      """
+      $bar_uri (1.0.2)
+      $baz_uri (1.0.2)
+      $foo_uri (1.0.2)
+      """
+    And a bootstrap script is created in "$home/.vim"
+    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"
+    And a flavor "$bar_uri" version "1.0.2" is deployed to "$home/.vim"
+    And a flavor "$baz_uri" version "1.0.2" is deployed to "$home/.vim"

data/lib/vim-flavor/cli.rb

@@ -17,14 +17,23 @@ module Vim
         )
       end
 
-      desc 'upgrade', 'Upgrade Vim plugins according to VimFlavor file.'
+      desc 'update [REPO_NAME...]',
+        'Update Vim plugins according to VimFlavor file.'
       common_options_to_deploy
-      def upgrade
-        Facade.new().upgrade(
-          options[:vimfiles_path] || default_vimfiles_path
+      def update(*repo_names)
+        Facade.new().update(
+          options[:vimfiles_path] || default_vimfiles_path,
+          repo_names
         )
       end
 
+      desc 'upgrade [REPO_NAME...]',
+        'Update Vim plugins.  (alias of "update")'
+      common_options_to_deploy
+      def upgrade(*repo_names)
+        update(*repo_names)
+      end
+
       desc 'test [FILES or DIRS]',
         'Test a Vim plugin in the current working directory.'
       def test(*files_or_dirs)

data/lib/vim-flavor/facade.rb

@@ -4,12 +4,17 @@ require 'shellwords'
 module Vim
   module Flavor
     class Facade
+      def initialize
+        @target_repo_names = []
+      end
+
       def install(vimfiles_path)
-        install_or_upgrade(:install, vimfiles_path)
+        install_or_update(:install, vimfiles_path)
       end
 
-      def upgrade(vimfiles_path)
-        install_or_upgrade(:upgrade, vimfiles_path)
+      def update(vimfiles_path, target_repo_names)
+        @target_repo_names = target_repo_names
+        install_or_update(:update, vimfiles_path)
       end
 
       def test(files_or_dirs)
@@ -55,7 +60,7 @@ module Vim
         exit(1) unless succeeded
       end
 
-      def install_or_upgrade(mode, vimfiles_path)
+      def install_or_update(mode, vimfiles_path)
         flavorfile = FlavorFile.load(Dir.getwd().to_flavorfile_path)
         lockfile = LockFile.load_or_new(Dir.getwd().to_lockfile_path)
         refresh_flavors(
@@ -87,8 +92,8 @@ module Vim
         trace "Completed.\n"
       end
 
-      def complete(current_flavor_table, locked_flavor_table, mode, level = 1)
-        nfs = complete_flavors(current_flavor_table, locked_flavor_table, mode, level, 'you')
+      def complete(current_flavor_table, locked_flavor_table, mode)
+        nfs = complete_flavors(current_flavor_table, locked_flavor_table, mode, 1, 'you')
 
         Hash[
           nfs.group_by {|nf| nf.repo_name}.map {|repo_name, nfg|
@@ -141,13 +146,22 @@ module Vim
           complete_a_flavor_dependencies(nf, locked_flavor_table, mode, level)
       end
 
+      def effective_mode(mode, repo_name)
+        return :install if
+          mode == :update and
+          not @target_repo_names.empty? and
+          not @target_repo_names.member?(repo_name)
+        mode
+      end
+
       def complete_a_flavor_itself(nf, lf, mode, level, requirer)
         trace "#{'  ' * level}Use #{nf.repo_name} ..."
 
         already_cached = nf.cached?
         nf.clone() unless already_cached
 
-        if mode == :install and lf and nf.satisfied_with?(lf.locked_version)
+        e_mode = effective_mode(mode, nf.repo_name)
+        if e_mode == :install and lf and nf.satisfied_with?(lf.locked_version)
           if not nf.cached_version?(lf.locked_version)
             nf.fetch()
             if not nf.cached_version?(lf.locked_version)

data/lib/vim-flavor/version.rb

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

data/vim-flavor.gemspec

@@ -1,25 +1,28 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/vim-flavor/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vim-flavor/version'
 
-Gem::Specification.new do |gem|
-  gem.authors       = ['Kana Natsuno']
-  gem.email         = ['dev@whileimautomaton.net']
-  gem.summary       = %q{A tool to manage your favorite Vim plugins}
-  gem.description   = gem.summary
-  gem.homepage      = 'https://github.com/kana/vim-flavor'
+Gem::Specification.new do |spec|
+  spec.name          = 'vim-flavor'
+  spec.version       = Vim::Flavor::VERSION
+  spec.authors       = ['Kana Natsuno']
+  spec.email         = ['dev@whileimautomaton.net']
+  spec.summary       = %q{A tool to manage your favorite Vim plugins}
+  spec.description   = spec.summary
+  spec.homepage      = 'https://github.com/kana/vim-flavor'
+  spec.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split(/\n/).map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split(/\n/)
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split(/\n/)
-  gem.name          = 'vim-flavor'
-  gem.require_paths = ['lib']
-  gem.version       = Vim::Flavor::VERSION
+  spec.files         = `git ls-files -z`.split("\x0")
+  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']
 
-  gem.add_dependency('parslet', '~> 1.0')
-  gem.add_dependency('thor', '~> 0.14')
+  spec.add_dependency('parslet', '~> 1.0')
+  spec.add_dependency('thor', '~> 0.14')
 
-  gem.add_development_dependency('aruba', '~> 0.5')
-  gem.add_development_dependency('cucumber', '~> 1.2')
-  gem.add_development_dependency('pry')
-  gem.add_development_dependency('rspec', '~> 2.8')
+  spec.add_development_dependency('aruba', '~> 0.5')
+  spec.add_development_dependency('cucumber', '~> 1.2')
+  spec.add_development_dependency('pry')
+  spec.add_development_dependency('rspec', '~> 2.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vim-flavor
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kana Natsuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -117,7 +117,7 @@ files:
 - features/branches/changing_tracking_branches.feature
 - features/branches/detect_incompatible_declarations.feature
 - features/branches/install.feature
-- features/branches/upgrade.feature
+- features/branches/update.feature
 - features/caching/README.md
 - features/caching/basics.feature
 - features/caching/deployment.feature
@@ -155,7 +155,7 @@ files:
 - features/typical_usage/deploy_to_arbitrary_place.feature
 - features/typical_usage/install_vim_plugins.feature
 - features/typical_usage/uninstall_vim_plugins.feature
-- features/typical_usage/upgrade_vim_plugins.feature
+- features/typical_usage/update_vim_plugins.feature
 - features/uninstall_vim_flavor.md
 - features/version_lock.feature
 - features/version_tag_format.feature
@@ -187,7 +187,8 @@ files:
 - spec/versionconstraint_spec.rb
 - vim-flavor.gemspec
 homepage: https://github.com/kana/vim-flavor
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -210,12 +211,13 @@ signing_key:
 specification_version: 4
 summary: A tool to manage your favorite Vim plugins
 test_files:
+- features/.nav
 - features/README.md
 - features/branches/README.md
 - features/branches/changing_tracking_branches.feature
 - features/branches/detect_incompatible_declarations.feature
 - features/branches/install.feature
-- features/branches/upgrade.feature
+- features/branches/update.feature
 - features/caching/README.md
 - features/caching/basics.feature
 - features/caching/deployment.feature
@@ -253,7 +255,7 @@ test_files:
 - features/typical_usage/deploy_to_arbitrary_place.feature
 - features/typical_usage/install_vim_plugins.feature
 - features/typical_usage/uninstall_vim_plugins.feature
-- features/typical_usage/upgrade_vim_plugins.feature
+- features/typical_usage/update_vim_plugins.feature
 - features/uninstall_vim_flavor.md
 - features/version_lock.feature
 - features/version_tag_format.feature

data/features/typical_usage/upgrade_vim_plugins.feature

@@ -1,26 +0,0 @@
-@typical_usage
-Feature: Upgrade Vim plugins
-  In order to automate boring steps,
-  as a lazy Vim user,
-  I want to use a declarative way to upgrade my favorite Vim plugins.
-
-  Background:
-    Given a repository "foo" with versions "1.0.0 1.0.1 1.0.2"
-
-  Scenario: Upgrade with lockfile
-    Given a flavorfile with:
-      """ruby
-      flavor '$foo_uri'
-      """
-    And a lockfile with:
-      """
-      $foo_uri (1.0.0)
-      """
-    When I run `vim-flavor upgrade`
-    Then it should pass
-    And the lockfile is updated with:
-      """
-      $foo_uri (1.0.2)
-      """
-    And a bootstrap script is created in "$home/.vim"
-    And a flavor "$foo_uri" version "1.0.2" is deployed to "$home/.vim"