hiiro 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5855f3252099301231f987ede7f80a670e1684b5173b196f2578626dca25de1
-  data.tar.gz: a4a4809a5448317290336b03f5f49786cc10d402e85529a15c34913419f07cdb
+  metadata.gz: 50b6c4372984b628ce714e2a29249f93f8f869af5298752b5983bc9d18edebcf
+  data.tar.gz: 9477252f59c4afcd35dca01b6b576a233c7352c6f40d640b5f019609287655f7
 SHA512:
-  metadata.gz: 4b061b0524532726d82d09652d700e09bbdf72b9bded349907b1da7a4990f63edf827bd55ed6288de9aa7bac1af1cdc5d023bc14ea386d0514107885921f5bfe
-  data.tar.gz: d611d34f3cceda9ab8a16b70dc1921fbc4575214b531af702bc0ab20eb6c3c6b5dac6cfe29bd272bbddd8c9ea670f48ddfc2402f63619caa9299c065383c81e4
+  metadata.gz: bc6efdae4f2a2b948436dc7551c8acd89098c21a42e53c53b5bb5034a10679dc34f680fb5cc0e6361226efce00ed4bafd95a9776eeda3582147d1c41ac8c7c82
+  data.tar.gz: 542dcc0dbf7a72c8b063c38bc02cf629a60522549a71dbdb44c20bca9c6de20a40d294c4fa417140436403fa5a6bb0fb40330399e8e8e45249dd5343a03aef83

data/bin/h-task

@@ -5,7 +5,6 @@ require "fileutils"
 require "yaml"
 require "pathname"
 
-Hiiro.load_env
 hiiro = Hiiro.init(*ARGV, plugins: [Tmux])
 
 class TaskManager
@@ -392,8 +391,12 @@ class TaskManager
       puts printable_apps.keys.sort.map{|k| format("%#{longest_app_name}s => %s", k, printable_apps[k]) }
       exit 1
     when 1
-      pwd_to_root = Pathname.new(tree_root).relative_path_from(Pathname.pwd)
-      print File.join(pwd_to_root, apps_config[matching_apps.first])
+      if Pathname.pwd.ascend.any? { |parent| parent.equal?(tree_root) }
+        pwd_to_root = Pathname.new(tree_root).relative_path_from(Pathname.pwd)
+        print File.join(pwd_to_root, apps_config[matching_apps.first])
+      else
+        print File.join(tree_root, apps_config[matching_apps.first])
+      end
       exit 0
     else
       puts "Multiple matches found:"
@@ -402,8 +405,6 @@ class TaskManager
     end
   end
 
-  private
-
   def printable_apps
     apps_config.transform_keys(&:to_s)
   end
@@ -562,6 +563,12 @@ class TaskManager
     { task: task_name, tree: tree, session: session }
   end
 
+  def task_name
+    task = current_task
+
+    (task || {})[:task]
+  end
+
   def switch_to_task(task_name, tree, app: nil)
     session = session_name_for(task_name)
     base_path = tree_path(tree)
@@ -698,14 +705,13 @@ hiiro.add_subcmd(:ls) { tasks.list_trees }
 hiiro.add_subcmd(:start) { |task_name, app=nil| tasks.start_task(task_name, app: app) }
 hiiro.add_subcmd(:switch) { |task_name=nil| tasks.switch_task(task_name) }
 hiiro.add_subcmd(:app) { |app_name| tasks.open_app(app_name) }
-hiiro.add_subcmd(:path) { |app_name=nil, task=nil| tasks.app_path(app_name, task: task) }
+hiiro.add_subcmd(:path) { |app_name=nil, task=nil| tasks.app_path(app_name, task: task || tasks.task_name) }
 hiiro.add_subcmd(:cd) { |*args| tasks.cd_app(*args) }
 hiiro.add_subcmd(:apps) { tasks.list_configured_apps }
 hiiro.add_subcmd(:status) { tasks.status }
 hiiro.add_subcmd(:st) { tasks.status }
 hiiro.add_subcmd(:save) { tasks.save_current }
 hiiro.add_subcmd(:stop) { |task_name=nil| task_name ? tasks.stop_task(task_name) : tasks.stop_current }
-
-hiiro.add_default { tasks.help }
+hiiro.add_subcmd(:current) { print tasks.task_name }
 
 hiiro.run

data/lib/hiiro/history.rb

@@ -176,7 +176,6 @@ class Hiiro
         source: 'manual',
         cmd: hiiro.full_command,
       )
-      puts "Added history entry: #{description}"
       true
     end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.25"
+  VERSION = "0.1.27"
 end

data/script/sync

@@ -8,7 +8,7 @@ set -e
 REPO_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$REPO_DIR"
 
-OTHER_DIR="$REPO_DIR/../home/"
+OTHER_DIR="$HOME"
 
 echo "Comparing directories with $OTHER_DIR"
 echo "Repository: $REPO_DIR ($0)"

metadata

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