distribustream 0.2.1 → 0.3.0

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: distribustream
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2008-10-22 00:00:00 -06:00
+  version: 0.3.0
+date: 2008-11-09 00:00:00 -07:00
 summary: DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost
 require_paths: 
 - lib
 email: tony@clickcaster.com
-homepage: http://distribustream.rubyforge.org
+homepage: http://distribustream.org
 rubyforge_project: distribustream
 description: 
 autorequire: 
@@ -34,7 +34,6 @@ authors:
 - Tom Stapleton
 files: 
 - bin/dsclient
-- bin/dsseed
 - bin/dstream
 - lib/pdtp
 - lib/pdtp/client
@@ -47,8 +46,8 @@ files:
 - lib/pdtp/client/transfer.rb
 - lib/pdtp/client.rb
 - lib/pdtp/common
-- lib/pdtp/common/common_init.rb
 - lib/pdtp/common/file_service.rb
+- lib/pdtp/common/http_server.rb
 - lib/pdtp/common/length_prefix_protocol.rb
 - lib/pdtp/common/protocol.rb
 - lib/pdtp/common.rb
@@ -58,7 +57,7 @@ files:
 - lib/pdtp/server/dispatcher.rb
 - lib/pdtp/server/file_service.rb
 - lib/pdtp/server/file_service_protocol.rb
-- lib/pdtp/server/stats_handler.rb
+- lib/pdtp/server/status_handler.rb
 - lib/pdtp/server/transfer.rb
 - lib/pdtp/server/trust.rb
 - lib/pdtp/server.rb
@@ -70,6 +69,7 @@ files:
 - COPYING
 - README
 - CHANGES
+- pdtp-specification.xml
 test_files: []
 
 rdoc_options: 
@@ -81,9 +81,9 @@ extra_rdoc_files:
 - COPYING
 - README
 - CHANGES
+- pdtp-specification.xml
 executables: 
 - dstream
-- dsseed
 - dsclient
 extensions: []
 
@@ -106,7 +106,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: json

data/bin/dsseed

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright (C) 2006-07 ClickCaster, Inc. (info@clickcaster.com)
-# All rights reserved.  See COPYING for permissions.
-# 
-# This source file is distributed as part of the 
-# DistribuStream file transfer system.
-#
-# See http://distribustream.rubyforge.org/
-#++
-
-require 'optparse'
-require 'rubygems'
-require 'eventmachine'
-require 'mongrel'
-
-require File.dirname(__FILE__) + '/../lib/pdtp/common/common_init'
-require File.dirname(__FILE__) + '/../lib/pdtp/server/file_service_protocol'
-
-common_init File.basename($0)
-
-# Run the EventMachine reactor loop
-EventMachine::run do
-  host, port, listen_port = @@config[:host], @@config[:port], @@config[:listen_port]
-  
-  connection = EventMachine::connect(host, port, PDTP::Server::FileService::Protocol) do |c|
-    c.instance_eval { @base_path = @@config[:file_root] }
-  end
-  
-  @@log.info "connecting with ev=#{EventMachine::VERSION}"
-  @@log.info "host= #{host}  port=#{port}"
-end

data/lib/pdtp/common/common_init.rb

@@ -1,122 +0,0 @@
-#--
-# Copyright (C) 2006-07 ClickCaster, Inc. (info@clickcaster.com)
-# All rights reserved.  See COPYING for permissions.
-# 
-# This source file is distributed as part of the 
-# DistribuStream file transfer system.
-#
-# See http://distribustream.rubyforge.org/
-#++
-
-#Provides functions used for initialization by both the client and server
-
-require 'optparse'
-require 'logger'
-
-require File.dirname(__FILE__) + '/protocol'
-
-STDOUT.sync=true
-STDERR.sync=true
-
-@@log=Logger.new(STDOUT)
-@@log.datetime_format=""
-
-CONFIG_TYPES = {
-  :host             => :string,
-  :vhost            => :string,
-  :port             => :int,
-  :listen_port      => :int,
-  :file_root        => :string,
-  :quiet            => :bool,
-  :chunk_size       => :int,
-  :request_url      => :string
-} unless defined? CONFIG_TYPES
-
-#prints banner and loads config file
-def common_init(program_name, config = nil)
-  @@config = config || {
-    :host             => '0.0.0.0',
-    :port             => 6086, #server port
-    :listen_port      => 8000, #client listen port
-    :file_root        => '.',
-    :chunk_size       => 5000,
-    :quiet            => true
-  }
-  
-  config_filename=nil
-  
-  unless config
-    OptionParser.new do |opts|
-      opts.banner = "Usage: #{program_name} [options]"
-      opts.on("--config CONFIGFILE", "Load specified config file.") do |c|
-        config_filename=c
-      end
-      opts.on("--help", "Prints this usage info.") do
-        puts opts
-        exit
-      end
-    end.parse!      
-  end
-  
-  puts "#{program_name} starting. Run '#{program_name} --help' for more info."
-
-  load_config_file(config_filename) unless config
-
-  begin
-    @@config[:file_root]=File.expand_path(@@config[:file_root])
-  rescue 
-    puts "Invalid path specified for file_root"
-    return
-  end
-
-  puts "@@config=#{@@config.inspect}"
-  validate_config_options
-  handle_config_options
-end
-
-#loads a config file specified by config_filename
-def load_config_file(config_filename)
-  if config_filename.nil?
-    puts "No config file specified. Using defaults."
-    return
-  end
-
-  confstr=File.read(config_filename) rescue nil
-  if confstr.nil?
-    puts "Unable to open config file: #{config_filename}"
-    exit
-  end
-
-  begin
-    new_config = YAML.load confstr
-    @@config.merge!(new_config)
-    @@config[:vhost] ||= @@config[:host] # Use host as vhost unless specified
-  rescue Exception => e
-    puts "Error parsing config file: #{config_filename}"
-    puts e
-    exit
-  end
-
-  puts "Loaded config file: #{config_filename}"
-end
-
-#make sure all the config options are of the right type
-def validate_config_options
-  @@config.each do |key,val|
-    type=CONFIG_TYPES[key]
-    if type.nil?
-      puts "Unknown parameter: #{key}"
-      exit
-    end
-
-    unless PDTP::Protocol.obj_matches_type?(val,type)
-      puts "Parameter: #{key} is not of type: #{type}"
-      exit
-    end
-  end
-end
-
-#responds to config options that are used by both client and server
-def handle_config_options
-  @@log.level=Logger::INFO if @@config[:quiet]  
-end

data/lib/pdtp/server/stats_handler.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'mongrel'
-
-module PDTP
-  class Server
-    #set up the mongrel server for serving the stats page
-    class StatsHandler < Mongrel::HttpHandler
-      def initialize(server)
-        @server = server
-      end
-
-      def process(request,response)
-        response.start(200) do |head, out|
-          out.write begin
-            outstr = @server.generate_html_stats
-          rescue Exception=>e
-            outstr = "Exception: #{e}\n#{e.backtrace.join("\n")}"
-          end
-        end    
-      end
-    end
-  end
-end