vimpk 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3352cab20c957f4b4fc580b6d9f2f0c91d0021cac3713ab6294111192ce5167d
-  data.tar.gz: 1044a2130c51433400d29c970be3e841d86469ab7dd5ddfeab615b3115a88626
+  metadata.gz: c1ddacdbd87289382f61dff2859903c4091456cd64ace528029ad8e497d12b0e
+  data.tar.gz: 72186f79e1e2fd67ff630d658fc6540410954cd18924d2756fec039b8adbedfa
 SHA512:
-  metadata.gz: 31a0432618e7f85059b10d25b7aa2034ed18bf64b077b04665e08ae8f216402a8195a343ea53767911232af0908d7e2043e8ea3e8d234a81dbda53badac9f53f
-  data.tar.gz: 6ed9798aedf9bfd255abffe3d93acb6d9aa5e3378c2462a4be569b55b10bc40b840cf8d3242a04fcd2f61098dc99cdfcf5d6b6fd68c245163170c6dea6071453
+  metadata.gz: b89b712ec4278d72e87f10c62040251eeae5a3c8f3cd438a97b2507cb3083eb05e794935b311f08fedc453ab23d67557483e72e747d4336eb01a1ba942ca816e
+  data.tar.gz: 5b85de54d8df5318fb988e981dca5e1f502578eb9cdb1b5de505c453e9357b4ff131ad65ea4b384684f940d1526d96d71392390b8480895edaf2d2173bdeaf22

data/lib/vimpk/cli.rb

@@ -19,6 +19,7 @@ module VimPK
     def call
       if @command
         send(@command, *@argv)
+        exit 0
       else
         puts @parser.parser
       end
@@ -37,6 +38,8 @@ module VimPK
       case name
       when "i", "install"
         :install_command
+      when "l", "list"
+        :list_command
       when "mv", "move"
         :move_command
       when "u", "update"
@@ -49,43 +52,49 @@ module VimPK
       end
     end
 
+    def list_command
+      command = Commands::List.new(@options)
+      list = command.call
+      puts list.sort_by(&:downcase)
+    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)
+      command = Commands::Install.new(package, @options)
+      puts "Installing #{package} to #{command.dest}…"
+      command.call
+      puts colorize("Installed #{package} to #{command.dest}. Took #{Time.now - time} seconds.", color: :green)
     rescue Git::GitError => e
       warn colorize("Error: #{e.message}", color: :yellow)
       abort e.output.lines.map { |line| "  #{line}" }.join
-    rescue Install::PackageExistsError => e
+    rescue PackageExistsError => e
       abort colorize("Error: #{e.message}", color: :red)
     rescue ArgumentError => e
       abort colorize("Error: #{e.message}", color: :red)
     end
 
     def move_command(name = nil)
-      move = Move.new(name, @options[:path], @options[:pack], @options[:type])
-      move.call
-      puts colorize("Moved #{name} to #{move.dest}.", color: :green)
-    rescue Move::PackageNotFoundError, Move::MultiplePackagesFoundError, ArgumentError => e
+      command = Commands::Move.new(name, @options)
+      command.call
+      puts colorize("Moved #{name} to #{command.dest}.", color: :green)
+    rescue PackageNotFoundError, MultiplePackagesFoundError, ArgumentError => e
       abort colorize(e.message, color: :red)
     end
 
     def update_command
-      update = Update.new(@options[:path])
-      puts "Updating #{update.plugins.size} packages in #{@options[:path]}…"
+      command = Commands::Update.new(@options)
+      puts "Updating #{command.plugins.size} packages in #{@options[:path]}…"
       start_time = Time.now
-      update.call
+      command.call
 
       statuses = {}
 
-      while (log = update.logs.pop)
+      while (log = command.logs.pop)
         basename = log[:basename]
         statuses[basename] = log[:log]
       end
 
-      basenames = update.plugins.map { |dir| File.basename(dir) }.sort_by(&:downcase)
+      basenames = command.plugins.map { |dir| File.basename(dir) }.sort_by(&:downcase)
 
       max_name_length = statuses.keys.map(&:length).max
 
@@ -97,11 +106,11 @@ module VimPK
         end
       end
 
-      if statuses.size < update.jobs.size
-        puts "The remaining #{update.jobs.size - statuses.size} plugins are up to date."
+      if statuses.size < command.jobs.size
+        puts "The remaining #{command.jobs.size - statuses.size} plugins are up to date."
       end
 
-      puts colorize("Finished updating #{update.jobs.size} plugins. Took #{Time.now - start_time} seconds.")
+      puts colorize("Finished updating #{command.jobs.size} plugins. Took #{Time.now - start_time} seconds.")
 
       if statuses.size.nonzero?
         print "Display diffs? (Y/n) "
@@ -112,18 +121,22 @@ module VimPK
           puts
           puts "Displaying diffs…"
 
-          statuses.each do |basename, status|
-            puts status.lines.map { |line| "#{basename}: #{colorize_diff line}" }.join
+          IO.popen("less", "w") do |io|
+            statuses.each do |basename, status|
+              status.lines.each do |line|
+                io.puts "#{basename}: #{colorize_diff line}"
+              end
+            end
           end
         end
       end
     end
 
     def remove_command(name = nil)
-      Remove.new(name, @options[:path]).call
+      Commands::Remove.new(name, @options).call
 
       puts colorize("Package #{name} removed.", color: :green)
-    rescue ArgumentError, VimPK::Remove::PackageNotFoundError => e
+    rescue ArgumentError, PackageNotFoundError => e
       abort colorize(e.message, color: :red)
     end
   end

data/lib/vimpk/commands/install.rb

@@ -0,0 +1,25 @@
+module VimPK
+  module Commands
+    class Install
+      include VimPK::Colorizer
+
+      attr_reader :dest
+
+      def initialize(package, options)
+        @package = package || raise(ArgumentError, "Package name is required")
+        @path = options.path
+        @pack = options.pack || options.default_pack
+        @type = options.type || options.default_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
+end

data/lib/vimpk/commands/list.rb

@@ -0,0 +1,24 @@
+require "fileutils"
+
+module VimPK
+  module Commands
+    class List
+      attr_reader :dest
+
+      def initialize(options)
+        @path = options.path
+        @pack = options.pack || "*"
+        @type = options.type || "{start,opt}"
+      end
+
+      def call
+        pattern = File.join(@path, @pack, @type, "*")
+        glob = Dir.glob(pattern)
+
+        raise PackageNotFoundError, "No packages were found in #{pattern}." if glob.empty?
+
+        glob
+      end
+    end
+  end
+end

data/lib/vimpk/commands/move.rb

@@ -0,0 +1,40 @@
+require "fileutils"
+
+module VimPK
+  module Commands
+    class Move
+      attr_reader :dest
+
+      def initialize(name, options)
+        raise ArgumentError, "New pack or type is required" unless options.pack || options.type
+        @name = name || raise(ArgumentError, "Package name is required")
+        @path = options.path
+        @pack = options.pack
+        @type = options.type
+      end
+
+      def call
+        glob = Dir.glob(File.join(@path, "*", "{start,opt}", @name))
+
+        if glob.empty?
+          raise PackageNotFoundError, "Package #{@name} not found in #{@path}."
+        elsif glob.size > 1
+          raise MultiplePackagesFoundError, "Multiple packages #{@name} found in #{glob.join(" and ")}."
+        else
+          source = glob.first
+          current_type = File.basename(File.dirname(source))
+          current_pack = File.basename(File.dirname(File.dirname(source)))
+          @dest = File.join(@path, @pack || current_pack, @type || current_type, @name)
+
+          if File.exist?(dest)
+            raise ArgumentError, "Package #{@name} already exists in #{dest}."
+          else
+            FileUtils.mkdir_p(File.dirname(dest))
+          end
+
+          FileUtils.mv(source, dest)
+        end
+      end
+    end
+  end
+end

data/lib/vimpk/commands/remove.rb

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

data/lib/vimpk/commands/update.rb

@@ -0,0 +1,26 @@
+module VimPK
+  module Commands
+    class Update
+      include VimPK::Colorizer
+
+      attr_reader :jobs, :logs, :plugins
+
+      def initialize(options)
+        @pack_dir = File.expand_path(options.path)
+        @logs = Queue.new
+        @pool = ThreadPool.new
+        @plugins = Dir.glob(File.join(@pack_dir, "*", "{start,opt}", "*", ".git")).sort.map(&File.method(:dirname))
+        @jobs = []
+      end
+
+      def call
+        @jobs = @plugins.map do |dir|
+          @pool.schedule Job.new(dir, @logs)
+        end
+
+        @pool.shutdown
+        @logs.close
+      end
+    end
+  end
+end

data/lib/vimpk/commands.rb

@@ -0,0 +1,9 @@
+module VimPK
+  module Commands
+    autoload :Install, "vimpk/commands/install"
+    autoload :List, "vimpk/commands/list"
+    autoload :Move, "vimpk/commands/move"
+    autoload :Remove, "vimpk/commands/remove"
+    autoload :Update, "vimpk/commands/update"
+  end
+end

data/lib/vimpk/options.rb

@@ -10,11 +10,11 @@ module VimPK
     DEFAULT_TYPE = "start"
     DEFAULT_PACK = "plugins"
 
-    DefaultOptions = Struct.new(:path, :pack, :type)
+    DefaultOptions = Struct.new(:path, :pack, :type, :default_pack, :default_type)
 
     def initialize(argv)
       @argv = argv
-      @options = DefaultOptions.new(DEFAULT_PATH, DEFAULT_PACK, DEFAULT_TYPE)
+      @options = DefaultOptions.new(DEFAULT_PATH, nil, nil, DEFAULT_PACK, DEFAULT_TYPE)
 
       @parser = OptionParser.new do |parser|
         parser.banner = "Usage: #{parser.program_name} [options] [command [options]"
@@ -54,7 +54,8 @@ module VimPK
         parser.separator ""
         parser.separator "Commands:"
         parser.separator "        i|install REPO/NAME [--opt|--start] [--pack=PATH] [--path=PATH] Install a package"
-        parser.separator "        mv|move                                                         Move a package"
+        parser.separator "        l|list [--opt|--start] [--pack=PATH] [--path=PATH]              List packages"
+        parser.separator "        mv|move NAME [--opt|--start] [--pack=PATH]                      Move a package"
         parser.separator "        u|update                                                        Update all packages"
         parser.separator "        rm|remove NAME                                                  Remove all occurrences of a package"
       end

data/lib/vimpk/thread_pool.rb

@@ -1,6 +1,7 @@
 module VimPK
   class ThreadPool
     def initialize(size = Etc.nprocessors * 2)
+      Thread.abort_on_exception = true
       @size = size
       @jobs = Queue.new
       @workers = Array.new(size) do

data/lib/vimpk/version.rb

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

data/lib/vimpk.rb

@@ -5,19 +5,17 @@ require "etc"
 
 require_relative "vimpk/version"
 
-Thread.abort_on_exception = true
-
 module VimPK
-  class Error < StandardError; end
+  Error = Class.new(StandardError)
+  PackageExistsError = Class.new(Error)
+  PackageNotFoundError = Class.new(Error)
+  MultiplePackagesFoundError = Class.new(Error)
 
   autoload :CLI, "vimpk/cli"
+  autoload :Commands, "vimpk/commands"
   autoload :Colorizer, "vimpk/colorizer"
   autoload :Git, "vimpk/git"
-  autoload :Install, "vimpk/install"
   autoload :Job, "vimpk/job"
-  autoload :Move, "vimpk/move"
   autoload :Options, "vimpk/options"
-  autoload :Remove, "vimpk/remove"
   autoload :ThreadPool, "vimpk/thread_pool"
-  autoload :Update, "vimpk/update"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimpk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Usewicz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -24,14 +24,16 @@ files:
 - lib/vimpk.rb
 - lib/vimpk/cli.rb
 - lib/vimpk/colorizer.rb
+- lib/vimpk/commands.rb
+- lib/vimpk/commands/install.rb
+- lib/vimpk/commands/list.rb
+- lib/vimpk/commands/move.rb
+- lib/vimpk/commands/remove.rb
+- lib/vimpk/commands/update.rb
 - lib/vimpk/git.rb
-- lib/vimpk/install.rb
 - lib/vimpk/job.rb
-- lib/vimpk/move.rb
 - lib/vimpk/options.rb
-- lib/vimpk/remove.rb
 - lib/vimpk/thread_pool.rb
-- lib/vimpk/update.rb
 - lib/vimpk/version.rb
 - vimpk.gemspec
 homepage: https://github.com/pusewicz/vimpk

data/lib/vimpk/install.rb

@@ -1,25 +0,0 @@
-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/move.rb

@@ -1,41 +0,0 @@
-require "fileutils"
-
-module VimPK
-  class Move
-    PackageNotFoundError = Class.new(StandardError)
-    MultiplePackagesFoundError = Class.new(StandardError)
-
-    attr_reader :dest
-
-    def initialize(name, path, pack = nil, type = nil)
-      @name = name || raise(ArgumentError, "Package name is required")
-      raise ArgumentError, "New pack or type is required" unless pack || type
-      @path = path
-      @pack = pack
-      @type = type
-    end
-
-    def call
-      glob = Dir.glob(File.join(@path, "*", "{start,opt}", @name))
-
-      if glob.empty?
-        raise PackageNotFoundError, "Package #{@name} not found in #{@path}."
-      elsif glob.size > 1
-        raise MultiplePackagesFoundError, "Multiple packages #{@name} found in #{glob.join(" and ")}."
-      else
-        source = glob.first
-        current_type = File.basename(File.dirname(source))
-        current_pack = File.basename(File.dirname(File.dirname(source)))
-        @dest = File.join(@path, @pack || current_pack, @type || current_type, @name)
-
-        if File.exist?(dest)
-          raise ArgumentError, "Package #{@name} already exists in #{dest}."
-        else
-          FileUtils.mkdir_p(File.dirname(dest))
-        end
-
-        FileUtils.mv(source, dest)
-      end
-    end
-  end
-end

data/lib/vimpk/remove.rb

@@ -1,24 +0,0 @@
-require "fileutils"
-
-module VimPK
-  class Remove
-    PackageNotFoundError = 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 PackageNotFoundError, "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

@@ -1,24 +0,0 @@
-module VimPK
-  class Update
-    include VimPK::Colorizer
-
-    attr_reader :jobs, :logs, :plugins
-
-    def initialize(path)
-      @pack_dir = File.expand_path(path)
-      @logs = Queue.new
-      @pool = ThreadPool.new
-      @plugins = Dir.glob(File.join(@pack_dir, "*", "{start,opt}", "*", ".git")).sort.map(&File.method(:dirname))
-      @jobs = []
-    end
-
-    def call
-      @jobs = @plugins.map do |dir|
-        @pool.schedule Job.new(dir, @logs)
-      end
-
-      @pool.shutdown
-      @logs.close
-    end
-  end
-end