terminitor 0.5.1 → 0.5.2

data/Gemfile.lock

@@ -1,11 +1,9 @@
 PATH
   remote: .
   specs:
-    terminitor (0.4.1)
-      github (~> 0.6.0)
-      rb-appscript
-      text-format (= 1.0.0)
-      text-hyphen (= 1.0.0)
+    terminitor (0.5.2)
+      github (~> 0.6.2)
+      rb-appscript (~> 0.6.1)
       thor (~> 0.14.0)
 
 GEM
@@ -13,19 +11,20 @@ GEM
   specs:
     configuration (1.2.0)
     fakefs (0.3.1)
-    github (0.6.0)
+    github (0.6.2)
       highline (~> 1.5.1)
-      json (~> 1.4.6)
+      json_pure (~> 1.5.1)
       launchy (~> 0.3.7)
       text-format (= 1.0.0)
+      text-hyphen (= 1.0.0)
     highline (1.5.2)
-    json (1.4.6)
+    json_pure (1.5.1)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     rake (0.8.7)
-    rb-appscript (0.6.0)
-    riot (0.12.2)
+    rb-appscript (0.6.1)
+    riot (0.12.3)
       rr
     rr (1.0.2)
     text-format (1.0.0)
@@ -39,6 +38,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   fakefs
-  riot (~> 0.12.0)
+  riot (~> 0.12.3)
   rr (~> 1.0.0)
   terminitor!

data/README.md

@@ -370,8 +370,9 @@ Thanks to the following people for their contributions so far:
  * Dave Perrett    ([recurser](https://github.com/recurser)) for adding basic iTerm support.
  * 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
+ * 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
+ * Jerry Cheung ([jch](https://github.com/jch)) For adding ignore for emac backups
 
 Acknowledgements
 -----------------

data/lib/terminitor/cli.rb

@@ -29,7 +29,7 @@ module Terminitor
     desc "list", "lists all terminitor scripts"
     def list
       say "Global scripts: \n"
-      Dir.glob("#{TERM_PATH}/*").each do |file|
+      Dir.glob("#{TERM_PATH}/*[^~]").each do |file|
         say "  * #{File.basename(file, '.term')} #{grab_comment_for_file(file)}"
       end
     end

data/lib/terminitor/cores/cmd_core/cmd_core.rb

@@ -17,16 +17,19 @@ module Terminitor
       (options[:in] || current_window).send_command(cmd)
     end
 
-    def open_tab(options = nil)
-      create_window 
+    def open_tab(options = {})
+      create_window options
     end
 
-    def open_window(options = nil)
-      create_window
+    def open_window(options = {})
+      create_window options
     end 
 
-    def create_window
-      WindowsConsole.new :name=>'cmd'
+    def create_window(options = {})
+      c = WindowsConsole.new :name=>'cmd'
+      c.send_command "title #{options[:name]}\n" if options[:name]
+      c.send_command "mode con: cols=#{options[:bounds][0]} lines=#{options[:bounds][1]}\n" if options[:bounds]
+      c
     end
   end
 end

data/lib/terminitor/cores/cmd_core/input.rb

@@ -194,11 +194,11 @@ module Terminitor
 
       case char
         when '0'..'9'
-          [code - ?0 + 0x30]
+          [code - ?0.ord + 0x30]
         when 'A'..'Z'
           [VK_SHIFT, code]
         when 'a'..'z'
-          [code - ?a + ?A]
+          [code - ?a.ord + ?A.ord]
         when ' '
           [code]
         when '+'

data/lib/terminitor/version.rb

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

data/test/cli_test.rb

@@ -24,10 +24,14 @@ context "Terminitor" do
     setup do
       File.open(terminitor_root('foo.yml'),"w") { |f| f.puts @template }
       File.open(terminitor_root('bar.yml'),"w") { |f| f.puts @template }
+      File.open(terminitor_root('baz.term'),"w") { |f| f.puts @template }
+      File.open(terminitor_root('baz.term~'),"w") { |f| f.puts @template }
       capture(:stdout) { Terminitor::Cli.start(['list']) }
     end
     asserts_topic.matches %r{foo\.yml - COMMENT OF SCRIPT HERE}
-    asserts_topic.matches %r{bar\.yml - COMMENT OF SCRIPT HERE}
+    asserts_topic.matches %r{bar\.yml - COMMENT OF SCRIPT HERE}   # yaml style
+    asserts_topic.matches %r{baz - COMMENT OF SCRIPT HERE}        # .term style
+    denies_topic.matches %r{baz\.term~ - COMMENT OF SCRIPT HERE}  # backup files
   end
 
   asserts "#init creates .terminitor" do

data/test/cores/cmd_core_test.rb

@@ -47,5 +47,28 @@ on_platform 'mingw32', 'mswin32' do
       asserts("that it executes in injected current window") { topic.execute_command "clear", :in => @window }
       teardown { @window.kill! }
     end
+    
+    context "accepts name" do
+      hookup do
+        any_instance_of(Terminitor::WindowsConsole) do |console|
+          mock(console).send_command("title named\n")
+        end
+      end
+
+      asserts("send_command was called"){ @window = topic.open_window :name=>'named' }
+      teardown { @window.kill! }
+    end
+
+    context "accepts bounds" do
+      hookup do
+        any_instance_of(Terminitor::WindowsConsole) do |console|
+          mock(console).send_command("mode con: cols=80 lines=90\n")
+        end
+      end
+
+      asserts("send_command was called"){ @window = topic.open_window :bounds=>[80,90] }
+      teardown { @window.kill! }
+    end
+
   end
 end

data/test/dsl_test.rb

@@ -8,20 +8,20 @@ context "Dsl" do
  
   context "to_hash" do
     setup { topic.to_hash }
-    asserts([:[],:setup]).equals ["echo \"setup\""]
+    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]})
+        asserts(:[],:before).equals ['cd /path']
+        asserts(:[],:options).equals({ :size => [70,30]})
 
         context "with :tabs" do
           setup { topic[:tabs] }
           
-          asserts([:[], 'tab2']).equivalent_to({
+          asserts(:[], 'tab2').equivalent_to({
             :commands=>["echo 'named tab'", "ls"],
             :options => {
               :name => "named tab",
@@ -29,11 +29,11 @@ context "Dsl" do
             }
           })
 
-          asserts([:[], 'tab1']).equivalent_to({
+          asserts(:[], 'tab1').equivalent_to({
             :commands=>["echo 'first tab'", "motion &", "echo 'than now'"]
           })
 
-          asserts([:[],'tab3']).equivalent_to({
+          asserts(:[],'tab3').equivalent_to({
             :commands=>["top","(mate &) && (gitx &) && cd /this"],
             :options =>{
               :name => "a tab",
@@ -41,7 +41,7 @@ context "Dsl" do
             }
           })
 
-          asserts([:[],'tab4']).equivalent_to({
+          asserts(:[],'tab4').equivalent_to({
             :commands=>["ls"],
             :options =>{
               :name => "another named tab",
@@ -49,7 +49,7 @@ context "Dsl" do
             }
           })
 
-          asserts([:[],'default']).equivalent_to({
+          asserts(:[],'default').equivalent_to({
             :commands=>['whoami && who && ls']
           })
         end
@@ -59,13 +59,13 @@ 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] }
 
-          asserts([:[], 'tab1']).equals({ :commands => ["uptime"]})
-          asserts([:[], 'default']).equals({ :commands => []})
+          asserts(:[], 'tab1').equals({ :commands => ["uptime"]})
+          asserts(:[], 'default').equals({ :commands => []})
         end
       end
 
@@ -75,11 +75,11 @@ context "Dsl" do
         context "with :tags key" do
           setup { topic[:tabs] }
 
-          asserts([:[],'tab1']).equals({
+          asserts(:[],'tab1').equals({
             :commands=>["echo 'default'", "echo 'default tab'", "ok", "for real"]
           })
 
-          asserts([:[],'default']).equals({
+          asserts(:[],'default').equals({
             :commands => []
           })
         end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terminitor
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 0.5.1
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -07:00
+date: 2011-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +27,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :runtime
   version_requirements: *id001
@@ -33,6 +43,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
   type: :runtime
   version_requirements: *id002
@@ -44,6 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
   type: :runtime
   version_requirements: *id003
@@ -55,6 +75,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id004
@@ -66,6 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 12
+        - 3
         version: 0.12.3
   type: :development
   version_requirements: *id005
@@ -77,6 +107,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id006
@@ -88,6 +123,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -165,12 +203,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []