rmux 0.3.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab87e46abc418f3c0279f95634d75563b5e69522d8e60bb823bdbf26823480f4
-  data.tar.gz: fc9a440bc0a5c72c48ab451c75e0d87a3a3b56a9b508024f66409d9bb0707e49
+  metadata.gz: b5f42cc5291cecf577a50da996b8afb16a0d06ee4fb651d80da4cf5476e75009
+  data.tar.gz: 1a3ac9b86ae3de6a0bc07748d2d42b0ff05f2540db05feb2c5d0fb652b1cd850
 SHA512:
-  metadata.gz: b4285774e467a7dae25100ba614e021c42c28a17ab991f15ddc82bd57fa8e3b0a267976dbc32967daee0674190186da85b98491fa5df62fbf9c0176f31b9142f
-  data.tar.gz: 5e4c2433f317bfb3bb7765f53bd0a6daf31893d2bed881d9d5ee1fda5d1fba3ff3c2ab7fde393f516cc90581803118e3bee8c3b9698edb9970c4b8323009fc9b
+  metadata.gz: ca1337fc3d0177a7da1e98b458f075fd954e3b2c00c8abef9391a974a8ced9210dcd811da7faf07e65d5b0cf034625b90cb85050711ddf000761220514ddb6af
+  data.tar.gz: '084b0dc3182376f3adbe0b4c0bf8519add8aabda36d62546c3229638a8e976f2bb1eef8ccccff2badcc74967cb4b98e2562fa48534a2097cc95883ee49f8e0a1'

data/README.md

@@ -21,6 +21,23 @@ the code of the two repos concerned.
 PRs/issues for better integrations might be considered if
 you flatten me enough (or rather the contrary)
 
+## Environnement
+
+### `Lab42TmuxThemes`
+
+optional but needed to use the `tmux_theme` command.
+It shall point to a direcory of files with an `zsh` extension (but 
+containing tmux commands, as they will be sourced by tmux)
+
+### `Lab42CompiledProjectDir`
+
+optional but if not set must be provided with the -s|--session_dir
+argument.
+It shall point to a directory containing session description files
+with an `rb` extension.
+
+optional but needed to run the `rmux` binary, it it is set the call
+
 
 # Author
 

data/bin/rmux

@@ -1,5 +1,21 @@
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require_relative '../lib/rmux'
-Rmux.new.run(ARGV) if $PROGRAM_NAME == __FILE__
+
+raise "Must not be required" unless $PROGRAM_NAME == __FILE__
+case ARGV.first
+when '-s', '--session-dir'
+  session_dir = ARGV[1]
+  args = [session_dir, *ARGV.drop(2)]
+else
+  message = 
+    "neither the -s|--session-dir switch, nor the environment variable RmuxSessionDescriptionsDir were provided"
+  session_dir = ENV.fetch('RmuxSessionDescriptionsDir') do
+    raise ArgumentError, message
+  end
+  args = [session_dir, *ARGV]
+end
+
+Rmux.new.run(args)
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/rmux/compiler/checker.rb

@@ -8,11 +8,11 @@ class Rmux
 
       attr_reader :session_data, :value
 
-      def check_data(session_data)
+      def check_data(session_data, options=OpenStruct.new)
         @session_data = session_data
         @value = {}
 
-        check_session_name
+        check_session_name unless options.in_tmux
         check_home_dir
         check_target_window
         check_tmux_theme

data/lib/rmux/compiler.rb

@@ -6,12 +6,16 @@ class Rmux
 
   class Compiler
 
-    attr_reader :home_dir, :session_data, :session_name, :target_window, :tmux_theme, :window_preludes
+    attr_reader :home_dir,
+      :options,
+      :session_data, :session_name,
+      :target_window, :tmux_theme,
+      :window_preludes
 
-    # TODO: read from config v0.2.0
+    # TODO: read from config v0.?.?
     NEW_WINDOW_PREFIX = 'FORCE_LOAD=1 source /Users/robert/etc/lab42-myzsh/lab42-my.zsh'
     def compile
-      checked = Checker.new.check_data(session_data)
+      checked = Checker.new.check_data(session_data, options)
       # $stderr.puts(checked.inspect)
       case checked
       in {ok: true, value:}
@@ -24,7 +28,8 @@ class Rmux
 
     private
 
-    def initialize(session_data)
+    def initialize(session_data, options=OpenStruct.new)
+      @options = options
       @session_data = session_data
     end
 
@@ -36,10 +41,10 @@ class Rmux
 
     def _compile(data)
       set_ivars_from(data)
-      compile_session_head
-      compile_window_prelude(0)
+      compile_session_head unless options.in_tmux
+      compile_window_prelude(0) unless options.in_tmux
       compile_windows
-      compile_final_attach
+      compile_final_attach unless options.in_tmux
     end
 
     def compile_final_attach

data/lib/rmux/data/built_in.rb

@@ -5,7 +5,7 @@ class Rmux
     module BuiltIn
       def irb_window(name = "ruby-console", *cmds, &blk)
         # if blk
-        windows << Window.new(name, *[*cmds, "RUBYLIB=./lib bundle exec irb"], &blk)
+        windows << Window.new(name, nil, *[*cmds, "RUBYLIB=./lib bundle exec irb"], &blk)
         # else
         #   windows << Window.new(name, *[*cmds, "bundle exec irb -I./lib"], &blk)
         # end

data/lib/rmux/data/common/window_commands.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class Rmux
+  class Data
+    module Common
+      module WindowCommands
+        def browser_sync(filter: "*.html", index: "index.html")
+          command  "browser-sync start --server --files #{filter} --index #{index}"
+        end
+
+        def cd(*path)
+          command("cd #{path.flatten.join("/")}")
+        end
+
+        def command(*cmds)
+          cmds.flatten.each { commands << it }
+        end
+
+        def commands
+          @__commands__ ||= []
+        end
+
+        def home_dir(path) = (home_dirs << path)
+
+        def home_dirs
+          @__home_dirs__ ||= []
+        end
+
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/rmux/data/window/pane.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../common/window_commands'
+class Rmux
+  class Data
+    class Window
+      class Pane
+        include Common::WindowCommands
+
+        attr_reader :format, :size
+
+        def to_hash
+          {pane_commands: commands, size:, format:}
+        end
+
+        private
+        def initialize(pane_commands:, size:, format:, &blk)
+          @__commands__ = pane_commands unless pane_commands.empty?
+          @size = size
+          @format = format
+          instance_exec(&blk) if blk
+        end
+
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/rmux/data/window.rb

@@ -1,38 +1,31 @@
 # frozen_string_literal: true
 
+require_relative 'window/pane'
 class Rmux
   class Data
     class Window
+      include Common::WindowCommands
 
-      attr_reader :name
-
-      def browser_sync(filter: "*.html", index: "index.html")
-        command  "browser-sync start --server --files #{filter} --index #{index}"
-      end
-      def command(*cmds)
-        cmds.flatten.each { commands << it }
-      end
-
-      def commands
-        @__commands__ ||= []
-      end
+      attr_reader :home_dir, :name
 
       def panes
         @__panes__ ||= []
       end
 
-      def hsplit(*commands, size: "50%") = __split(commands, size:, format: 'h')
-      def vsplit(*commands, size: "50%") = __split(commands, size:, format: 'v')
+      def hsplit(*commands, dir: nil, size: "50%", &blk) = __split(commands, dir:, size:, format: 'h', &blk)
+      def vsplit(*commands, dir: nil, size: "50%", &blk) = __split(commands, dir:, size:, format: 'v', &blk)
 
       private
-      def initialize(name, *cmds, &blk)
+      def initialize(name, home_dir, *cmds, &blk)
         @name = name
+        @home_dir = home_dir
         cmds.flatten.each { commands << it }
         instance_exec(&blk) if blk
       end
 
-      def __split(pane_commands, size:, format:)
-        panes << {pane_commands:, size:, format:}
+      def __split(pane_commands, dir:, size:, format:, &blk)
+        pane_commands = ["cd #{File.join(home_dir, dir)}", *pane_commands] if dir
+        panes << Pane.new(pane_commands:, size:, format:, &blk)
       end
     end
   end

data/lib/rmux/data.rb

@@ -9,6 +9,7 @@ class Rmux
   class Data
     include BuiltIn
     include Helper
+    include Common::WindowCommands
 
     def import(file, **args)
       path = Tools::File.join_with_ext(@base_dir, file, 'rb')
@@ -17,16 +18,10 @@ class Rmux
       instance_eval content
     end
 
-    def home_dir(path) = (home_dirs << path)
-
     def arguments
       @__arguments__ ||= {}
     end
 
-    def home_dirs
-      @__home_dirs__ ||= []
-    end
-
     def session_name(name) = (session_names << name)
 
     def session_prelude(cmd) = (session_preludes << cmd)
@@ -59,7 +54,7 @@ class Rmux
     end
 
     def window(name, *cmds, &blk)
-      windows << Window.new(name, *cmds, &blk)
+      windows << Window.new(name, home_dirs.first, *cmds, &blk)
     end
 
     def windows

data/lib/rmux/runner.rb

@@ -15,7 +15,7 @@ class Rmux
       return display_session_data  if option.interpret_only
 
       # $stderr.puts "SESSION_NAME: #{session_data.session_names}"
-      case Compiler.new(session_data).compile
+      case Compiler.new(session_data, option).compile
       in {ok: true, value: commands}
         # $stderr.puts "FIRST: #{commands.first}"
         Commander.issue_commands(commands, debug: option.debug)
@@ -25,8 +25,9 @@ class Rmux
     end
 
     private
-    def initialize(base_dir, file, option=nil)
+    def initialize(base_dir, file, option=nil, in_tmux: false)
       set_option(option)
+      @option.in_tmux = in_tmux
       @data = Data.new(base_dir)
       @file = file
     end

data/lib/rmux/tmux.rb

@@ -24,12 +24,15 @@ class Rmux
     def new_window_init(cmds, session_name:, win_id:, pane_id: nil)
       target = _target(session_name:, win_id:, pane_id:)
       cmds = cmds.zip([";"] * cmds.length.pred)
+      cmds = [["alias last_rmux_command='#{cmds.last.first}'", ";"], *cmds]
       send_cmds = cmds.flat_map do |cmd, sep|
         [
           "tmux send-keys #{target} #{Shellwords.shellescape cmd}",
           ("tmux send-keys #{target} '; '" if sep)
         ].compact
       end
+      # require "debug"; binding.break
+      # send_cmds << "tmux send-keys #{target}
       send_cmds << "tmux send-keys #{target}  C-m"
     end
 

data/lib/rmux.rb

@@ -20,7 +20,7 @@ class Rmux
   attr_reader :data, :session_data
 
   class << self
-    def version = "0.3.1"
+    def version = "0.5.3"
   end
 
   def run(args)
@@ -31,8 +31,12 @@ class Rmux
       return Tools::Color.putsc(version)
     when '-h', '--help'
       return Tools::Color.putsc(HELPTEXT)
+    end
+
+    if ENV['TMUX']
+      run_in_tmux(args)
     else
-      run_file(args)
+      run_new(args)
     end
   end
 
@@ -40,7 +44,12 @@ class Rmux
 
   private
 
-  def run_file(args) = Runner.new(*args).run
-end
+  def run_in_tmux(args)
+    Runner.new(*args, in_tmux: true).run
+  end
 
+  def run_new(args)
+    Runner.new(*args).run
+  end
+end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/tools/color.rb

@@ -1,16 +1,15 @@
 # tfrozen_string_literal: true
 
-require 'ex_aequo/colorize'
-
 module Tools
   module Color extend self
     def col(lines)
-      case ExAequo::Colorizer.colorize(lines)
-      in {ok: true, result:} 
-        result
-      in {ok: false, message:} 
-        raise(message)
-      end
+      lines
+      # case ExAequo::Colorizer.colorize(lines)
+      # in {ok: true, result:} 
+      #   result
+      # in {ok: false, message:} 
+      #   raise(message)
+      # end
     end
 
     def putsc(lines, device: $stdout) = device.puts(col(lines))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rmux
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
-date: 2025-01-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -84,8 +84,10 @@ files:
 - lib/rmux/compiler/checker.rb
 - lib/rmux/data.rb
 - lib/rmux/data/built_in.rb
+- lib/rmux/data/common/window_commands.rb
 - lib/rmux/data/helper.rb
 - lib/rmux/data/window.rb
+- lib/rmux/data/window/pane.rb
 - lib/rmux/runner.rb
 - lib/rmux/tmux.rb
 - lib/tools/color.rb
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Tmux sessions
 test_files: []