hubeye 0.3.2 → 0.3.3

data/VERSION.rb

@@ -1,5 +1,5 @@
 module Hubeye
-  # 0.3.0 since Dec. 4, 2011
-  VERSION = [0,3,2]
+  # 0.3.3 since Jan. 28, 2012
+  VERSION = [0,3,3]
 end
 

data/lib/hubeye/client/client.rb

@@ -5,7 +5,12 @@ require_relative 'connection'
 module Hubeye
   module Client
     class Client
-      @@stty_save = `stty -g`
+
+      def self.testing?
+        ENV["HUBEYE_ENV"] == 'test'
+      end
+
+      @@stty_save = `stty -g` unless testing?
 
       begin
         Readline.emacs_editing_mode
@@ -21,6 +26,7 @@ module Hubeye
         @debug = debug
       end
 
+
       def start(host, port)
         conn = Connection.new(host, port)
         conn.receive_welcome
@@ -54,17 +60,17 @@ module Hubeye
           begin
             mesg = @s.read_all
           rescue EOFError
-            mesg = "Bye!\n"
+            mesg = "Bye!"
           end
-          if mesg.chop.strip == "Bye!"
-            mesg[-1] == "\n" ? print(mesg) : puts(mesg)
+          if mesg.strip == "Bye!"
+            puts(mesg)
             @s.close
             exit 0
-          elsif mesg.chop.strip.match(/shutting/i)
+          elsif mesg.strip.match(/shutting/i)
             @s.close
             exit 0
           else
-            mesg[-1] == "\n" ? print(mesg) : puts(mesg)
+            puts(mesg)
             next
           end
         end
@@ -74,7 +80,7 @@ module Hubeye
         begin
           @input = Readline.readline('> ', true)
         rescue Interrupt => e
-          system('stty', @@stty_save)
+          system('stty', @@stty_save) unless Client.testing?
           exit
         end
       end

data/lib/hubeye/client/connection.rb

@@ -22,6 +22,7 @@ module Hubeye
           puts mesg
         rescue SystemCallError, NoMethodError
           puts "The server's not running!"
+          exit 1
         rescue EOFError
           @retried ||= -1
           @retried += 1

data/test/integration.rb

@@ -1,24 +1,38 @@
+require_relative "test_helper"
+
 class HubeyeIntegrationTest < Test::Unit::TestCase
   include Hubeye::Environment
 
   EXECUTABLE = File.join(BINDIR, 'hubeye')
 
-  def interact
-    start_server
-    sleep 0.5
-    start_client
-  end
-
   def start_server
     system "#{EXECUTABLE} -s"
   end
 
-  def start_client
-    IO.popen("#{EXECUTABLE} -c", "r+") do |p|
-      p.write 'fjdksfjlsdj'
-      p.close_write
-      p.read.chomp
+  def start_client &blk
+    IO.popen("#{EXECUTABLE} -c", "r+") do |c|
+      begin
+        yield c if c
+      ensure
+        c.puts "shutdown"
+        c.close_write
+        c.close
+      end
+    end
+  end
+
+  def setup
+    start_server
+    sleep 0.5
+  end
+
+  def test_truth
+    start_client do |c|
+      c.puts 'hi'
+      @response = c.gets
     end
+    STDOUT.puts @response
+    assert @response.match /github/i
   end
 
 end

data/test/runner.rb

@@ -1,10 +1,6 @@
 #!/usr/bin/env ruby
 
-# environment file
-require File.join(File.expand_path(File.dirname(__FILE__) + '/..'), "lib/hubeye/config/environment")
-
-# test/unit
-require 'test/unit'
+require_relative "test_helper"
 
 # test files
 require_relative 'environment'

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require File.expand_path("../../lib/hubeye/config/environment", __FILE__)
+require "test/unit"
+ENV["HUBEYE_ENV"] = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubeye
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -50,6 +50,7 @@ files:
 - LICENSE
 - test/config_parser.rb
 - test/runner.rb
+- test/test_helper.rb
 - test/integration.rb
 - test/environment.rb
 - test/notification.rb