infect 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infect (0.0.1)
+    infect (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,32 +1,31 @@
-# Infect
+# ☣ Infect
 
-Asset Pipeline for Vim and Pathogen
+Asset Pipeline Bundler for Vim and Pathogen
 
 ## Installation
 
+Infect has no dependencies other than a recentish version of ruby. And can be installed as a standalone script, perhaps in your `~/bin` directory.
+
+    $ curl https://raw.github.com/csexton/infect/master/standalone/infect > ~/bin/infect && chmod +x ~/bin/infect
+
+Or if you prefer to manage it at a gem:
+
     $ gem install infect
 
 ## Objective
 
-The point of Infect it to make it easy to manage your vim config. You should be able to check in yoru `.vimrc` into source control and use that one file to easily install any plugins you need.
+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.
 
 ## Usage
 
-Infect reads your `.vimrc` file and looks for magic comments. It uses those to install pathogen style vim bundles.
-
-    " Include bundle:
-    "=bundle tpope/vim-pathogen
-    "=bundle tpope/vim-sensible
-    "=bundle csexton/trailertrash.vim
-
-A minimal vimrc to use with infect would look like this:
+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:
 
-    " vim bundles:
     "=bundle tpope/vim-pathogen
     "=bundle tpope/vim-sensible
     source ~/.vim/bundle/vim-pathogen/autoload/pathogen.vim
-    execute pathogen#infect()
+    execute pathogen#runtime_append_all_bundles()
     syntax on
     filetype plugin indent on
 
+Just put those lines at the top of your vimrc and infect will install pathogen and the bundles for you.
 

data/Rakefile

@@ -1,6 +1,14 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-desc "Compile infect into a single file"
-task :compile do
-  puts "yay"
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
+file "./standalone/infect" => FileList.new("lib/infect.rb", "lib/infect/*.rb") do |task|
+  $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+  require 'infect/standalone'
+  Infect::Standalone.save("./standalone/infect")
 end
+
+desc "Build standalone script"
+task :standalone => "./standalone/infect"

data/bin/infect

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-
-require 'optparse'
 require "#{File.dirname(__FILE__)}/../lib/infect"
 
-Infect.run
+Infect::Runner.call(*ARGV)

data/lib/infect.rb

@@ -1,27 +1,9 @@
 lib = File.expand_path('..', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'infect/version'
+require 'infect/colorize'
 require 'infect/command'
 require 'infect/command/bundle'
-
-module Infect
-  # Globals be global
-  VIMHOME = ENV['VIM'] || "#{ENV['HOME']}/.vim"
-  VIMRC = ENV['MYVIMRC'] || "#{ENV['HOME']}/.vimrc"
-
-
-  def self.run
-    commands = []
-
-    File.open( VIMRC ).each do |line|
-      if line =~ /^"=/
-        command, *args = line.split
-        commands << Command.build(command.gsub('"=', ''), args)
-      end
-    end
-
-    commands.compact.each do |command|
-      command.call
-    end
-  end
-end
+require 'infect/command/prereqs'
+require 'infect/cleanup'
+require 'infect/runner'

data/lib/infect/cleanup.rb

@@ -0,0 +1,57 @@
+module Infect
+  class Cleanup
+    include Infect::Colorize
+    attr_reader :commands, :force
+
+    def initialize(commands, args = {})
+      @commands = commands
+      @force = args[:force] || false
+    end
+
+    def call
+      uninstall_unless_included names
+    end
+
+    private
+
+    def uninstall_unless_included(list)
+      Dir["#{BUNDLE_DIR}/*"].each do |path|
+        unless list.include? File.basename(path)
+          if confirm(path)
+            notice "Deleting #{path}"
+            require 'fileutils'
+            FileUtils.rm_rf path
+          else
+            notice "Leaving #{path}"
+          end
+        end
+      end
+    end
+
+    def confirm(name)
+      unless force
+        print "Remove #{name}? [Yn]: "
+        response = STDIN.gets.chomp
+        case response.downcase
+        when ''
+          true
+        when 'y'
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def names
+      list = []
+      commands.each do |command|
+        if command.respond_to? :name
+          list << command.name
+        end
+      end
+      list
+    end
+
+  end
+end

data/lib/infect/colorize.rb

@@ -0,0 +1,17 @@
+require 'open-uri'
+require 'fileutils'
+
+module Infect
+  module Colorize
+    def colorize(code, str)
+      "\e[#{code}m#{str}\e[0m"
+    end
+    def notice(str)
+      puts colorize(32, str)
+    end
+    def error(str)
+      puts colorize(31, str)
+    end
+  end
+end
+

data/lib/infect/command.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 
 module Infect
   class Command
+    include Infect::Colorize
+
     def self.build(command, args)
       case command.to_sym
       when :bundle
@@ -15,8 +17,13 @@ module Infect
     protected
 
     def mkdir(path)
-      FileUtils.mkdir_p(File.expand_path(path))
+      expanded_path = File.expand_path(path)
+      unless File.directory?(expanded_path)
+        notice "Making dir #{path}"
+        FileUtils.mkdir_p(expanded_path)
+      end
     end
+
     def chdir(path)
       Dir.chdir(path)
     end
@@ -28,16 +35,5 @@ module Infect
         end
       end
     end
-
-    def colorize(code, str)
-      "\e[#{code}m#{str}\e[0m"
-    end
-    def notice(str)
-      puts colorize(32, str)
-    end
-    def error(str)
-      puts colorize(31, str)
-    end
-
   end
 end

data/lib/infect/command/bundle.rb

@@ -5,7 +5,7 @@ module Infect
       def initialize(args)
         @bundle = args[0]
         @name = File.basename(bundle)
-        @location = File.expand_path("~/.vim/bundle/#{name}")
+        @location = File.expand_path("#{BUNDLE_DIR}/#{name}")
       end
 
       def url
@@ -14,8 +14,8 @@ module Infect
 
       def install
         notice "Installing #{name}... "
-        mkdir "~/.vim/bundle"
-        chdir "#{VIMHOME}/bundle"
+        mkdir BUNDLE_DIR
+        chdir BUNDLE_DIR
         git "clone '#{url}'"
       end
 

data/lib/infect/command/prereqs.rb

@@ -0,0 +1,20 @@
+module Infect
+  class Command
+    class Prereqs < Command
+      def call
+        mkdir_p "~/.vim/bundle"
+        # create the cache directories for sensible.vim:
+        # TODO: Support Windows
+        if RUBY_PLATFORM =~ /darwin/
+          mkdir_p "~/Library/Vim/swap"
+          mkdir_p "~/Library/Vim/backup"
+          mkdir_p "~/Library/Vim/undo"
+        else
+          mkdir_p "~/.local/share/vim/swap"
+          mkdir_p "~/.local/share/vim/backup"
+          mkdir_p "~/.local/share/vim/undo"
+        end
+      end
+    end
+  end
+end

data/lib/infect/runner.rb

@@ -0,0 +1,28 @@
+module Infect
+  # Globals be global
+  VIMHOME = ENV['VIM'] || "#{ENV['HOME']}/.vim"
+  VIMRC = ENV['MYVIMRC'] || "#{ENV['HOME']}/.vimrc"
+  BUNDLE_DIR = "#{VIMHOME}/bundle"
+
+  class Runner
+    def self.call(*args)
+      force = args.include? "-f"
+
+      commands = [Command::Prereqs.new()]
+
+      File.open( VIMRC ).each do |line|
+        if line =~ /^"=/
+          command, *args = line.split
+          commands << Command.build(command.gsub('"=', ''), args)
+        end
+      end
+
+      commands.compact.each do |command|
+        command.call
+      end
+
+      Cleanup.new(commands, :force => force).call
+
+    end
+  end
+end

data/lib/infect/standalone.rb

@@ -0,0 +1,58 @@
+module Infect
+  # Inspired by https://github.com/defunkt/hub/blob/master/lib/hub/standalone.rb
+  module Standalone
+    extend self
+
+    ROOT = File.expand_path('../../..', __FILE__)
+
+    PREAMBLE = <<-preamble
+#
+# This file is generated code. DO NOT send patches for it.
+#
+# Original source files with comments are at:
+# https://github.com/csexton/infect
+#
+
+preamble
+
+    def save(filename, path = '.')
+      target = File.join(File.expand_path(path), filename)
+      File.open(target, 'w') do |f|
+        build f
+        f.chmod 0755
+      end
+    end
+
+    def build io
+      io.puts "#!#{ruby_executable}"
+      io << PREAMBLE
+
+      each_source_file do |filename|
+        File.open(filename, 'r') do |source|
+          source.each_line {|line| io << line if line !~ /^\s*#/ }
+        end
+        io.puts ''
+      end
+
+      io.puts "Infect::Runner.call(*ARGV)"
+    end
+
+    def each_source_file
+      File.open(File.join(ROOT, 'lib/infect.rb'), 'r') do |main|
+        main.each_line do |req|
+          if req =~ /^require\s+["'](.+)["']/
+            yield File.join(ROOT, 'lib', "#{$1}.rb")
+          end
+        end
+      end
+    end
+
+    def ruby_executable
+      if File.executable? '/usr/bin/ruby' then '/usr/bin/ruby'
+      else
+        require 'rbconfig'
+        File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
+      end
+    end
+  end
+end

data/lib/infect/version.rb

@@ -1,3 +1,3 @@
 module Infect
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/standalone_spec.rb

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

data/standalone/infect

@@ -0,0 +1,220 @@
+#!/usr/bin/ruby
+#
+# This file is generated code. DO NOT send patches for it.
+#
+# Original source files with comments are at:
+# https://github.com/csexton/infect
+#
+
+module Infect
+  VERSION = "0.0.3"
+end
+
+require 'open-uri'
+require 'fileutils'
+
+module Infect
+  module Colorize
+    def colorize(code, str)
+      "\e[#{code}m#{str}\e[0m"
+    end
+    def notice(str)
+      puts colorize(32, str)
+    end
+    def error(str)
+      puts colorize(31, str)
+    end
+  end
+end
+
+
+require 'open-uri'
+require 'fileutils'
+
+module Infect
+  class Command
+    include Infect::Colorize
+
+    def self.build(command, args)
+      case command.to_sym
+      when :bundle
+        Bundle.new(args)
+      else
+        $stderr.puts "WARNING: #{command} is not a valid command, ignorning"
+      end
+    end
+
+    protected
+
+    def mkdir(path)
+      expanded_path = File.expand_path(path)
+      unless File.directory?(expanded_path)
+        notice "Making dir #{path}"
+        FileUtils.mkdir_p(expanded_path)
+      end
+    end
+
+    def chdir(path)
+      Dir.chdir(path)
+    end
+
+    def download(url, path)
+      File.open(File.expand_path(path), "w") do |file|
+        open(url) do |read_file|
+          file.write(read_file.read)
+        end
+      end
+    end
+  end
+end
+
+module Infect
+  class Command
+    class Bundle < Command
+      attr_reader :bundle, :name, :location
+      def initialize(args)
+        @bundle = args[0]
+        @name = File.basename(bundle)
+        @location = File.expand_path("#{BUNDLE_DIR}/#{name}")
+      end
+
+      def url
+        "git@github.com:#{bundle}.git"
+      end
+
+      def install
+        notice "Installing #{name}... "
+        mkdir BUNDLE_DIR
+        chdir BUNDLE_DIR
+        git "clone '#{url}'"
+      end
+
+      def update
+        notice "Updating #{name}... "
+        chdir @location
+        git "pull"
+      end
+
+      def call
+        if File.exists? @location
+          update
+        else
+          install
+        end
+      end
+
+      private
+
+      def git(args)
+        `git #{args}`
+      end
+    end
+  end
+end
+
+module Infect
+  class Command
+    class Prereqs < Command
+      def call
+        mkdir_p "~/.vim/bundle"
+        if RUBY_PLATFORM =~ /darwin/
+          mkdir_p "~/Library/Vim/swap"
+          mkdir_p "~/Library/Vim/backup"
+          mkdir_p "~/Library/Vim/undo"
+        else
+          mkdir_p "~/.local/share/vim/swap"
+          mkdir_p "~/.local/share/vim/backup"
+          mkdir_p "~/.local/share/vim/undo"
+        end
+      end
+    end
+  end
+end
+
+module Infect
+  class Cleanup
+    include Infect::Colorize
+    attr_reader :commands, :force
+
+    def initialize(commands, args = {})
+      @commands = commands
+      @force = args[:force] || false
+    end
+
+    def call
+      uninstall_unless_included names
+    end
+
+    private
+
+    def uninstall_unless_included(list)
+      Dir["#{BUNDLE_DIR}/*"].each do |path|
+        unless list.include? File.basename(path)
+          if confirm(path)
+            notice "Deleting #{path}"
+            require 'fileutils'
+            FileUtils.rm_rf path
+          else
+            notice "Leaving #{path}"
+          end
+        end
+      end
+    end
+
+    def confirm(name)
+      unless force
+        print "Remove #{name}? [Yn]: "
+        response = STDIN.gets.chomp
+        case response.downcase
+        when ''
+          true
+        when 'y'
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def names
+      list = []
+      commands.each do |command|
+        if command.respond_to? :name
+          list << command.name
+        end
+      end
+      list
+    end
+
+  end
+end
+
+module Infect
+  VIMHOME = ENV['VIM'] || "#{ENV['HOME']}/.vim"
+  VIMRC = ENV['MYVIMRC'] || "#{ENV['HOME']}/.vimrc"
+  BUNDLE_DIR = "#{VIMHOME}/bundle"
+
+  class Runner
+    def self.call(*args)
+      force = args.include? "-f"
+
+      commands = [Command::Prereqs.new()]
+
+      File.open( VIMRC ).each do |line|
+        if line =~ /^"=/
+          command, *args = line.split
+          commands << Command.build(command.gsub('"=', ''), args)
+        end
+      end
+
+      commands.compact.each do |command|
+        command.call
+      end
+
+      Cleanup.new(commands, :force => force).call
+
+    end
+  end
+end
+
+Infect::Runner.call(*ARGV)

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: infect
 version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
 authors:
 - Christopher Sexton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Asset Pipeline for Pathogen.vim
 email:
 - csexton@gmail.com
@@ -45,10 +45,17 @@ files:
 - bin/infect
 - infect.gemspec
 - lib/infect.rb
+- lib/infect/cleanup.rb
+- lib/infect/colorize.rb
 - lib/infect/command.rb
 - lib/infect/command/bundle.rb
+- lib/infect/command/prereqs.rb
+- lib/infect/runner.rb
+- lib/infect/standalone.rb
 - lib/infect/version.rb
 - spec/command_spec.rb
+- spec/standalone_spec.rb
+- standalone/infect
 homepage: https://github.com/csexton/infect
 licenses: []
 post_install_message: 
@@ -56,23 +63,24 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Asset Pipeline for Vim and Pathogen, install vim bundles included in your
   vimrc
 test_files:
 - spec/command_spec.rb
+- spec/standalone_spec.rb