campline 0.0.1 → 0.0.2

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
 gem "tinder"
-gem "rb-readline"
 gem "cli-colorize"
 
 # Add dependencies to develop your gem here.

data/README.rdoc

@@ -18,7 +18,6 @@ The client will prompt for your password and that's it - you're in!
 
 == Copyright
 
-Partially based on campfire-cli, by Petyo Ivanov
-
-Copyleft (c) 2012 Herval. See LICENSE.txt for further details.
+Partially based on campfire-cli, by Petyo Ivanov. STDIN/OUT tricks by http://www.rubyquiz.com/quiz45.html (thanks @cfcosta!)
 
+Copyleft (c) 2012 Herval. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/campline

@@ -7,9 +7,18 @@ if ARGV.size != 3
   exit 1
 end
 
-domain, room, username = *ARGV
+begin
+  domain, room, username = *ARGV
 
-puts "Type in your password:"
-password = $stdin.gets.strip
+  begin
+    %x{stty -echo}
+    puts "Type in your password:"
+    password = $stdin.gets.strip
+  ensure
+    %x{stty raw -echo}
+  end
 
-Campline::Client.new(domain, room, username, password).listen!
+  Campline::Client.new(domain, room, username, password).listen!
+ensure
+  %x{stty -raw echo}
+end

data/campline.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "campline"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Herval Freire"]
@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<tinder>, [">= 0"])
-      s.add_runtime_dependency(%q<rb-readline>, [">= 0"])
       s.add_runtime_dependency(%q<cli-colorize>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
@@ -50,7 +49,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<tinder>, [">= 0"])
-      s.add_dependency(%q<rb-readline>, [">= 0"])
       s.add_dependency(%q<cli-colorize>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
@@ -59,7 +57,6 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<tinder>, [">= 0"])
-    s.add_dependency(%q<rb-readline>, [">= 0"])
     s.add_dependency(%q<cli-colorize>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])

data/lib/campline.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
-require 'readline'
+require 'thread'
 require 'tinder'
+require 'io/wait'
 require 'yaml'
 require 'cli-colorize'
 
@@ -17,30 +18,32 @@ module Campline
       @password = password
       @user_id = nil
       @room_users = []
+      @output_buffer = ""
+      @input_buffer = Queue.new
     end
 
     def print_message(msg)
-      next if msg[:user] && msg[:user][:id] == @user_id
+      return if (msg[:user] && msg[:user][:id] == @user_id)
       case msg[:type]
         when "SoundMessage" then
-          puts "#{green(msg[:user][:name])} played some annoying sound" 
+          @input_buffer << "#{green(msg[:user][:name])} played some annoying sound" 
         when "PasteMessage" then
-          puts "#{green(msg[:user][:name])}: #{msg[:body]}"
+          @input_buffer << "#{green(msg[:user][:name])}: #{msg[:body]}"
         when "TextMessage" then
-          puts "#{green(msg[:user][:name])}: #{msg[:body]}"
+          @input_buffer << "#{green(msg[:user][:name])}: #{msg[:body]}"
       end
     end
 
     def commands
       {
-        "/help" => lambda { puts "Available commands: /users (list users on the room), /exit (quit!)"},
+        "/help" => lambda { print "\r\nAvailable commands: /users (list users on the room), /exit (quit!)"},
         "/exit" => lambda { @campfire_room.leave; exit; },
         "/users" => lambda { list_users }
       }
     end
 
     def list_users
-      puts white("In the room right now: #{@room_users.join(', ')}")
+      print white("\r\nIn the room right now: #{@room_users.join(', ')}")
     end
 
     def update_user_list
@@ -48,13 +51,25 @@ module Campline
       @room_users = new_list if @room_users.empty?
 
       new_guys = new_list - @room_users
-      new_guys.each { |n| puts "#{n} joined the room" }
+      new_guys.each { |n| @input_buffer << "#{n} joined the room" }
 
       dead_guys = @room_users - new_list
-      dead_guys.each { |n| puts "#{n} left the room" }
+      dead_guys.each { |n| @input_buffer << "#{n} left the room" }
       @room_users = new_list
     end
 
+    def backspace!
+      @output_buffer.chop!
+      go_back = "\r\e[0K" # return to beginning of line and use the ANSI clear command "\e" or "\003"
+      print "#{go_back}> #{@output_buffer}"
+    end
+
+    def show_prompt
+      puts "\r\n"
+      print "> #{@output_buffer}"
+      $stdout.flush
+    end
+
     def blue(str)
       colorize(str, :foreground => :blue)
     end
@@ -71,18 +86,32 @@ module Campline
       colorize(str, :background => :red)
     end
 
+    def send_line!
+      if commands[@output_buffer]
+        commands[@output_buffer].call
+      else
+        @campfire_room.speak @output_buffer
+      end
+      @output_buffer = ""
+    end
+
     def listen!
-      puts "Logging in..."
-      campfire = Campfire.new @domain, :username => @username, :password => @password, :ssl => true
+      puts "Logging in...\r\n"
+      begin
+        campfire = Campfire.new @domain, :username => @username, :password => @password, :ssl => true
+      rescue Tinder::AuthenticationFailed
+        raise "There was an authentication error - check your username and password\r\n"
+      end
       @user_id = campfire.me.id
 
-      puts "Joining #{@room}..."
+      puts "Joining #{@room}...\r\n"
       @campfire_room = campfire.find_room_by_name @room
+      raise "Can't find room named #{@room}!\r\n" if @campfire_room.nil?
+      
       @campfire_room.join
-
       update_user_list
       
-      puts "You're up! For a list of available commands, type #{highlight('/help')}"
+      puts "You're up! For a list of available commands, type #{highlight('/help')}\r\n"
 
       Thread.new(@campfire_room) do |listener|
         while true
@@ -99,14 +128,33 @@ module Campline
         end
       end
 
-      while msg = Readline.readline('', true)
-        next if msg.strip.blank?
-        if commands[msg]
-          commands[msg].call
-        else
-          @campfire_room.speak msg
-        end 
-      end
+      Thread.new do
+        while true #msg = Readline.readline('> ', true)
+          if $stdin.ready?
+            character = $stdin.getc
+            case character
+              when ?\C-c
+                break
+              when ?\r, ?\n
+                send_line!
+                show_prompt
+              when ?\u007F, ?\b
+                backspace!
+              else
+                @output_buffer << character
+                print character.chr
+                $stdout.flush
+            end
+          end
+
+          unless @input_buffer.empty?   # read from server
+            puts "\r\n"
+            puts "#{@input_buffer.shift}\r\n" until @input_buffer.empty?
+            show_prompt
+          end
+
+        end
+      end.join
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: campline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cli-colorize
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813841254707109310
+      hash: -3789922764660391293
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: