infect 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9954bd5a373cc6a42f6fb4c0ac0474feafe9d8e9
-  data.tar.gz: 2727006e4ad2ee6ff29a27cb395f03342d5f8790
+  metadata.gz: 27f2905781c72059e8fffaaae72dddb511fda306
+  data.tar.gz: '0585f4046b6b476cfe198509d333b507ea909784'
 SHA512:
-  metadata.gz: 79c54e4f1692467ca425666f6de7bc6d7b9b5a2486e8f6abb2e513e3d83dc68767bfc6abfd83633524c8119ba6e3c623562c9719c712d245bf4ebe17fe85d248
-  data.tar.gz: 7039ce9fe5e4ad685a748d85470526c1ae92d6efd0356aa8fb5fe0a9b09e5fee4801a05b4faac29d7796a47af6a15259fda791cecc5181193af25204a84c8807
+  metadata.gz: c731ee5a480c727c6e24c4d10f10b2e7ac1b1dbca047b626ac65df357098fc7bf9feabb73b7300213640397ef9f2bd4abb823df601a4698e87a128c49f048981
+  data.tar.gz: 8953da79d7386f789e63dcb5a2c072ce55c121a943d936926e51f215661e1739397d1799934e2c0ba7c3c92a87eefeb45ab246a69fc9b99b362ebab13198260c

data/Gemfile.lock

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

data/README.md

@@ -56,7 +56,7 @@ Some plugins have binaries that need to be compiled, and infect can automaticall
 
 Packages are collections of plugins. Introduced in Vim 8, they provide a way to combine a number of plugins together and have Vim load them for you. One of the nice upsides to this is you don't need any external plugin manager to be able to load plugin bundles, just have to put them in the right folder.
 
-Infect will do this for you. If you declare a 'plugin`, infect will put that in the `default` package's `start` directory. That will cause it to automatically be loaded when vim is started.
+Infect will do this for you. If you declare a `plugin`, infect will put that in the default package called `plugins`. That will cause it to automatically be loaded when vim is started.
 
 ## Loading automatically or optionally
 
@@ -66,9 +66,9 @@ According to Vim docs:
 ones under "pack/foo/start".  See |pack-add| below for how the "opt" directory
 is used.
 
-This means you have to call `:packadd` to load any optional plugins. This can be hanyd if you don't want to proactivly load up some plugins.
+This means you have to call `:packadd` to load any optional plugins. This can be handy if you don't want to proactively load up some plugins.
 
-Tell vim to only load trailertrash when requested:
+Tell vim to only load Trailer Trash when requested:
 
     "=plugin csexton/trailertrash.vim load: opt
 

data/bin/infect

@@ -1,4 +1,21 @@
 #!/usr/bin/env ruby
 require "#{File.dirname(__FILE__)}/../lib/infect"
 
+unless (ARGV & %w[-v --version]).empty?
+  puts "infect version #{Infect::VERSION}"
+  exit 0
+end
+
+unless (ARGV & %w[-h --help]).empty?
+  puts "Command line tool for installing packages for Vim"
+  puts "Usage: infect [options]"
+  puts "Options:"
+  puts "    -f            Force removal of old packages without prompting"
+  puts "    -v/--version  Print the version"
+  puts "    -h/--help     Print this message"
+  puts ""
+  puts "See https://github.com/csexton/infect for instructions"
+  exit 0
+end
+
 Infect::Runner.call(*ARGV)

data/lib/infect/command/plugin.rb

@@ -28,8 +28,7 @@ module Infect
       def update
         notice "Updating #{name}..."
         chdir location
-        git "fetch"
-        git "checkout master"
+        git "pull"
       end
 
       def call

data/lib/infect/runner.rb

@@ -6,7 +6,7 @@ module Infect
 
   class Runner
     def self.call(*args)
-      self.new.call(args)
+      self.new.call(*args)
     end
 
     def call(*args)

data/lib/infect/version.rb

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

data/spec/runner_spec.rb

@@ -18,7 +18,7 @@ describe Infect::Runner do
 
     Infect::Command.stub(:builder)
     Infect::Command.should_receive(:build).with("bundle", "NoParams", {})
-    Infect::Runner.call
+    Infect::Runner.call("-f")
   end
 
   it "reads bundle command" do
@@ -27,7 +27,7 @@ describe Infect::Runner do
 
     Infect::Command.stub(:builder)
     Infect::Command.should_receive(:build).with("bundle", "ExtraParams", {param1:"val1", param2:"val2"})
-    Infect::Runner.call
+    Infect::Runner.call("-f")
   end
 
 

data/standalone/infect

@@ -7,7 +7,7 @@
 #
 
 module Infect
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
 
 require 'open-uri'
@@ -74,11 +74,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"
@@ -97,8 +99,7 @@ module Infect
       def update
         notice "Updating #{name}..."
         chdir location
-        git "fetch"
-        git "checkout master"
+        git "pull"
       end
 
       def call
@@ -178,7 +179,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}"
@@ -206,6 +207,18 @@ module Infect
       end
     end
 
+    private
+
+    def install_paths
+
+      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
 
@@ -216,7 +229,7 @@ module Infect
 
   class Runner
     def self.call(*args)
-      self.new.call(args)
+      self.new.call(*args)
     end
 
     def call(*args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infect
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Christopher Sexton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Asset Pipeline for Vim and Pathogen, install vim bundles included in your