infect 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    infect (0.0.2)
+    infect (0.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.0.9)
     diff-lcs (1.1.3)
+    method_source (0.8.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -15,10 +21,12 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
+    slop (3.4.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   infect!
+  pry
   rspec

data/README.md

@@ -1,8 +1,8 @@
 # ☣ Infect
 
-Bundle manager for [pathogen](https://github.com/tpope/vim-pathogen).
+Bundle manager for [Pathogen](https://github.com/tpope/vim-pathogen).
 
-Manage your entire vim config with a single '.vimrc' file. Much the same way that [sprockets](https://github.com/sstephenson/sprockets) lets you include web assets, infect will handle install vim plugins for you.
+Manage your entire vim config with a single `.vimrc` file. Much the same way that [sprockets](https://github.com/sstephenson/sprockets) lets you include web assets, infect will handle install vim plugins for you.
 
 ## Installation
 
@@ -18,6 +18,25 @@ Or if you prefer to manage it at a gem:
 
 The point of Infect it to make it easy to manage your vim config. You should be able to check in your `.vimrc` into source control and use that one file to easily install any plugins you need.
 
+## Rationale
+
+Why invent another way of managing vim plugins?
+
+* I want to be able to use my `.vimrc` when without installing plugins.
+* I like having simple command line apps to manage my setup.
+* I wanted to use pathogen to do the loading.
+* I was tired of managing git submodules, nor did I find it very scalable.
+
+
+Vundle is really slick, much nicer now than when I used it a few years ago. But I had two main problems with it:
+
+* The `vimrc` is not usable unless vundle is installed. You will get errors on the config lines if you try to run vim with out the vundle plugin no installed. This is probably not normally a problem for most people, but I like to be able to scp my `.vimrc` to servers to get a basic configuration up there, but don't want to worry about installing the plugins.
+* Vundle was slower than pathogen to load. Not sure if this is still the case, but at one point it added a noticable delay in loading vim.
+* 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.
+
+Like I said, [Vundle](https://github.com/gmarik/vundle) is really nice, quite polished and active. Just not for me, you may want to check it out.
+
+
 ## 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 would look like this:

data/infect.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_development_dependency('rspec')
+  gem.add_development_dependency('pry')
 end

data/lib/infect/command.rb

@@ -5,10 +5,10 @@ module Infect
   class Command
     include Infect::Colorize
 
-    def self.build(command, args)
+    def self.build(command, arg ,opts)
       case command.to_sym
       when :bundle
-        Bundle.new(args)
+        Bundle.new(arg, opts)
       else
         $stderr.puts "WARNING: #{command} is not a valid command, ignorning"
       end

data/lib/infect/command/bundle.rb

@@ -2,8 +2,9 @@ module Infect
   class Command
     class Bundle < Command
       attr_reader :bundle, :name, :location
-      def initialize(args)
-        @bundle = args[0]
+      def initialize(arg, opts)
+        @bundle = arg
+        @options = opts
         @name = File.basename(bundle)
         @location = File.expand_path("#{BUNDLE_DIR}/#{name}")
       end

data/lib/infect/command/prereqs.rb

@@ -4,7 +4,7 @@ module Infect
     class Prereqs < Command
       def mkdirs(list)
         list.each do |path|
-          FileUtils.mkdir_p path
+          FileUtils.mkdir_p(File.expand_path(path))
         end
       end
       def call

data/lib/infect/runner.rb

@@ -10,10 +10,10 @@ module Infect
 
       commands = [Command::Prereqs.new()]
 
-      File.open( VIMRC ).each do |line|
+      File.open( VIMRC ).each_line do |line|
         if line =~ /^"=/
-          command, *args = line.split
-          commands << Command.build(command.gsub('"=', ''), args)
+          command, arg, opts = parse_command(line.gsub('"=', ''))
+          commands << Command.build(command, arg, opts)
         end
       end
 
@@ -24,5 +24,45 @@ module Infect
       Cleanup.new(commands, :force => force).call
 
     end
+
+    private
+
+    def self.parse_command(line)
+      # TODO: pass in named params after for things like build commands and
+      # branches
+      #
+      # "bundle BundleName build: "make -f file", branch: awesome
+      #
+      # So this will split the command into 3 parts
+      # Now we can take args and split by ',' the split those by ':' and
+      # map that to a hash that we can pass into the command builder
+
+      # This splits adn perserves "quoted words"
+      #command, *args = line.split /\s(?=(?:[^"]|"[^"]*")*$)/
+
+      #command, *args = line.split
+
+      command, arg, opts_string = line.split ' ', 3
+      [command, arg, parse_opts(opts_string)]
+    end
+
+    def self.parse_opts(string)
+      hash = {}
+      # Woah now.
+      #
+      # The first split and regex will perserver quoted strings" and split on
+      # whitespace or colons.
+      #
+      # The reject removes any duplicate empty strings that the split might
+      # create when it encounters a colon and space next to each other
+      # (something like this: ": " will do that)
+      parts = string.split(/[\s:](?=(?:[^"]|"[^"]*")*$)/).reject! { |c| c.empty? }
+      if parts
+        parts.each_slice(2) do |key, val|
+          hash[key.to_sym] = val
+        end
+      end
+      hash
+    end
   end
 end

data/lib/infect/version.rb

@@ -1,3 +1,3 @@
 module Infect
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/command_spec.rb

@@ -2,10 +2,10 @@ require "./lib/infect"
 
 describe Infect::Command do
   it "build a nil class when given a bad command" do
-    Infect::Command.build("blargl", []).should be_nil
+    Infect::Command.build("blargl", "bangle", {}).should be_nil
   end
 
   it "build a bundle command" do
-    Infect::Command.build("bundle", ["tpope/vim-pathogen"]).name.should == "vim-pathogen"
+    Infect::Command.build("bundle", "tpope/vim-pathogen", {}).name.should == "vim-pathogen"
   end
 end

data/spec/runner_spec.rb

@@ -0,0 +1,34 @@
+require "./lib/infect"
+require 'tempfile'
+require 'pry'
+require 'tmpdir'
+
+describe Infect::Runner do
+  before do
+    stub_const "Infect::VIMRC", file
+    stub_const "Infect::BUNDLE_DIR", dir
+  end
+
+  let(:file) { Tempfile.new("rspec") }
+  let(:dir) { Dir.mktmpdir }
+
+  it "reads bundle command" do
+    file.puts '"=bundle NoParams'
+    file.close
+
+    Infect::Command.stub(:builder)
+    Infect::Command.should_receive(:build).with("bundle", "NoParams", {})
+    Infect::Runner.call
+  end
+
+  it "reads bundle command" do
+    file.puts '"=bundle ExtraParams param1:val1 param2: val2'
+    file.close
+
+    Infect::Command.stub(:builder)
+    Infect::Command.should_receive(:build).with("bundle", "ExtraParams", {param1:"val1", param2:"val2"})
+    Infect::Runner.call
+  end
+
+
+end

data/spec/standalone_spec.rb

@@ -1,7 +1,4 @@
 require "./lib/infect"
 
-describe Infect::Standalone do
-debugger
-binding.pry
-
+describe 'Infect::Standalone' do
 end

data/standalone/infect

@@ -7,7 +7,7 @@
 #
 
 module Infect
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 
 require 'open-uri'
@@ -35,10 +35,10 @@ module Infect
   class Command
     include Infect::Colorize
 
-    def self.build(command, args)
+    def self.build(command, arg ,opts)
       case command.to_sym
       when :bundle
-        Bundle.new(args)
+        Bundle.new(arg, opts)
       else
         $stderr.puts "WARNING: #{command} is not a valid command, ignorning"
       end
@@ -72,8 +72,9 @@ module Infect
   class Command
     class Bundle < Command
       attr_reader :bundle, :name, :location
-      def initialize(args)
-        @bundle = args[0]
+      def initialize(arg, opts)
+        @bundle = arg
+        @options = opts
         @name = File.basename(bundle)
         @location = File.expand_path("#{BUNDLE_DIR}/#{name}")
       end
@@ -112,19 +113,21 @@ module Infect
   end
 end
 
+require 'fileutils'
 module Infect
   class Command
     class Prereqs < Command
+      def mkdirs(list)
+        list.each do |path|
+          FileUtils.mkdir_p(File.expand_path(path))
+        end
+      end
       def call
-        mkdir_p "~/.vim/bundle"
+        mkdir "~/.vim/bundle"
         if RUBY_PLATFORM =~ /darwin/
-          mkdir_p "~/Library/Vim/swap"
-          mkdir_p "~/Library/Vim/backup"
-          mkdir_p "~/Library/Vim/undo"
+          mkdirs %w(~/Library/Vim/swap ~/Library/Vim/backup ~/Library/Vim/undo)
         else
-          mkdir_p "~/.local/share/vim/swap"
-          mkdir_p "~/.local/share/vim/backup"
-          mkdir_p "~/.local/share/vim/undo"
+          mkdirs %w(~/.local/share/vim/swap ~/.local/share/vim/backup ~/.local/share/vim/undo")
         end
       end
     end
@@ -200,10 +203,10 @@ module Infect
 
       commands = [Command::Prereqs.new()]
 
-      File.open( VIMRC ).each do |line|
+      File.open( VIMRC ).each_line do |line|
         if line =~ /^"=/
-          command, *args = line.split
-          commands << Command.build(command.gsub('"=', ''), args)
+          command, arg, opts = parse_command(line.gsub('"=', ''))
+          commands << Command.build(command, arg, opts)
         end
       end
 
@@ -214,6 +217,27 @@ module Infect
       Cleanup.new(commands, :force => force).call
 
     end
+
+    private
+
+    def self.parse_command(line)
+
+
+
+      command, arg, opts_string = line.split ' ', 3
+      [command, arg, parse_opts(opts_string)]
+    end
+
+    def self.parse_opts(string)
+      hash = {}
+      parts = string.split(/[\s:](?=(?:[^"]|"[^"]*")*$)/).reject! { |c| c.empty? }
+      if parts
+        parts.each_slice(2) do |key, val|
+          hash[key.to_sym] = val
+        end
+      end
+      hash
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infect
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asset Pipeline for Pathogen.vim
 email:
 - csexton@gmail.com
@@ -54,6 +70,7 @@ files:
 - lib/infect/standalone.rb
 - lib/infect/version.rb
 - spec/command_spec.rb
+- spec/runner_spec.rb
 - spec/standalone_spec.rb
 - standalone/infect
 homepage: https://github.com/csexton/infect
@@ -83,4 +100,5 @@ summary: Asset Pipeline for Vim and Pathogen, install vim bundles included in yo
   vimrc
 test_files:
 - spec/command_spec.rb
+- spec/runner_spec.rb
 - spec/standalone_spec.rb