autotest-tmux 1.1.0 → 1.2.0

data/.gitignore

@@ -17,5 +17,6 @@ tmtags
 coverage
 rdoc
 pkg
+release
 
 ## PROJECT::SPECIFIC

data/README.rdoc

@@ -4,7 +4,7 @@ http://github.com/yoshuki/autotest-tmux
 
 == Description
 
-Autotest::Tmux shows autotest/autospec progress on tmux status-right.
+Autotest::Tmux displays autotest/autospec progress on tmux status-right.
 
 == Features
 

data/Rakefile

@@ -5,8 +5,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "autotest-tmux"
-    gem.summary = %Q{shows autotest/autospec progress on tmux status-right.}
-    gem.description = %Q{shows autotest/autospec progress on tmux status-right.}
+    gem.summary = %Q{displays autotest/autospec progress on tmux status-right.}
+    gem.description = %Q{displays autotest/autospec progress on tmux status-right.}
     gem.email = "yoshuki@saikyoline.jp"
     gem.homepage = "http://github.com/yoshuki/autotest-tmux"
     gem.authors = ["MIKAMI Yoshiyuki"]

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/autotest-tmux.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autotest-tmux}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["MIKAMI Yoshiyuki"]
-  s.date = %q{2010-10-14}
-  s.description = %q{shows autotest/autospec progress on tmux status-right.}
+  s.date = %q{2010-10-15}
+  s.description = %q{displays autotest/autospec progress on tmux status-right.}
   s.email = %q{yoshuki@saikyoline.jp}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{shows autotest/autospec progress on tmux status-right.}
+  s.summary = %q{displays autotest/autospec progress on tmux status-right.}
   s.test_files = [
     "spec/autotest-tmux_spec.rb",
      "spec/spec_helper.rb"

data/lib/autotest/tmux.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'autotest'
 
 ##
-# Autotest::Tmux shows autotest/autospec progress on tmux status-right.
+# Autotest::Tmux displays autotest/autospec progress on tmux status-right.
 #
 # == Features
 # * Screenshots aren't available yet. (but, almost same as autotest_screen[http://f.hatena.ne.jp/yoshuki/autotest_screen/].)
@@ -26,8 +26,13 @@ class Autotest::Tmux
     :red    => ['white', 'red']
   }
 
-  def self.message(msg=statusright, color=:black)
-    col = SCREEN_COLOR[color]
+  @last_result = {}
+
+  def self.message(msg=statusright, sc=:black)
+    msg ||= statusright       # when nil given
+    sc  ||= :black            # when nil given
+
+    col = SCREEN_COLOR[sc]
     msg = "#[fg=#{col[0]},bg=#{col[1]}] #{msg} #[default]" unless msg == statusright
     send_cmd(msg)
   end
@@ -37,8 +42,7 @@ class Autotest::Tmux
   end
 
   def self.run_tmux_session?
-    cmd = "#{tmux_cmd} has-session"
-    system cmd
+    system "#{tmux_cmd} has-session"
   end
 
   def self.execute?
@@ -52,13 +56,9 @@ class Autotest::Tmux
   def self.tmux_cmd=(tc); @tmux_cmd = tc; end
 
   def self.send_cmd(msg)
-    cmd = "#{tmux_cmd} set status-right '#{msg.gsub("'", "\'")}'"
-    system cmd
-    nil
+    system "#{tmux_cmd} set status-right '#{msg.gsub("'", "\'")}'"
   end
 
-  @last_message = {}
-
   # All blocks return false, to execute each of following blocks defined in user's own ".autotest".
 
   # Do nothing.
@@ -104,23 +104,23 @@ class Autotest::Tmux
       num_failures, num_errors = results.map{|r| r.to_i}
 
       if num_failures > 0 || num_errors > 0
-        @last_message = {:message => "Red F:#{num_failures} E:#{num_errors}", :color => :red}
+        @last_result = {:message => "Red F:#{num_failures} E:#{num_errors}", :color => :red}
       else
-        @last_message = {:message => 'All Green', :color => :green}
+        @last_result = {:message => 'All Green', :color => :green}
       end
-    when 'Autotest::Rspec', 'Autotest::Rspec2', 'Autotest::RailsRspec', 'Autotest::MerbRspec'
+    when 'Autotest::Rspec', 'Autotest::Rspec2', 'Autotest::RailsRspec', 'Autotest::RailsRspec2', 'Autotest::MerbRspec'
       results = output.scan(/(\d+)\s*examples?,\s*(\d+)\s*failures?(?:,\s*(\d+)\s*pendings?)?/).first
       num_examples, num_failures, num_pendings = results.map{|r| r.to_i}
 
       if num_failures > 0
-        @last_message = {:message => "Fail F:#{num_failures} P:#{num_pendings}", :color => :red}
+        @last_result = {:message => "Fail F:#{num_failures} P:#{num_pendings}", :color => :red}
       elsif num_pendings > 0
-        @last_message = {:message => "Pend F:#{num_failures} P:#{num_pendings}", :color => :yellow}
+        @last_result = {:message => "Pend F:#{num_failures} P:#{num_pendings}", :color => :yellow}
       else
-        @last_message = {:message => 'All Green', :color => :green}
+        @last_result = {:message => 'All Green', :color => :green}
       end
     else
-      @last_message = {:message => "Unknown class name. (#{class_name})", :color => :red}
+      @last_result = {:message => "Unknown class. (#{class_name})"}
     end
     next false
   end
@@ -147,7 +147,7 @@ class Autotest::Tmux
 
   Autotest.add_hook :waiting do |at, *args|
     sleep 0.5
-    message @last_message[:message], @last_message[:color] if execute?
+    message @last_result[:message], @last_result[:color] if execute?
     next false
   end
 end

data/spec/autotest-tmux_spec.rb

@@ -1,10 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Autotest::Tmux do
-  context 'all added hooks should be called by autotest' do
+  context 'All added hooks should be called by autotest' do
     Autotest::HOOKS.keys.each do |hook|
       subject { Autotest::ALL_HOOKS }
       it { should include(hook) }
     end
   end
+
+  describe 'When display message' do
+    context 'without params' do
+      it { Autotest::Tmux.message.should be_true }
+    end
+
+    context 'with String as message' do
+      it { Autotest::Tmux.message('foo').should be_true }
+    end
+
+    context 'with nil as message' do
+      it { Autotest::Tmux.message(nil).should be_true }
+    end
+
+    context 'with Symbol as color' do
+      it { Autotest::Tmux.message('foo', :black).should be_true }
+    end
+
+    context 'with nil as color' do
+      it { Autotest::Tmux.message('foo', nil).should be_true }
+    end
+  end
+
+  after(:all) do
+    Autotest::Tmux.clear
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - MIKAMI Yoshiyuki
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +09:00
+date: 2010-10-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: shows autotest/autospec progress on tmux status-right.
+description: displays autotest/autospec progress on tmux status-right.
 email: yoshuki@saikyoline.jp
 executables: []
 
@@ -112,7 +112,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: shows autotest/autospec progress on tmux status-right.
+summary: displays autotest/autospec progress on tmux status-right.
 test_files: 
 - spec/autotest-tmux_spec.rb
 - spec/spec_helper.rb