vimpk 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7dead9ffe26e414571f4abe1cefd9f4062c7d371fb2a04659c05387af8c5bd
-  data.tar.gz: 249aad7c6ef651efed1ad2a449a79f0cffdd386973750209a2ff312ebba081e0
+  metadata.gz: 1fb0dfb2236f49356b5b50889c8f063c70952ba85fce011400943acc449ca8c5
+  data.tar.gz: 513194b7c2e2bc8b3a3c48393addf328f10834f53568721673484fcd9569343c
 SHA512:
-  metadata.gz: 806ad154df6624026c2055b08290fc300b544df9c8c68873cfadeb81099ec52a714519ac35e690ce2b686bbe541317b28d4ecfd11aeb47d75ef81af30e836378
-  data.tar.gz: a3d1730a8cb5f1e54f7e26bc991e2263aace1d563610f3259f78acbe96c3c484a3b9d6d86fa2ab5a8ca7fe6c1cbe6f1c3f0758ebd829f4e91f7723409e539167
+  metadata.gz: a2c7c9684d5d750c00f31f314d0fe80f3f1cfa6bfa9bcfb135ea39880bd1b2b9ffba8d790550ca563ba74290992f47c77e9b23c20838e82bab21c712a416e95e
+  data.tar.gz: c56b63a7ad96710c7b6fc76a71ba69db43b99d4cba37b12c8a5f60c98dbe9e227556b1a97e6cefa194b29ce8482ea69ec815b3c29a67bcedcbf83b4c688b304a

data/exe/vimpk

@@ -4,4 +4,4 @@ $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "vimpk"
 
-VimPK::CLI.start(ARGV)
+VimPK::CLI.new(ARGV).call

data/lib/vimpk/cli.rb

@@ -2,8 +2,112 @@
 
 module VimPK
   class CLI
-    def self.start(args)
-      VimPK::Update.run
+    include Colorizer
+
+    attr_reader :command
+
+    def initialize(argv)
+      @argv = argv
+      @parser = Options.new(argv)
+      @options = @parser.parse
+      @command = determine_command
+    rescue OptionParser::MissingArgument, OptionParser::InvalidOption => e
+      puts e.message
+      abort("Use --help for usage information")
+    end
+
+    def call
+      if @command
+        send(@command, *@argv)
+      else
+        puts @parser.parser
+      end
+    end
+
+    def determine_command
+      return nil if @argv.empty?
+
+      name = @argv.shift&.downcase
+      case name
+      when "i", "install"
+        :install_command
+      when "u", "update"
+        :update_command
+      when "rm", "remove"
+        :remove_command
+      else
+        raise ArgumentError, "Unknown command: #{name}"
+      end
+    end
+
+    def install_command(package = nil)
+      time = Time.now
+      install = Install.new(package, @options[:path], @options[:pack], @options[:type])
+      puts "Installing #{package} to #{install.dest}…"
+      install.call
+      puts colorize("Installed #{package} to #{install.dest}. Took #{Time.now - time} seconds.", color: :green)
+    rescue Git::GitError => e
+      puts colorize("Error: #{e.message}", color: :red)
+      abort e.output.lines.map { |line| "  #{line}" }.join
+    rescue Install::PackageExistsError => e
+      puts colorize("Error: #{e.message}", color: :red)
+    rescue ArgumentError => e
+      puts colorize("Error: #{e.message}", color: :red)
+    end
+
+    def update_command
+      update = Update.new(@options[:path])
+      puts "Updating #{update.plugins.size} packages in #{@options[:path]}…"
+      start_time = Time.now
+      update.call
+
+      statuses = {}
+
+      while (log = update.logs.pop)
+        basename = log[:basename]
+        statuses[basename] = log[:log]
+      end
+
+      basenames = update.plugins.map { |dir| File.basename(dir) }.sort_by(&:downcase)
+
+      max_name_length = statuses.keys.map(&:length).max
+
+      basenames.each do |basename|
+        if statuses[basename]
+          formatted_name = basename.rjust(max_name_length)
+          formatted_status = colorize("Updated!", color: :green)
+          puts "#{formatted_name}: #{formatted_status}"
+        end
+      end
+
+      if statuses.size < update.jobs.size
+        puts "The remaining #{update.jobs.size - statuses.size} plugins are up to date."
+      end
+
+      puts colorize("Finished updating #{update.jobs.size} plugins. Took #{Time.now - start_time} seconds.")
+
+      if statuses.size.nonzero?
+        print "Display diffs? (Y/n) "
+
+        answer = $stdin.getch
+
+        if answer.downcase == "y" || answer == "\r"
+          puts
+          puts "Displaying diffs…"
+
+          statuses.each do |basename, status|
+            puts status.lines.map { |line| "#{basename}: #{colorize_diff line}" }.join
+          end
+        end
+      end
+    end
+
+    def remove_command(name = nil)
+      Remove.new(name, @options[:path]).call
+
+      puts colorize("Package #{name} removed.", color: :green)
+    rescue ArgumentError, VimPK::Remove::PackageNotFound => e
+      abort colorize(e.message, color: :red)
     end
   end
 end

data/lib/vimpk/colorizer.rb

@@ -31,6 +31,10 @@ module VimPK
         "\e[31m#{text}\e[0m"
       when :blue
         "\e[34m#{text}\e[0m"
+      when :yellow
+        "\e[33m#{text}\e[0m"
+      else
+        raise ArgumentError, "Unknown color: #{color}"
       end
     end
   end

data/lib/vimpk/git.rb

@@ -0,0 +1,43 @@
+module VimPK
+  module Git
+    module_function
+
+    class GitError < StandardError
+      attr_reader :output
+
+      def initialize(message, output)
+        super(message)
+        @output = output
+      end
+    end
+
+    def branch(dir: Dir.pwd)
+      command("rev-parse --abbrev-ref HEAD", dir: dir)
+    end
+
+    def log(branch, dir: Dir.pwd)
+      command("log -p --full-diff HEAD..origin/#{branch}", dir: dir)
+    end
+
+    def fetch(branch, dir: Dir.pwd)
+      command("fetch origin #{branch}", dir: dir)
+    end
+
+    def pull(dir: Dir.pwd)
+      command("pull --rebase", dir: dir)
+    end
+
+    def clone(source, dest, dir: Dir.pwd)
+      out = command("clone #{source} #{dest}", dir: dir)
+      if $?.exitstatus != 0
+        raise GitError.new("Failed to clone #{source} to #{dest}", out)
+      end
+    end
+
+    def command(args, dir: Dir.pwd)
+      IO.popen("git -C #{dir} #{args}", dir: dir, err: [:child, :out]) do |io|
+        io.read.chomp
+      end
+    end
+  end
+end

data/lib/vimpk/install.rb

@@ -0,0 +1,25 @@
+module VimPK
+  class Install
+    include VimPK::Colorizer
+
+    PackageExistsError = Class.new(StandardError)
+
+    attr_reader :dest
+
+    def initialize(package, path, pack, type)
+      @package = package || raise(ArgumentError, "Package name is required")
+      @path = path
+      @pack = pack
+      @type = type
+      @dest = File.join(@path, @pack, @type, File.basename(@package))
+      @source = "https://github.com/#{package}.git"
+      @git = Git
+    end
+
+    def call
+      raise PackageExistsError, "Package #{@package} already exists at #{@dest}" if File.exist?(@dest)
+
+      Git.clone(@source, @dest, dir: @path)
+    end
+  end
+end

data/lib/vimpk/job.rb

@@ -1,34 +1,22 @@
 module VimPK
   class Job
-    def initialize(dir, updates, output)
+    def initialize(dir, logs)
       @dir = dir
       @basename = File.basename(dir)
-      @updates = updates
-      @output = output
+      @logs = logs
+      @git = Git
     end
 
     def call
-      branch = git("rev-parse --abbrev-ref HEAD", dir: @dir)
-      git("fetch origin #{branch}", dir: @dir)
-      log = git("log -p --full-diff HEAD..origin/#{branch}", dir: @dir)
+      branch = Git.branch(dir: @dir)
+      Git.fetch(branch, dir: @dir)
+      log = Git.log(branch, dir: @dir)
 
-      if log.empty?
-        puts("Already up to date.")
-      else
-        git("pull --rebase", dir: @dir)
-        @updates << {basename: @basename, log: log}
-        puts "Updated!"
-      end
-    end
-
-    def puts(message = "\n")
-      @output << {@basename => message}
-    end
-
-    private
+      unless log.empty?
+        @logs << {basename: @basename, log: log}
 
-    def git(command, dir:)
-      IO.popen("git -C #{dir} #{command}", dir: dir, err: [:child, :out]) { |io| io.read.chomp }
+        Git.pull(dir: @dir)
+      end
     end
   end
 end

data/lib/vimpk/options.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "optparse"
+
+module VimPK
+  class Options
+    attr_reader :options, :parser
+
+    DEFAULT_PATH = File.expand_path("~/.vim/pack").freeze
+    DEFAULT_TYPE = "start"
+    DEFAULT_PACK = "plugins"
+
+    DefaultOptions = Struct.new(:path, :pack, :type)
+
+    def initialize(argv)
+      @argv = argv
+      @options = DefaultOptions.new(DEFAULT_PATH, DEFAULT_PACK, DEFAULT_TYPE)
+
+      @parser = OptionParser.new do |parser|
+        parser.banner = "Usage: #{parser.program_name} [options] [command [options]"
+        parser.separator ""
+        parser.separator "Options:"
+
+        parser.on("--pack=PATH", String, "Name of the pack (#{DEFAULT_PACK})") do |pack|
+          @options[:pack] = pack
+        end
+
+        parser.on("--path=PATH", String, "Path to Vim's pack directory (#{DEFAULT_PATH})") do |path|
+          path = File.expand_path(path)
+          unless File.directory?(path)
+            abort("Error: #{path} is not a directory")
+          end
+          @options[:path] = path
+        end
+
+        parser.on("--opt", "Install package as an optional plugin") do
+          @options[:type] = "opt"
+        end
+
+        parser.on("--start", "Install package as a start plugin (default)") do
+          @options[:type] = "start"
+        end
+
+        parser.on("-h", "--help", "Show this help message") do
+          puts parser
+          exit
+        end
+
+        parser.on("-v", "--version", "Show version") do
+          puts VimPK::VERSION
+          exit
+        end
+
+        parser.separator ""
+        parser.separator "Commands:"
+        parser.separator "        i|install REPO/NAME [--opt|--start] [--pack=PATH] [--path=PATH] Install a package"
+        parser.separator "        u|update                                                        Update all packages"
+        parser.separator "        rm|remove NAME                                                  Remove all occurrences of a package"
+      end
+    end
+
+    def parse
+      @parser.permute!(@argv)
+      @options
+    end
+  end
+end

data/lib/vimpk/remove.rb

@@ -0,0 +1,24 @@
+require "fileutils"
+
+module VimPK
+  class Remove
+    PackageNotFound = Class.new(StandardError)
+
+    def initialize(name, path)
+      @name = name || raise(ArgumentError, "Package name is required")
+      @path = path
+    end
+
+    def call
+      glob = Dir.glob(File.join(@path, "*", "{start,opt}", @name))
+
+      if glob.empty?
+        raise PackageNotFound, "Package #{@name} not found in #{@path}."
+      else
+        glob.each do |dir|
+          FileUtils.rm_rf(dir)
+        end
+      end
+    end
+  end
+end

data/lib/vimpk/update.rb

@@ -2,71 +2,23 @@ module VimPK
   class Update
     include VimPK::Colorizer
 
-    def self.run
-      new.update
-    end
+    attr_reader :jobs, :logs, :plugins
 
-    def initialize(path = "~/.vim/pack")
-      @before = Time.now
+    def initialize(path)
       @pack_dir = File.expand_path(path)
-      @updates = Queue.new
-      @output = Queue.new
+      @logs = Queue.new
       @pool = ThreadPool.new
-      @dirs = Dir.glob(File.join(@pack_dir, "*", "{start,opt}", "*", ".git")).sort
-      @basenames = @dirs.map { |dir| File.basename(File.dirname(dir)) }
-      @longest_name = @basenames.map(&:length).max
-    end
-
-    def format_name(name)
-      name.rjust(@longest_name)
+      @plugins = Dir.glob(File.join(@pack_dir, "*", "{start,opt}", "*", ".git")).sort.map(&File.method(:dirname))
+      @jobs = []
     end
 
-    def update
-      puts "Updating #{@dirs.size} plugins in #{@pack_dir}"
-
-      jobs = @dirs.map do |git_dir|
-        plugin_dir = File.dirname(git_dir)
-        @pool.schedule Job.new(plugin_dir, @updates, @output)
+    def call
+      @jobs = @plugins.map do |dir|
+        @pool.schedule Job.new(dir, @logs)
       end
 
       @pool.shutdown
-      @output.close
-
-      while (message = @output.pop)
-        case message
-        when String
-          Kernel.puts message
-        when Hash
-          basename = message.keys.first
-          message = message.values.first
-          message = case message
-          when "Updated!" then colorize(message, color: :green)
-          when "Already up to date." then colorize(message, color: :blue)
-          else message
-          end
-          puts "#{format_name(basename)}: #{message}"
-        end
-      end
-
-      puts
-      puts colorize("Done updating #{jobs.size} plugins. Took #{Time.now - @before} seconds.")
-
-      if @updates.size.nonzero?
-        print "Display diffs? (Y/n) "
-
-        answer = $stdin.getch
-
-        if answer.downcase == "y" || answer == "\r"
-          puts
-          puts "Displaying diffs…"
-
-          @updates.size.times do
-            update = @updates.pop
-            next if update[:log].empty?
-            puts update[:log].lines.map { |line| "#{format_name(update[:basename])}: #{colorize_diff line}" }.join
-          end
-        end
-      end
+      @logs.close
     end
   end
 end

data/lib/vimpk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VimPK
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/vimpk.rb

@@ -11,8 +11,12 @@ module VimPK
   class Error < StandardError; end
 
   autoload :CLI, "vimpk/cli"
-  autoload :ThreadPool, "vimpk/thread_pool"
-  autoload :Job, "vimpk/job"
   autoload :Colorizer, "vimpk/colorizer"
+  autoload :Git, "vimpk/git"
+  autoload :Install, "vimpk/install"
+  autoload :Job, "vimpk/job"
+  autoload :Options, "vimpk/options"
+  autoload :Remove, "vimpk/remove"
+  autoload :ThreadPool, "vimpk/thread_pool"
   autoload :Update, "vimpk/update"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimpk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Usewicz
@@ -19,18 +19,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- README.md
-- Rakefile
-- Steepfile
 - exe/vimpk
 - lib/vimpk.rb
 - lib/vimpk/cli.rb
 - lib/vimpk/colorizer.rb
+- lib/vimpk/git.rb
+- lib/vimpk/install.rb
 - lib/vimpk/job.rb
+- lib/vimpk/options.rb
+- lib/vimpk/remove.rb
 - lib/vimpk/thread_pool.rb
 - lib/vimpk/update.rb
 - lib/vimpk/version.rb
-- sig/vimpk.rbs
 homepage: https://github.com/pusewicz/vimpk
 licenses:
 - MIT
@@ -39,6 +39,7 @@ metadata:
   homepage_uri: https://github.com/pusewicz/vimpk
   source_code_uri: https://github.com/pusewicz/vimpk
   changelog_uri: https://github.com/pusewicz/vimpk/blob/main/CHANGELOG.md
+  github_repo: https://github.com/pusewicz/vimpk.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -47,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/README.md

@@ -1,33 +0,0 @@
-# VimPK
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/vimpk`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-## Installation
-
-Install the gem by executing:
-
-    $ gem install vimpk
-
-## Usage
-
-To use the gem, you can run the following command:
-
-    $ vimpk
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/pusewicz/vimpk. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/pusewicz/vimpk/blob/main/CODE_OF_CONDUCT.md).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Vimpk project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/pusewicz/vimpk/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "minitest/test_task"
-
-Minitest::TestTask.create
-
-require "standard/rake"
-
-task default: %i[test standard]

data/Steepfile

@@ -1,29 +0,0 @@
-# D = Steep::Diagnostic
-#
-# target :lib do
-#   signature "sig"
-#
-#   check "lib"                       # Directory name
-#   check "Gemfile"                   # File name
-#   check "app/models/**/*.rb"        # Glob
-#   # ignore "lib/templates/*.rb"
-#
-#   # library "pathname"              # Standard libraries
-#   # library "strong_json"           # Gems
-#
-#   # configure_code_diagnostics(D::Ruby.default)      # `default` diagnostics setting (applies by default)
-#   # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
-#   # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
-#   # configure_code_diagnostics(D::Ruby.silent)       # `silent` diagnostics setting
-#   # configure_code_diagnostics do |hash|             # You can setup everything yourself
-#   #   hash[D::Ruby::NoMethod] = :information
-#   # end
-# end
-
-# target :test do
-#   signature "sig", "sig-private"
-#
-#   check "test"
-#
-#   # library "pathname"              # Standard libraries
-# end

data/sig/vimpk.rbs

@@ -1,4 +0,0 @@
-module Vimpk
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end