vimpk 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6e8ca14353f2e289dcf72b6049f1f694b7277ca702c48e95526a3bbc736a7a
-  data.tar.gz: efddf087e1596aa801a174dd30242bcf72913aeac50ba443976f7f0c5b64111a
+  metadata.gz: c1ddacdbd87289382f61dff2859903c4091456cd64ace528029ad8e497d12b0e
+  data.tar.gz: 72186f79e1e2fd67ff630d658fc6540410954cd18924d2756fec039b8adbedfa
 SHA512:
-  metadata.gz: 78c8fbb9298b12bce49f149507c7b89b7f2437b2942f53320f42e0c79fc63843ef83e565f0cbfc716657669f19c04b2150715aa8e8a60ed959cbca410065f7df
-  data.tar.gz: 575726746604f123e148bee44fc9c001222df4d7dfa9bf7cb092021a08e34aadd522c23d2b949ba383c9d86dbd5cfd2c4e1891ee775ac27d0e3b6797d23d4cc5
+  metadata.gz: b89b712ec4278d72e87f10c62040251eeae5a3c8f3cd438a97b2507cb3083eb05e794935b311f08fedc453ab23d67557483e72e747d4336eb01a1ba942ca816e
+  data.tar.gz: 5b85de54d8df5318fb988e981dca5e1f502578eb9cdb1b5de505c453e9357b4ff131ad65ea4b384684f940d1526d96d71392390b8480895edaf2d2173bdeaf22

data/lib/vimpk/cli.rb

@@ -53,36 +53,36 @@ module VimPK
     end
 
     def list_command
-      command = List.new(@options)
+      command = Commands::List.new(@options)
       list = command.call
       puts list.sort_by(&:downcase)
     end
 
     def install_command(package = nil)
       time = Time.now
-      command = Install.new(package, @options)
+      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)
-      command = Move.new(name, @options)
+      command = Commands::Move.new(name, @options)
       command.call
       puts colorize("Moved #{name} to #{command.dest}.", color: :green)
-    rescue Move::PackageNotFoundError, Move::MultiplePackagesFoundError, ArgumentError => e
+    rescue PackageNotFoundError, MultiplePackagesFoundError, ArgumentError => e
       abort colorize(e.message, color: :red)
     end
 
     def update_command
-      command = Update.new(@options)
+      command = Commands::Update.new(@options)
       puts "Updating #{command.plugins.size} packages in #{@options[:path]}…"
       start_time = Time.now
       command.call
@@ -121,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).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/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.4.0"
+  VERSION = "0.5.0"
 end

data/lib/vimpk.rb

@@ -5,20 +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 :List, "vimpk/list"
-  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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Piotr Usewicz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -24,15 +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/list.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, 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

data/lib/vimpk/list.rb

@@ -1,24 +0,0 @@
-require "fileutils"
-
-module VimPK
-  class List
-    PackageNotFoundError = Class.new(StandardError)
-
-    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

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, options)
-      @name = name || raise(ArgumentError, "Package name is required")
-      raise ArgumentError, "New pack or type is required" unless pack || type
-      @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

data/lib/vimpk/remove.rb

@@ -1,24 +0,0 @@
-require "fileutils"
-
-module VimPK
-  class Remove
-    PackageNotFoundError = Class.new(StandardError)
-
-    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

data/lib/vimpk/update.rb

@@ -1,24 +0,0 @@
-module VimPK
-  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