threeman 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb5fce8492e5868a3b033affa86b026f3f90c3a
-  data.tar.gz: 36f664f9664b76e5b8bf0cda32fa64c1e9ec30f0
+  metadata.gz: 765f19786b13a7cb5a023f159e8d430d1a0e75a3
+  data.tar.gz: f86d28d400765992a9de7df2323f1b414f30b493
 SHA512:
-  metadata.gz: 6fdc1645b9da3d0e35f64503f578d9309346e9747551ff521708540eb039f68b181809cd47fbfe334cf6d2b93fb3de9cb334b616731f08b68e39dcb36cd3750b
-  data.tar.gz: 1f6cf541d3aff2685ac08ac7695f23e88ac4d01686e1110333c001cae005cbc75b1f2371bf6249ce563aa2dbfa26964184fe7940f039696f11eed77508b95263
+  metadata.gz: ddbce7064da10dfb54e0c9b5951c0432a185e015b08de43991b310d66bca1f68ce8220f78cf348db3262b6d5a49ec49829cc58eb288775dbd81ed944c16182b4
+  data.tar.gz: 2150184f85c6c89adc40105462d305db012073c82102bbb910691c03d2142ae5f85b78550b0c4501ad77b6d1a32913fd55a72edf8f4c931cef805bb2d0ce96ed

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# 0.2.0 - March 29, 2016
+
+* Refactor into multiple frontends
+* Add support for Mac OS X Terminal.app
+
+# 0.1.1 - March 28, 2016
+
+* Add license
+* Add code of conduct
+* Change ownership to patientslikeme
+
+# 0.1.0 - March 28, 2016
+
+* First release

data/README.md

@@ -1,13 +1,18 @@
 # Threeman
 
-Threeman is an alternative to [Foreman](https://github.com/ddollar/foreman) for Mac users.  Rather than running all the commands together in one terminal, it opens a new [iTerm 2](https://www.iterm2.com) window with each command in a tab.  The benefits of this are:
+Threeman is an alternative to [Foreman](https://github.com/ddollar/foreman).  Rather than running all the commands together in one terminal, it opens a new terminal window with each command in a tab.  The benefits of this are:
 
-* iTerm 2 will notify you using an icon when there's new output from each command
+* Your terminal app will notify you using an icon when there's new output from each command
 * Because your command's input and output aren't being intercepted by Foreman, you can use [Pry](http://pryrepl.org)
 
+Threeman also has an extensible architecture to allow it to support multiple terminal apps.  Right now, it supports:
+
+* iTerm 2.9 and above
+* Mac OS X's built-in Terminal app
+
 ## Installation
 
-Make sure you have [iTerm 2](https://www.iterm2.com/downloads.html) at least version 2.9 installed.
+Make sure you have a supported terminal app installed.
 
 Run:
 
@@ -19,7 +24,7 @@ From your app's directory (with a Procfile in it), run:
 
     $ threeman
 
-Threeman will open a new iTerm 2 window with each of your Procfile commands running in a separate tab.
+Threeman will open a new terminal window with each of your Procfile commands running in a separate tab.
 
 ## Development
 

data/lib/threeman/cli.rb

@@ -1,43 +1,63 @@
-require 'foreman/procfile'
-require 'shellwords'
-require 'rb-scpt'
+require 'threeman/procfile'
 require 'thor'
 
 module Threeman
+  FRONTENDS = {
+    :iterm3 => lambda {
+      require 'threeman/frontends/iterm3'
+      Threeman::Frontends::Iterm3.new
+    },
+    :mac_terminal => lambda {
+      require 'threeman/frontends/mac_terminal'
+      Threeman::Frontends::MacTerminal.new
+    }
+  }
+
   class CLI < Thor
     default_task :start
 
     desc "start", "Start the application"
+    option :frontend
     def start
-      iterm = Appscript.app("iTerm")
-      iterm.activate
-      window = iterm.create_window_with_default_profile
-
       pwd = Dir.pwd
+      procfile = Threeman::Procfile.new(File.expand_path("Procfile", pwd))
+      commands = procfile.commands(pwd)
 
-      procfile = Foreman::Procfile.new(File.expand_path("Procfile", pwd))
-      is_first = true
-      procfile.entries do |name, command|
-        current_tab = if is_first
-          window
-        else
-          window.create_tab_with_default_profile
-        end
-
-        run_command(current_tab.current_session, name, pwd, command)
-        is_first = false
+      frontend_name = options[:frontend] || auto_frontend
+      unless frontend_name
+        puts "Couldn't determine a frontend to use.  Please specify one using --frontend."
+        print_valid_frontend_names
+        exit! 1
       end
+
+      frontend(frontend_name).run_commands(commands)
     end
 
     private
-    def run_command(session, name, workdir, command)
-      bash_script = [
-        "echo -ne \"\\033]0;#{Shellwords.escape name}\\007\"",
-        "cd #{workdir}",
-        command
-      ].join(" ; ")
-
-      session.write(text: "bash -c #{Shellwords.escape bash_script}")
+    def frontend(name)
+      frontend_lambda = FRONTENDS[name.to_sym]
+      unless frontend_lambda
+        puts "No frontend named #{name}!"
+        print_valid_frontend_names
+        exit! 1
+      end
+
+      frontend_lambda.call
+    end
+
+    def auto_frontend
+      if File.exist?('/Applications/iTerm.app/Contents/Info.plist')
+        iterm_version = `defaults read /Applications/iTerm.app/Contents/Info.plist CFBundleShortVersionString`
+        return :iterm3 if iterm_version >= "2.9"
+      end
+
+      if File.exist?('/Applications/Utilities/Terminal.app/Contents/Info.plist')
+        return :mac_terminal
+      end
+    end
+
+    def print_valid_frontend_names
+      puts "Valid frontend names are: #{FRONTENDS.keys.sort.join(', ')}."
     end
   end
 end

data/lib/threeman/command.rb

@@ -0,0 +1,20 @@
+require 'shellwords'
+
+module Threeman
+  class Command
+    attr_accessor :name, :command, :workdir
+
+    def initialize(name, command, workdir)
+      @name = name
+      @command = command
+      @workdir = workdir
+    end
+
+    def bash_script
+      [
+        "cd #{workdir}",
+        command
+      ].join(" ; ")
+    end
+  end
+end

data/lib/threeman/frontend.rb

@@ -0,0 +1,16 @@
+require 'shellwords'
+
+module Threeman
+  class Frontend
+    def run_commands(commands)
+      raise "Subclasses must implement #run_commands"
+    end
+
+    def bash_script(command)
+      [
+        "echo -ne \"\\033]0;#{Shellwords.escape command.name}\\007\"",
+        command.bash_script
+      ].join(" ; ")
+    end
+  end
+end

data/lib/threeman/frontends/iterm3.rb

@@ -0,0 +1,34 @@
+require 'threeman/frontend'
+begin
+  require 'rb-scpt'
+rescue LoadError
+  puts "The iterm3 frontend for Threeman requires the rb-scpt gem.  Install it using: gem install rb-scpt"
+  exit!
+end
+
+module Threeman
+  module Frontends
+    class Iterm3 < Threeman::Frontend
+      def run_commands(commands)
+        iterm = Appscript.app("iTerm")
+        iterm.activate
+        window = iterm.create_window_with_default_profile
+
+        commands.each_with_index do |command, index|
+          current_tab = if index == 0
+            window
+          else
+            window.create_tab_with_default_profile
+          end
+
+          run_command(current_tab.current_session, command)
+        end
+      end
+
+      private
+      def run_command(session, command)
+        session.write(text: "bash -c #{Shellwords.escape bash_script(command)}")
+      end
+    end
+  end
+end

data/lib/threeman/frontends/mac_terminal.rb

@@ -0,0 +1,41 @@
+require 'threeman/frontend'
+begin
+  require 'rb-scpt'
+rescue LoadError
+  puts "The mac_terminal frontend for Threeman requires the rb-scpt gem.  Install it using: gem install rb-scpt"
+  exit!
+end
+
+module Threeman
+  module Frontends
+    class MacTerminal < Threeman::Frontend
+      def run_commands(commands)
+        events = Appscript.app("System Events")
+
+        terminal = Appscript.app("Terminal")
+        terminal.activate
+
+        terminal_controller = events.processes['Terminal']
+
+        commands.each_with_index do |command, index|
+          if index == 0
+            terminal.do_script("")
+          else
+            sleep 0.3 # Terminal is slow and its scripting API is prone to misbehavior; wait for it to finish doing the thing we just did
+
+            terminal_controller.keystroke("t", using: [:command_down])
+            terminal.do_script("", in: terminal.windows[0])
+          end
+
+          sleep 0.3
+          terminal_controller.keystroke(bash_cmd(command) + "\n")
+        end
+      end
+
+      private
+      def bash_cmd(command)
+        "bash -c #{Shellwords.escape bash_script(command)}"
+      end
+    end
+  end
+end

data/lib/threeman/procfile.rb

@@ -0,0 +1,16 @@
+require 'foreman/procfile'
+require 'threeman/command'
+
+module Threeman
+  class Procfile < Foreman::Procfile
+    def commands(workdir)
+      commands = []
+
+      entries do |name, command|
+        commands << Threeman::Command.new(name, command, workdir)
+      end
+
+      commands
+    end
+  end
+end

data/lib/threeman/version.rb

@@ -1,3 +1,3 @@
 module Threeman
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/threeman.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rb-scpt"
   spec.add_dependency "foreman"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rb-scpt"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: threeman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rb-scpt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-scpt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An alternative to Foreman for Mac users, which runs each command in a
   separate iTerm 2 tab
 email:
@@ -91,6 +105,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -101,6 +116,11 @@ files:
 - exe/threeman
 - lib/threeman.rb
 - lib/threeman/cli.rb
+- lib/threeman/command.rb
+- lib/threeman/frontend.rb
+- lib/threeman/frontends/iterm3.rb
+- lib/threeman/frontends/mac_terminal.rb
+- lib/threeman/procfile.rb
 - lib/threeman/version.rb
 - threeman.gemspec
 homepage: https://github.com/patientslikeme/threeman