terminitor 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terminitor (0.2.2)
+    terminitor (0.3.1)
       github (~> 0.4.5)
       rb-appscript
       thor (~> 0.14.0)

data/README.md

@@ -9,6 +9,29 @@ Installation
     $ gem install terminitor
     $ terminitor init
 
+Development Setup
+---------------------
+
+To begin development on Terminitor, run bundler:
+
+    $ gem install bundler
+    $ bundle install
+
+The test suite uses ([Riot](https://www.github.com/thumblemonks/riot/)).
+to run the test run:
+
+    $ rake test
+
+or use watchr:
+
+    $ watchr test.watchr
+
+or if you have terminitor installed,
+
+    $ terminitor fetch achiu terminitor
+
+this will git clone the repo and bundle install.
+
 Usage
 -------
 
@@ -30,7 +53,7 @@ This will open your default editor (set through the $TERM_EDITOR or $EDITOR vari
       - cd ~/foo/bar
       - gitx
     - tab2:
-      - mysql -u root
+      - mysql -u root)
       - use test;
       - show tables;
     - tab3: echo "hello world"
@@ -306,10 +329,12 @@ Contributors
 
 Thanks to the following people for their contributions so far:
 
- * Pat George ([pcg79](http://github.com/pcg79)) for contributing a patch for when a project is not found.
- * Flavio Castelli ([flavio](http://github.com/flavio)) for contributing Konsole(KDE) core.
- * Alexey Kuleshov ([kulesa](http://github.com/kulesa)) for contributing the terminal settings and terminal settings capture functionality
-
+ * Pat George      ([pcg79](https://github.com/pcg79)) for contributing a patch for when a project is not found.
+ * Flavio Castelli ([flavio](https://github.com/flavio)) for contributing Konsole(KDE) core.
+ * Alexey Kuleshov ([kulesa](https://github.com/kulesa)) for contributing the terminal settings and terminal settings capture functionality
+ * Arthur Gunn     ([gunn](https://github.com/gunn)) for contributing a path to support tab syntax and load path.
+ * Elliot Winkler  ([mcmire](https://github.com/mcmire)) for adding 1.8.6 compatiblity and ensuring tabs open in order.
+ 
 Acknowledgements
 -----------------
 

data/Termfile

@@ -1,11 +1,7 @@
 # Terminitor Termfile
 
-setup do
-  run 'bundle install'
-end
+setup 'bundle install'
 
-window do
-  tab 'watchr test.watchr'
-  tab "gitx", "irb"
-  tab "open 'http://www.github.com/achiu/terminitor/issues'"
-end
+run 'watchr test.watchr'
+tab "irb"
+tab "open 'http://www.github.com/achiu/terminitor/issues'"

data/lib/terminitor.rb

@@ -1,3 +1,6 @@
+lib_dir = File.expand_path("..", __FILE__)
+$:.unshift( lib_dir ) unless $:.include?( lib_dir )
+
 require 'terminitor/yaml'
 require 'terminitor/dsl'
 require 'terminitor/runner'

data/lib/terminitor/abstract_capture.rb

@@ -33,4 +33,4 @@ module Terminitor
       dsl << margin + "end\n\n"
     end
   end
-end
+end

data/lib/terminitor/abstract_core.rb

@@ -29,15 +29,17 @@ module Terminitor
     def run_in_window(window_name, window_content, options = {})
       window_options = window_content[:options]
       first_tab = true
-      window_content[:tabs].each_pair do |tab_key, tab_content|
+      window_content[:tabs].keys.sort.each do |tab_key|
+        tab_content = window_content[:tabs][tab_key]
         # Open window on first 'tab' statement
         # first tab is already opened in the new window, so first tab should be
         # opened as a new tab in default window only
         tab_options = tab_content[:options]
         tab_name    = tab_options[:name] if tab_options
         if first_tab && !options[:default]
-          first_tab = false 
-          window_options = Hash[window_options.to_a + tab_options.to_a] # safe merge
+          first_tab = false
+          combined_options = (window_options.to_a + tab_options.to_a).inject([]) {|arr, pair| arr += pair }
+          window_options = Hash[*combined_options] # safe merge
           tab = window_options.empty? ? open_window(nil) : open_window(window_options)
         else
           tab = ( tab_key == 'default' ? active_window : open_tab(tab_options) ) # give us the current window if its default, else open a tab.

data/lib/terminitor/cores/mac_core.rb

@@ -128,7 +128,8 @@ module Terminitor
     
     # selects options allowed for window or tab
     def allowed_options(object_type, options)
-      Hash[ options.select {|option, value| ALLOWED_OPTIONS[object_type].include?(option) }]
+      pairs = options.select {|option, value| ALLOWED_OPTIONS[object_type].include?(option) }.inject([]) {|arr, pair| arr += pair }
+      Hash[*pairs]
     end
     
     # Add option to the list of delayed options

data/lib/terminitor/dsl.rb

@@ -34,12 +34,13 @@ module Terminitor
 
     # stores command in context
     # run 'brew update'
-    def run(command)
+    def run(*commands)
       if @_context.is_a?(Hash) && @_context[:tabs] # if we are in a window context, append commands to default tab.
-        @_context[:tabs]['default'][:commands]<<(command)
+        current = @_context[:tabs]['default'][:commands]
       else
-        @_context<<(command)
+        current = @_context
       end
+      current << commands.join(" && ")
     end
 
     # runs commands before each tab in window context
@@ -58,15 +59,21 @@ module Terminitor
     # sets command context to be run inside specific tab
     # tab(:name => 'new tab', :settings => 'Grass') { run 'mate .' }
     # tab 'ls', 'gitx'
-    def tab(options = {}, *commands, &block)
+    def tab(*args, &block)
       tabs     = @_context[:tabs]
       tab_name = "tab#{tabs.keys.size}"
       if block_given?
         tab_contents = tabs[tab_name] = {:commands => []}
+        
+        options = {}
+        options = args.pop          if args.last.is_a? Hash
+        options[:name] = args.first if args.first.is_a?(String) || args.first.is_a?(Symbol)
+        
         tab_contents[:options] = options unless options.empty?
+        
         in_context tab_contents[:commands], &block
       else
-        tabs[tab_name] = { :commands => [options] + commands}
+        tabs[tab_name] = { :commands => args}
       end
     end
 

data/lib/terminitor/version.rb

@@ -1,3 +1,3 @@
 module Terminitor
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/abstract_capture_test.rb

@@ -17,20 +17,13 @@ context "AbstractCapture" do
     end
     
     setup { @capture.capture_settings() }
-    asserts_topic.equivalent_to <<-OUTPUT
-window :size => [10, 20], :name => "main window" do
-    tab :settings => "Grass" do
-    end
-
-end
-
-window :size => [14, 30], :name => "another window" do
-    tab :settings => "Yello" do
-    end
-
-end
-
-OUTPUT
-
+    asserts_topic.matches %r{window .* do}
+    asserts_topic.matches %r{tab .* do\s+end}
+    asserts_topic.matches %r{\:name \=\> "main window"}
+    asserts_topic.matches %r{\:size \=\> \[10\, 20\]}
+    asserts_topic.matches %r{\:settings \=\> "Grass"}
+    asserts_topic.matches %r{\:name \=\> "another window"}
+    asserts_topic.matches %r{\:size \=\> \[14, 30\]}
+    asserts_topic.matches %r{\:settings \=\> "Yello"}
   end
-end
+end

data/test/abstract_core_test.rb

@@ -164,6 +164,39 @@ context "AbstractCore" do
         core.process!
       end
     end
+    
+    should "execute tabs in order" do
+      any_instance_of(Terminitor::AbstractCore) do |core|
+        stub(core).load_termfile('/path/to') {
+          {:windows => {'default' => {:tabs => {'tab1' => {:commands => ['ls']}, 
+                                                'tab2' => {:commands => ['ps']},
+                                                'tab3' => {:commands => ['whoami']},
+                                                'tab4' => {:commands => ['cd']},
+                                                'tab5' => {:commands => ['clear']},
+                                                'tab6' => {:commands => ['nmap']}}
+                                     }
+                       }
+          }
+        }
+      end
+      stub(Dir).pwd { nil }
+      core = Terminitor::AbstractCore.new('/path/to')
+      
+      mock(core).
+        open_tab(nil) { "first" }.then.
+        execute_command('ls', :in => "first").then.
+        open_tab(nil) { "second" }.then.
+        execute_command('ps', :in => "second").then.
+        open_tab(nil) { "third" }.then.
+        execute_command('whoami', :in => "third").then.
+        open_tab(nil) { "fourth" }.then.
+        execute_command('cd', :in => "fourth").then.
+        open_tab(nil) { "fifth" }.then.
+        execute_command('clear', :in => "fifth").then.
+        open_tab(nil) { "sixth" }.then.
+        execute_command('nmap', :in => "sixth")
+      core.process!
+    end
   end
 
 

data/test/cores/mac_core_test.rb

@@ -81,7 +81,7 @@ if platform?("darwin") # Only run test if it's darwin
 
     context "set_options" do 
       setup do 
-        @object, @terminal, @windows= 3.times.collect { Object.new }
+        @object, @terminal, @windows = Array.new(3) { Object.new }
         stub(@terminal).windows { @windows }
         any_instance_of(Terminitor::MacCore) do |core|
           stub(core).app('Terminal')           { @terminal }

data/test/dsl_test.rb

@@ -16,7 +16,9 @@ context "Dsl" do
                                                       "tab1"=>{:commands=>["echo 'first tab'", "echo 'of window'", "echo 'than now'"]},
                                                       "tab3"=>{:commands=>["top"],
                                                                :options =>{:name => "a tab", :settings => "Pro"}},
-                                                      "default"=>{:commands=>['whoami']}
+                                                      "tab4"=>{:commands=>["ls"],
+                                                               :options =>{:name => "another named tab", :settings => "Grass"}},
+                                                      "default"=>{:commands=>['whoami && who && ls']}
                                                      },
                                               :before => ['cd /path'],
                                               :options => {:size=>[70,30]}},

data/test/fixtures/bar.term

@@ -9,7 +9,7 @@ window :size => [70,30] do
   
   before 'cd /path'
 
-  run "whoami"
+  run "whoami","who", "ls"
   tab "echo 'first tab'", "echo 'of window'", "echo 'than now'"
   
   tab :name => "named tab", :settings => "Grass" do
@@ -17,9 +17,11 @@ window :size => [70,30] do
     run "ls"
   end
 
-  tab :name => "a tab", :settings => "Pro" do
+  tab "a tab", :settings => "Pro" do
     run "top"
   end
+  
+  tab("another named tab", :settings => 'Grass') { run "ls" }
 end
 
 window :name => 'server' do

data/test/teststrap.rb

@@ -18,32 +18,28 @@ end
 
 module Kernel
   def capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval("$#{stream} = #{stream.upcase}")
-    end
-    result
+    eval "$#{stream} = StringIO.new"
+    yield
+    eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.to_s.upcase}")
   end
 end
 
 # This is to silence the 'task' warning for the mocks.
 class Thor
   class << self
-        def create_task(meth) #:nodoc:
-        if @usage && @desc
-          base_class = @hide ? Thor::HiddenTask : Thor::Task
-          tasks[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)
-          @usage, @desc, @long_desc, @method_options, @hide = nil
-          true
-        elsif self.all_tasks[meth] || meth == "method_missing"
-          true
-        else
-          false
-        end
+    def create_task(meth) #:nodoc:
+      if @usage && @desc
+        base_class = @hide ? Thor::HiddenTask : Thor::Task
+        tasks[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)
+        @usage, @desc, @long_desc, @method_options, @hide = nil
+        true
+      elsif self.all_tasks[meth] || meth == "method_missing"
+        true
+      else
+        false
       end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency