hubbard 0.0.5 → 0.0.6

data/README.md

@@ -5,12 +5,12 @@ Hubbard is a command line tool for managing shared git repositories in a team en
 
 Hubbard uses public SSH keys to keep track of who is executing what commands. This means you only have to create a single account on the server, instead of one per user.
 
-Hubbards was heavily inspired by gitosis, another tool for managing git repositories. However, the goal of Hubbard was to place less burden on the system administrator by allowing users to manage permissions for their own projects.
+Hubbard was heavily inspired by gitosis, another tool for managing git repositories. However, the goal of Hubbard was to place less burden on the system administrator by allowing users to manage permissions for their own projects.
 
 How It Works
 ============
 
-All comminication between users the the Hubbard server happens over SSH. Users must register their public SSH keys with the server before they can connect to it.
+All comminication between users and the Hubbard server happens over SSH. Users must register their public SSH keys with the server before they can connect to it.
 
 When a user connects to the Hubbard server, the SSH daemon tries to find the user's public SSH key the "~/.ssh/authorized_keys" file on the server. That file also contains information about which user to associate with that SSH key. That information is automatically passed to the "hubbard" executable, so there is no way for users to run other programs on the server. 
 
@@ -27,6 +27,13 @@ Unless you installed the gem using "sudo", the "hubbard" executable will be foun
 
     export PATH=$PATH:~/.gem/ruby/1.8/bin
 
+Create the directories and files that SSH needs to work.
+    [in hub's home directory]
+    mkdir .ssh
+    chmod 700 .ssh
+    touch .ssh/authorized_keys
+    chmod 600 .ssh/authorized_keys
+
 The next step is to create an SSH keypair to access the "admin" account on the Hubbard server. You should only use this key when performing tasks that require admin access. Run this on the machine that you'll be accessing Hubbard from (i.e. your local workstation, not the server):
 
     $ ssh-keygen -f ~/.ssh/hubadmin
@@ -58,4 +65,5 @@ Assuming your SSH keys have been set up correcly, you can simply SSH into the se
 
 To test it, run:
     
-    $ hub help
+    $ hub help
+

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/hubbard

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
+require 'socket'
 
 PROJECT_REGEX='[a-zA-Z0-9\-]{1,32}'
 REPOSITORY_REGEX='[a-zA-Z0-9\-]{1,32}'
 USERNAME_REGEX='[a-zA-Z0-9\-]{1,32}'
 
 HUB_DATA = ENV['HUB_DATA'] || File.expand_path("~/.hubbard")
+HUB_HOST = ENV['HUB_HOST'] || Socket.gethostname
 
 FileUtils.mkdir_p(File.join(HUB_DATA, "projects"))
 FileUtils.mkdir_p(File.join(HUB_DATA, "accounts"))

data/commands/create-repository.rb

@@ -4,5 +4,6 @@ authorize(project_name, 'admin')
 dir = find_repository_dir(project_name, repository_name)
 FileUtils.mkdir_p(dir)
 Dir.chdir(dir) do
-  exec "git init --bare" 
+  exit $? unless system "git init --bare" 
+  exec "git config hubbard.forkid #{project_name}/#{repository_name}/#{Time.now.to_i}" 
 end

data/commands/fork-repository.rb

@@ -0,0 +1,15 @@
+from_project_name = read_project_name
+from_repository_name = read_repository_name
+to_project_name = read_project_name
+to_repository_name = read_repository_name
+authorize(from_project_name, 'read')
+authorize(to_project_name, 'admin')
+from_dir = find_repository_dir(from_project_name, from_repository_name)
+to_dir = find_repository_dir(to_project_name, to_repository_name)
+forkid = Dir.chdir(from_dir) { `git config --get hubbard.forkid` }
+FileUtils.mkdir_p(to_dir)
+exit $? unless system "git clone --bare #{from_dir} #{to_dir}" 
+Dir.chdir(to_dir) do
+  exec "git config hubbard.forkid #{forkid}"
+end
+

data/commands/help.rb

@@ -9,11 +9,15 @@ delete-project <project>
 
 Repositories:
 
+list-repositories <project>
 create-repository <project> <repository>
 delete-repository <project> <repository>
+fork-repository <from-project> <from-repository> <to-project> <to-repository>
+list-forks <project> <repository>
 
 Permissions:
 
+list-permissions <project>
 add-permission <project> <username> read|write|admin
 remove-permission <project> <username>
 

data/commands/list-forks.rb

@@ -0,0 +1,17 @@
+project_name = read_project_name
+repository_name = read_repository_name
+authorize(project_name, 'read')
+forkid = Dir.chdir(find_repository_dir(project_name, repository_name)) { `git config --get hubbard.forkid` }
+project_dir = find_project_dir(project_name)
+Dir.foreach(File.join(HUB_DATA, 'projects')) do |dir|
+  next if dir == "." || dir == ".."
+  next unless is_authorized(dir, 'read')
+  Dir.foreach(find_project_dir(project_name)) do |repository_name|
+    next if repository_name =~ /^\./
+    Dir.chdir(find_repository_dir(project_name, repository_name)) do
+      if forkid == `git config --get hubbard.forkid`
+        puts "#{project_name}/#{repository_name}"
+      end
+    end
+  end
+end

data/commands/list-permissions.rb

@@ -2,11 +2,6 @@ project_name = read_project_name
 authorize(project_name, 'admin')
 dir = find_project_dir(project_name)
 username = ARGV.shift
-action = ARGV.shift
-unless ['admin','write','read'].member?(action)
-  $stderr.puts "Not a valid action (must be one of: read, write, admin)"
-  exit 1
-end
 File.open(File.join(dir, ".permissions"), "r+") do |f| 
   f.flock(File::LOCK_EX)
   contents = f.read

data/commands/list-repositories.rb

@@ -2,6 +2,6 @@ project_name = read_project_name
 authorize(project_name, 'read')
 Dir.foreach(find_project_dir(project_name)) do |repository_name|
   next if repository_name =~ /^\./
-  git_url = "#{ENV['USER']}@#{ENV['HUB_HOST']}:#{project_name}/#{repository_name}.git"
+  git_url = "#{ENV['USER']}@#{HUB_HOST}:#{project_name}/#{repository_name}.git"
   puts "#{repository_name}\t#{git_url}"
 end

data/spec/hubbard_spec.rb

@@ -160,6 +160,58 @@ describe "Hubble" do
     end
   end
 
+  it "should fork repository in same project" do
+    hub("kipper", "create-project foo")
+    hub("kipper", "create-repository foo bar")
+
+    with_test_project do
+      git("kipper", "push #{ENV['USER']}@#{HUB_HOST}:foo/bar.git master")
+      hub("kipper", "fork-repository foo bar foo bar2")
+      git("kipper", "pull #{ENV['USER']}@#{HUB_HOST}:foo/bar2.git master")
+    end
+  end
+
+  it "should fork repository in different project" do
+    hub("kipper", "create-project foo")
+    hub("kipper", "create-project foo2")
+    hub("kipper", "create-repository foo bar")
+
+    with_test_project do
+      git("kipper", "push #{ENV['USER']}@#{HUB_HOST}:foo/bar.git master")
+      hub("kipper", "fork-repository foo bar foo2 bar2")
+      git("kipper", "pull #{ENV['USER']}@#{HUB_HOST}:foo2/bar2.git master")
+    end
+  end
+
+  it "should track projects related by forking" do
+    hub("kipper", "create-project foo")
+    hub("kipper", "create-repository foo bar")
+
+    with_test_project do
+      git("kipper", "push #{ENV['USER']}@#{HUB_HOST}:foo/bar.git master")
+      hub("kipper", "fork-repository foo bar foo bar2")
+      hub("kipper", "list-forks foo bar").should == "foo/bar\nfoo/bar2\n"
+    end
+  end
+
+  it "should require read access to fork repository" do
+    hub("kipper", "create-project foo")
+    hub("kipper", "create-project foo2")
+    hub("kipper", "create-repository foo bar")
+
+    with_test_project do
+      git("kipper", "push #{ENV['USER']}@#{HUB_HOST}:foo/bar.git master")
+      lambda { hub("tiger", "fork-repository foo bar foo2 bar2") }.should raise_error
+      hub("kipper", "add-permission foo tiger read")
+      lambda { hub("tiger", "fork-repository foo bar foo2 bar2") }.should raise_error
+      hub("kipper", "add-permission foo2 tiger write")
+      lambda { hub("tiger", "fork-repository foo bar foo2 bar2") }.should raise_error
+      hub("kipper", "add-permission foo2 tiger admin")
+      hub("tiger", "fork-repository foo bar foo2 bar2")
+      hub("kipper", "add-permission foo2 tiger admin")      
+    end
+  end
+
   it "should remove permission" do
     hub("kipper", "create-project foo")
     hub("kipper", "create-repository foo bar")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hubbard
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -06:00
+date: 2010-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +26,7 @@ description: Hubbard is a command line tool for managing git repositories.
 email: git@foemmel.com
 executables: 
 - hubbard
+- hubbard~
 - hubbard
 extensions: []
 
@@ -45,9 +46,11 @@ files:
 - commands/create-project.rb
 - commands/create-repository.rb
 - commands/delete-project.rb
+- commands/fork-repository.rb
 - commands/git-receive-pack.rb
 - commands/git-upload-pack.rb
 - commands/help.rb
+- commands/list-forks.rb
 - commands/list-keys.rb
 - commands/list-permissions.rb
 - commands/list-projects.rb