gitjour 6.0.9 → 6.4.0

data/History.txt

@@ -1,3 +1,16 @@
+== 6.4.0 2009-03-13
+
+* Add pull command
+* Support git 1.6+
+* Require dnssd 0.7.1+ to support Avahi
+
+== 6.3.0 2008-08-23
+
+* Simplify project layout, remove newgem dependency
+* Add a prefix to projects' served name
+
+[...]
+
 == 0.0.1 2008-05-29
 
 * 1 major enhancement:

data/Manifest.txt

@@ -1,25 +1,8 @@
-bin/gitjour
 History.txt
-License.txt
 Manifest.txt
 README.txt
 Rakefile
-config/hoe.rb
-config/requirements.rb
+bin/gitjour
 lib/gitjour.rb
-lib/gitjour/application.rb
-lib/gitjour/version.rb
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
 test/test_gitjour.rb
 test/test_helper.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/README.txt

@@ -1,8 +1,67 @@
-README
+= gitjour
 
-DEVELOPMENT
+* http://github.com/technomancy/gitjour
 
-How to test from the console:
+== DESCRIPTION:
 
-irb -r 'lib/gitjour/application'
-> Gitjour::Application.run "list"
+Automates zeroconf-powered serving and cloning of git repositories.
+
+== SYNOPSIS:
+
+  % gitjour serve [project_dir] [name_to_advertise_as]
+  Registered phil-gitjour on port 9418. Starting service.
+
+  % gitjour list
+  Gathering for up to 5 seconds...
+  === phil-gitjour on pdp10.local.:9418 ===
+    gitjour (clone|pull) phil-gitjour
+
+  % gitjour clone phil-gitjour
+  Gathering for up to 5 seconds...
+  Connecting to pdp10.local.:9418
+  Initialized empty Git repository in /home/phil/phil-gitjour/.git/
+  [...]
+  Resolving deltas: 100% (342/342), done.
+
+  % gitjour pull phil-gitjour
+  Gathering for up to 5 seconds...
+  Connecting to pdp10.local.:9418
+  From git://pdp10.local.:9418
+   * branch            master     -> FETCH_HEAD
+  Updating 5ede61a..781bc4d
+  [...]
+  4 files changed, 35 insertions(+), 80 deletions(-)
+
+== REQUIREMENTS:
+
+* dnssd, which requires development headers to bonjour or avahi
+  See dnssd documentation for details.
+
+== INSTALL:
+
+* sudo gem install gitjour
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2008 Chad Fowler, Evan Phoenix, and Rich Kilmer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,4 +1,15 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# -*- ruby -*-
+
+require 'rubygems'
+require 'hoe'
+require './lib/gitjour.rb'
+
+Hoe.new('gitjour', Gitjour::VERSION) do |p|
+  p.extra_deps << ['dnssd', "~> 0.7.1"]
+  p.developer('Chad Fowler', 'chad@chadfowler.com')
+  p.developer('Evan Phoenix', 'evan@fallingsnow.net')
+  p.developer('Rich Kilmer', 'rich@example.com')
+  p.developer('Phil Hagelberg', 'technomancy@gmail.com')
+end
+
+# vim: syntax=Ruby

data/bin/gitjour

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'gitjour'
+
 trap "INT" do
   exit!
 end
-Gitjour::Application.run(*ARGV)
+
+Gitjour::Application.run(*ARGV)

data/lib/gitjour.rb

@@ -1 +1,188 @@
-require 'gitjour/application'
+require 'rubygems'
+require 'dnssd'
+require 'set'
+
+Thread.abort_on_exception = true
+
+module Gitjour
+  VERSION = "6.4.0"
+  GitService = Struct.new(:name, :host, :port, :description)
+
+  class Application
+
+    class << self
+      def run(*args)
+        case args.shift
+        when "list"
+          list
+        when "pull"
+          pull(*args)
+        when "clone"
+          clone(*args)
+        when "serve"
+          serve(*args)
+        when "remote"
+          remote(*args)
+        else
+          help
+        end
+      end
+
+      private
+
+      def list
+        service_list.each do |service|
+          puts "=== #{service.name} on #{service.host}:#{service.port} ==="
+          puts "  gitjour (clone|pull) #{service.name}"
+          if service.description != '' && service.description !~ /^Unnamed repository/
+            puts "  #{service.description}"
+          end
+          puts
+        end
+      end
+
+      def pull(repository_name, branch = "master")
+        service = locate_repo(repository_name) or
+          abort "ERROR: Unable to find project named '#{repository_name}'"
+
+        puts "Connecting to #{service.host}:#{service.port}"
+
+        system "git pull git://#{service.host}:#{service.port}/ #{branch}"
+      end
+
+      def clone(repository_name, *rest)
+        dir = rest.shift || repository_name
+        if File.exists?(dir)
+          abort "ERROR: Clone directory '#{dir}' already exists."
+        end
+
+        puts "Cloning '#{repository_name}' into directory '#{dir}'..."
+
+        service = locate_repo(repository_name) or
+          abort "ERROR: Unable to find project named '#{repository_name}'"
+
+        puts "Connecting to #{service.host}:#{service.port}"
+
+        system "git clone git://#{service.host}:#{service.port}/ #{dir}"
+      end
+
+      def remote(repository_name, *rest)
+        dir = rest.shift || repository_name
+        service = locate_repo repository_name
+        system "git remote add #{dir} git://#{service.host}:#{service.port}/"
+      end
+
+      def serve(path=Dir.pwd, *rest)
+        path = File.expand_path(path)
+        name = rest.shift || File.basename(path)
+        port = rest.shift || 9418
+
+        # If the name starts with ^, then don't apply the prefix
+        if name[0] == ?^
+          name = name[1..-1]
+        else
+          prefix = `git config --get gitjour.prefix`.chomp
+          prefix = ENV["USER"] if prefix.empty?
+          name   = [prefix, name].compact.join("-")
+        end
+
+        if File.exists?("#{path}/.git")
+          announce_repo(path, name, port.to_i)
+        else
+          Dir["#{path}/*"].each do |dir|
+            if File.directory?(dir)
+              name = File.basename(dir)
+              announce_repo(dir, name, 9418)
+            end
+          end
+        end
+
+        `git daemon --verbose --export-all --port=#{port} --base-path=#{path} --base-path-relaxed`
+      end
+
+      def help
+        puts "Gitjour #{Gitjour::VERSION}"
+        puts "Serve up and use git repositories via ZeroConf."
+        puts "\nUsage: gitjour <command> [args]"
+        puts
+        puts "  list"
+        puts "      Lists available repositories."
+        puts
+        puts "  clone <project> [<directory>]"
+        puts "      Clone a gitjour-served repository."
+        puts
+        puts "  serve <path_to_project> [<name_of_project>] [<port>] or"
+        puts "        <path_to_projects>"
+        puts "      Serve up the current directory or projects via gitjour."
+        puts
+        puts "      The name of your project is automatically prefixed with"
+        puts "      `git config --get gitjour.prefix` or your username (preference"
+        puts "      in that order). If you don't want a prefix, put a ^ on the front"
+        puts "      of the name_of_project (the ^ is removed before announcing)."
+        puts
+        puts "  pull <project> [<branch>]"
+        puts "      Pull from a gitjour-served repository."
+        puts
+        puts "  remote <project> [<name>]"
+        puts "      Add a ZeroConf remote into your current repository."
+        puts "      Optionally pass name to not use pwd."
+        puts
+      end
+
+      class Done < RuntimeError; end
+
+      def discover(timeout=5)
+        waiting_thread = Thread.current
+
+        dns = DNSSD.browse "_git._tcp" do |reply|
+          DNSSD.resolve reply.name, reply.type, reply.domain do |resolve_reply|
+            service = GitService.new(reply.name,
+                                     resolve_reply.target,
+                                     resolve_reply.port,
+                                     resolve_reply.text_record['description'].to_s)
+            begin
+              yield service
+            rescue Done
+              waiting_thread.run
+            end
+          end
+        end
+
+        puts "Gathering for up to #{timeout} seconds..."
+        sleep timeout
+        dns.stop
+      end
+
+      def locate_repo(name)
+        found = nil
+
+        discover do |obj|
+          if obj.name == name
+            found = obj
+            raise Done
+          end
+        end
+
+        return found
+      end
+
+      def service_list
+        list = Set.new
+        discover { |obj| list << obj }
+
+        return list
+      end
+
+      def announce_repo(path, name, port)
+        return unless File.exists?("#{path}/.git")
+
+        tr = DNSSD::TextRecord.new
+        tr['description'] = File.read("#{path}/.git/description") rescue "a git project"
+
+        DNSSD.register(name, "_git._tcp", 'local', port, tr.encode) do |rr|
+          puts "Registered #{name} on port #{port}. Starting service."
+        end
+      end
+    end
+  end
+end

data/test/test_gitjour.rb

@@ -1,11 +1,23 @@
+require 'net/telnet'
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestGitjour < Test::Unit::TestCase
+  def test_thread_friendly
+    repo = File.dirname(__FILE__) + '/repo'
+    port = 3289
+    FileUtils.rm_rf repo
+    `mkdir -p #{repo}; cd #{repo}; git init`
+    
+    thread = Thread.new do
+      Gitjour::Application.send(:serve, repo, 'test', port)
+    end
 
-  def setup
-  end
-  
-  def test_truth
-    assert true
+    sleep 1
+    Net::Telnet::new("Host" => "localhost", "Port" => port)
+
+    thread.kill
+    assert_raises(Errno::ECONNREFUSED) do
+      Net::Telnet::new("Host" => "localhost", "Port" => port)
+    end
   end
 end

data/test/test_helper.rb

@@ -1,2 +1,3 @@
 require 'test/unit'
+require 'fileutils'
 require File.dirname(__FILE__) + '/../lib/gitjour'

metadata

@@ -1,68 +1,67 @@
 --- !ruby/object:Gem::Specification 
 name: gitjour
 version: !ruby/object:Gem::Version 
-  version: 6.0.9
+  version: 6.4.0
 platform: ruby
 authors: 
 - Chad Fowler
-- Rich Kilmer
 - Evan Phoenix
+- Rich Kilmer
+- Phil Hagelberg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-31 00:00:00 -07:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dnssd
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.9.0
     version: 
-description: Automates DNSSD-powered serving and cloning of git repositories.
-email: chad@chadfowler.com
+description: Automates zeroconf-powered serving and cloning of git repositories.
+email: 
+- chad@chadfowler.com
+- evan@fallingsnow.net
+- rich@example.com
+- technomancy@gmail.com
 executables: 
 - gitjour
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- License.txt
 - Manifest.txt
 - README.txt
-- website/index.txt
 files: 
-- bin/gitjour
 - History.txt
-- License.txt
 - Manifest.txt
 - README.txt
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
+- bin/gitjour
 - lib/gitjour.rb
-- lib/gitjour/application.rb
-- lib/gitjour/version.rb
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
 - test/test_gitjour.rb
 - test/test_helper.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
-homepage: http://gitjour.rubyforge.org
+homepage: http://github.com/technomancy/gitjour
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -84,10 +83,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gitjour
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1.2403
 signing_key: 
-specification_version: 2
-summary: Automates DNSSD-powered serving and cloning of git repositories.
+specification_version: 3
+summary: Automates zeroconf-powered serving and cloning of git repositories.
 test_files: 
-- test/test_gitjour.rb
 - test/test_helper.rb
+- test/test_gitjour.rb