brownbeagle-gitauth 0.0.3 → 0.0.3.3

data/README.rdoc

@@ -7,13 +7,13 @@ At the moment configuration / adding users is done via a single command - +gitau
 === License
 
 GitAuth is licensed under AGPL, with parts of the code being derived
-from Gitorius - http://gitorious.org/
+from Gitorius - http://gitorious.org
 
 === Installing GitAuth
 
 Getting started is relatively simple. First of, you'll need to log onto the remote server / your git host. Next, you'll need to install the gem:
 
-  sudo gem install brownbeagle-gitauth --source=https://gems.github.com/
+  sudo gem install brownbeagle-gitauth --source http://gems.github.com/
   
 Once that's done, the +gitauth+ and +gitauth-shell+ commands should be in your path.
 Next, you'll want to (in most cases anyway) use a specific +git+ user to host repositories.
@@ -99,4 +99,17 @@ to use the full form:
 
   git push origin master
 
-As it starts as an empty repo.
+As it starts as an empty repo.
+
+Alternatively, if you get the error "fatal: no matching remote head" when you
+clone and it doesn't create a local copy, you'll instead have to do the following
+on your local PC (due to the way git handles remote repositories):
+
+  mkdir my-repo
+  cd my-repo
+  git init
+  touch README
+  git add .
+  git commit -m "Added blank readme"
+  git add remote origin git@your-server:my-repo.git
+  git push origin master

data/USAGE

@@ -0,0 +1,27 @@
+GitAuth is an SSH and Ruby based authenticated Git server.
+
+gitauth install ADMIN_PUBLIC_KEY
+  Pass in a valid SSH public key that will be used by the GitAuth administrator
+  
+gitauth permissions REPO USERORGROUP [PERMISSION=all,read,write]
+  REPO: the repository name you wish to set permissions on
+  USER/GROUP: the user or group name you with to give permissions
+  PERMISSION:
+    Default = all
+    The level of permissions you want to give the user or group on the repository in question
+      all = read/write
+      read = the user can see the repository and pull it, but cannot push changes
+      write = user can push changes but can't pull it.
+      
+gitauth addrepo NAME PATH
+  NAME: the name you want your repository to have
+  PATH: the part path you want the repository to have, will be ~REPOBASE~/PATH
+  
+gitauth adduser [--admin] NAME PUBLIC_KEY
+  NAME: the name of your new user
+  PUBLIC_KEY: a valid path to a copy of the users SSH public key file
+  
+  --admin: pass this flag if you want your user to be able to administer the gitauth install
+  
+gitauth addgroup NAME
+  NAME: the name of your new group

data/bin/gitauth

@@ -26,6 +26,10 @@ require File.join(File.dirname(__FILE__), "..", "lib", "gitauth")
 
 class GitAuthRunner < Thor
   
+  map "-h" => :help
+  map "--help" => :help
+  map "--usage" => :usage
+  
   # Adding users, groups and repos
   
   desc "addrepo REPO-NAME [PATH-PART]", "Adds a new repository"
@@ -219,6 +223,16 @@ class GitAuthRunner < Thor
     exit! 1
   end
   
+  def usage
+    counter = 1
+    file = File.new("USAGE", "r")
+    while (line = file.gets)
+      puts line
+      counter = counter + 1
+    end
+    file.close
+  end
+  
   protected
   
   def read_password

data/lib/gitauth/repo.rb

@@ -32,7 +32,7 @@ module GitAuth
       repository = self.new(name, path)
       return false unless repository.create_repo!
       self.add_item(repository)
-      return true
+      return repository
     end
     
     attr_accessor :name, :path, :permissions
@@ -89,7 +89,7 @@ module GitAuth
         FileUtils.mkdir_p(path)
         output = ""
         Dir.chdir(path) do
-          IO.popen("git init --bare") { |f| output << f.read }
+          IO.popen("git --bare init") { |f| output << f.read }
         end
         return !!(output =~ /Initialized empty Git repository/)
       end
@@ -101,5 +101,16 @@ module GitAuth
       self.class.save!
     end
     
+    def execute_post_create_hook!
+      script = File.expand_path("~/.gitauth/post-create")
+      if File.exist?(script) && File.executable?(script)
+        system(script, @name, @path)
+        return $?.success?
+      else
+        # If there isn't a file, run it ourselves.
+        return true
+      end
+    end
+    
   end
 end

data/lib/gitauth/user.rb

@@ -111,7 +111,7 @@ module GitAuth
     end
     
     def self.clean_ssh_key(key)
-      if key =~ /^(ssh-\w+ [a-zA-Z0-9\/\+]+==).*$/
+      if key =~ /^(ssh-\w+ [a-zA-Z0-9\/\+]+==?).*$/
         return $1
       else
         return nil

data/lib/gitauth/web_app.rb

@@ -117,8 +117,12 @@ module GitAuth
       name = params[:repo][:name]
       path = params[:repo][:path]
       path = name if path.to_s.strip.empty?
-      if GitAuth::Repo.create(name, path)
-        redirect root_with_message("Repository successfully added")
+      if repo = GitAuth::Repo.create(name, path)
+        if repo.execute_post_create_hook!
+          redirect "/repo_name=#{URI.encode(name)}"
+        else
+          redirect root_with_message("Repository added but the post-create hook exited unsuccessfully.")
+        end
       else
         redirect root_with_message("There was an error adding the repository.")
       end

data/public/gitauth.css

@@ -217,7 +217,7 @@ div.message {
   background: #17768A;
 }
 
-.section ul li a {
+.section ul li a, #repository-details a {
   text-decoration: none;
   color: #395F99;
 }
@@ -261,4 +261,29 @@ br.clear { clear: both; }
 .view ul li a {
   text-decoration: none;
   color: #416999;
+}
+
+#repository-details {
+  line-height: 1.8em;
+  padding: 0.5em 1em;
+  margin-bottom: 2em;
+}
+
+#repository-details h3 {
+  font-weight: bold;
+  font-size: 1.1em;
+  text-align: center;
+  margin-bottom: 0.75em;
+  color: #C55E25;
+}
+
+
+#repository-details code {
+  display: block;
+  white-space: pre;
+  padding: 0.5em;
+  font-family: Consolas, Lucida Console, Monaco, monospace;
+  background: #F4F4F4;
+  margin: 0.25em 0;
+  
 }

data/views/index.erb

@@ -1,3 +1,7 @@
+<% if params[:repo_name] %>
+  <%= erb :clone_repo, :layout => false %>
+<% end %>
+
 <div class="section">
   <h2>Repositories <a href="#" onclick="showForm('repo'); return false;"  title="Add a new repository" id="add-repo-link">[+]</a></h2>
   <form id="add-repo" action="/repos" method="post" class="hidden">

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: brownbeagle-gitauth
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.3.3
 platform: ruby
 authors: 
 - Darcy Laycock
 - Alex Pooley
+- Matt Didcoe
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -43,6 +44,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
+- USAGE
 files: 
 - bin/gitauth
 - bin/gitauth-shell
@@ -59,6 +61,7 @@ files:
 - public/gitauth.js
 - public/jquery.js
 - README.rdoc
+- USAGE
 - views/group.erb
 - views/index.erb
 - views/layout.erb