heytmux 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3e03ac69a2016e30bea5cd11e8bb8dd367ea4acc7e9a6402185201f5a66e7c
-  data.tar.gz: 170eca1fda547fdd1b13b2a0e684903a5cea2f9812f993e6a9418e694e8f66f9
+  metadata.gz: 2416296679429973f3324dee4b41204cf0414cba0296028c2856215370dc2627
+  data.tar.gz: 6b5b41223076adf68875297d9e2c5fc8959b07250a37e9df71e435baa03bed6a
 SHA512:
-  metadata.gz: f0287d21b34ced56d79fe24fa96dcf6efbc8985469df7ddd6a83103b9823e0911c000257af71c3f7148365bff15384884fb0bfb78bfa6ffdd20253a6b5ba7ea4
-  data.tar.gz: 8a73271ceb4baf815354603ec4edbe45a5ec43ab272ecba00c5559acfbec6b71f066fb81e6bd4e1fb82c4be5250a0bcc9e8fc2ae4e4f9a15e43d5e6a49c44533
+  metadata.gz: 579bf7e26c4e2c91870303e608c6e5a9bfe9d9368b1d610550fa6d0e185e4cfc62aaf4c364f12ef5679e5a263548b5c44720074e8675e0759059701e0b587b7b
+  data.tar.gz: fcb6ae512001bb29b3af8c2aeb8f124dbb2fe66b018769ca6bd7af9804b3dbc82058dcbc96a4cf7951cff939ed635f7085dc7fed95ffdd33c9a4f3b3ec87e453

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in heytmux.gemspec

data/README.md

@@ -1,7 +1,7 @@
 Hey tmux!
 =========
 
-[![travis-ci](https://travis-ci.org/junegunn/heytmux.svg?branch=master)](https://travis-ci.org/junegunn/heytmux)
+[![GitHub Actions Status](https://github.com/junegunn/heytmux/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/junegunn/heytmux/actions)
 [![Coverage Status](https://coveralls.io/repos/github/junegunn/heytmux/badge.svg?branch=master)](https://coveralls.io/github/junegunn/heytmux?branch=master)
 [![Gem](https://img.shields.io/gem/v/heytmux.svg)](https://rubygems.org/gems/heytmux)
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/exe/heytmux

@@ -23,7 +23,7 @@ strings = [ARGV.any? || $stdin.tty? ? nil : ['standard input', $stdin.read],
 specs = strings.map do |name, str|
   begin
     str = Heytmux.replace_env_vars(str)
-    YAML.respond_to?(:safe_load) ? YAML.safe_load(str) : YAML.load(str)
+    YAML.safe_load(str)
   rescue StandardError => e
     abort("Failed to parse #{name}: #{e}")
   end

data/heytmux.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls_reborn'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake'
 end

data/lib/heytmux/core.rb

@@ -77,7 +77,11 @@ module Heytmux
       label, body = command.is_a?(Hash) ? command.first : [:paste, command]
       PaneAction.for(label).process(window_index, pane_index, body) do |source|
         string = source.to_s
-        item ? string.gsub(ITEM_PAT, item).gsub(ITEM_INDEX_PAT, item_index.to_s) : string
+        if item
+          string.gsub(ITEM_PAT, item).gsub(ITEM_INDEX_PAT, item_index.to_s)
+        else
+          string
+        end
       end
     end
   end
@@ -85,9 +89,8 @@ module Heytmux
   # Groups entities by the group key and extracts unique, sorted indexes and
   # returns stateful indexer that issues index number for the given group key
   def indexer(entities, group_key, index_key)
-    indexes =
-      Hash[entities.group_by { |e| e[group_key] }
-                   .map { |g, es| [g, es.map { |e| e[index_key] }.sort.uniq] }]
+    indexes = entities.group_by { |e| e[group_key] }
+                      .transform_values { |es| es.map { |e| e[index_key] }.sort.uniq }
     ->(group) { indexes.fetch(group, []).shift }
   end
   private_class_method :indexer
@@ -141,10 +144,17 @@ module Heytmux
   end
 
   def interpret_and_expand_pane_spec(pane, items, pane_indexer)
+    pane_items = pane[ITEMS_KEY]
+    if pane_items && pane.length > 1
+      pane = pane.except(ITEMS_KEY)
+      items = pane_items || items
+    end
+
     title, command = pane.is_a?(Hash) ? pane.first : [pane.tr("\n", ' '), pane]
     if title =~ ITEM_PAT || title =~ ITEM_INDEX_PAT
       items.map.with_index do |item, item_idx|
-        title_sub = title.gsub(ITEM_PAT, item.to_s).gsub(ITEM_INDEX_PAT, item_idx.to_s)
+        title_sub = title.gsub(ITEM_PAT, item.to_s)
+                         .gsub(ITEM_INDEX_PAT, item_idx.to_s)
         { title: title_sub, command: command,
           item: item.to_s, item_index: item_idx,
           index: pane_indexer[title_sub] }
@@ -156,9 +166,9 @@ module Heytmux
 
   # Checks if there are entities without the required_field and creates them
   # with the given block. Returns two arrays of found and created entities.
-  def create_if_missing(entities, required_field)
+  def create_if_missing(entities, required_field, &block)
     found, missing = entities.partition { |e| e[required_field] }
-    [found, missing.map { |e| yield e }]
+    [found, missing.map(&block)]
   end
   private_class_method :create_if_missing
 

data/lib/heytmux/pane_action.rb

@@ -25,7 +25,7 @@ module Heytmux
       def register(*labels, klass)
         instance = klass.new
         (@actions ||= {}).merge!(
-          Hash[labels.map { |label| [label, instance] }]
+          labels.to_h { |label| [label, instance] }
         )
       end
 

data/lib/heytmux/pane_actions/expect.rb

@@ -17,6 +17,7 @@ module Heytmux
         wait_until do
           content = Tmux.capture(window_index, pane_index)
           raise 'Failed to capture pane content' unless $CHILD_STATUS.success?
+
           content =~ regex
         end
       end

data/lib/heytmux/tmux.rb

@@ -23,7 +23,7 @@ module Heytmux
       list = tmux(%w[list-panes -s -F],
                   labels.map { |label| "\#{#{label}}" }.join(delimiter))
       list.each_line.map do |line|
-        Hash[labels.zip(line.chomp.split(delimiter))].tap do |h|
+        labels.zip(line.chomp.split(delimiter)).to_h.tap do |h|
           h[:window_index] = h[:window_index].to_i
           h[:pane_index] = h[:pane_index].to_i
         end

data/lib/heytmux/validations.rb

@@ -12,15 +12,15 @@ module Heytmux
                   unless spec.key?(WINDOWS_KEY)
                     raise(ArgumentError, 'windows key is not found')
                   end
+
                   spec[WINDOWS_KEY]
                 when Array then spec
                 else
                   raise ArgumentError, "Not a valid spec: #{spec}"
                 end
 
-      unless windows.is_a?(Array)
-        raise ArgumentError, 'windows must be given as a list'
-      end
+      raise ArgumentError, 'windows must be given as a list' unless windows.is_a?(Array)
+
       windows.each { |window| validate_window(window) }
       nil
     end
@@ -33,9 +33,8 @@ module Heytmux
       message = "Not a valid window spec: #{window_spec.inspect}"
       case window_spec
       when Hash
-        unless single_spec?(window_spec, Hash, Array)
-          raise ArgumentError, message
-        end
+        raise ArgumentError, message unless single_spec?(window_spec, Hash, Array)
+
         spec = window_spec.first.last
         spec = { PANES_KEY => spec } if spec.is_a?(Array)
         spec.fetch(PANES_KEY, []).each do |pane|
@@ -55,6 +54,17 @@ module Heytmux
       message = "Not a valid pane spec: #{pane_spec.inspect}"
       case pane_spec
       when Hash
+        # Is 'items' present?
+        has_items = pane_spec.key?(ITEMS_KEY)
+        if has_items && pane_spec.except(ITEMS_KEY).any?
+          items = pane_spec[ITEMS_KEY]
+          if !items.is_a?(Array) || items.empty?
+            raise ArgumentError, "'items' must be a non-empty array"
+          end
+
+          pane_spec = pane_spec.except(ITEMS_KEY)
+        end
+
         unless single_spec?(pane_spec)
           if unquoted_pane_title?(pane_spec)
             message = 'Invalid pane title. ' \
@@ -62,6 +72,15 @@ module Heytmux
           end
           raise ArgumentError, message
         end
+
+        if has_items
+          title = pane_spec.first.first
+          unless title =~ ITEM_PAT || title =~ ITEM_INDEX_PAT
+            raise ArgumentError,
+                  'Pane title must contain {{ item }} or {{ item.index }} ' \
+                  "when 'items' is given"
+          end
+        end
         validate_commands(pane_spec.first.last)
       else
         raise ArgumentError, message unless valid_name?(pane_spec)
@@ -77,6 +96,7 @@ module Heytmux
         case command
         when Hash
           raise ArgumentError, message unless single_spec?(command)
+
           label, body = command.first
           validate_action(label, body)
         else
@@ -90,6 +110,7 @@ module Heytmux
     def validate_action(label, body)
       action = PaneAction.for(label)
       raise ArgumentError, "Unsupported action: #{label}" unless action
+
       action.validate(body)
     end
 

data/lib/heytmux/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Heytmux
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/heytmux.rb

@@ -6,9 +6,9 @@ require 'set'
 module Heytmux
   DEFAULT_LAYOUT = ->(num_panes) { num_panes <= 3 ? 'even-vertical' : 'tiled' }
   DEFAULT_OPTIONS = {
-    'automatic-rename'   => 'off',
-    'allow-rename'       => 'off',
-    'pane-base-index'    => 0,
+    'automatic-rename' => 'off',
+    'allow-rename' => 'off',
+    'pane-base-index' => 0,
     'pane-border-status' => 'bottom',
     'pane-border-format' => '#{pane_title}'
   }.freeze
@@ -17,9 +17,9 @@ module Heytmux
   LAYOUT_KEY = 'layout'
   PANES_KEY = 'panes'
   ITEMS_KEY = 'items'
-  ITEM_PAT = /{{ *item *}}/i
-  ITEM_INDEX_PAT = /{{ *item\.index *}}/i
-  ENV_PAT = /{{ *\$([a-z0-9_]+) *(?:\| *(.*?) *)?}}/i
+  ITEM_PAT = /{{ *item *}}/i.freeze
+  ITEM_INDEX_PAT = /{{ *item\.index *}}/i.freeze
+  ENV_PAT = /{{ *\$([a-z0-9_]+) *(?:\| *(.*?) *)?}}/i.freeze
 
   EXPECT_SLEEP_INTERVAL = 0.5
   EXPECT_TIMEOUT = 60

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: heytmux
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Junegunn Choi
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +69,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 description: Tmux scripting made easy
 email:
 - junegunn.c@gmail.com
@@ -107,7 +106,6 @@ files:
 homepage: https://github.com/junegunn/heytmux
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Hey tmux!
 test_files: []