terminal_velocity 0.0.2 → 0.0.3

data/Rakefile

@@ -19,7 +19,7 @@ Spec::Rake::SpecTask.new do |t|
 end
 
 GEM = "terminal_velocity"
-GEM_VERSION = "0.0.2"
+GEM_VERSION = "0.0.3"
 AUTHOR = "Corey Donohoe"
 EMAIL = "atmos@atmos.org"
 HOMEPAGE = "http://www.atmos.org/terminal-velocity/"

data/lib/terminal_velocity/templates/applescript.ssh.erb

@@ -38,9 +38,14 @@ tell application "Terminal"
   activate
 
   -- make a new window with the execution of a trivial command
+  <% if options[:current_window] %>
+  set tabOffset to 1
+  set windowOffset to 0
+  <% else %>
   set tabOffset to 0
   set windowOffset to 1
-  my do_submenu("Terminal", "Shell", "New Window", "Pro")
+  my do_submenu("Terminal", "Shell", "New Window", "<%= options[:term_theme] %>")
+  <% end %>
 
   -- load up the window id of the window we just created
   set window_id to id of first window whose frontmost is true
@@ -48,7 +53,7 @@ tell application "Terminal"
 
   -- make tabs 2, 3 and 4
   repeat with i from 1 to (<%= @users_at_hostnames.size %> - windowOffset)
-    my do_submenu("Terminal", "Shell", "New Tab", "Pro")
+    my do_submenu("Terminal", "Shell", "New Tab", "<%= options[:term_theme] %>")
   end repeat
 
   <% @users_at_hostnames.each_with_index do |user_at_hostname, i| %>

data/lib/terminal_velocity/templates.rb

@@ -1,9 +1,12 @@
 module TerminalVelocity
   module Templates
     class Runner
-      def self.run(username, hostnames)
+      def self.run(username, hostnames, custom_options = { })
         users_at_hostnames = hostnames.map { |hostname| "#{username}@#{hostname}" }
-        new(users_at_hostnames).run
+
+        runner = new(users_at_hostnames)
+        runner.options.merge!(custom_options)
+        runner.run
       end
 
       def initialize(users_at_hostnames)
@@ -15,6 +18,10 @@ module TerminalVelocity
         launch
       end
 
+      def options
+        @options ||= { :term_theme => "Pro", :current_window => false}
+      end
+
       private
         def ssh_command(user_at_hostname)
           "clear; ssh -o StrictHostKeyChecking=no #{user_at_hostname}"
@@ -27,7 +34,14 @@ module TerminalVelocity
         end
 
         def launch
-          %x{#{launcher_script} "#{script_filename}" 2>/dev/null}
+          results = `#{launcher_script} "#{script_filename}" 2>&1`
+          if $?.to_i != 0
+            case results
+              when /Can’t get window 1 whose frontmost = true. Invalid index/
+                $stderr.puts("You need to 'Enable access for assistive devices.'")
+              else
+            end
+          end
         end
 
         def script_filename

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terminal_velocity
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Corey Donohoe