fargo 0.3.0 → 0.4.0

data/lib/fargo/supports/remote_file_list.rb

@@ -1,5 +1,5 @@
 require 'bzip2'
-require 'libxml'
+require 'nokogiri'
 
 module Fargo
   class Listing < Struct.new(:tth, :size, :name, :nick, :mtime, :root); end
@@ -39,6 +39,11 @@ module Fargo
 
         @getting_file_list[nick] = true
         download nick, 'files.xml.bz2'
+
+        EventMachine.add_timer 60 do
+          @file_list.delete nick
+          @getting_file_list.delete nick
+        end
       end
 
       # Wait for the results to arrive, timed out after some time
@@ -68,7 +73,7 @@ module Fargo
         if file && File.exists?(file)
           Fargo.logger.debug "Parsing file list for: '#{nick}' at '#{file}'"
           xml = Bzip2::Reader.open(file).read
-          doc = LibXML::XML::Document.string xml
+          doc = Nokogiri::XML::Document.parse xml
 
           construct_file_list doc.root, nil, nick
         else
@@ -79,17 +84,14 @@ module Fargo
       def construct_file_list node, prefix, nick
         list = {}
 
-        node.each_element do |element|
+        node.element_children.each do |element|
           path = prefix ? prefix + "\\" + element['Name'] : element['Name']
 
           if element.name =~ /directory/i
             list[element['Name']] = construct_file_list element, path, nick
           else
-            # Why does this consistently segfault ruby 1.8.7 when I convert
-            # element['Size'] to an integer before the struct is created?!
             element = list[element['Name']] = Listing.new(element['TTH'],
-              element['Size'], path, nick)
-            element.size = element.size.to_i
+              element['Size'].to_i, path, nick)
           end
         end
 

data/lib/fargo/supports/searches.rb

@@ -26,9 +26,15 @@ module Fargo
         @searches[search.to_s]       = []
         @search_objects[search.to_s] = search
         search_hub search
+
+        EventMachine.add_timer(600) { remove_search search }
       end
 
       def searches
+        search_objects.map{ |s| s.query }
+      end
+
+      def search_objects
         @searches.keys.map { |k| @search_objects[k] }
       end
 

data/lib/fargo/version.rb

@@ -1,3 +1,3 @@
 module Fargo
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/fargo/protocol/hub_spec.rb

@@ -9,7 +9,7 @@ describe Fargo::Protocol::Hub do
   }
   include Fargo::TTH
 
-  context "searches" do
+  context "searches", :type => :emsync do
     let(:file1) { Fargo.config.download_dir + '/file12' }
     let(:file2) { Fargo.config.download_dir + '/file23' }
     let(:file3) { Fargo.config.download_dir + '/file34' }

data/spec/fargo/protocol/peer_upload_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Fargo::Protocol::PeerUpload do
+describe Fargo::Protocol::PeerUpload, :type => :emsync do
   let(:conn) {
     helper_object(Fargo::Protocol::Peer).tap do |conn|
       conn.client     = Fargo::Client.new

data/spec/fargo/search_spec.rb

@@ -62,7 +62,12 @@ describe Fargo::Search do
     subject.should_not match_hash(:tth => 'foobar')
   end
 
-  it "only matches anything with a filetype of ANY" do
+  it "extracts the query from the pattern specified" do
+    subject.pattern = 'a$b$c'
+    subject.query.should == 'a b c'
+  end
+
+  it "matches valid file names with a filetype of ANY" do
     subject.query = 'foo bar baz'
     subject.filetype = Fargo::Search::ANY
 

data/spec/fargo/supports/chat_spec.rb

@@ -30,4 +30,11 @@ describe Fargo::Supports::Chat, :type => :em do
     client.messages.should == []
     client.messages_with('foo').should == []
   end
+
+  it "sends the correct message when chatting" do
+    client.instance_variable_set('@hub', hub = mock)
+    hub.should_receive(:send_data).with('<fargo> hello world!|')
+
+    client.send_chat 'hello world!'
+  end
 end

data/spec/fargo/supports/local_file_list_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe Fargo::Supports::LocalFileList do
+describe Fargo::Supports::LocalFileList, :type => :emsync do
+
+  include Fargo::TTH
 
   before :each do
     @root = Fargo.config.download_dir + '/shared'
@@ -29,6 +31,16 @@ describe Fargo::Supports::LocalFileList do
     hash['shared']['c']['d'].name.should == 'shared/c/d'
   end
 
+  it "caches the file list so that another client can come along" do
+    @client.share_directory @root
+
+    client2 = Fargo::Client.new
+    client2.config.override_share_size = nil
+    client2.local_file_list.should     == @client.local_file_list
+    client2.share_size.should          == @client.share_size
+    client2.shared_directories.should  == @client.shared_directories
+  end
+
   it "caches the size of each file shared" do
     @client.share_directory @root
 
@@ -67,4 +79,23 @@ describe Fargo::Supports::LocalFileList do
 
     @client.listing_for('TTH/' + listing.tth).should == listing
   end
+
+  it "generates a correct file list" do
+    @client.share_directory @root
+    file = Bzip2::Reader.open(@client.config.config_dir + '/files.xml.bz2')
+    xml = file.read
+
+    xml.should == <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<FileListing Base="/" Version="1" Generator="fargo #{Fargo::VERSION}">
+  <Directory Name="shared">
+    <File Name="a" Size="1" TTH="#{file_tth(@root + '/a')}"/>
+    <File Name="b" Size="1" TTH="#{file_tth(@root + '/b')}"/>
+    <Directory Name="c">
+      <File Name="d" Size="1" TTH="#{file_tth(@root + '/c/d')}"/>
+    </Directory>
+  </Directory>
+</FileListing>
+XML
+  end
 end

data/spec/spec_helper.rb

@@ -28,12 +28,15 @@ RSpec.configure do |c|
   end
 
   c.around :each, :type => :em do |example|
-    EventMachine.run {
+    EventMachine.run_block {
       example.run
-
-      EventMachine.stop_event_loop
     }
   end
+
+  c.before :each, :type => :emsync do
+    EM.stub(:schedule).and_yield
+    EM.stub(:defer).and_yield
+  end
 end
 
 Dir[File.dirname(__FILE__) + '/support/*.rb'].each { |f| load f }

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fargo
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alex Crichton
@@ -15,76 +14,100 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -04:00
+date: 2010-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: eventmachine
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: em-websocket
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  name: eventmachine
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  requirement: *id002
   type: :runtime
-  name: activesupport
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
-  name: libxml-ruby
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: bzip2-ruby
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :runtime
-  name: bzip2-ruby
   prerelease: false
+  version_requirements: *id006
 description: Direct Connect (DC) Client implemented in pure Ruby
 email: alex@alexcrichton.com
-executables: []
-
+executables: 
+- fargo
 extensions: 
 - ext/fargo/extconf.rb
+- ext/readline/extconf.rb
 extra_rdoc_files: []
 
 files: 
+- bin/fargo
 - ext/fargo/base32.c
 - ext/fargo/base32.h
 - ext/fargo/extconf.rb
@@ -96,8 +119,24 @@ files:
 - ext/fargo/tigertree.h
 - ext/fargo/tth.c
 - ext/fargo/tth.h
+- ext/readline/extconf.rb
+- ext/readline/fargo_cli.c
+- ext/readline/screen.c
+- ext/readline/screen.h
 - lib/fargo.rb
+- lib/fargo/cli.rb
+- lib/fargo/cli/completion.rb
+- lib/fargo/cli/downloads.rb
+- lib/fargo/cli/help.rb
+- lib/fargo/cli/info.rb
+- lib/fargo/cli/logging.rb
+- lib/fargo/cli/nick_browser.rb
+- lib/fargo/cli/searches.rb
+- lib/fargo/cli/stats.rb
 - lib/fargo/client.rb
+- lib/fargo/ext/irb.rb
+- lib/fargo/ext/readline.rb
+- lib/fargo/ext/struct.rb
 - lib/fargo/parser.rb
 - lib/fargo/protocol/dc.rb
 - lib/fargo/protocol/hub.rb
@@ -135,8 +174,8 @@ homepage: http://github.com/alexcrichton/fargo
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 - ext
@@ -145,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4279216489116306912
       segments: 
       - 0
       version: "0"
@@ -154,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4279216489116306912
       segments: 
       - 0
       version: "0"