hubbard 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/bin/hubbard

@@ -111,12 +111,13 @@ end
 
 def is_authorized(project_name, action)
   project_dir = find_project_dir(project_name)
-  return false if not File.exist?(project_dir)
+  return false unless File.exist?(project_dir)
   return true if @username == 'admin'
   Dir.chdir(project_dir) do
     if action == 'read' && File.read('.visibility').strip == 'public'
       return true
     end
+    return false unless File.exist?(".permissions")
     File.read(".permissions").split("\n").each do |line|
       permission = line.strip.split('=')
       line_username = permission[0]
@@ -176,7 +177,12 @@ end
 command_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "commands", "#{command}.rb"))
 
 if File.exist?(command_file)
-  load command_file
+  begin
+    load command_file
+  rescue SystemCallError => e
+    $stderr.puts "SystemCallError [#{e.errno}]: #{e.message}"
+    exit e.errno
+  end
 else
   $stderr.puts "Unknown command: #{command}"
   exit 1

data/commands/list-permissions.rb

@@ -2,9 +2,13 @@ project_name = read_project_name
 authorize(project_name, 'admin')
 dir = find_project_dir(project_name)
 username = ARGV.shift
-File.open(File.join(dir, ".permissions"), "r+") do |f| 
-  f.flock(File::LOCK_EX)
-  contents = f.read
-  puts contents
-  f.flock(File::LOCK_UN)
+
+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
+    puts contents
+    f.flock(File::LOCK_UN)
+  end
 end

data/hubbard.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hubbard}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Foemmel"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-02-06}
   s.description = %q{Hubbard is a command line tool for managing git repositories.}
   s.email = %q{git@foemmel.com}
-  s.executables = ["hubbard", "hubbard~", "hubbard"]
+  s.executables = ["hubbard", "hubbard"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"

data/spec/hubbard_spec.rb

@@ -10,6 +10,10 @@ describe "Hubble" do
     reset_file_system
   end
 
+  it "should pass exitstatus along from SystemCallError" 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")
     projects = list_projects('kipper')
@@ -80,6 +84,21 @@ describe "Hubble" do
     url.should == "#{ENV['USER']}@#{HUB_HOST}:foo/bar.git"    
   end
 
+  describe "when admin creates a project" do
+    before(:each) do
+      hub("admin", "create-project foo foo-desc")
+    end
+
+    it "should not raise error on missing permissions file for non-admin listing permissions" do
+      lambda { hub("kipper", "list-permissions foo") }.should_not raise_error(Errno::ENOENT)
+    end
+
+    it "should list project permissions for admin" do
+      permissions = hub("admin", "list-permissions foo")
+      permissions.should == ""
+    end
+  end
+
   def with_test_project
     Dir.mkdir('tmp')
     Dir.chdir('tmp') do

data/spec/spec_helper.rb

@@ -26,18 +26,14 @@ def hub(username, command, input=nil)
   else
     result = `#{HUB} #{username} #{command}`
   end
-  if $?.exitstatus != 0
-    raise "Command failed: hub #{username} #{command}\n#{result}"
-  end
+  handle_exitstatus(command, result)
   result
 end
 
 def git(username, command)
   ENV['HUB_USERNAME'] = username
   result = `git #{command}`
-  if $?.exitstatus != 0
-    raise "Command failed: git #{command}:\n#{result}"
-  end
+  handle_exitstatus(command, result)
   result
 end
 
@@ -50,3 +46,11 @@ def list_projects(user)
   hub(user, "list-projects").split("\n").map { |line| line.split[0] }
 end
 
+private
+def handle_exitstatus(command, result)
+  exit_code = $?.exitstatus
+  if exit_code != 0
+    msg = "Command failed [#{exit_code}]: git #{command}:\n#{result}"
+    raise SystemCallError.new(msg, exit_code)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hubbard
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -06:00
+date: 2010-02-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,6 @@ description: Hubbard is a command line tool for managing git repositories.
 email: git@foemmel.com
 executables: 
 - hubbard
-- hubbard~
 - hubbard
 extensions: []