hiiro 0.1.64 → 0.1.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26230a22dcc41666062bbd486f5c5f0f289f1c0f901890ff8eded9184fff6d1d
-  data.tar.gz: 49a1d56f36ba069d0738533f1ac26b649534e7dc999822d6d44cc5bb7a9ce626
+  metadata.gz: ee0c1414031bed7ec09923ecd3c88bd20b72a5a64bce2bdf31234dbe03b2c2d1
+  data.tar.gz: 3b88d057d457e74f3a796874203e6c863b27325a9238b004f88b6aedec57cf22
 SHA512:
-  metadata.gz: 7bf0a65e90a7e97d940eae54c2734f496161294b9d4518cca53e652594244cd5a1f7c4c36e27dfa45dc8ce1fe0e6f1db2fe01431c262a7e7647197d0675fdaca
-  data.tar.gz: 1551df9b3fb4b018a085b2deffcd774f7677fbc9337fef7e050024162c6b8cfa402d04b1cbc32baed2304e3adb22272e09332c72698c9341fd59ba43073def78
+  metadata.gz: a4d11de5d29582076d40150b510b09bf8219f0713c26d59a3205f2f6704b05bffbb84205077d6340cd33c7870a5e4d6c3c83723fd273966c63c1e3ae2badcb29
+  data.tar.gz: 5dc971e9c3070edaa1cbf1ae92105929350fa6b4c3eced60183f46215322288ad9df975af6f307724a44cbbae6c16ac5b148e321da7a010501fe7f5be31a5539

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.64"
+  VERSION = "0.1.65"
 end

data/lib/hiiro.rb

@@ -163,6 +163,10 @@ class Hiiro
     @git ||= Git.new(self, Dir.pwd)
   end
 
+  def attach_method(name, &block)
+    define_method(name.to_sym, &block)
+  end
+
   def load_plugins(*plugins)
     plugins.flatten.each { |plugin| load_plugin(plugin) }
   end

data/plugins/tasks.rb

@@ -809,33 +809,36 @@ module Tasks
     add_subcommands(hiiro)
   end
 
-  def self.attach_methods(hiiro)
-    hiiro.instance_eval do
-      def environment
-        @environment ||= Environment.current
-      end
-    end
+  def self.attach_methods(hiiro, task_manager=nil)
+    environment = Environment.current
+
+    hiiro.attach_method(:environment) { environment }
+    hiiro.attach_method(:env) { environment }
+    hiiro.attach_method(:task_manager) { task_manager }
+    hiiro.attach_method(:tm) { task_manager }
+
+    hiiro
   end
 
   def self.add_subcommands(hiiro)
     hiiro.add_subcmd(:task) do |*args|
-      mgr = TaskManager.new(hiiro, scope: :task)
-      task_hiiro = Tasks.build_hiiro(hiiro, mgr)
-      task_hiiro.run
+      tm = TaskManager.new(hiiro, scope: :task)
+      build_hiiro(hiiro, tm).run
     end
 
     hiiro.add_subcmd(:subtask) do |*args|
-      mgr = TaskManager.new(hiiro, scope: :subtask)
-      task_hiiro = Tasks.build_hiiro(hiiro, mgr)
-      task_hiiro.run
+      tm = TaskManager.new(hiiro, scope: :subtask)
+      build_hiiro(hiiro, tm).run
     end
   end
 
-  def self.build_hiiro(parent_hiiro, mgr)
+  def self.build_hiiro(parent_hiiro, task_manager)
     bin_name = [parent_hiiro.bin, parent_hiiro.subcmd || ''].join('-')
 
-    Hiiro.init(bin_name:, args: parent_hiiro.args, task_manager: mgr) do |h|
-      tm = mgr
+    task_hiiro = Hiiro.init(
+      bin_name:,
+      args: parent_hiiro.args,
+    ) do |h|
       h.add_subcmd(:list) { tm.list }
       h.add_subcmd(:ls) { tm.list }
 
@@ -893,5 +896,7 @@ module Tasks
         system(ENV['EDITOR'] || 'nvim', __FILE__)
       end
     end
+
+    attach_methods task_hiiro, task_manager
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.64
+  version: 0.1.65
 platform: ruby
 authors:
 - Joshua Toyota