infect 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d75015caec374001e4358c43d235a82d35b363
-  data.tar.gz: 9e5ea3749966f1bc0650aaffb5e0861c454bb89b
+  metadata.gz: 9954bd5a373cc6a42f6fb4c0ac0474feafe9d8e9
+  data.tar.gz: 2727006e4ad2ee6ff29a27cb395f03342d5f8790
 SHA512:
-  metadata.gz: e96756c93fa19f14ee5f4b772f13d4abebb3417b8bf46cbfd577048a47fa500769e968d33188feb08f1001c6de728ece48a6f5d507b1b5d028a7ab9d196e36e9
-  data.tar.gz: d02ef3b339747ae14051c06c0a1bec0ec862125c1d3a62fb1f870b89d284e35a2d67975775d96bef742fd2bf39d942d87540401c8cede694df73ce076124d938
+  metadata.gz: 79c54e4f1692467ca425666f6de7bc6d7b9b5a2486e8f6abb2e513e3d83dc68767bfc6abfd83633524c8119ba6e3c623562c9719c712d245bf4ebe17fe85d248
+  data.tar.gz: 7039ce9fe5e4ad685a748d85470526c1ae92d6efd0356aa8fb5fe0a9b09e5fee4801a05b4faac29d7796a47af6a15259fda791cecc5181193af25204a84c8807

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infect (1.0.0)
+    infect (1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -42,4 +42,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.13.5
+   1.13.6

data/README.md

@@ -4,7 +4,7 @@ Package manager for [Vim 8](https://github.com/vim/vim/blob/master/runtime/doc/v
 
 The only package manager that makes no impact on start up time.
 
-Manage your entire vim config with a single `.vimrc` file, while keeping the vimrc file functional on systems with out any custom plugins installed, or with older versions of Vim.
+Manage your entire vim config with a single `.vimrc` file, while keeping the `.vimrc` file functional on systems with out any custom plugins installed, or with older versions of Vim.
 
 ## Installation
 
@@ -30,13 +30,13 @@ Why invent another way of managing vim plugins?
 * I was tired of managing git submodules, nor did I find it very scalable.
 * I do not want my plugin manager to **affect the start up time** of my editor.
 
-Many of the other plugins mangers are really slick, but every one I have seen has violated of of those reasons.
+Many of the other plugins mangers are really slick, but every one I have seen has violated at least one of those.
 
-I don't really want to use my editor for installing stuff. Bram said "Each program has its own task and should be good at it" and think installing bundles is better suited for a command line script.
+I don't really want to use my editor for installing stuff. Feels like it goes against the Vim philosophy. Bram said "Each program has its own task and should be good at it" and think installing things is better suited for a command line script.
 
 ## Usage
 
-Infect reads your `.vimrc` file and looks for magic comments. It uses those to install pathogen style vim bundles. A minimal `.vimrc` to use with infect might look like this:
+Infect reads your `.vimrc` file and looks for magic comments. It uses those to install vim packages and plugins. A minimal `.vimrc` to use with infect might look like this:
 
     "=plugin tpope/vim-sensible
     "=plugin csexton/trailertrash.vim
@@ -44,7 +44,7 @@ Infect reads your `.vimrc` file and looks for magic comments. It uses those to i
     syntax on
     filetype plugin indent on
 
-Just put those lines at the top of your vimrc and infect will install plugins and packages for you.
+Just put those lines at the top of your `.vimrc` and infect will install plugins and packages for you.
 
 ## Building plugins
 

data/lib/infect/cleanup.rb

@@ -9,7 +9,7 @@ module Infect
     end
 
     def call
-      Dir["#{PACK_DIR}*/*/*"].each do |path|
+      install_paths.each do |path|
         unless names.include? File.basename(path)
           if confirm(path)
             notice "Deleting #{path}"
@@ -37,5 +37,20 @@ module Infect
       end
     end
 
+    private
+
+    def install_paths
+      # Get the list of directories that plugins might be installed to, since
+      # we install legacy plugins in a special directory we want to look under
+      # that as well as in the top level `pack` directory.
+
+      default_dir = Command::Plugin::DEFAULT_DIR
+      plugins = Dir["#{PACK_DIR}#{default_dir}/*/*"]
+      packages = Dir["#{PACK_DIR}*"]
+      packages.delete("#{PACK_DIR}#{default_dir}")
+
+      plugins + packages
+    end
+
   end
 end

data/lib/infect/command/plugin.rb

@@ -3,11 +3,13 @@ require 'open3'
 module Infect
   class Command
     class Plugin < Command
+      DEFAULT_DIR = "plugins"
+
       attr_reader :build, :location, :name, :options, :url
 
       def initialize(arg, opts)
         load = opts.fetch(:load) { "start" }
-        package = opts.fetch(:package) { "default" }
+        package = opts.fetch(:package) { DEFAULT_DIR }
 
         @name = File.basename(arg)
         @url = "git@github.com:#{arg}.git"

data/lib/infect/version.rb

@@ -1,3 +1,3 @@
 module Infect
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infect
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Sexton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec