terminitor 0.4.1 → 0.5.0

data/terminitor.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Arthur Chiu', 'Nathan Esquenazi']
   s.email       = ['mr.arthur.chiu@gmail.com','nesquena@gmail.com']
   s.homepage    = "http://rubygems.org/gems/terminitor"
-  s.summary     = "Outsource your workflow to Skynet"
+  s.summary     = "Automate your development workflow"
   s.description = "Automate your development workflow"
 
   s.required_rubygems_version = ">= 1.3.6"
@@ -17,24 +17,35 @@ Gem::Specification.new do |s|
   # Platform Specific Dependencies
   case RUBY_PLATFORM.downcase
   when %r{darwin}
-    s.add_dependency "rb-appscript"
+    s.add_dependency "rb-appscript", "~>0.6.1"
+  when %r{linux}
+    s.add_dependency "ruby-dbus"
+  when %r{mswin|mingw}
+    s.add_dependency "windows-api", "= 0.4.0"
+    s.add_dependency "windows-pr", "= 1.1.2"
+    s.add_dependency "win32-process", "= 0.6.4"
   else
   end
   
-  s.add_dependency "text-hyphen", "1.0.0"
-  s.add_dependency "text-format", "1.0.0"
   s.add_dependency "thor",   "~>0.14.0"
-  s.add_dependency "github", "~>0.6.0"
+  s.add_dependency "github", "~>0.6.2"
   s.add_development_dependency "bundler", "~>1.0.0"
-  s.add_development_dependency "riot",    "~>0.12.0"
+  s.add_development_dependency "riot",    "~>0.12.3"
   s.add_development_dependency "rr",      "~>1.0.0"
   s.add_development_dependency "fakefs"
   s.post_install_message = %q{********************************************************************************
 
-    Terminitor is installed! 
-    Please run 'terminitor init'. 
-    This will create a directory at ~/.terminitor which will hold all your global scripts.
-    Thanks!
+    Terminitor is installed!  Please run:
+    
+      terminitor init
+
+    This will create a directory at ~/.config/terminitor which will hold all your global scripts.
+
+    For those updating from a previous version of Terminitor(<=0.4.1) please run
+
+      terminitor update
+
+    This will copy over your terminitor files from the old path to the newer .config/terminitor location.
 
 ********************************************************************************
   }

data/test.watchr

@@ -3,10 +3,14 @@ system 'clear'
 
 def growl(message)
   growlnotify = `which growlnotify`.chomp
-  title = "Watchr Test Results"
-  image = message.include?('0 failures, 0 errors') ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
-  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
-  system %(#{growlnotify} #{options} &)
+  if not growlnotify.empty?
+    title = "Watchr Test Results"
+    image = message.include?('0 failures, 0 errors') ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
+    options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
+    system %(#{growlnotify} #{options} &)
+  else
+    puts message
+  end
 end
 
 def run(cmd)
@@ -67,4 +71,4 @@ Signal.trap 'INT' do
     # raise Interrupt, nil # let the run loop catch it
     run_suite
   end
-end
+end

data/test/capture/mac_capture_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../teststrap',__FILE__)
 
-if platform?("darwin") # Only run test if it's darwin
+on_platform "darwin" do
   context "MacCapture" do
     # Stub out the initialization
     setup do
@@ -35,8 +35,4 @@ if platform?("darwin") # Only run test if it's darwin
       asserts_topic.equals { {:bounds => [10,20,30,40]} }
     end
   end
-else
-  context "MacCore" do
-    puts "Nothing to do, you are not on OSX"
-  end
-end
+end

data/test/cli_test.rb

@@ -1,12 +1,16 @@
 require File.expand_path('../teststrap', __FILE__)
 
 context "Terminitor" do
+
+  helper(:terminitor_root) { |file| File.join(ENV['HOME'],'.config','terminitor',file) }
+
   setup do
-    @yaml = File.read(File.expand_path('../fixtures/foo.yml', __FILE__))
+    @yaml     = File.read(File.expand_path('../fixtures/foo.yml', __FILE__))
     @template = File.read(File.expand_path('../../lib/templates/example.yml.tt', __FILE__))
     FakeFS.activate!
-    FileUtils.mkdir_p(File.join(ENV["HOME"],'.terminitor'))
+    FileUtils.mkdir_p(File.join(ENV["HOME"],'.config','terminitor'))
   end
+
   teardown  { FakeFS.deactivate! }
 
   context "help" do
@@ -18,9 +22,8 @@ context "Terminitor" do
 
   context "list" do
     setup do
-      @path = "#{ENV['HOME']}/.terminitor/"
-      File.open(File.join(@path,'foo.yml'),"w") { |f| f.puts @template }
-      File.open(File.join(@path,'bar.yml'),"w") { |f| f.puts @template }
+      File.open(terminitor_root('foo.yml'),"w") { |f| f.puts @template }
+      File.open(terminitor_root('bar.yml'),"w") { |f| f.puts @template }
       capture(:stdout) { Terminitor::Cli.start(['list']) }
     end
     asserts_topic.matches %r{foo\.yml - COMMENT OF SCRIPT HERE}
@@ -29,20 +32,20 @@ context "Terminitor" do
 
   asserts "#init creates .terminitor" do
     capture(:stdout) { Terminitor::Cli.start(['init']) }
-    File.exists?("#{ENV['HOME']}/.terminitor")
+    File.exists?("#{ENV['HOME']}/.config/terminitor")
   end
 
   context "edit" do
     setup do
       FakeFS.deactivate!
-      `rm -rf #{ENV['HOME']}/.terminitor/test_foo_bar2.yml`
-      `rm -rf #{ENV['HOME']}/.terminitor/test_foo_bar2.term`
+      `rm -rf #{terminitor_root('test_foo_bar2.yml')}`
+      `rm -rf #{terminitor_root('test_foo_bar2.term')}`
     end
 
     teardown  do
       `rm -rf /tmp/sample_project`
-      `rm -rf #{ENV['HOME']}/.terminitor/test_foo_bar2.yml`
-      `rm -rf #{ENV['HOME']}/.terminitor/test_foo_bar2.term`
+      `rm -rf #{terminitor_root('test_foo_bar2.yml')}`
+      `rm -rf #{terminitor_root('test_foo_bar2.term')}`
     end
 
     context "for project" do
@@ -50,39 +53,41 @@ context "Terminitor" do
       context "for yaml" do
         setup do 
           capture(:stdout) do
-            mock.instance_of(Terminitor::Cli).open_in_editor("#{ENV['HOME']}/.terminitor/test_foo_bar2.yml",nil) { true }.once
+            mock.instance_of(Terminitor::Cli).open_in_editor(terminitor_root('test_foo_bar2.yml'),nil) { true }.once
             Terminitor::Cli.start(['edit','test_foo_bar2', '-s=yml'])
           end
         end
         asserts_topic.matches %r{create}
         asserts_topic.matches %r{test_foo_bar2.yml}
-        asserts("has yml template") { File.read(File.join(ENV['HOME'],'.terminitor','test_foo_bar2.yml')) }.matches %r{- tab1}
+        asserts("has yml template") { File.read terminitor_root('test_foo_bar2.yml') }.matches %r{- tab1}
       end
 
       context "for term" do
         setup do
           capture(:stdout) do
-            mock.instance_of(Terminitor::Cli).open_in_editor("#{ENV['HOME']}/.terminitor/test_foo_bar2.term",nil) { true }.once
+            mock.instance_of(Terminitor::Cli).open_in_editor(terminitor_root('test_foo_bar2.term'),nil) { true }.once
             Terminitor::Cli.start(['edit','test_foo_bar2', '-s=term'])
           end
         end
         asserts_topic.matches %r{create}
         asserts_topic.matches %r{test_foo_bar2.term}
-        asserts("has term template") { File.read(File.join(ENV['HOME'],'.terminitor','test_foo_bar2.term')) }.matches %r{setup}
+        asserts("has term template") { File.read terminitor_root('test_foo_bar2.term') }.matches %r{setup}
       end
 
     end
 
     context "for Termfile" do
+
+      helper(:termfile) { '/tmp/sample_project/Termfile' }
       setup do
         capture(:stdout) do
-          mock.instance_of(Terminitor::Cli).open_in_editor("/tmp/sample_project/Termfile",nil) { true }.once
+          mock.instance_of(Terminitor::Cli).open_in_editor(termfile,nil) { true }.once
           Terminitor::Cli.start ['edit','-s=yml','-r=/tmp/sample_project']
         end
       end
       asserts_topic.matches %r{create}
       asserts_topic.matches %r{Termfile}
-      asserts("has term template") { File.read('/tmp/sample_project/Termfile') }.matches %r{setup}
+      asserts("has term template") { File.read termfile }.matches %r{setup}
     end
 
     should "accept editor flag" do
@@ -104,7 +109,7 @@ context "Terminitor" do
         asserts "with no core returns a message that" do
           capture(:stdout) do
             mock.instance_of(Terminitor::Cli).capture_core(anything) { nil }
-            FileUtils.touch("#{ENV['HOME']}/.terminitor/delete_this.term")
+            FileUtils.touch terminitor_root('delete_this.term')
             Terminitor::Cli.start(['edit', 'test_foo_bar2', '--capture'])
           end
         end.matches %r{No suitable core found!}
@@ -112,7 +117,7 @@ context "Terminitor" do
 
         asserts "with core that it executes" do
           mock.instance_of(Terminitor::Cli).capture_core(anything) { mock!.new.mock!.capture_settings { "settings"} }
-          mock.instance_of(Terminitor::Cli).open_in_editor("#{ENV['HOME']}/.terminitor/test_foo_bar2.term",nil) { true }
+          mock.instance_of(Terminitor::Cli).open_in_editor(terminitor_root('test_foo_bar2.term'),nil) { true }
           Terminitor::Cli.start(['edit','test_foo_bar2', '--capture'])
         end
 
@@ -144,15 +149,15 @@ context "Terminitor" do
     end
 
     denies "yaml exists" do
-      FileUtils.touch "#{ENV['HOME']}/.terminitor/delete_this.yml"
+      FileUtils.touch terminitor_root('delete_this.yml')
       capture(:stdout) { Terminitor::Cli.start(['delete','delete_this', '-s=yml']) }
-      File.exists? "#{ENV['HOME']}/.terminitor/delete_this.yml"
+      File.exists? terminitor_root('delete_this.yml')
     end
 
     denies "term exists" do
-      FileUtils.touch "#{ENV['HOME']}/.terminitor/delete_this.term"
+      FileUtils.touch terminitor_root('delete_this.term')
       capture(:stdout) { Terminitor::Cli.start(['delete','delete_this']) }
-      File.exists? "#{ENV['HOME']}/.terminitor/delete_this.term"
+      File.exists? terminitor_root('delete_this.term')
     end
   end
 
@@ -177,4 +182,31 @@ context "Terminitor" do
       Terminitor::Cli.start ['fetch','achiu','terminitor']
     end
   end
+
+  context "#update" do
+
+    context "with old global path" do
+      helper(:test_yml) { File.join(ENV["HOME"], '.terminitor', 'test.yml') }
+
+      setup do
+        FileUtils.mkdir_p File.join(ENV['HOME'], '.terminitor')
+        FileUtils.touch test_yml
+      end
+
+      asserts "that it will move the old global folder over to the new one" do
+        capture(:stdout) do
+          Terminitor::Cli.start(['update'])
+        end
+      end.matches %r{Terminitor has updated your global folder}
+
+      denies "that their exists the old folder" do
+        File.exists? test_yml
+      end
+
+      asserts "that the new folder exists" do
+        File.exists? File.join(ENV['HOME'],'.config','terminitor', 'test.yml')
+      end
+    end
+
+  end
 end

data/test/cores/cmd_core_test.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../../teststrap', __FILE__)
+
+on_platform 'mingw32', 'mswin32' do
+
+  context "CmdCore" do
+    setup do
+        any_instance_of(Terminitor::CmdCore) do |core|
+        stub(core).load_termfile('/path/to') { true }
+        stub(core).window_id { "1" }
+      end
+    end
+    setup { Terminitor::CmdCore.new('/path/to') }
+    
+    context "open_window" do
+      setup{ topic.open_window }  #topic is switched from cmdcore to windowsconsole.
+      asserts_topic.kind_of(Terminitor::WindowsConsole)
+      denies("that window id is nil"){ topic.pid.nil? }
+      asserts("that killed window returns id"){topic.kill!}
+    end
+
+    #currently same thing, we emulate tab as window.
+    context "open_tab" do
+      setup{ topic.open_tab } 
+      asserts_topic.kind_of(Terminitor::WindowsConsole)
+      denies("that window id is nil"){ topic.pid.nil? }
+      asserts("that killed window returns id"){topic.kill!}
+    end
+
+    context "execute with window" do
+      hookup { @window = topic.open_window }
+      hookup { mock(@window).send_command("hello\n") { true }}
+      asserts("that it can execute") { topic.execute_command "hello", :in => @window }
+      teardown { @window.kill! }
+    end
+
+    context "execute without window" do
+      hookup { @window = topic.open_window }
+      hookup { mock(@window).send_command("hello\n") { true }}
+      hookup { mock(topic).current_window { @window }}
+      asserts("that it executes in injected current window") { topic.execute_command "hello" }
+      teardown { @window.kill! }
+    end
+
+    context "translate commands" do
+      hookup { @window = topic.open_window }
+      hookup { mock(@window).send_command("cls\n") { true }}
+      asserts("that it executes in injected current window") { topic.execute_command "clear", :in => @window }
+      teardown { @window.kill! }
+    end
+  end
+end

data/test/cores/iterm_core_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../../teststrap',__FILE__)
 
-if platform?("darwin") # Only run test if it's darwin
+on_platform "darwin" do 
+
   context "ItermCore" do
     setup do
       any_instance_of(Terminitor::ItermCore) do |core|
@@ -59,9 +60,5 @@ if platform?("darwin") # Only run test if it's darwin
     end
 
   end
-else
-  context "itermCore" do
-    puts "Nothing to do, you are not on OSX"
-  end
 end
 

data/test/cores/konsole_core_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../teststrap',__FILE__)
-if platform?('linux')
+on_platform 'linux' do
   require 'dbus'
   context "KonsoleCore" do
     # Stub out the initialization

data/test/cores/mac_core_test.rb

@@ -1,13 +1,14 @@
 require File.expand_path('../../teststrap',__FILE__)
 
-if platform?("darwin") # Only run test if it's darwin
+on_platform "darwin" do
+
   context "MacCore" do
     setup do
       any_instance_of(Terminitor::MacCore) do |core|
         stub(core).app('Terminal')           { mock!.windows { true } }
         stub(core).load_termfile('/path/to') { true }
       end
-     @mac_core = Terminitor::MacCore.new('/path/to')  
+      Terminitor::MacCore.new('/path/to')
     end
 
     asserts "#terminal_process calls System Events" do
@@ -98,9 +99,12 @@ if platform?("darwin") # Only run test if it's darwin
       context "invalid settings" do
         should "return a error message that" do
           stub(@terminal).settings_sets {{:invalid_settings => true}}
-          stub(Object).raise 
-          stub(@object).current_settings.stub!.set(anything) { raise Appscript::CommandError.new("code","error","object","reference", "command") }
-          capture(:stdout) { Terminitor::MacCore.new('/path/to').set_options(@object, :settings => :invalid_settings) }
+          stub(@object).current_settings.stub!.set(anything) do
+            raise Appscript::CommandError.new("code","error","object","reference", "command")
+          end
+          capture(:stdout) do
+            Terminitor::MacCore.new('/path/to').set_options(@object, :settings => :invalid_settings)
+          end
         end.matches %r{Error: invalid settings}
       end
 
@@ -124,8 +128,9 @@ if platform?("darwin") # Only run test if it's darwin
       context "unknown option" do
         
         should "return a message" do
-          stub(Object).raise 
-          stub(@object).unknown_option.stub!.set(anything) { raise Appscript::CommandError.new("code","error","object","reference", "command") }
+          stub(@object).unknown_option.stub!.set(anything) do
+            raise Appscript::CommandError.new("code","error","object","reference", "command")
+          end
           capture(:stdout) { Terminitor::MacCore.new('/path/to').set_options(@object, :unknown_option => true)}
         end.matches %r{Error}
 
@@ -152,8 +157,4 @@ if platform?("darwin") # Only run test if it's darwin
     end
 
   end
-else
-  context "MacCore" do
-    puts "Nothing to do, you are not on OSX"
-  end
 end

data/test/cores/terminator_core_test.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../../teststrap', __FILE__)
+
+on_platform 'linux' do
+  context "TerminatorCore" do
+    helper(:fake_exec_success) { IO.popen("true").read }
+    setup do
+      @xdotool = `which xdotool`.chomp
+      # stub xdotool invocations and termfile loading
+      any_instance_of(Terminitor::TerminatorCore) do |core|
+        stub(core).load_termfile('/path/to') { true }
+        stub(core).window_id { "1" }
+        stub(core).execute { |cmd| puts "Would run \"#{cmd}\"" }
+      end
+    end
+    
+    setup { @core = Terminitor::TerminatorCore.new('/path/to') }
+
+    context "open_tab" do
+      setup do
+        mock(@core).execute("#{@xdotool} key --window 1 ctrl+shift+t") { fake_exec_success }
+      end
+      asserts("opens a new tab") { @core.open_tab }
+    end
+
+    context "open_window" do
+      setup do
+        mock(@core).execute("#{@xdotool} key --window 1 ctrl+shift+i") { fake_exec_success }
+      end
+      asserts("opens a new window") { @core.open_window }
+    end
+
+    context "execute_command" do
+      setup do
+        mock(@core).execute("#{@xdotool} type --window 1 \"hasta\n\"") { fake_exec_success }
+      end
+      asserts("executes command") { @core.execute_command('hasta') }
+    end
+  end
+end

data/test/dsl_test.rb

@@ -1,35 +1,89 @@
 require File.expand_path('../teststrap', __FILE__)
 
 context "Dsl" do
-  setup { @path = File.expand_path('../fixtures/bar.term', __FILE__)}
-  setup { @yaml = Terminitor::Dsl.new(@path) }
+  setup { Terminitor::Dsl.new File.expand_path('../fixtures/bar.term', __FILE__) }
   asserts_topic.assigns :setup
   asserts_topic.assigns :windows
   asserts_topic.assigns :_context
  
   context "to_hash" do
-    setup { @yaml.to_hash }
-    asserts_topic.equivalent_to :setup=>["echo \"setup\""], 
-                                :windows=>{
-                                  "window1"=>{:tabs=>{"tab2"=>{:commands=>["echo 'named tab'", "ls"], 
-                                                               :options => {:name => "named tab", :settings=>"Grass"}}, 
-                                                      "tab1"=>{:commands=>["echo 'first tab'", "echo 'of window'", "echo 'than now'"]},
-                                                      "tab3"=>{:commands=>["top"],
-                                                               :options =>{:name => "a tab", :settings => "Pro"}},
-                                                      "tab4"=>{:commands=>["ls"],
-                                                               :options =>{:name => "another named tab", :settings => "Grass"}},
-                                                      "default"=>{:commands=>['whoami && who && ls']}
-                                                     },
-                                              :before => ['cd /path'],
-                                              :options => {:size=>[70,30]}},
-                                  "window2"=>{:tabs=>{"tab1"=>{:commands=>["uptime"]},
-                                                      "default"=>{:commands=>[]}
-                                                     },
-                                              :before => ['whoami'],
-                                              :options => {:name => 'server'}},
-                                  "default"=>{:tabs=>{"tab1"=>{:commands=>["echo 'default'", "echo 'default tab'", "ok", "for real"]},
-                                                      "default"=>{:commands=>[]}
-                                                     }}}
-  end
+    setup { topic.to_hash }
+    asserts([:[],:setup]).equals ["echo \"setup\""]
+    context ":windows" do
+      setup { topic[:windows] }
+
+      context "with 'window1' key" do
+        setup { topic['window1'] }
+
+        asserts([:[],:before]).equals ['cd /path']
+        asserts([:[],:options]).equals({ :size => [70,30]})
+
+        context "with :tabs" do
+          setup { topic[:tabs] }
+          
+          asserts([:[], 'tab2']).equivalent_to({
+            :commands=>["(echo 'named tab')", "(ls)"], 
+            :options => {
+              :name => "named tab",
+              :settings=>"Grass"
+            }
+          })
+
+          asserts([:[], 'tab1']).equivalent_to({
+            :commands=>["echo 'first tab'", "echo 'of window'", "echo 'than now'"]
+          })
+
+          asserts([:[],'tab3']).equivalent_to({
+            :commands=>["(top)"],
+            :options =>{
+              :name => "a tab",
+              :settings => "Pro"
+            }
+          })
+
+          asserts([:[],'tab4']).equivalent_to({
+            :commands=>["(ls)"],
+            :options =>{
+              :name => "another named tab",
+              :settings => "Grass"
+            }
+          })
+
+          asserts([:[],'default']).equivalent_to({
+            :commands=>['(whoami) && (who) && (ls)']
+          })
+        end
+
+      end
 
+      context "with 'window2' key" do
+        setup { topic['window2'] }
+
+        asserts([:[],:before]).equals ['(whoami)']
+
+        context "with :tabs" do
+          setup { topic[:tabs] }
+
+          asserts([:[], 'tab1']).equals({ :commands => ["uptime"]})
+          asserts([:[], 'default']).equals({ :commands => []})
+        end
+      end
+
+      context "with 'default' key" do
+        setup { topic['default'] }
+
+        context "with :tags key" do
+          setup { topic[:tabs] }
+
+          asserts([:[],'tab1']).equals({
+            :commands=>["echo 'default'", "echo 'default tab'", "ok", "for real"]
+          })
+
+          asserts([:[],'default']).equals({
+            :commands => []
+          })
+        end
+      end
+    end
+  end
 end