lab42_tmux2 0.0.1pre3 → 0.0.1pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 011cc804cf724cd9516c46971d0d21b60f333a0c
-  data.tar.gz: 3a33a65919f51e7f885abdf714583ed55f90f18b
+  metadata.gz: d83b9c45369edab02ddee3ff9248a899dfd5f89d
+  data.tar.gz: 737d9d882cb972d5de3d87e6e6fd6823fe98aac8
 SHA512:
-  metadata.gz: cab3d6012d10a33dae63ddfae8df3b5c0d1ad8738e2e92d0b8d681ec7a9ad97c76e3b64282b8af4aa9a1689dcbb68ab9e30193372cf732c2cf1d51e5bc761fdf
-  data.tar.gz: 302912baf4d282e8345e28747f4c90fd3d2a55a6d8c056f33e43c8ddfdd2427ee97a21a265044bbb0dc618f0e8d4d0c5c01a04c186565bb81afe13b953c5e0ce
+  metadata.gz: 7023719f39716a788a03e60c3ca1fd632c453bbbbca3d5a911cebb492918166eb33af6b9a1f8e62078d23dfad5eac0fab9aa52ad191e1fab8abcbab80172de16
+  data.tar.gz: 9ef8c13b005882f231dba5a49a624e0d4b725b6a15a7fa8ca0cf20537453302a85db132db42413addb67b245f0bc5fc6f3611058979271f056084a6beb3ade69

data/README.md

@@ -25,12 +25,12 @@ A simple API for launching tmux sessions from Ruby scripts
 
     session "vi_session" do
       configure do | c |
-        c.home '.'                  # Would have been the default
-        c.session_name = ARGV.first # Would have been the default
+        c.home '.'                     # Would have been the default
+        c.window_automatic_rename true # Default is false
       end
       new_window 'vi' do
         send_keys 'vi .'
-        wait_for '.. (up a dir)' # NERDTree pane has loaded
+        wait_for '.. (up a dir)'       # NERDTree pane has loaded (not yet implemented)
         send_keys_raw 'C-w', 'l'
       end
       new_window 'pry' do
@@ -40,6 +40,28 @@ A simple API for launching tmux sessions from Ruby scripts
     end
 ```
 
+### Hooks
+
+Add a `after_new_window` hook for tmux commands to be executed after the creation of a new
+window.
+
+```ruby
+    session 'my rails' do
+      after_new_window do
+        send_keys "rvm use default@my-rails"
+      end
+      # ...
+    end
+```
+
+
+### Plugins
+
+Plugins are easy to write, just MP the `Lab42::Tmux::Session` class. However precise guidelines
+how to do this will be available soon, also you might want to create some configuration.
+
+The plugin guidelines and some plugins (vi, ruby, rvm, python's virtualenv) are planned for
+the near future.
 
 ## Dev Notes
 

data/lib/lab42/tmux/config.rb

@@ -15,10 +15,13 @@ module Lab42
         end
       end
 
+      define_setter_getters :pre_wait_interval, :post_wait_interval, :wait_interval, :wait_timeout
       define_setter_getters :session_name, :window_automatic_rename
 
       private
       def initialize
+        @wait_interval = 0.5
+        @wait_timeout  = 2
       end
     end # module Config
   end # module Tmux

data/lib/lab42/tmux/dry_run.rb

@@ -7,7 +7,24 @@ module Lab42
       end
       def query *args
         puts args.join( ' ' )
-        return args.first != 'has-session'
+        if args.first == 'capture-pane'
+          capture_pane( *args.drop( 1 ) )
+        else
+          args.first != 'has-session'
+        end
+      end
+
+      private
+      def capture_pane *args
+        pane_addr = args[1]
+        second_capture = (@panes ||= {})[pane_addr]
+        if second_capture
+          @panes[pane_addr] = false
+          'hit'
+        else
+          @panes[pane_addr] = true
+          'miss'
+        end
       end
     end # module Interface
   end # module Tmux

data/lib/lab42/tmux/session/commands.rb

@@ -4,17 +4,47 @@ module Lab42
   module Tmux
     class Session
       module Commands
-        def new_window name
-          @win_number += 1
-          commands << %W{ new-window #{session_address} -n #{name} }
+        def new_window window_name, &block
+          @window_number += 1
+          command 'new-window', '-t', session_name, '-n', window_name
           instance_exec( &@after_new_window_hook ) if @after_new_window_hook
-          # TODO: Include after_new_window hoox
+          instance_exec( &block ) if block
         end
 
         def send_keys *keys
-          # TODO: determine target of the << operation (if in hook we need something more complicated here)
-          commands << %W{ send-keys #{window_address} #{keys.map(&:inspect).join(' ')} C-m }
+          command( 'send-keys', '-t', [session_name, window_number].join(':'), *keys.map(&:inspect), 'C-m' )
         end
+
+        def wait_for text_or_rgx, alternate_pane_addr=nil, &blk
+          require 'timeout'
+          pane_addr = alternate_pane_addr || window_address
+          text_or_rgx = %r{#{text_or_rgx}} unless Regexp === text_or_rgx
+          conditional_sleep configuration.pre_wait_interval
+          Timeout.timeout configuration.wait_timeout do
+            really_wait_for text_or_rgx, in_pane: pane_addr, dependent_actions: blk
+          end
+        rescue Timeout::Error 
+        end
+
+        def really_wait_for( match_rgx, in_pane:, dependent_actions: )
+          loop do
+            text = capture_pane in_pane
+            if match_rgx === text
+              conditional_sleep configuration.post_wait_interval
+              return instance_exec( &dependent_actions )
+            end
+            sleep configuration.wait_interval
+          end
+        end
+
+        private 
+        def capture_pane pane_addr
+          query( 'capture-pane', *(pane_addr.split), '-p' ) 
+        end
+        def conditional_sleep sleepy_or_falsy
+          sleep sleepy_or_falsy if sleepy_or_falsy
+        end
+
       end # module Commands
       include Commands
     end # class Session

data/lib/lab42/tmux/session/parameter_helpers.rb

@@ -3,10 +3,10 @@ module Lab42
     class Session
       module ParameterHelpers
         def session_address
-          "-t #{name}"
+          "-t #{session_name}"
         end
         def window_address
-          "-t #{name}:#{win_number}"
+          "-t #{session_name}:#{window_number}"
         end
       end # module ParameterHelpers
       include ParameterHelpers

data/lib/lab42/tmux/session.rb

@@ -2,36 +2,33 @@ require_relative 'errors'
 require_relative 'session/commands'
 require_relative 'session/hooks'
 
+require 'forwarder'
+
 module Lab42
   module Tmux
     class Session
-      attr_reader :commands, :configuration, :name, :win_number
+
+      attr_reader :commands, :configuration, :session_name, :window_number
+
+      extend Forwarder
+      forward_all :command, :query, to_object: Interface
 
       def config &block
         block.( configuration )
       end
     
-      def define block
-        @definition_block = block
-      end
-
-      def run
-        register_commands
-        run_registered_commands
-      end
-
-      def register_commands
+      def run &block
         return attach if running?
-
-        create_session_and_windows
-        instance_exec( &@definition_block ) if @definition_block
+        create_session
+        instance_exec( &block )
         attach
       end
 
+
       private
       def initialize sess_name
-        @name = sess_name
-        @win_number = 0
+        @session_name = sess_name
+        @window_number = 0
         @commands = []
         @configuration = Config.new
 
@@ -39,21 +36,18 @@ module Lab42
       end
 
       def attach
-        add_command 'attach-session', '-t', name
-      end
-
-      def add_command *args
-        commands << args
+        command 'attach-session', '-t', session_name
       end
 
-      def create_session_and_windows
-        add_command 'source-file', File.join( ENV["HOME"], '.tmux.conf' )
-        add_command 'new-session', '-d', '-s', name, '-n', 'sh'
-        add_command 'set-window-option', '-g', 'automatic-rename', 'off' unless configuration.window_automatic_rename
+      def create_session
+        command 'source-file', File.join( ENV["HOME"], '.tmux.conf' )
+        # TODO: replace 'sh' with a configuration value
+        command 'new-session', '-d', '-s', session_name, '-n', 'sh'
+        command 'set-window-option', '-g', 'automatic-rename', 'off' unless configuration.window_automatic_rename
       end
 
       def running?
-        Interface.query 'has-session', '-t', name
+        Interface.query 'has-session', '-t', session_name
       end
 
       def run_command command

data/lib/lab42/tmux/version.rb

@@ -1,6 +1,6 @@
 
 module Lab42
   module Tmux
-    VERSION = '0.0.1pre3'
+    VERSION = '0.0.1pre4'
   end # module Tmux
 end # module Lab42

data/lib/lab42/tmux.rb

@@ -8,8 +8,7 @@ module Lab42
     def new_session session_name=nil, &block
       raise ArgumentError, 'No block provided' unless block
       session = Session.new session_name || Config.session_name
-      session.define block if block
-      session.run
+      session.run &block
     end
 
     def dry_run!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_tmux2
 version: !ruby/object:Gem::Version
-  version: 0.0.1pre3
+  version: 0.0.1pre4
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarder2