lib/gitjour/application.rb @@ -7,8 +7,8 @@ Rakefile config/hoe.rb config/requirements.rb lib/gitjour.rb +lib/gitjour/application.rb lib/gitjour/version.rb -log/debug.log script/destroy script/generate script/txt2html Manifest.txt @@ -1 +1,8 @@ -README \ No newline at end of file +README + +DEVELOPMENT + +How to test from the console: + +irb -r 'lib/gitjour/application' +> Gitjour::Application.run "list" README.txt @@ -1,38 +1,14 @@ #!/usr/bin/env ruby require 'rubygems' -require 'dnssd' -require 'set' require 'cooloptions' - -Thread.abort_on_exception = true - -GitService = Struct.new(:name, :host, :port, :description) - -def service_list(looking_for = nil) - wait_seconds = 5 - - service_list = Set.new - waiting_thread = Thread.new { sleep wait_seconds } - - service = DNSSD.browse "_git._tcp" do |reply| - DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply| - service_list << GitService.new(reply.name, resolve_reply.target, resolve_reply.port, resolve_reply.text_record['description']) - if looking_for && reply.name == looking_for - waiting_thread.kill - end - end - end - puts "Gathering for up to #{wait_seconds} seconds..." - waiting_thread.join - service.stop - service_list -end +require 'gitjour' COMMANDS = { 'list' => 'Lists available repositories.', 'clone' => 'Clone a gitjour served repository.', 'serve' => 'Serve up the current directory via gitjour.' } + options = CoolOptions.parse!("[options] command [name]") do |o| o.desc 'Serve up and use git repositories via Bonjour/DNSSD.' o.desc "\n" @@ -45,33 +21,16 @@ options = CoolOptions.parse!("[options] command [name]") do |o| o.desc "\n" o.desc "Options:" - o.on 'port PORT', "Pass to serve to serve on a different port.", 9148 + o.on 'port PORT', "Pass to serve to serve on a different port.", 9418 + o.on 'verbose', "Verbose output.", false o.after do |result| (result.command = ARGV.shift) || o.error("Command is required.") o.error("Unknown command.") if !COMMANDS.keys.include?(result.command) result.name = ARGV.shift o.error("Name is required.") if result.command == "clone" && !result.name + result.port = result.port.to_i end end -case options.command - when "list" - service_list.each do |service| - puts "#{service.name} on #{service.host}: gitjour clone #{service.name}" - end - when "clone" - name_of_share = options.name - service = service_list(options.name).detect{|service| service.name == options.name} - system("git clone git://#{service.host}:#{service.port}/ #{options.name}") - when "serve" - name = options.name || File.basename(Dir.pwd) - tr = DNSSD::TextRecord.new - tr['description'] = File.read(".git/description") rescue "a git project" - DNSSD.register(name, "_git._tcp", 'local', options.port.to_i, tr.encode) do |register_reply| - p register_reply - end - `git-daemon --verbose --export-all --base-path=#{Dir.pwd} --port=#{options.port}` -end - - +Gitjour::Application.run(options) bin/gitjour @@ -1,5 +1 @@ -$:.unshift File.dirname(__FILE__) - -module Gitjour - -end \ No newline at end of file +require 'gitjour/application' lib/gitjour.rb @@ -1,6 +1,6 @@ module Gitjour #:nodoc: module VERSION #:nodoc: - MAJOR = 3 + MAJOR = 6 MINOR = 0 TINY = 0 lib/gitjour/version.rb 261a4d7c7adb514b0cd146192ba7a18603368e9c Nathaniel Talbott nathaniel@terralien.com http://github.com/dustin/gitjour/commit/e196aba33446f14ce80f8709e5137b45f8aa8fb6 e196aba33446f14ce80f8709e5137b45f8aa8fb6 2008-05-31T16:19:15-07:00 2008-05-31T16:19:15-07:00 Merged latest. 8673845a4bc0800d41c8a3e593f4453276aaacd1 Nathaniel Talbott nathaniel@terralien.com