terminitor 0.4.1 → 0.5.0

data/test/runner_test.rb

@@ -18,6 +18,9 @@ class TestItem
 end
 
 context "Runner" do
+
+  helper(:terminitor_root) { |file| File.join(ENV['HOME'],'.config','terminitor', file) } 
+
   setup do 
     @yaml = File.read(File.expand_path('../fixtures/foo.yml', __FILE__))
     @template = File.read(File.expand_path('../../lib/templates/example.yml.tt', __FILE__))
@@ -28,22 +31,36 @@ context "Runner" do
 
 
   context "#find_core" do
-    if ENV['TERM_PROGRAM'] == 'iTerm.app'
-      should("have Darwin") { @test_runner.find_core('darwin') }.equals Terminitor::ItermCore
-    else
-      should("have Darwin") { @test_runner.find_core('darwin') }.equals Terminitor::MacCore
+
+    helper(:find_core) { |core| @test_runner.find_core core }
+
+    on_platform 'darwin' do
+      if ENV['TERM_PROGRAM'] == 'iTerm.app'
+        should("have iTerm") { find_core('darwin') }.equals Terminitor::ItermCore
+      else
+        should("have Terminal") { find_core('darwin') }.equals Terminitor::MacCore
+      end
     end
 
-    if platform?('linux') # TODO Gotta be a better way.
-      should("have KDE") { @test_runner.find_core('linux') }.equals Terminitor::KonsoleCore
+    on_platform 'linux' do # TODO Gotta be a better way.
+      if `which terminator`.chomp.empty?
+        should("have KDE") { find_core('linux') }.equals Terminitor::KonsoleCore
+      else
+        should("have terminator") { find_core('linux') }.equals Terminitor::TerminatorCore
+      end
     end
   end
   
   context "#capture_core" do 
-    if ENV['TERM_PROGRAM'] == 'iTerm.app'
-      should("have Darwin") { @test_runner.capture_core('darwin') }.equals Terminitor::ItermCapture
-    else
-      should("have Darwin") { @test_runner.capture_core('darwin') }.equals Terminitor::MacCapture
+
+    helper(:capture_core) { |core| @test_runner.capture_core core }
+
+    on_platform 'darwin' do
+      if ENV['TERM_PROGRAM'] == 'iTerm.app'
+        should("have iTerm") { capture_core('darwin') }.equals Terminitor::ItermCapture
+      else
+        should("have Terminal") { capture_core('darwin') }.equals Terminitor::MacCapture
+      end
     end
   end
 
@@ -79,23 +96,23 @@ context "Runner" do
   end
 
   context "#resolve_path" do
-    setup { FileUtils.mkdir_p(File.join(ENV['HOME'],'.terminitor')) }
+    setup { FileUtils.mkdir_p(File.join(ENV['HOME'],'.config','terminitor')) }
 
     should "return yaml" do
-      FileUtils.touch(File.join(ENV['HOME'],'.terminitor','test.yml'))
-      @test_runner.resolve_path('test')
-    end.equals File.join(ENV['HOME'],'.terminitor','test.yml')
+      FileUtils.touch terminitor_root('test.yml')
+      @test_runner.resolve_path('test') == terminitor_root('test.yml')
+    end
 
     should "return term" do
-      FileUtils.touch(File.join(ENV['HOME'],'.terminitor','test.term'))
-      FileUtils.rm(File.join(ENV['HOME'],'.terminitor','test.yml'))
-      @test_runner.resolve_path('test')
-    end.equals File.join(ENV['HOME'],'.terminitor','test.term')
+      FileUtils.touch terminitor_root('test.term')
+      FileUtils.rm terminitor_root('test.yml')
+      @test_runner.resolve_path('test') == terminitor_root('test.term')
+    end
 
 
     should "return Termfile" do
-      FileUtils.rm(File.join(ENV['HOME'],'.terminitor','test.yml'))
-      FileUtils.rm(File.join(ENV['HOME'],'.terminitor','test.term'))
+      FileUtils.rm terminitor_root('test.yml')
+      FileUtils.rm terminitor_root('test.term')
       FileUtils.touch("Termfile")
       mock(@test_runner).options { {:root => '.'} }
       @test_runner.resolve_path("")
@@ -104,8 +121,8 @@ context "Runner" do
 
     context "with nothing" do
       setup do
-        FileUtils.rm(File.join(ENV['HOME'],'.terminitor','test.yml'))
-        FileUtils.rm(File.join(ENV['HOME'],'.terminitor','test.term'))
+        FileUtils.rm terminitor_root('test.term')
+        FileUtils.rm terminitor_root('test.yml')
         FileUtils.rm("Termfile")
       end
       
@@ -121,8 +138,14 @@ context "Runner" do
   end
 
   context "config_path" do
-    should("have yaml") { @test_runner.config_path('test',:yml)   }.equals File.join(ENV['HOME'],'.terminitor','test.yml')
-    should("have term") { @test_runner.config_path('test', :term) }.equals File.join(ENV['HOME'],'.terminitor', 'test.term')
+
+    should("have yaml") do
+      @test_runner.config_path('test',:yml) == terminitor_root('test.yml')
+    end
+
+    should("have term") do
+      @test_runner.config_path('test', :term) == terminitor_root('test.term')
+    end
     
     should "have Termfile" do
       mock(@test_runner).options { {:root => '/tmp'} }

data/test/teststrap.rb

@@ -2,18 +2,26 @@ require 'rubygems'
 require 'riot'
 require 'riot/rr'
 require File.expand_path('../../lib/terminitor',__FILE__)
-require 'fakefs/safe'
-Riot.reporter = Riot::DotMatrixReporter
 
-class Riot::Situation
+
+# Yield the block if the platform matches current platform
+# example:
+#   on_platform('linux') { puts 'hi' }
+def on_platform(*platform)
+  platform = [platform] unless platform.respond_to? :each
+  platform.each { |p|  yield && break if RUBY_PLATFORM.downcase.include?(p) }
 end
 
-class Riot::Context
+on_platform('linux', 'darwin') do
+  require 'fakefs/safe'
+end
+
+Riot.pretty_dots
+
+class Riot::Situation
 end
 
-# Checks to see if Ruby Platform matches designated platform
-def platform?(platform)
-  RUBY_PLATFORM.downcase.include?(platform)
+class Riot::Context
 end
 
 module Kernel

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: terminitor
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,131 +20,77 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.6.1
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: text-hyphen
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: text-format
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 0
         version: 0.14.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: github
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+        version: 0.6.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: riot
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 0
-        version: 0.12.0
+        version: 0.12.3
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 description: Automate your development workflow
 email: 
 - mr.arthur.chiu@gmail.com
@@ -163,6 +105,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - Termfile
@@ -172,27 +115,34 @@ files:
 - lib/terminitor.rb
 - lib/terminitor/abstract_capture.rb
 - lib/terminitor/abstract_core.rb
+- lib/terminitor/capture/cmd_capture.rb
 - lib/terminitor/capture/iterm_capture.rb
 - lib/terminitor/capture/konsole_capture.rb
 - lib/terminitor/capture/mac_capture.rb
+- lib/terminitor/capture/terminator_capture.rb
 - lib/terminitor/cli.rb
+- lib/terminitor/cores/cmd_core/cmd_core.rb
+- lib/terminitor/cores/cmd_core/input.rb
+- lib/terminitor/cores/cmd_core/windows_console.rb
 - lib/terminitor/cores/iterm_core.rb
 - lib/terminitor/cores/konsole_core.rb
 - lib/terminitor/cores/mac_core.rb
+- lib/terminitor/cores/terminator_core.rb
 - lib/terminitor/dsl.rb
 - lib/terminitor/runner.rb
 - lib/terminitor/version.rb
 - lib/terminitor/yaml.rb
-- templates/example.yml.tt
 - terminitor.gemspec
 - test.watchr
 - test/abstract_capture_test.rb
 - test/abstract_core_test.rb
 - test/capture/mac_capture_test.rb
 - test/cli_test.rb
+- test/cores/cmd_core_test.rb
 - test/cores/iterm_core_test.rb
 - test/cores/konsole_core_test.rb
 - test/cores/mac_core_test.rb
+- test/cores/terminator_core_test.rb
 - test/dsl_test.rb
 - test/fixtures/bar.term
 - test/fixtures/foo.term
@@ -204,7 +154,7 @@ has_rdoc: true
 homepage: http://rubygems.org/gems/terminitor
 licenses: []
 
-post_install_message: "********************************************************************************\n\n    Terminitor is installed! \n    Please run 'terminitor init'. \n    This will create a directory at ~/.terminitor which will hold all your global scripts.\n    Thanks!\n\n\
+post_install_message: "********************************************************************************\n\n    Terminitor is installed!  Please run:\n    \n      terminitor init\n\n    This will create a directory at ~/.config/terminitor which will hold all your global scripts.\n\n    For those updating from a previous version of Terminitor(<=0.4.1) please run\n\n      terminitor update\n\n    This will copy over your terminitor files from the old path to the newer .config/terminitor location.\n\n\
   ********************************************************************************\n  "
 rdoc_options: []
 
@@ -215,25 +165,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: terminitor
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: Outsource your workflow to Skynet
+summary: Automate your development workflow
 test_files: []
 

data/templates/example.yml.tt

@@ -1,16 +0,0 @@
-# COMMENT OF SCRIPT HERE
-# you can make as many tabs as you wish...
-# tab names are actually arbitrary at this point too.
----
-- tab1:
-  - cd ~/foo/bar
-  - gitx
-- tab2:
-  - mysql -u root
-  - use test;
-  - show tables;
-- tab3: echo "hello world"
-- tab4: cd ~/baz/ && git pull
-- tab5:
-  - cd ~/foo/project
-  - autotest