terminitor 0.5.0 → 0.5.1

data/README.md

@@ -371,7 +371,8 @@ Thanks to the following people for their contributions so far:
  * Ilkka Laukkanen ([ilkka](https://github.com/achiu/terminitor/commits/master?author=ilkka)) for Terminator core and other fixes
  * Elia Schito     ([elia](https://github.com/achiu/terminitor/commits/master?author=elia)) for patch to allow usage of "&" for background operations
  * Dotan J. Nahum  ([[jondot](https://github.com/jondot)) for adding windows(cmd.exe) support
- 
+ * Kyriacos Souroullas ([[kyriacos](https://github.com/kyriacos) For removing params to support generic commands
+
 Acknowledgements
 -----------------
 

data/lib/terminitor.rb

@@ -14,9 +14,9 @@ module Terminitor
   when %r{darwin}
     require 'appscript'
     autoload :MacCore,        'terminitor/cores/mac_core'
-    autoload :MacCapture,     'terminitor/capture/mac_capture'  
+    autoload :MacCapture,     'terminitor/capture/mac_capture'
     autoload :ItermCore,      'terminitor/cores/iterm_core'
-    autoload :ItermCapture,   'terminitor/capture/iterm_capture' 
+    autoload :ItermCapture,   'terminitor/capture/iterm_capture'
   when %r{linux}
     require 'dbus'
     autoload :KonsoleCore,    'terminitor/cores/konsole_core'

data/lib/terminitor/dsl.rb

@@ -45,12 +45,14 @@ module Terminitor
     #   run 'brew update'
     def run(*commands)
       # if we are in a window context, append commands to default tab.
-      if @_context.is_a?(Hash) && @_context[:tabs] 
+      if @_context.is_a?(Hash) && @_context[:tabs]
         current = @_context[:tabs]['default'][:commands]
       else
         current = @_context
       end
-      current << commands.map { |c| "(#{c})" }.join(" && ")
+      current << commands.map do |c|
+        c =~ /&$/ ? "(#{c})" : c
+      end.join(" && ")
     end
 
     # runs commands before each tab in window context

data/lib/terminitor/version.rb

@@ -1,3 +1,3 @@
 module Terminitor
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/dsl_test.rb

@@ -22,7 +22,7 @@ context "Dsl" do
           setup { topic[:tabs] }
           
           asserts([:[], 'tab2']).equivalent_to({
-            :commands=>["(echo 'named tab')", "(ls)"], 
+            :commands=>["echo 'named tab'", "ls"],
             :options => {
               :name => "named tab",
               :settings=>"Grass"
@@ -30,11 +30,11 @@ context "Dsl" do
           })
 
           asserts([:[], 'tab1']).equivalent_to({
-            :commands=>["echo 'first tab'", "echo 'of window'", "echo 'than now'"]
+            :commands=>["echo 'first tab'", "motion &", "echo 'than now'"]
           })
 
           asserts([:[],'tab3']).equivalent_to({
-            :commands=>["(top)"],
+            :commands=>["top","(mate &) && (gitx &) && cd /this"],
             :options =>{
               :name => "a tab",
               :settings => "Pro"
@@ -42,7 +42,7 @@ context "Dsl" do
           })
 
           asserts([:[],'tab4']).equivalent_to({
-            :commands=>["(ls)"],
+            :commands=>["ls"],
             :options =>{
               :name => "another named tab",
               :settings => "Grass"
@@ -50,7 +50,7 @@ context "Dsl" do
           })
 
           asserts([:[],'default']).equivalent_to({
-            :commands=>['(whoami) && (who) && (ls)']
+            :commands=>['whoami && who && ls']
           })
         end
 
@@ -59,7 +59,7 @@ context "Dsl" do
       context "with 'window2' key" do
         setup { topic['window2'] }
 
-        asserts([:[],:before]).equals ['(whoami)']
+        asserts([:[],:before]).equals ['whoami']
 
         context "with :tabs" do
           setup { topic[:tabs] }

data/test/fixtures/bar.term

@@ -10,7 +10,7 @@ window :size => [70,30] do
   before 'cd /path'
 
   run "whoami","who", "ls"
-  tab "echo 'first tab'", "echo 'of window'", "echo 'than now'"
+  tab "echo 'first tab'", "motion &", "echo 'than now'"
   
   tab :name => "named tab", :settings => "Grass" do
     run "echo 'named tab'"
@@ -19,6 +19,7 @@ window :size => [70,30] do
 
   tab "a tab", :settings => "Pro" do
     run "top"
+    run "mate &", "gitx &", "cd /this"
   end
   
   tab("another named tab", :settings => 'Grass') { run "ls" }

metadata

@@ -2,7 +2,7 @@
 name: terminitor
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -07:00
+date: 2011-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency