gitjour 5.0.0 → 6.0.0

data/Manifest.txt

@@ -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

data/README.txt

@@ -1 +1,8 @@
-README
+README
+
+DEVELOPMENT
+
+How to test from the console:
+
+irb -r 'lib/gitjour/application'
+> Gitjour::Application.run "list"

data/bin/gitjour

@@ -1,58 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'dnssd'
-require 'set'
-Thread.abort_on_exception = true
-
-GitService = Struct.new(:name, :host, :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.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
+require 'gitjour'
+trap "INT" do
+  exit!
 end
-
-case ARGV.shift
-  when "list"
-    service_list.each do |service|
-      puts "#{service.name} on #{service.host}: gitjour clone #{service.name}"
-      puts "  #{service.description}" if service.description && service.description != ''
-    end
-  when "clone"
-    name_of_share = ARGV.shift || fail("You have to pass in a name")
-    host = service_list(name_of_share).detect{|service| service.name == name_of_share}.host
-    system("git clone git://#{host}/ #{name_of_share}")
-  when "serve"
-    name = ARGV.shift || File.basename(Dir.pwd)
-    tr = DNSSD::TextRecord.new
-    tr['description'] = File.read(".git/description") rescue "a git project"
-    DNSSD.register(name, "_git._tcp", 'local', 9148, tr.encode) do |register_reply| 
-      p register_reply
-    end
-    `git-daemon --verbose --export-all --base-path=#{Dir.pwd}`
-  else
-    puts "Serve up and use git repositories via Bonjour/DNSSD."
-    puts "Usage: gitjour <command> [name]"
-    puts
-    puts "  list      Lists available repositories."
-    puts "  clone     Clone a gitjour served repository."
-    puts "  serve     Serve up the current directory via gitjour."
-    puts "            Optionally pass name to not use pwd."
-    puts
-end
-
-
+Gitjour::Application.run(*ARGV)

data/lib/gitjour.rb

@@ -1,5 +1 @@
-$:.unshift File.dirname(__FILE__)
-
-module Gitjour
-  
-end
+require 'gitjour/application'

data/lib/gitjour/application.rb

@@ -0,0 +1,95 @@
+require 'rubygems'
+require 'dnssd'
+require 'set'
+Thread.abort_on_exception = true
+
+module Gitjour
+  GitService = Struct.new(:name, :host, :description)  
+  class Application
+
+    class << self
+      def run(operation = nil, argument = nil)
+        case operation
+          when "list"
+            service_list.each do |service|
+              puts "=== #{service.name} on #{service.host} ==="
+  	          puts "  gitjour clone #{service.name}"
+              puts "  #{service.description}" if service.description && service.description != '' && service.description !~ /^Unnamed repository/
+  	          puts
+            end
+          when "clone"
+            clone(repository_name)
+          when "serve"
+            serve(argument)
+          else
+            help
+        end
+      end
+      
+      private
+      def clone(repository_name)
+        name_of_share = repository_name || fail("You have to pass in a name")
+        host = service_list(name_of_share).detect{|service| service.name == name_of_share}.host rescue exit_with!("Couldn't find #{name_of_share}")
+        system("git clone git://#{host}/ #{name_of_share}/")
+        
+      end
+      def serve(path)
+        path ||= Dir.pwd
+        path = File.expand_path(path)
+        File.exists?("#{path}/.git") ? announce_repo(path) : Dir["#{path}/*"].each{|dir| announce_repo(dir) if File.directory?(dir)}
+        `git-daemon --verbose --export-all --base-path=#{path} --base-path-relaxed`
+      end
+      
+      def help
+        puts "Serve up and use git repositories via Bonjour/DNSSD."
+        puts "Usage: gitjour <command> [name]"
+        puts
+        puts "  list      Lists available repositories."
+        puts "  clone     Clone a gitjour served repository."
+        puts "  serve     Serve up the current directory via gitjour."
+        puts "            Optionally pass name to not use pwd."
+        puts
+      end
+      
+      def exit_with!(message)
+        STDERR.puts message
+        exit!
+      end
+    
+      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.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
+
+      def announce_repo(path)
+        return unless File.exists?("#{path}/.git")
+        name = "#{File.basename(path)}"
+        tr = DNSSD::TextRecord.new
+        tr['description'] = File.read(".git/description") rescue "a git project"
+        DNSSD.register(name, "_git._tcp", 'local', 9148, tr.encode) do |register_reply| 
+          puts "Registered #{name}.  Starting service."
+        end
+      end      
+    end
+
+    
+  end
+end
+
+
+

data/lib/gitjour/version.rb

@@ -1,6 +1,6 @@
 module Gitjour #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 5
+    MAJOR = 6
     MINOR = 0
     TINY  = 0
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitjour
 version: !ruby/object:Gem::Version 
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors: 
 - Chad Fowler
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -07:00
+date: 2008-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ files:
 - 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