Add gitjour remote and update gitjour serve

- 'gitjour serve' now takes a second argument, the share name, like: 'gitjour serve . nicksieger-gitjour'.
- 'gitjour remote' adds a gitjour remote by name.

lib/gitjour/application.rb

@@ -4,62 +4,75 @@
 Thread.abort_on_exception = true
 
 module Gitjour
-  GitService = Struct.new(:name, :host, :description)  
+  GitService = Struct.new(:name, :host, :description)
   class Application
 
     class << self
-      def run(operation = nil, argument = nil)
+      def run(operation = nil, *arguments)
         case operation
           when "list"
             service_list.each do |service|
               puts "=== #{service.name} on #{service.host} ==="
-  	          puts "  gitjour clone #{service.name}"
+              puts "  gitjour clone #{service.name}"
               puts "  #{service.description}" if service.description && service.description != '' && service.description !~ /^Unnamed repository/
-  	          puts
+              puts
             end
           when "clone"
-            clone(repository_name)
+            clone(*arguments)
           when "serve"
-            serve(argument)
+            serve(*arguments)
+          when "remote"
+            remote(*arguments)
           else
             help
         end
       end
-      
+
       private
-      def clone(repository_name)
+      def get_host_and_share(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}")
+        [host, name_of_share]
+      end
+
+      def clone(repository_name,*rest)
+        host, name_of_share = get_host_and_share(repository_name)
         system("git clone git://#{host}/ #{name_of_share}/")
-
       end
-      def serve(path)
+
+      def remote(repository_name,*rest)
+        host, name_of_share = get_host_and_share(repository_name)
+        system("git remote add #{name_of_share} git://#{host}/")
+      end
+
+      def serve(path, share_name = nil, *rest)
         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)}
+        File.exists?("#{path}/.git") ? announce_repo(path, share_name) : 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 "Usage: gitjour <command> [args]"
         puts
         puts "  list      Lists available repositories."
         puts "  clone     Clone a gitjour served repository."
         puts "  serve     Serve up the current directory via gitjour."
+        puts "  remote    Add a Bonjour remote into your current repository."
         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  
+        service_list = Set.new
         waiting_thread = Thread.new { sleep wait_seconds }
 
         service = DNSSD.browse "_git._tcp" do |reply|
@@ -72,22 +85,20 @@ def service_list(looking_for = nil)
         end
         puts "Gathering for up to #{wait_seconds} seconds..."
         waiting_thread.join
-        service.stop 
+        service.stop
         service_list
       end
 
-      def announce_repo(path)
+      def announce_repo(path, share_name = nil)
         return unless File.exists?("#{path}/.git")
-        name = "#{File.basename(path)}"
+        name = share_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| 
+        DNSSD.register(name, "_git._tcp", 'local', 9148, tr.encode) do |register_reply|
           puts "Registered #{name}.  Starting service."
         end
-      end      
+      end
     end
-
-
   end
 end