rubtella 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/bin/rubtella

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'rubtella'
+
+case ARGV[0]
+when "start"
+  $0 = 'rubtella-base'
+  
+  @p = fork do
+    $0 = 'rubtella'
+    Signal.trap("TERM") do
+      @@logger.info "terminating..."
+      File.delete Rubtella::Config::PID_FILE if File.exist? Rubtella::Config::PID_FILE
+      exit
+    end
+  
+    Thread.new do
+      server = Rubtella::Listener.new
+      server.listen
+    end
+    
+    Thread.new do
+      gnutella = Rubtella::Sender.new
+      gnutella.connect
+      gnutella.send_query("doors")
+    end
+    
+    while true
+      sleep 100
+    end
+  end 
+  
+  #save pid
+  f = File.new Rubtella::Config::PID_FILE, File::CREAT|File::TRUNC|File::RDWR, 0644
+  f.puts @p
+  f.close
+  
+  Process.detach(@p)
+
+when "stop"
+  unless File.exist? Rubtella::Config::PID_FILE
+    puts 'No pid file found'
+  else
+    f = File.open Rubtella::Config::PID_FILE
+    pid = f.read.to_i
+    Process.kill "TERM", pid
+  end
+else
+  puts "[start|stop]"
+end

data/lib/config/config.rb

@@ -9,9 +9,25 @@ module Rubtella
       guid
     end
 
-    IP_ADDRESS = "127.0.0.1"
-    PORT = 54321
+    if File.exist?(ENV["HOME"] + "/.rubtella/config.rb")
+      load ENV["HOME"] + "/.rubtella/config.rb"
+    else
+      Dir.mkdir(ENV['HOME'] + "/.rubtella") unless File.exist?(ENV['HOME'] + "/.rubtella")
+      File.open(ENV["HOME"] + "/.rubtella/config.rb", 'w') do |f| 
+        f.puts("#put your config here") 
+        f.puts("#") 
+        f.puts("# example below") 
+        f.puts("#") 
+        f.puts("#IP_ADDRESS = 127.0.0.1") 
+        f.puts("#PORT = 54321") 
+      end
+    end
+
+    IP_ADDRESS = "127.0.0.1" unless defined? IP_ADDRESS
+    PORT = 54321 unless defined? PORT
+
     GUID  = generate_guid
+    PID_FILE = ENV["HOME"] + "/.rubtella/rubtella.pid"
 
     
     

data/lib/rubtella/rubtella.rb

@@ -31,30 +31,32 @@ module Rubtella
          Thread.start do  
 
            begin
-             parse_request session
+             manage_connection session
            rescue => e
-             session.puts "Rubtella Server Error: " + e.to_s
-             puts "Rubtella Server Error: " + e.to_s
+             session.puts "Rubtella Listener Error: " + e.to_s
+             @@logger.info "Rubtella Server Error: " + e.to_s
            ensure
              session.close
            end
 
          end
       end   #end loop 
-
     end
+      
+    def manage_connection stream
+      loop do
+        @@logger.info 'we\'re listening..'
+        resp = stream.recv 1000
+        if parse(resp) == "ping"
+          pong = TCPData::Builder::Pong.new
+          stream.send pong.build , 0 
+          @@logger.info 'pong send..'
+          stream.close
+          @@logger.info 'connection closed'
+          break
+        end
+      end 
 
-    def parse_request request
-      req = request.recv 1000
-
-      puts req
-      request.send Sender.pong, 0
-      puts 'response send!'
-      req = request.recv 1000
-      puts 'received content:'
-
-      puts req
-      puts 'received!'
     end
 
   end
@@ -64,44 +66,58 @@ module Rubtella
 
     attr_accessor :peer, :connected
     
-    def initialize peer
-      @peer = peer
+    def initialize peer = nil
+      @peers = Array.new
+      init_peers 
+
+      if peer
+        @peers << peer
+      end
+
+      raise RubtellaError, "No peer address! Pleas add peers to hosts file!" if @peers.empty?
+
+      @peer = @peers.pop
+
       @standard_headers = {"User-Agent" => "Rubtella",
                            "X-Ultrapeer" => "False",
                            "X-Query-Routing" => "0.1"}
+
+    rescue => e
+      @@logger.info e.to_s
     end
 
     def connect
-      begin
-        puts "connecting to: #{@peer.ip}:#{@peer.port}"
+      @@logger.info "connecting to: #{@peer.ip}:#{@peer.port}"
+      stream = nil
+      timeout(5) do 
         stream = TCPSocket.new @peer.ip, @peer.port
-        timeout(5) do 
-          stream.send handshake_req, 0
-        end
-        @response = stream.recv 1000
+        stream.send handshake_req, 0
+      end
+      @response = stream.recv 1000
       
-        resp = HTTPData::Parser.new @response 
-        stream.send handshake_resp, 0
-
-        if resp.ok?
-          #connection established
-          puts 'connection established'
-          @connected = @peer
-          puts "Connected with #{@connected.ip} #{@connected.port}"
-          @@logger.info "Connected with #{@connected.ip} #{@connected.port}"
-          
-          manage_connection stream
-        else
-          puts 'failed to connect'
-          @peer = resp.peers.shift
-          connect
-        end
-      rescue Timeout::Error
-        @peer = resp.peers.shift
+      resp = HTTPData::Parser.new @response 
+      stream.send handshake_resp, 0
+
+      if resp.ok?
+        #connection established
+        @@logger.info 'connection established'
+        @connected = @peer
+        @@logger.info "Connected with #{@connected.ip} #{@connected.port}"
+        @@logger.info "Connected with #{@connected.ip} #{@connected.port}"
+        
+        manage_connection stream
+      else
+        @@logger.info 'failed to connect'
+        @peers.concat resp.peers
+        @peer = @peers.pop
         connect
-      rescue => e
-        @@logger.info e.to_s
       end
+    rescue Timeout::Error,Errno::ECONNREFUSED
+      @@logger.info "Timeout"
+      @peer = resp.peers.shift
+      connect
+    rescue => e
+      @@logger.info e.to_s
     end
 
     def handshake_req
@@ -116,14 +132,14 @@ module Rubtella
     
     def manage_connection stream
       loop do
-        puts 'we\'re listening..'
+        @@logger.info 'we\'re listening..'
         resp = stream.recv 1000
         if parse(resp) == "ping"
           pong = TCPData::Builder::Pong.new
           stream.send pong.build , 0 
-          puts 'pong send..'
+          @@logger.info 'pong send..'
           stream.close
-          puts 'connection closed'
+          @@logger.info 'connection closed'
           break
         end
       end 
@@ -134,7 +150,7 @@ module Rubtella
     
     def parse message
       parsed = TCPData::Parser.new message
-      puts parsed.message
+      @@logger.info parsed.message
       
       parsed.message
 
@@ -145,10 +161,19 @@ module Rubtella
       query = TCPData::Builder::Query.new(:criteria => text)
       @@logger.info "sending query - #{text}"
       stream.send query.build, 0
-      puts 'we\'re listening..'
+      @@logger.info 'we\'re listening..'
       resp = stream.recv 1000
       parse(resp)
     end
+
+    def init_peers
+      if File.exist?(ENV["HOME"] + "/.rubtella/hosts")
+        hosts_file = File.open ENV["HOME"] + "/.rubtella/hosts"
+        hosts = hosts_file.read
+        hosts.split("\n")
+        hosts.each {|h| @peers << Peer.new(*(h.split(":")))}
+      end
+    end
   end
 
 end

data/rubtella.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubtella}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateusz Zawisza"]
-  s.date = %q{2010-01-10}
-  s.default_executable = %q{rubtellad}
+  s.date = %q{2010-01-19}
+  s.default_executable = %q{rubtella}
   s.description = %q{Library for Gnuttale in Ruby}
   s.email = %q{mateusz.zawisza@gmail.com}
-  s.executables = ["rubtellad"]
+  s.executables = ["rubtella"]
   s.extra_rdoc_files = [
     "README"
   ]
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
      "README",
      "Rakefile",
      "VERSION",
-     "bin/rubtellad",
+     "bin/rubtella",
      "lib/config/config.rb",
      "lib/rubtella.rb",
      "lib/rubtella/errors.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubtella
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mateusz Zawisza
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +01:00
-default_executable: rubtellad
+date: 2010-01-19 00:00:00 +01:00
+default_executable: rubtella
 dependencies: []
 
 description: Library for Gnuttale in Ruby
 email: mateusz.zawisza@gmail.com
 executables: 
-- rubtellad
+- rubtella
 extensions: []
 
 extra_rdoc_files: 
@@ -26,7 +26,7 @@ files:
 - README
 - Rakefile
 - VERSION
-- bin/rubtellad
+- bin/rubtella
 - lib/config/config.rb
 - lib/rubtella.rb
 - lib/rubtella/errors.rb

data/bin/rubtellad

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubtella'
-
-$0 = 'rubtella-base'
-
-@p = fork do
-  $0 = 'rubtella'
-  Thread.new do
-    server = Rubtella::Listener.new
-    server.listen
-  end
-  
-  Thread.new do
-    gnutella = Rubtella::Sender.new Rubtella::Peer.new("70.188.16.73",38093) 
-    gnutella.connect
-    gnutella.send_query("doors")
-  end
-  
-  while true
-    sleep 100
-  end
-end 
-
-Process.detach(@p)
-