threeman 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27245f62909c634dffc2b58459d0274a43b7bd5
-  data.tar.gz: 171dfafb1e03b7511e7b77bafdf244cc46eb2117
+  metadata.gz: 69d8685bd916a582798ff25ff645c0cc0d1b2349
+  data.tar.gz: 09caa15bd71c1c46aae565d13ae450ee1c064019
 SHA512:
-  metadata.gz: 508af4ea8207a1bd4411944b89d75799552d4841209a69f188b129eb6eacfe940fdd87f8737d2344180a32d9badc7345f61ff71eddcfb9207d76b160d29a3cdc
-  data.tar.gz: 7ff53715ab635ebf6ada6f68ac9f2d43e2e00b7903cf32b62a6347ebdbffed6f5ac5bab2f48c8b0198cff89f7b86e8e67dd8541ab62af785c0433abce888eed9
+  metadata.gz: bdd20f5247ee87ec37f52cf27169c6f6b409940410e9238f92c88e9ee758476dfb0c34ac6c66fdd7dba6f47021a46776fcd1341e71cb213bbdcabfb28ff60527
+  data.tar.gz: ad118a7c53bb3b6aacf54e6285708dc2af36216e34e1fe895dbdf940e761ff5918a79c2700ee37e2e54c7afca54fba4629d2fefb3483061cbb4ae2049bf586e1

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/tmux-client-*.log
+/.ruby-version

data/.threeman

@@ -0,0 +1,3 @@
+panes:
+  - one 
+  - three

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.0 - May 31, 2017
+
+* Adds `--panes=command_name command_two` to run certain commands in panes
+
 # 0.4.0 - March 18, 2017
 
 * Support reading .threeman or .foreman files to get the default options
@@ -28,4 +32,4 @@
 
 # 0.1.0 - March 28, 2016
 
-* First release
+* First release

data/Procfile

@@ -0,0 +1,3 @@
+one: echo 1; sleep 10
+two: echo 2; sleep 10
+three: echo 3; sleep 10

data/lib/threeman/cli.rb

@@ -4,17 +4,17 @@ require 'yaml'
 
 module Threeman
   FRONTENDS = {
-    :iterm3 => lambda {
+    :iterm3 => lambda { |options|
       require 'threeman/frontends/iterm3'
-      Threeman::Frontends::Iterm3.new
+      Threeman::Frontends::Iterm3.new(options)
     },
-    :mac_terminal => lambda {
+    :mac_terminal => lambda { |options|
       require 'threeman/frontends/mac_terminal'
-      Threeman::Frontends::MacTerminal.new
+      Threeman::Frontends::MacTerminal.new(options)
     },
-    :tmux => lambda {
+    :tmux => lambda { |options|
       require 'threeman/frontends/tmux'
-      Threeman::Frontends::Tmux.new
+      Threeman::Frontends::Tmux.new(options)
     }
   }
 
@@ -23,7 +23,10 @@ module Threeman
 
     desc "start", "Start the application"
     option :frontend, desc: "Which frontend to use.  One of: #{FRONTENDS.keys.sort.join(', ')}"
+    option :panes, desc: "Runs each command in a pane, if supported by the frontend.  (Currently supported in iterm3 and tmux.)", type: :array
     option :port, desc: "The port to run the application on.  This will set the PORT environment variable.", type: :numeric
+    option :layout_name, desc: "If using tmux, the layout name to use for paned commands", type: :string
+
     def start
       pwd = Dir.pwd
       procfile = Threeman::Procfile.new(File.expand_path("Procfile", pwd))
@@ -36,11 +39,11 @@ module Threeman
         exit! 1
       end
 
-      frontend(frontend_name).run_commands(commands)
+      frontend(frontend_name, options).run_commands(commands)
     end
 
     private
-    def frontend(name)
+    def frontend(name, options = {})
       frontend_lambda = FRONTENDS[name.to_sym]
       unless frontend_lambda
         puts "No frontend named #{name}!"
@@ -48,7 +51,7 @@ module Threeman
         exit! 1
       end
 
-      frontend_lambda.call
+      frontend_lambda.call(options)
     end
 
     def auto_frontend
@@ -83,4 +86,4 @@ module Threeman
       @dotfile ||= ['.threeman', '.foreman'].find { |filename| File.file?(filename) }
     end
   end
-end
+end

data/lib/threeman/frontend.rb

@@ -2,6 +2,12 @@ require 'shellwords'
 
 module Threeman
   class Frontend
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
     def run_commands(commands)
       raise "Subclasses must implement #run_commands"
     end
@@ -12,5 +18,13 @@ module Threeman
         command.bash_script
       ].join(" ; ")
     end
+
+    def sort_commands(commands)
+      commands.sort_by { |c| paned_command_names.include?(c.name) ? 0 : 1 }
+    end
+
+    def paned_command_names
+      options[:panes] || []
+    end
   end
-end
+end

data/lib/threeman/frontends/iterm3.rb

@@ -14,9 +14,13 @@ module Threeman
         iterm.activate
         window = iterm.create_window_with_default_profile
 
-        commands.each_with_index do |command, index|
+        sort_commands(commands).each_with_index do |command, index|
           current_tab = if index == 0
             window
+          elsif paned_command_names.include?(command.name)
+            tab = window.current_session.split_horizontally_with_same_profile
+            tab.select
+            window
           else
             window.create_tab_with_default_profile
           end
@@ -33,4 +37,4 @@ module Threeman
       end
     end
   end
-end
+end

data/lib/threeman/frontends/mac_terminal.rb

@@ -39,4 +39,4 @@ module Threeman
       end
     end
   end
-end
+end

data/lib/threeman/frontends/tmux.rb

@@ -5,12 +5,13 @@ module Threeman
     class Tmux < Threeman::Frontend
       attr_reader :session
 
-      def initialize
+      def initialize(options)
         @session = "threeman_#{Time.now.to_i}"
+        super
       end
 
       def run_commands(commands)
-        commands.each_with_index do |command, index|
+        sort_commands(commands).each_with_index do |command, index|
           run_command(command, index)
         end
 
@@ -21,13 +22,21 @@ module Threeman
       def run_command(command, index)
         bash_cmd = "bash -c #{Shellwords.escape bash_script(command)}"
 
-        common_opts = "-n #{Shellwords.escape command.name} -c #{Shellwords.escape command.workdir} #{Shellwords.escape bash_cmd}"
+        name_opt = "-n #{Shellwords.escape command.name}"
+        common_opts = "-c #{Shellwords.escape command.workdir} #{Shellwords.escape bash_cmd}"
         if index == 0
-          system "tmux new-session -d -s #{session} #{common_opts}"
+          system "tmux new-session -d -s #{session} #{name_opt} #{common_opts}"
+        elsif paned_command_names.include?(command.name)
+          system "tmux split-window -v -d -f -t #{session}:0.#{index - 1} #{common_opts}"
+          system "tmux select-layout -t #{session}:0 #{layout_name}"
         else
-          system "tmux -v new-window -t #{session}:#{index} #{common_opts}"
+          system "tmux -v new-window -t #{session}:#{index} #{name_opt} #{common_opts}"
         end
       end
+
+      def layout_name
+        options[:layout_name] || 'tiled'
+      end
     end
   end
-end
+end

data/lib/threeman/procfile.rb

@@ -13,4 +13,4 @@ module Threeman
       commands
     end
   end
-end
+end

data/lib/threeman/version.rb

@@ -1,3 +1,3 @@
 module Threeman
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: threeman
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -104,11 +104,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".threeman"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
 - bin/console