Permalink
Browse files

Merge github.com:PrasannaVenkadesh/Whiz-Chat

Conflicts:
	README.txt
	chat.rb
	features.rdoc
  • Loading branch information...
2 parents a9e41fe + cd28d60 commit 5e5a300d435a1bc70cf9710807e220d74603f86b @PrasannaVenkadesh committed Sep 2, 2011
Showing with 37 additions and 0 deletions.
  1. +4 −0 README.txt
  2. +23 −0 chat.rb
  3. +10 −0 features.rdoc
View
4 README.txt
@@ -4,7 +4,11 @@ This is a team work of
S. Sathianarayanan(sathia2704@gmail.com) &
S. Prasanna Venkadesh (prasmailme@gmail.com)
+<<<<<<< HEAD
md5Checksum - 8dfd16649bb0f5918f80b8ee87bac8c0 chat.rb
+=======
+md5Checksum - f6e1547a8dae8fdb644b2ed818e09c51 chat.rb
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
Step 1: Download the file 'chat.rb' from the repository
View
23 chat.rb
@@ -1,26 +1,39 @@
+<<<<<<< HEAD
=begin
Application Name: Whiz-Chat
Version: 2.01
License: GPL V2.0
=end
+=======
+
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
begin
require 'rubygems' #Rubygems gem
require 'colorize' #gem used to set colors to text and backgrounds
require 'xmpp4r-simple' #Simple XML Protocol for Jabber API
require "highline/import" #for password protection
+<<<<<<< HEAD
system('clear')
system('espeak "Welcome. Dude" >/dev/null 2>&1')
puts "Whiz Chat Version - 2.01\nDeveloped by- S. Sathianarayanan (sathia2704@gmail.com)\nImproved by- S. Prasanna Venkadesh (prasmailme@gmail.com)\nGithub Repository: https://github.com/PrasannaVenkadesh/Whiz-Chat\n".colorize( :blue ).underline
+=======
+ puts "Whiz Chat\nVersion - 2.0\t Developed by - S. Sathianarayanan(sathia2704@gmail.com)\nImproved by - S. Prasanna Venkadesh(prasmailme@gmail.com)\n".colorize( :grey ).on_blue.underline
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
print 'Enter the username :'
username = gets.chomp #Get input from username for user-id
#gets password for mail account, ask from higline gem
password = ask("Enter the password :" ) { |p| p.echo = "*" }
+<<<<<<< HEAD
print 'To username: '
+=======
+ print 'to address: '
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
@to_username = gets.chomp #prompt for userid to whom you want to chat with
puts "Connecting to jabber server.."
@jabber = Jabber::Simple.new(username+'@gmail.com',password) #using jabber api to connect with gmail account.
system('clear') #to clear the console screen to keep the screen clean.
+<<<<<<< HEAD
system('espeak "Connected.." >/dev/null 2>&1')
puts " Do you want to set Status Message (y) or (n)"
@@ -33,6 +46,9 @@
system('clear')
puts "You can now start chatting\nType bye to quit" #note you need to type 'bye' at terminal to quit the app.
+=======
+ puts "Connected.\nType bye to quit" #note you need to type 'bye' at terminal to quit the app.
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
@mess #a variable to get input message from you and also to quit from this chat.
#method to exit
@@ -75,7 +91,11 @@ def receive
end #end of receive method
t1=Thread.new { send() } #instance for sending thread
+<<<<<<< HEAD
t2=Thread.new { receive() } #instance for receiving thread
+=======
+ t2=Thread.new { receive() } #instance for receiving thread
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
t1.join #when encounters sleep, jumps to thread t2
t2.join #when encounters sleep, jumps to thread t1
@@ -85,7 +105,10 @@ def receive
print 'Dependencies was not installed. Do you want to install (y) or not (n)'
a = gets.chomp
if( a == 'y')
+<<<<<<< HEAD
system('sudo apt-get install rubygems1.8')
+=======
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
system('sudo gem install xmpp4r-simple')
system('sudo gem install highline')
system('sudo gem install colorize')
View
10 features.rdoc
@@ -5,10 +5,17 @@ Known Bugs:
1. If more than one user chats, then all the chats will be displayed messing up (Debugged in version 2.0)
2. Do not Works, if you are using proxy for your internet.
3. Throws some Interrupt exceptions.
+<<<<<<< HEAD
-------------------------------------------------------------------------------------------------------------------
Features of Whiz-chat - 2.0:
1. Basic sending and receiving messages between users by gmail account.
2. Color differentiation between sender and reciever chat.
+=======
+
+Features of Whiz-chat - 2.0 (Current):
+ 1. Basic sending and receiving messages between users by gmail account.
+ 2. Added colors to display, differentiating messages between users.
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a
3. Sound Alert on each received chat.
Bugs Fixed:
@@ -18,6 +25,7 @@ Bugs Fixed:
Known Bugs:
1. Do not works, if you are using proxy for your internet.
+<<<<<<< HEAD
-------------------------------------------------------------------------------------------------------------------
Features of Whiz-chat - 2.01 (Current):
1. Basic sending and receiving messages between users by gmail account.
@@ -27,5 +35,7 @@ Features of Whiz-chat - 2.01 (Current):
No Bugs were fixed since version 2.0
-------------------------------------------------------------------------------------------------------------------
+=======
+>>>>>>> cd28d606912fd77c4d73da172a9cd703fc40932a

0 comments on commit 5e5a300

Please sign in to comment.