hiiro 0.1.33.pre.2 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcfae77d18ac4bf22f781a841bd6410867a8f2d6b3326845a6a4fcab79229175
-  data.tar.gz: e6677f372a9442aa0cccbb888f7ee9da8a8568543bad42e7485b674ed30d2af4
+  metadata.gz: 8746a15f85121b84a7fcebefcbd7b1b63e5f289190d8bb75a230c27df3ce0279
+  data.tar.gz: fc0faa4d8bf9dde3de151b1a2d59e536010f31cd44e8ec6a18a062a735f4c49f
 SHA512:
-  metadata.gz: 4b87d2d1eeec269aae9371f93b8ba28c68a2eba03817d6b667289c5178d799b5c86ce0802f0d8dec3f02ecb7d5687745e6b132b354bf32c5ce8ed0656b5ecc29
-  data.tar.gz: c0789c1f694680700927d7301a587775e655a3ebe0d07137bcb812314614edb2da07b4f1148a3ec2db178e1f64ae2e03ebda565bbd0bada47c4f439f634ad27b
+  metadata.gz: ffde10d22c1385fb63333a0679d911c0a062e15a74d4979980c7b2946060add058570db64c52bfeae385b47d488e2b36dbc0bff1604751750d8b1a26a7bd4730
+  data.tar.gz: 77d81a271282525001a763fe7ee88e3a92b1fd6804a92ca59ff77a07dce08fb9a9f50b1fa7703f717ea4378bd9c679f7472ec07113529de6771f753ecfada4ce

data/bin/g-pr

@@ -6,7 +6,8 @@ require "fileutils"
 require "yaml"
 require "json"
 
-hiiro = Hiiro.init(*ARGV, plugins: [:OldTask, :Tmux, :Pins])
+Hiiro.load_env
+hiiro = Hiiro.init(*ARGV, plugins: [OldTask, Tmux, Pins])
 
 class PRManager
   attr_reader :hiiro

data/bin/h-branch

@@ -4,7 +4,8 @@ require "hiiro"
 require "fileutils"
 require "yaml"
 
-hiiro = Hiiro.init(*ARGV, plugins: [:OldTask])
+Hiiro.load_env
+hiiro = Hiiro.init(*ARGV, plugins: [OldTask])
 
 class BranchManager
   attr_reader :hiiro

data/bin/h-buffer

@@ -12,7 +12,7 @@ def find_buffer(partial)
   buffer
 end
 
-o = Hiiro.init(*ARGV, plugins: [:Pins])
+o = Hiiro.init(*ARGV, plugins: [Pins])
 
 o.add_subcmd(:ls) { |*args|
   system('tmux', 'list-buffers', *args)

data/bin/h-link

@@ -193,7 +193,7 @@ class LinkManager
 end
 
 lm = LinkManager.new
-o = Hiiro.init(*ARGV, plugins: [:Tmux, :Pins], links_file: lm.links_file)
+o = Hiiro.init(*ARGV, plugins: [Tmux, Pins], links_file: lm.links_file)
 
 o.add_subcmd(:add) do |*args|
   links = lm.load_links

data/bin/h-osubtask

@@ -7,7 +7,8 @@ require "fileutils"
 require "yaml"
 require "time"
 
-hiiro = Hiiro.init(*ARGV, plugins: [:Tmux, :OldTask])
+Hiiro.load_env
+hiiro = Hiiro.init(*ARGV, plugins: [Tmux, OldTask])
 
 tasks = hiiro.task_manager
 

data/bin/h-otask

@@ -5,7 +5,7 @@ require "fileutils"
 require "yaml"
 require "pathname"
 
-hiiro = Hiiro.init(*ARGV, plugins: [:Tmux])
+hiiro = Hiiro.init(*ARGV, plugins: [Tmux])
 
 class TaskManager
   attr_reader :hiiro

data/bin/h-pane

@@ -2,7 +2,7 @@
 
 load File.join(Dir.home, 'bin', 'h')
 
-o = Hiiro.init(*ARGV, plugins: [:Pins])
+o = Hiiro.init(*ARGV, plugins: [Pins])
 
 o.add_subcmd(:ls) { |*args|
   system('tmux', 'list-panes', *args)

data/bin/h-plugin

@@ -5,7 +5,7 @@ require 'json'
 require 'hiiro'
 
 BASE_DIR = File.join(Dir.home, '.config/hiiro/plugins')
-o = Hiiro.init(*ARGV, plugins: [:Tmux, :Pins], dir: BASE_DIR)
+o = Hiiro.init(*ARGV, plugins: [Tmux, Pins], dir: BASE_DIR)
 
 def plugin_files
   Dir.glob(File.join(BASE_DIR, '**/*'))

data/bin/h-pr

@@ -6,7 +6,8 @@ require "fileutils"
 require "yaml"
 require "json"
 
-hiiro = Hiiro.init(*ARGV, plugins: [:OldTask, :Tmux, :Pins])
+Hiiro.load_env
+hiiro = Hiiro.init(*ARGV, plugins: [OldTask, Tmux, Pins])
 
 class PRManager
   attr_reader :hiiro

data/bin/h-session

@@ -22,7 +22,7 @@ require 'rspec'
 #    has       (subcommand)  /Users/unixsuperhero/bin/h-session:139
 #    info      (subcommand)  /Users/unixsuperhero/bin/h-session:143
 
-o = Hiiro.init(*ARGV, plugins: [:Pins])
+o = Hiiro.init(*ARGV, plugins: [Pins])
 
 o.add_subcmd(:ls) { |*args|
   system('tmux', 'list-sessions', *args)

data/bin/h-sha

@@ -4,7 +4,7 @@ require 'hiiro'
 
 BASE_DIR = File.join(Dir.home, 'work/carrot')
 
-Hiiro.init(*ARGV, plugins: [:Tmux, :Pins, :Project]) { |hiiro|
+Hiiro.init(*ARGV, plugins: [Tmux, Pins, Project]) { |hiiro|
 
 }.run
 

data/bin/h-vim

@@ -5,7 +5,7 @@ require 'hiiro'
 BASE_DIR = CONFIG_DIR = File.join(Dir.home, '.config/nvim')
 TMUX_SESSION_NAME = 'vim'
 
-o = Hiiro.init(*ARGV, plugins: [:Tmux, :Pins, :Project])
+o = Hiiro.init(*ARGV, plugins: [Tmux, Pins, Project])
 
 o.add_subcmd(:edit) { |*args|
   nvim = ENV['EDITOR']

data/bin/h-window

@@ -2,7 +2,7 @@
 
 load File.join(Dir.home, 'bin', 'h')
 
-o = Hiiro.init(*ARGV, plugins: [:Pins])
+o = Hiiro.init(*ARGV, plugins: [Pins])
 
 o.add_subcmd(:ls) { |*args|
   system('tmux', 'list-windows', *args)

data/exe/h

@@ -3,7 +3,7 @@
 require "hiiro"
 require "fileutils"
 
-hiiro = Hiiro.init(*ARGV, cwd: Dir.pwd, plugins: [:Tasks])
+hiiro = Hiiro.init(*ARGV, cwd: Dir.pwd, plugins: [Tasks])
 
 hiiro.add_subcommand(:version) { |*args|
   puts Hiiro::VERSION

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.33.pre.2"
+  VERSION = "0.1.34"
 end

data/lib/hiiro.rb

@@ -4,7 +4,6 @@ require "shellwords"
 
 require_relative "hiiro/version"
 require_relative "hiiro/history"
-require_relative "hiiro/plugins"
 
 class String
   def underscore(camel_cased_word=self)
@@ -21,12 +20,12 @@ end
 
 class Hiiro
   def self.init(*args, plugins: [], logging: false, **values, &block)
-    load_plugins(plugins)
+    load_env
     args = ARGV if args.empty?
 
     new($0, *args, logging: logging, **values).tap do |hiiro|
       History.load(hiiro)
-      hiiro.init_plugins(*plugins)
+      hiiro.load_plugins(*plugins)
 
       hiiro.add_subcmd(:edit, **values) { |*args|
         system(ENV['EDITOR'] || 'nvim', hiiro.bin)
@@ -42,10 +41,12 @@ class Hiiro
     hiiro.run
   end
 
-  def self.load_plugins(plugin_list)
-    plugin_list.each do |name|
-      Plugins.load_plugin(name.to_s)
+  def self.load_env
+    Config.plugin_files.each do |plugin_file|
+      require plugin_file
     end
+
+    self
   end
 
   attr_reader :bin, :bin_name, :all_args, :full_command
@@ -131,24 +132,11 @@ class Hiiro
 
   def pins = @pins ||= Pin.new(self)
 
-  def init_plugins(*names)
-    names.flatten.each do |name|
-      plugin_const = Hiiro::Plugins.const_get(name.to_s) rescue nil
-      next unless plugin_const
-      load_plugin(plugin_const)
-    end
-  end
-
   def load_plugins(*plugins)
     plugins.flatten.each { |plugin| load_plugin(plugin) }
   end
 
-  def load_plugin(plugin)
-    plugin_const = case plugin
-      when Module then plugin
-      when String, Symbol then Hiiro::Plugins.load_plugin(plugin.to_s)
-      end
-    return unless plugin_const
+  def load_plugin(plugin_const)
     return if @loaded_plugins.include?(plugin_const)
 
     plugin_const.load(self)
@@ -205,6 +193,22 @@ class Hiiro
 
   class Config
     class << self
+      def plugin_files
+        user_files = Dir.glob(File.join(plugin_dir, '*.rb'))
+        user_basenames = user_files.map { |f| File.basename(f) }
+
+        gem_plugin_dir = File.join(File.expand_path('../..', __FILE__), 'plugins')
+        gem_files = Dir.exist?(gem_plugin_dir) ? Dir.glob(File.join(gem_plugin_dir, '*.rb')) : []
+
+        fallback_files = gem_files.reject { |f| user_basenames.include?(File.basename(f)) }
+
+        user_files + fallback_files
+      end
+
+      def plugin_dir
+        config_dir('plugins')
+      end
+
       def config_dir(subdir=nil)
         File.join(Dir.home, '.config/hiiro', *[subdir].compact).tap do |config_path|
           FileUtils.mkdir_p(config_path) unless Dir.exist?(config_path)
@@ -454,4 +458,6 @@ class Hiiro
       end
     end
   end
+
+  load_env
 end

data/plugins/notify.rb

@@ -2,7 +2,7 @@
 
 module Notify
   def self.load(hiiro)
-    hiiro.load_plugin('Tmux')
+    hiiro.load_plugin(Tmux)
     attach_methods(hiiro)
     add_subcommands(hiiro)
   end

data/plugins/old_task.rb

@@ -2,7 +2,7 @@
 
 module OldTask
   def self.load(hiiro)
-    hiiro.load_plugin('Tmux')
+    hiiro.load_plugin(Tmux)
     attach_methods(hiiro)
     add_subcommands(hiiro)
   end

data/plugins/project.rb

@@ -2,7 +2,7 @@
 
 module Project
   def self.load(hiiro)
-    hiiro.load_plugin('Tmux')
+    hiiro.load_plugin(Tmux)
     attach_methods(hiiro)
     add_subcommands(hiiro)
   end

data/plugins/tasks.rb

@@ -741,7 +741,7 @@ end
 
 module Tasks
   def self.load(hiiro)
-    hiiro.load_plugin('Tmux')
+    hiiro.load_plugin(Tmux)
     add_subcommands(hiiro)
   end
 

data/script/publish

@@ -2,24 +2,9 @@
 
 require "hiiro"
 
-pre_release = ARGV.include?("-t")
-parts = Hiiro::VERSION.split(?.)
-
-if parts.length == 5 && parts[3] == "pre"
-  major, minor, patch, _, pre_num = parts
-  if pre_release
-    new_version = [major, minor, patch, "pre", pre_num.to_i + 1].join(?.)
-  else
-    new_version = [major, minor, patch].join(?.)
-  end
-else
-  major, minor, patch = parts
-  if pre_release
-    new_version = [major, minor, patch.to_i + 1, "pre", 1].join(?.)
-  else
-    new_version = [major, minor, patch.to_i + 1].join(?.)
-  end
-end
+major, minor, patch = Hiiro::VERSION.split(?.)
+
+new_version = [major, minor, patch.to_i + 1].join(?.)
 
 File.open('lib/hiiro/version.rb', 'w+') do |f|
   f.puts 'class Hiiro'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.33.pre.2
+  version: 0.1.34
 platform: ruby
 authors:
 - Joshua Toyota
@@ -77,7 +77,6 @@ files:
 - hiiro.gemspec
 - lib/hiiro.rb
 - lib/hiiro/history.rb
-- lib/hiiro/plugins.rb
 - lib/hiiro/version.rb
 - links.backup.yml
 - notes
@@ -109,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

data/lib/hiiro/plugins.rb

@@ -1,64 +0,0 @@
-class Hiiro
-  class Plugins
-    class << self
-      def load_plugin(name)
-        name_str = name.to_s
-        return const_get(name_str) if plugin_loaded?(name_str)
-
-        path = plugin_path(name_str)
-        unless path
-          warn "[hiiro] plugin not found: #{name_str}"
-          return nil
-        end
-
-        module_eval(File.read(path), path, 1)
-
-        unless const_defined?(name_str, false)
-          warn "[hiiro] plugin #{name_str} did not define expected constant"
-          return nil
-        end
-
-        @loaded_plugins ||= []
-        @loaded_plugins << name_str
-        const_get(name_str)
-      end
-
-      def plugin_loaded?(name_str)
-        (@loaded_plugins || []).include?(name_str.to_s)
-      end
-
-      def plugin_path(name_str)
-        plugin_filename = name_str.underscore + '.rb'
-
-        paths_to_check = [
-          File.join(Dir.home, '.config/hiiro/plugins'),
-          File.join(File.expand_path('../..', __FILE__), 'plugins'),
-        ]
-
-        paths_to_check.each do |dir|
-          full_path = File.join(dir, plugin_filename)
-          return full_path if File.exist?(full_path)
-        end
-
-        nil
-      end
-
-      def load_all
-        user_dir = File.join(Dir.home, '.config/hiiro/plugins')
-        gem_dir = File.join(File.expand_path('../..', __FILE__), 'plugins')
-
-        FileUtils.mkdir_p(user_dir) unless Dir.exist?(user_dir)
-
-        user_files = Dir.glob(File.join(user_dir, '*.rb'))
-        user_basenames = user_files.map { |f| File.basename(f) }
-
-        gem_files = Dir.exist?(gem_dir) ? Dir.glob(File.join(gem_dir, '*.rb')) : []
-        fallback_files = gem_files.reject { |f| user_basenames.include?(File.basename(f)) }
-
-        (user_files + fallback_files).each do |path|
-          module_eval(File.read(path), path, 1)
-        end
-      end
-    end
-  end
-end