lab42_tmux 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f15f6f7b7cc46ac2975640531b3cdccfcb5d6d90
-  data.tar.gz: 0af03c1673a9bde59186e9301e8eabdfed12e35d
+  metadata.gz: 8dc676118065197a5cd977d51690037f3814d2c2
+  data.tar.gz: c7584c2f8d3be9c1a02761224d79377b412f6ef0
 SHA512:
-  metadata.gz: 8aed7ad5a9495ded7b32b3a9d2a12223c630683f77a2403a876e129041bc40b84afe68793b4e7d6a3ecea898b555d8e23ec0304118d38e21d62f55cf0f20b47f
-  data.tar.gz: 6b8815601f598e2b85f6838786c000802ee44409c7ca9e6681b3d14c01eeec74c142fa33e4ce13f27156cc4d0b1989c4a23a29233c968c2c4b74a65df02104c6
+  metadata.gz: 61a8732386b3395e170c04043ba50ff8149e4f666f75729c8cc65236744e6e1cd13a40ea85b36f2f9dff89ac12a41634a50e40494ebf27546b87e91925ca0291
+  data.tar.gz: 39f97a1ab9130d792766aa1f9d43551503504fa91ed15507d98e0cdc02e83bc9896c9089641db821208895a72a0af482bbdaddf453602e9fc688cb2d190274d4

data/bin/lab42_tmux

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'lab42/tmux'
+require 'lab42/tmux/predefined/tmux_session'
 
-Lab42::Tmux.new do
-  options.windows.to_i.times do
-    add_window
-  end
-end.exec!
+begin
+  Lab42::Tmux::Predefined::TmuxSession.new( *ARGV.dup ).exec!
+rescue ArgumentError => ae
+  $stderr.puts ae.message
+  exit -1
+end

data/lib/lab42/tmux.rb

@@ -1,6 +1,7 @@
 require 'lab42/options'
 require 'lab42/tmux/core_helpers'
 require 'lab42/tmux/commands'
+require 'lab42/tmux/command'
 require 'lab42/tmux/window'
 require 'lab42/tmux/extensions/ostruct'
 require 'lab42/tmux/extensions/hash'
@@ -10,12 +11,13 @@ require 'lab42/tmux/helpers'
 module Lab42
   class Tmux
     include Commands
+    include Command
     include Helpers
 
     attr_reader   :commands, :options, :project_home, :session_name, :windows
 
     def add_window name=nil, options={}, &blk
-      window =  Window.new windows.size, self, name: name, command: options[:command]
+      window =  Window.new windows.size.succ, self, name: name, command: options[:command]
       windows << window
 
       window.instance_eval_or_call blk if blk
@@ -50,6 +52,8 @@ module Lab42
 
     def process_options
       @project_home = options.args.first
+      @project_home = File.join Dir.pwd, @project_home unless
+        !@project_home || %r{\A[/~]} === @project_home
       @session_name = File.basename project_home rescue nil
     end
 
@@ -63,7 +67,6 @@ module Lab42
       return if session_exists?
       tmux_new_session
       tmux_source_file
-      tmux_no_session_rename
     end
 
     def session_exists?

data/lib/lab42/tmux/command.rb

@@ -1,3 +1,4 @@
+require 'lab42/tmux/current_window'
 class Array
   def mk_string *args, &blk
     args = [' '] if args.empty?
@@ -8,35 +9,13 @@ end # class Array
 module Lab42
   class Tmux
     module Command
+      include CurrentWindow
 
-      def tmux cmd
-        commands << "tmux #{cmd}"
-      end
-
-      def tmux_current_window
-        window = [@options.session_name, tmux_current_window_number].join(":")
-        "-t #{window}"
-      end
-
-      def tmux_current_window_command cmd, *args
-        args = args.compact
-        arguments = args.empty? ? "" : " #{args.join(" ")}"
-        tmux "#{cmd} #{tmux_current_window}#{arguments}"
-      end
-
-      def tmux_current_window_number
-        @__tmux_current_window_number__ ||= 0
-      end
-
-      def tmux_current_window_number= new_val
-        @__tmux_current_window_number__ = new_val
-      end
-
-      def tmux_execute_window_commands
-        ( @tmux_window_precommands || [] ).each do | blk |
-          blk.()
-        end
-      end
+      # def tmux_execute_window_commands
+      #   ( @tmux_window_precommands || [] ).each do | blk |
+      #     blk.()
+      #   end
+      # end
 
       def tmux_increase_current_window_number by=1
         self.tmux_current_window_number += by
@@ -44,19 +23,18 @@ module Lab42
 
       # tmux new-session -s $session_name -n console -d
       def tmux_new_session params=nil
-        if has_tmux_session?
-          tmux "attach -t #{@options.session_name}"
+        if session_exists?
+          system "tmux attach -t #{session_name}"
           exit 0
         end
         suffix = params ? " #{params}" : ""
-        session_name = @options.session_name
         tmux "new-session -s #{session_name} -d#{suffix}"
-        return if @options.no_source_file || @options.tmux_source_file.nil?
-        tmux "source-file #{@options.tmux_source_file}"
+        unless @options.no_source_file || @options.tmux_source_file.nil?
+          tmux "source-file #{@options.tmux_source_file}"
+        end
         tmux "set-window-option -g automatic-rename off"
-        tmux_project_home
-        at_exit do
-          tmux "attach -t #{session_name}"
+        unless @options.no_cd
+          tmux_project_home
         end
       end
 
@@ -87,10 +65,10 @@ module Lab42
         tmux_send_keys [@options.cmd_prefix, cmd].mk_string, eol
       end
 
-      # def tmux_project_home dir=nil
-      #   dir = File.join @options.dir, dir if dir && %r{\A[^/]} === dir
-      #   tmux_send_keys "cd #{dir || @options.dir}" 
-      # end
+      def tmux_project_home dir=project_home
+        dir = File.join project_home, dir if dir && %r{\A[^/~]} === dir
+        tmux_send_keys "cd #{dir}" 
+      end
 
       def tmux_register_window_command noexec=false, &blk
         blk.() unless noexec

data/lib/lab42/tmux/commands.rb

@@ -4,14 +4,6 @@ module Lab42
       attr_accessor :window_count
       def tmux cmd; commands << "tmux #{cmd}" end
 
-      def tmux_new_session cmd=nil
-        tmux "new-session -s #{session_name} -d#{lprefix cmd}"
-      end
-
-      def tmux_no_session_rename
-        tmux "set-window-option -g automatic-rename off" unless options.no_session_rename
-      end
-
       def tmux_source_file
         tmux "source-file #{options.source_file || File.join( ENV["HOME"], ".tmux.conf" )}"
       end

data/lib/lab42/tmux/current_window.rb

@@ -0,0 +1,28 @@
+module Lab42
+  class Tmux
+    module CurrentWindow
+
+      def tmux_current_window
+        "-t #{tmux_current_window_designation}"
+      end
+
+      def tmux_current_window_command cmd, *args
+        args = args.compact
+        arguments = args.empty? ? "" : " #{args.join(" ")}"
+        tmux "#{cmd} #{tmux_current_window}#{arguments}"
+      end
+
+      def tmux_current_window_designation
+        [session_name, tmux_current_window_number].join(":")
+      end
+      def tmux_current_window_number
+        @__tmux_current_window_number__ ||= 0
+      end
+
+      def tmux_current_window_number= new_val
+        @__tmux_current_window_number__ = new_val
+      end
+
+    end # module CurrentWindow
+  end # class Tmux
+end # module Lab42

data/lib/lab42/tmux/predefined/abstract_session.rb

@@ -0,0 +1,15 @@
+require 'lab42/tmux'
+require 'forwarder'
+
+module Lab42
+  class Tmux
+    module Predefined
+      module AbstractSession
+        attr_reader :tmux
+        extend Forwarder
+        forward_all :exec!, :render, to: :tmux
+      end # module AbstractSession
+    end # module Predefined
+  end # class Tmux
+end # module Lab42
+

data/lib/lab42/tmux/predefined/ruby_session.rb

@@ -33,6 +33,9 @@ module Lab42
             add_window "sh"
             # TODO: Specify this later if needed
             # instance_eval_or_call blk if blk
+            if options[:rails_server]
+              add_window "server", command: "bundle exec rails server"
+            end
           end
         end 
       end # class RubySession

data/lib/lab42/tmux/predefined/tmux_session.rb

@@ -0,0 +1,19 @@
+require 'lab42/tmux/predefined/abstract_session'
+
+module Lab42
+  class Tmux
+    module Predefined
+      class TmuxSession
+        include AbstractSession
+        private
+        def initialize *args, &blk
+          @tmux = Lab42::Tmux.new args do
+            options.wins.to_i.times do
+              add_window "sh"
+            end
+          end
+        end 
+      end # cmass TmuxSession
+    end # module Predefined
+  end # class Tmux
+end # module Lab42

data/lib/lab42/tmux/version.rb

@@ -1,5 +1,5 @@
 module Lab42
-  module Tmux
-    VERSION = "0.0.2"
+  class Tmux
+    VERSION = "0.0.3"
   end 
 end

data/lib/lab42/tmux/window/command.rb

@@ -6,12 +6,9 @@ module Lab42
       module Command
         include VimCommand
         extend Forwarder
-        forward_all :lprefix, :session_name, to: :session
-
-        def tmux *args
-          added_commands << session.tmux( *args )
-        end
+        forward_all :lprefix, :session_name, :tmux, to: :session
 
+        # TODO: Check for dead code here!
         def tmux_new_window( rename: false )
           [ tmux( "new-window -t #{session_name}#{new_window_name}" ) ] +
             (rename ? [] : [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_tmux
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lab42_options
@@ -106,12 +106,15 @@ extra_rdoc_files: []
 files:
 - lib/lab42/tmux.rb
 - lib/lab42/tmux/core_helpers.rb
+- lib/lab42/tmux/current_window.rb
 - lib/lab42/tmux/extensions/ostruct.rb
 - lib/lab42/tmux/extensions/object.rb
 - lib/lab42/tmux/extensions/hash.rb
 - lib/lab42/tmux/options.rb
 - lib/lab42/tmux/helpers.rb
 - lib/lab42/tmux/version.rb
+- lib/lab42/tmux/predefined/tmux_session.rb
+- lib/lab42/tmux/predefined/abstract_session.rb
 - lib/lab42/tmux/predefined/ruby_session.rb
 - lib/lab42/tmux/commands.rb
 - lib/lab42/tmux/window/command/vim_command.rb