hubbard 0.0.16 → 0.0.18

data/.gitignore

@@ -13,6 +13,9 @@ tmtags
 ## VIM
 *.swp
 
+## NetBeans
+nbproject
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.18

data/bin/hub-daemon

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
+require 'hubbard'
+
+puts "git daemon --base-path #{Hubbard::PROJECTS_PATH} #{Hubbard::PROJECTS_PATH}"
+
+exec "git daemon --base-path=#{Hubbard::PROJECTS_PATH} #{Hubbard::PROJECTS_PATH}"
+
+
+

data/bin/hubbard

@@ -2,17 +2,19 @@
 require 'fileutils'
 require 'optparse'
 require 'yaml'
+require 'shellwords'
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'hubbard'
+require 'project'
 
 FileUtils.mkdir_p(Hubbard::PROJECTS_PATH)
 FileUtils.mkdir_p(Hubbard::ACCOUNTS_PATH)
 
 formats = [:text, :yaml]
-defaults = { :format => formats.first }
-options = {}
-opts = OptionParser.new do |opts|
+DEFAULTS = { :format => formats.first }
+OPTIONS = {}
+OPTS = OptionParser.new do |opts|
   opts.banner = <<BANNER
 Usage: hubbard [options] <command>
 
@@ -37,88 +39,69 @@ Options:
 BANNER
 
   opts.on("--private", "Create project with visibility set to private") do |o|
-    options[:private] = o
+    OPTIONS[:private] = o
   end
   opts.on("-f", "--format [FORMAT]", formats,
           "Output format (#{formats.join(', ')})") do |o|
-    options[:format] = o
+    OPTIONS[:format] = o
   end
 end
 
+class HubbardException < Exception
+  attr_reader :exitstatus
+  def initialize(exitstatus)
+    @exitstatus = exitstatus
+  end
+end
+
+def error(exitstatus,message)
+  raise HubbardException.new(exitstatus), message
+end
+
 def next_arg(msg)
   if ARGV.length < 1
-    $stderr.puts msg
-    exit 1
+    error 1, msg
   end
   ARGV.shift
 end
 
+def rest_args(msg)
+  if ARGV.length < 1
+    error 1, msg
+  end
+  ARGV
+end
+
 def check_status(msg)
   if $!.exitstatus != 0
-    $sderr.puts msg
-    exit 1
+    error $!.exitstatus, msg
   end
 end
 
 def validate_project_name(name)
   if name !~ /#{Hubbard::PROJECT_REGEX}/
-    $stderr.put "Project names can only contain letter, numbers, and hyphens"
-    exit 1
+    error 1, "Project names can only contain letter, numbers, and hyphens"
   end 
 end
 
 def validate_repository_name(name)
   if name !~ /#{Hubbard::REPOSITORY_REGEX}/
-    $stderr.put "Repository names can only contain letter, numbers, and hyphens"
-    exit 1
+    error 1, "Repository names can only contain letter, numbers, and hyphens"
   end 
 end
 
 def validate_user_name(name)
   if name !~ /#{Hubbard::USERNAME_REGEX}/
-    $stderr.put "User names can only contain letter, numbers, and hyphens"
-    exit 1
+    error 1, "User names can only contain letter, numbers, and hyphens"
   end 
 end
 
 def validate_action_name(action)
   unless Hubbard::ACTIONS.member?(action)
-    $stderr.put "Not a valid action (must be one of: read, write, admin)"
-    exit 1
+    error 1, "Not a valid action (must be one of: read, write, admin)"
   end 
 end
 
-username = next_arg "Please specify the username to run as"
-
-if ENV['SSH_ORIGINAL_COMMAND']
-  ARGV.clear
-  ENV['SSH_ORIGINAL_COMMAND'].split.each do |arg|
-    ARGV << arg
-  end
-end
-
-opts.parse!
-OPTIONS = defaults.merge(options)
-OPTIONS.freeze
-
-if ARGV.empty? || ARGV[0] == 'help'
-  puts opts
-  exit 0
-end
-
-command = next_arg "Please specify a command to run"
-
-if command == "run-as"
-  if username != "admin"
-    $stderr.puts "You don't have permission to do that"
-    exit 1
-  end
-  username = next_arg "Please specify the username to run as"
-  command = next_arg "Please specify a command to run"
-end
-
-@username = username
-
 def implies(a1, a2)
   case a1
   when 'admin'
@@ -134,8 +117,7 @@ end
 
 def authorize(project_name, action)
   unless is_authorized(project_name, action)
-    $stderr.puts "You don't have permission to do that"
-    exit 3
+    error 3, "You don't have permission to do that"
   end
 end
 
@@ -204,16 +186,76 @@ def sync_keys
   end
 end
 
-command_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "commands", "#{command}.rb"))
+USERNAME = next_arg "Please specify the username to run as"
 
-if File.exist?(command_file)
-  begin
-    load command_file
-  rescue SystemCallError => e
-    $stderr.puts "SystemCallError [#{e.errno}]: #{e.message}"
-    exit e.errno
+if ENV['SSH_ORIGINAL_COMMAND']
+  ARGV.clear
+  ENV['SSH_ORIGINAL_COMMAND'].split.each do |arg|
+    ARGV << arg
+  end
+end
+
+def run_command
+  OPTS.parse!
+  @options = DEFAULTS.merge(OPTIONS)
+  @options.freeze
+
+  command = next_arg "Please specify a command to run"
+
+  if command == 'help'
+    puts OPTS
+    puts
+    return 0
   end
+
+  @username = USERNAME
+
+  if command == "run-as"
+    if USERNAME != "admin"
+      $stderr.puts "You don't have permission to do that"
+      return 1
+     end 
+    @username = next_arg "Please specify the username to run as"
+    command = next_arg "Please specify a command to run"
+  end
+
+  command_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "commands", "#{command}.rb"))
+
+  if File.exist?(command_file)
+    begin
+      load command_file
+    rescue SystemCallError => e
+      $stderr.puts "SystemCallError [#{e.errno}]: #{e.message}"
+      return e.errno
+    end
+  else
+    $stderr.puts "Unknown command: #{command}"
+    return 1
+  end
+end
+
+if ARGV.empty?
+   while true
+     print "hubbard> "
+     line = readline.strip
+     if line == "exit"
+       exit 0
+     else
+       ARGV.clear
+       Shellwords.shellwords(line).each { |arg| ARGV << arg }
+       next if ARGV.empty?
+       begin
+         run_command
+       rescue HubbardException => e
+         $stderr.puts e.message
+       end
+     end
+   end
 else
-  $stderr.puts "Unknown command: #{command}"
-  exit 1
+  begin
+    exit(run_command)
+  rescue HubbardException => e
+    $stderr.puts e.message
+    exit e.exitstatus
+  end
 end

data/commands/add-key.rb

@@ -1,13 +1,11 @@
 name = next_arg("Please specify the key name")
 if name !~ Hubbard::KEY_NAME_REGEX
-  $stderr.puts "Not a valid key name (letters and numbers only)"
-  exit 1
+  error 1, "Not a valid key name (letters and numbers only)"
 end
 
 key = $stdin.read.strip
 if key !~ Hubbard::KEY_REGEX
-  $stderr.puts "Not a valid key"
-  exit 1
+  error 1, "Not a valid key"
 end
 
 type = $1

data/commands/add-permission.rb

@@ -5,16 +5,5 @@ username = ARGV.shift
 action = ARGV.shift
 validate_action_name(action)
 
-File.open(File.join(dir, ".lock"), "w+") do |lock|
-  lock.flock(File::LOCK_EX)
-  begin
-    filename = File.join(dir, ".permissions")
-    permissions = File.read(filename).split("\n").map { |line| line.strip }.select { |line| line.split('=')[0] != username }
-    permissions << "#{username}=#{action}"
-    File.open(filename, "w") do |file| 
-      permissions.each { |permission| file << permission << "\n" }
-    end
-  ensure
-    lock.flock(File::LOCK_UN)
-  end
-end
+project = Project.new(project_name)
+project.lock { project.add_permission(username,action) }

data/commands/create-project.rb

@@ -1,18 +1,6 @@
-require 'fileutils'
-
 project_name = read_project_name
-description = next_arg "Please specify a project description"
-dir = find_project_dir(project_name)
-if File.exist?(dir)
-  $stderr.puts "Project already exists with that name"
-  exit 4
-end
-unless Dir.mkdir(dir)
-  $stderr.puts "Unable to create directory: #{dir}"
-end
-visibility = OPTIONS[:private] ? "private" : "public"
-if @username != 'admin'
-  File.open(File.join(dir, ".permissions"), "w") { |f| f << "#{@username}=admin\n" }
-end
-File.open(File.join(dir, ".visibility"), "w") { |f| f << "#{visibility}\n" }
-File.open(File.join(dir, ".description"), "w") { |f| f << "#{description}\n" }
+
+project = Project.new(project_name)
+project.create
+project.add_permission(@username,'admin')
+project.visibility=@options[:private] ? "private" : "public"

data/commands/create-repository.rb

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

data/commands/fork-repository.rb

@@ -7,9 +7,8 @@ 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 --shared #{from_dir} #{to_dir}" 
+error $?, "Unable to create repository" unless system "git clone --bare --shared #{from_dir} #{to_dir}" 
 Dir.chdir(to_dir) do
-  exec "git config hubbard.forkid #{forkid}"
+  error $?, "Unable to create repository" unless system "git config hubbard.forkid #{forkid}"
 end
 

data/commands/list-forks.rb

@@ -3,6 +3,7 @@ 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)
+forks = []
 Dir.foreach(File.join(Hubbard::PROJECTS_PATH)) do |dir|
   next if dir == "." || dir == ".."
   next unless is_authorized(dir, 'read')
@@ -11,8 +12,10 @@ Dir.foreach(File.join(Hubbard::PROJECTS_PATH)) do |dir|
     repository_name = repository_dir.chomp('.git')
     Dir.chdir(find_repository_dir(project_name, repository_name)) do
       if forkid == `git config --get hubbard.forkid`
-        puts "#{project_name}/#{repository_name}"
+        forks << "#{project_name}/#{repository_name}"
       end
     end
   end
 end
+
+puts forks.sort

data/commands/list-keys.rb

@@ -5,7 +5,7 @@ Dir.entries(dirname).each do |name|
   keys << name
 end
 
-if OPTIONS[:format] == :yaml
+if @options[:format] == :yaml
   puts YAML::dump(keys)
 else
   keys.each { |k| puts k }

data/commands/list-permissions.rb

@@ -1,26 +1,13 @@
 project_name = read_project_name
 authorize(project_name, 'admin')
-dir = find_project_dir(project_name)
-username = ARGV.shift
+project = Project.new(project_name)
 
-contents = ""
-permissions_file = File.join(dir, ".permissions")
-if File.exists?(permissions_file)
-  File.open(permissions_file, "r+") do |f|
-    f.flock(File::LOCK_EX)
-    contents = f.read
-    f.flock(File::LOCK_UN)
-  end
-end
+permissions = project.lock { project.permissions }
 
-if OPTIONS[:format] == :yaml
-  permissions = []
-  contents.split("\n").map do |l|
-    l.strip!
-    p = l.split('=')
-    permissions << { :user => p.first, :access => p.last }
-  end
+if @options[:format] == :yaml
   puts YAML::dump(permissions)
-elsif OPTIONS[:format] == :text
-  puts contents unless contents.empty?
+elsif @options[:format] == :text
+  permissions.each do |permission|
+    puts "#{permission[:user]}=#{permission[:access]}"
+  end
 end

data/commands/list-projects.rb

@@ -9,7 +9,9 @@ Dir.foreach(Hubbard::PROJECTS_PATH) do |project|
   end
 end
 
-if OPTIONS[:format] == :yaml
+projects = projects.sort_by { |project| project[:name] }
+
+if @options[:format] == :yaml
   puts YAML::dump(projects)
 else
   projects.each do |p| 

data/commands/list-repositories.rb

@@ -7,7 +7,7 @@ Dir.foreach(find_project_dir(project_name)) do |repository_dir|
   repositories << { :name => repository_dir.chomp('.git'), :url => git_url }
 end
 
-if OPTIONS[:format] == :yaml
+if @options[:format] == :yaml
   puts YAML::dump(repositories)
 else
   repositories.each { |r| puts "#{r[:name]}\t#{r[:url]}" }

data/commands/list-users.rb

@@ -1,6 +1,5 @@
 if @username != 'admin'
-  $stderr.puts "You don't have permission to do that"
-  exit 3
+  error 3, "You don't have permission to do that"
 end
 
 accounts = []
@@ -9,7 +8,9 @@ Dir.entries(Hubbard::ACCOUNTS_PATH).each do |account|
   accounts << account
 end
 
-if OPTIONS[:format] == :yaml
+accounts.sort!
+
+if @options[:format] == :yaml
   puts YAML::dump(accounts)
 else
   accounts.each { |a| puts a }

data/commands/move-repository.rb

@@ -11,13 +11,11 @@ authorize(from_project_name, 'admin')
 authorize(to_project_name, 'admin')
 
 if not File.exist?(from_dir)
-  $stderr.puts "Repository not found"
-  exit 4
+  error 4, "Repository not found"
 end
 
 if File.exist?(to_dir)
-  $stderr.puts "Repository already exists with that name"
-  exit 4
+  error 4, "Repository already exists with that name"
 end
 
 FileUtils.mv(from_dir, to_dir)

data/commands/remove-key.rb

@@ -1,7 +1,6 @@
 name = next_arg("Please specify the key name")
 if name !~ Hubbard::KEY_NAME_REGEX
-  $stderr.puts "Not a valid key name (letters and numbers only)"
-  exit 1
+  error 1, "Not a valid key name (letters and numbers only)"
 end
 
 dirname = File.join(find_account_dir(@username), "keys")
@@ -9,13 +8,11 @@ FileUtils.mkdir_p(dirname)
 
 filename = File.join(dirname, name)
 if !File.exist?(filename)
-  $stderr.puts "Key not found"
-  exit 1
+  error 1, "Key not found"
 end
 
 unless FileUtils.rm(filename)
-  $stderr.puts "Unable to delete key"
-  exit 1
+  error 1, "Unable to delete key"
 end
 
 sync_keys

data/commands/remove-permission.rb

@@ -2,15 +2,6 @@ project_name = read_project_name
 authorize(project_name, 'admin')
 dir = find_project_dir(project_name)
 username = ARGV.shift
-File.open(File.join(dir, ".lock"), "w+") do |lock|
-  lock.flock(File::LOCK_EX)
-  begin
-    filename = File.join(dir, ".permissions")
-    permissions = File.read(filename).split("\n").map { |line| line.strip }.select { |line| line.split('=')[0] != username }
-    File.open(filename, "w") do |file| 
-      permissions.each { |permission| file << permission << "\n" }
-    end
-  ensure
-    lock.flock(File::LOCK_UN)
-  end
-end
+
+project = Project.new(project_name)
+project.lock { project.remove_permission(username) }

data/commands/rename-project.rb

@@ -3,8 +3,7 @@ to_project_name = next_arg "Please specify the new project name"
 from_dir = find_project_dir(from_project_name)
 to_dir = find_project_dir(to_project_name)
 if File.exist?(to_dir)
-  $stderr.puts "A project already exists with that name"
-  exit 3
+  error 3, "A project already exists with that name"
 end
 
 authorize(from_project_name, 'admin')

data/commands/set-description.rb

@@ -3,13 +3,13 @@ require 'fileutils'
 project_name = read_project_name
 authorize(project_name, 'admin')
 
-description = next_arg "Please specify the description"
+description = rest_args "Please specify the description"
+desc = description.join(' ')
 
 dir = find_project_dir(project_name)
 if !File.exist?(dir)
-  $stderr.puts "Project not found"
-  exit 4
+  error 4, "Project not found"
 end
 
-File.open(File.join(dir, ".description"), "w") { |f| f << description << "\n" }
+File.open(File.join(dir, ".description"), "w") { |f| f << desc << "\n" }
 

data/commands/set-visibility.rb

@@ -3,14 +3,12 @@ require 'fileutils'
 project_name = read_project_name
 visibility = next_arg "Please specify one of: public, private"
 if visibility != 'public' and visibility != 'private'
-  $stderr.puts "Please specify one of: public, private"
-  exit 3
+  error 3, "Please specify one of: public, private"
 end
 
 dir = find_project_dir(project_name)
 if !File.exist?(dir)
-  $stderr.puts "Project not found"
-  exit 4
+  error 4, "Project not found"
 end
 
 File.open(File.join(dir, ".visibility"), "w") { |f| f << visibility << "\n" }

data/hubbard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hubbard}
-  s.version = "0.0.16"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Foemmel"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-25}
   s.default_executable = %q{hubbard}
   s.description = %q{Hubbard is a command line tool for managing git repositories.}
   s.email = %q{git@foemmel.com}
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "bin/hub-daemon",
      "bin/hubbard",
      "commands/add-key.rb",
      "commands/add-permission.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
      "commands/whoami.rb",
      "hubbard.gemspec",
      "lib/hubbard.rb",
+     "lib/project.rb",
      "spec/gitssh",
      "spec/hubbard_spec.rb",
      "spec/spec.opts",
@@ -58,12 +60,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mfoemmel/hubbard}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Hubbard is a command line tool for managing git repositories.}
   s.test_files = [
-    "spec/yaml_spec.rb",
-     "spec/hubbard_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/hubbard_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/yaml_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/project.rb

@@ -0,0 +1,71 @@
+class Project
+  attr_reader :project_name
+
+  def initialize(project_name)
+    @project_name = project_name
+    @dir = find_project_dir project_name
+  end
+
+  def create
+    if File.exist?(@dir)
+      error 4, "Project already exists with that name"
+    end
+
+    unless Dir.mkdir(@dir)
+      error 1, "Unable to create directory: #{dir}"
+    end
+  end
+
+  def lock
+    File.open(File.join(@dir, ".lock"), "w+") do |lock|
+      lock.flock(File::LOCK_EX)
+      begin
+        yield
+      ensure
+        lock.flock(File::LOCK_UN)
+      end
+    end
+  end
+
+  def visibility=(visibility)
+    File.open(File.join(@dir, ".visibility"), "w") { |f| f << "#{visibility}\n" }
+  end
+  
+  def description=(description)
+    File.open(File.join(@dir, ".description"), "w") { |f| f << "#{description}\n" }
+  end
+
+  def permissions
+    if File.exists?(permissions_file)
+      File.read(permissions_file).split("\n").map do |line|
+        permission = line.strip.split('=')
+        { :user => permission.first, :access => permission.last }
+      end
+    else
+      []
+    end  
+  end
+
+  def add_permission(username,action)
+    new_permissions = permissions.select { |permission| permission[:user] != username }
+    if username != 'admin'
+      new_permissions << { :user => username, :access => action }
+    end
+    File.open(permissions_file, "w") do |file| 
+      new_permissions.each { |permission| file << permission[:user] << '=' << permission[:access] << "\n" }
+    end
+  end
+
+  def remove_permission(username)
+    new_permissions = permissions.select { |permission| permission[:user] != username }
+    File.open(permissions_file, "w") do |file| 
+      new_permissions.each { |permission| file << permission[:user] << '=' << permission[:access] << "\n" }
+    end
+  end
+
+  private
+
+  def permissions_file
+    File.join(@dir, ".permissions")
+  end
+end

data/spec/hubbard_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'fileutils'
 
-describe "Hubble" do
+describe "Hubbard" do
   before(:each) do
     reset_file_system
   end
@@ -14,40 +14,44 @@ describe "Hubble" do
     pending "Not sure how to make sure that hubbard is passing back the proper exit codes from SystemCallErrors. Doing so would introduce complexity or add something that shouldn't be callable."
   end
 
-  it "should create project" do
-    hub("kipper", "create-project foo foo-desc")
+  it "should create project and set project description" do
+    hub("kipper", "create-project foo")
+    hub("kipper", "set-description foo foo-desc")
     projects = list_projects('kipper')
     projects.should == ["foo"]
   end
 
   it "should set project description" do
-    hub("kipper", "create-project foo old-desc")
-    hub("kipper", "set-description foo new-desc")
+    hub("kipper", "create-project foo")
+    hub("kipper", "set-description foo 'Test description contains a space.'")
     project = hub("kipper", "list-projects").split("\n")[0].split
-    project[2].should == "new-desc"
+    project_name = project.shift # throw away unused arg.
+    visibility = project.shift # throw away unused arg.
+    description = project.join(' ')
+    description.should == "Test description contains a space."
   end
 
   it "should set project visibility" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "set-visibility foo private")
     project = hub("kipper", "list-projects").split("\n")[0].split
     project[1].should == "private"
   end
 
   it "should rename project" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "rename-project foo bar")
     project = hub("kipper", "list-projects").split("\n")[0].split
     project[0].should == "bar"
   end
 
   it "should not allow multiple projects with same name" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     lambda { hub("kipper", "create-project foo") }.should raise_error
   end
 
   it "should delete project" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "delete-project foo")
 
     projects = hub("kipper", "list-projects").split("\n")
@@ -55,7 +59,7 @@ describe "Hubble" do
   end
 
   it "should default to public project" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
 
     # Other users can see...
     projects = list_projects("tiger")
@@ -66,7 +70,8 @@ describe "Hubble" do
   end
 
   it "should support private project" do
-    hub("kipper", "create-project foo foo-desc --private")
+    hub("kipper", "create-project foo --private")
+    hub("kipper", "set-description foo new-desc")
 
     # Other users can't see
     projects = hub("tiger", "list-projects").split("\n")
@@ -74,7 +79,7 @@ describe "Hubble" do
   end
 
   it "should create repositories" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     repositories = hub("kipper", "list-repositories foo").split("\n")
@@ -86,7 +91,7 @@ describe "Hubble" do
 
   describe "when admin creates a project" do
     before(:each) do
-      hub("admin", "create-project foo foo-desc")
+      create_project("admin", "foo", "foo-desc")
     end
 
     it "should not raise error on missing permissions file for non-admin listing permissions" do
@@ -111,7 +116,7 @@ describe "Hubble" do
   end
 
   it "should allow git push" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -120,8 +125,8 @@ describe "Hubble" do
   end
 
   it "should move repository" do
-    hub("kipper", "create-project foo foo-desc")
-    hub("kipper", "create-project new-foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
+    create_project("kipper", "new-foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -132,7 +137,7 @@ describe "Hubble" do
   end
 
   it "should allow git push with write permissions" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "add-permission foo tiger write")
     hub("kipper", "create-repository foo bar")
 
@@ -142,7 +147,7 @@ describe "Hubble" do
   end
 
   it "should not allow git push with read permissions" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "add-permission foo tiger read")
     hub("kipper", "create-repository foo bar")
 
@@ -152,7 +157,7 @@ describe "Hubble" do
   end
 
   it "should allow git pull" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -162,7 +167,8 @@ describe "Hubble" do
   end
 
   it "should not allow git pull with no permissions" do
-    hub("kipper", "create-project foo foo-desc --private")
+    hub("kipper", "create-project foo --private")
+    hub("kipper", "set-description foo foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -182,7 +188,7 @@ describe "Hubble" do
   end
 
   it "should fork repository in same project" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -193,8 +199,8 @@ describe "Hubble" do
   end
 
   it "should fork repository in different project" do
-    hub("kipper", "create-project foo foo-desc")
-    hub("kipper", "create-project foo2 foo2-desc")
+    create_project("kipper", "foo", "foo-desc")
+    create_project("kipper", "foo2", "foo2-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -205,7 +211,7 @@ describe "Hubble" do
   end
 
   it "should track projects related by forking" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -216,8 +222,8 @@ describe "Hubble" do
   end
 
   it "should require read access to fork repository" do
-    hub("kipper", "create-project foo foo-desc")
-    hub("kipper", "create-project foo2 foo-desc")
+    create_project("kipper", "foo", "foo-desc")
+    create_project("kipper", "foo2", "foo2-desc")
     hub("kipper", "create-repository foo bar")
 
     with_test_project do
@@ -234,7 +240,7 @@ describe "Hubble" do
   end
 
   it "should remove permission" do
-    hub("kipper", "create-project foo foo-desc")
+    create_project("kipper", "foo", "foo-desc")
     hub("kipper", "create-repository foo bar")
     hub("kipper", "add-permission foo tiger read")
     hub("kipper", "remove-permission foo tiger")
@@ -261,7 +267,8 @@ describe "Hubble" do
   end
 
   it "should allow admin to run-as another user" do
-    hub("admin", "run-as kipper create-project foo foo-desc")
+    hub("admin", "run-as kipper create-project foo")
+    hub("admin", "run-as kipper set-description foo foo-desc")
     projects = list_projects("kipper")
     projects.should == ["foo"]
   end

data/spec/spec_helper.rb

@@ -42,6 +42,12 @@ def reset_file_system
   FileUtils.rm_rf "tmp"
 end
 
+# Simple helper to create a public project with a description.
+def create_project(user, project_name, project_desc)
+  hub(user, "create-project #{project_name}")
+  hub(user, "set-description #{project_name} #{project_desc}")
+end
+
 def list_projects(user)
   hub(user, "list-projects").split("\n").map { |line| line.split[0] }
 end

data/spec/yaml_spec.rb

@@ -12,16 +12,16 @@ describe "Hubble with yaml output" do
   end
 
   it "should list-projects" do
-    hub("yammer", "create-project a a-desc")
-    hub("yammer", "create-project b b-desc")
-    hub("yammer", "create-project c c-desc")
+    create_project("yammer", "a", "a-desc")
+    create_project("yammer", "b", "b-desc")
+    create_project("yammer", "c", "c-desc")
 
     projects = YAML::load(hub("yammer", "#{YAML_OPTION} list-projects")).map{|project|project[:name]}
     projects.should == ["a", "b", "c"]
   end
 
   it "should list repositories" do
-    hub("yammer", "create-project a a-desc")
+    create_project("yammer", "a", "a-desc")
     hub("yammer", "create-repository a b")
 
     repositories = YAML::load(hub("yammer", "#{YAML_OPTION} list-repositories a"))
@@ -31,7 +31,7 @@ describe "Hubble with yaml output" do
   end
 
   it "should list permissions" do
-    hub("yammer", "create-project a a-desc")
+    create_project("yammer", "a", "a-desc")
     permissions = YAML::load(hub("yammer", "#{YAML_OPTION} list-permissions a"))
     permissions.length.should == 1
     permissions.first[:user].should == "yammer"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hubbard
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -06:00
+date: 2010-03-25 00:00:00 -05:00
 default_executable: hubbard
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Hubbard is a command line tool for managing git repositories.
 email: git@foemmel.com
 executables: 
@@ -38,6 +47,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/hub-daemon
 - bin/hubbard
 - commands/add-key.rb
 - commands/add-permission.rb
@@ -62,6 +72,7 @@ files:
 - commands/whoami.rb
 - hubbard.gemspec
 - lib/hubbard.rb
+- lib/project.rb
 - spec/gitssh
 - spec/hubbard_spec.rb
 - spec/spec.opts
@@ -80,22 +91,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Hubbard is a command line tool for managing git repositories.
 test_files: 
-- spec/yaml_spec.rb
 - spec/hubbard_spec.rb
 - spec/spec_helper.rb
+- spec/yaml_spec.rb