brownbeagle-gitauth 0.0.4.1 → 0.0.4.2

data/bin/gitauth

@@ -69,7 +69,12 @@ GitAuth::Application.processing(ARGV) do |a|
     end
 
     if options[:admin]
-      
+      key_contents = File.read(options[:admin]).strip
+      if GitAuth::User.create("admin", true, key_contents)
+        puts "Default admin user added with key '#{options[:admin]}'"
+      else
+        die! "Error adding default admin user with key at '#{options[:admin]}'"
+      end
     end
     
   end
@@ -115,12 +120,17 @@ GitAuth::Application.processing(ARGV) do |a|
     end
   end
   
+  a.option(:make_empty, "Initializes the repository to be empty / have an initial blank commit")
   a.add("add-repo NAME [PATH=NAME]", "Creates a named repository, with an optional path on the file system") do |name, *args|
     GitAuth.prepare
     options = args.extract_options!
     path = (args.shift || name)
-    if GitAuth::Repo.create(name, path)
+    if (repo = GitAuth::Repo.create(name, path))
       puts "Successfully created repository '#{name}' located at '#{path}'"
+      if options[:make_empty]
+        puts "Attempting to make empty repository"
+        repo.make_empty!
+      end
     else
       die! "Unable to create repository '#{name}' in location '#{path}'"
     end

data/lib/gitauth.rb

@@ -21,7 +21,7 @@ require 'ostruct'
 
 module GitAuth
   
-  VERSION     = [0, 0, 4, 1]
+  VERSION     = [0, 0, 4, 2]
   BASE_DIR    = Pathname.new(__FILE__).dirname.join("..").expand_path
   LIB_DIR     = BASE_DIR.join("lib", "gitauth")
   GITAUTH_DIR = Pathname.new("~/.gitauth/").expand_path
@@ -94,6 +94,13 @@ module GitAuth
       each_model(:load!)
     end
     
+    def run(command)
+      GitAuth::Logger.info "Running command: #{command}"
+      result = system "#{command} 2> /dev/null 1> /dev/null"
+      GitAuth::Logger.info "Command was #{"not " if !result}successful"
+      return result
+    end
+    
   end
   
 end

data/lib/gitauth/client.rb

@@ -21,18 +21,19 @@
 
 module GitAuth
   class Client
+    include GitAuth::Loggable
     
     attr_accessor :user, :command
     
     def initialize(user_name, command)
-      GitAuth::Logger.debug "Initializing client with command: #{command.inspect} and user name #{user_name.inspect}"
+      logger.debug "Initializing client with command: #{command.inspect} and user name #{user_name.inspect}"
       @callbacks = Hash.new { |h,k| h[k] = [] }
       @user      = GitAuth::User.get(user_name.to_s.strip)
       @command   = command
     end
     
     def exit_with_error(error)
-      GitAuth::Logger.warn "Exiting with error: #{error}"
+      logger.warn "Exiting with error: #{error}"
       $stderr.puts error
       exit! 1
     end
@@ -59,16 +60,16 @@ module GitAuth
           exit_with_error "Ze repository you specified does not exist."
         elsif user.can_execute?(command, repo)
           git_shell_argument = "#{command.verb} '#{repo.real_path}'"
-          GitAuth::Logger.info "Running command: #{git_shell_argument} for user: #{@user.name}"
+          logger.info "Running command: #{git_shell_argument} for user: #{@user.name}"
           exec("git-shell", "-c", git_shell_argument)
         else
           exit_with_error "These are not the droids you are looking for"
         end
       end
     rescue Exception => e
-      GitAuth::Logger.fatal "Exception: #{e.class.name}: #{e.message}"
+      logger.fatal "Exception: #{e.class.name}: #{e.message}"
       e.backtrace.each do |l|
-        GitAuth::Logger.fatal "  => #{l}"
+        logger.fatal "  => #{l}"
       end
       exit_with_error "Holy crap, we've imploded cap'n!"
     end

data/lib/gitauth/group.rb

@@ -19,7 +19,8 @@
 
 module GitAuth
   class Group < SaveableClass(:groups)
-
+    include GitAuth::Loggable
+    
     attr_accessor :name, :members
     
     def initialize(name)
@@ -73,7 +74,7 @@ module GitAuth
     end
     
     def self.get(name)
-      GitAuth::Logger.debug "Getting group named #{name.inspect}"
+      logger.debug "Getting group named #{name.inspect}"
       real_name = name.to_s.gsub(/^@/, "")
       self.all.detect { |g| g.name == real_name }
     end

data/lib/gitauth/repo.rb

@@ -19,10 +19,12 @@
 require 'fileutils'
 module GitAuth
   class Repo < SaveableClass(:repositories)
+    include GitAuth::Loggable
+    
     NAME_RE = /^([\w\_\-\.\+]+(\.git)?)$/i
     
     def self.get(name)
-      GitAuth::Logger.debug "Getting Repo w/ name: '#{name}'"
+      logger.debug "Getting Repo w/ name: '#{name}'"
       (all || []).detect { |r| r.name == name }
     end
     
@@ -97,12 +99,28 @@ module GitAuth
     
     def make_empty!
       tmp_path = "/tmp/gitauth-#{rand(100000)}-#{Time.now.to_i}"
-      FileUtils.mkdir(tmp_path)
-      system('git', 'clone', real_path, "#{tmp_path}/current-repo")
+      logger.info "Creating temporary dir at #{tmp_path}"
+      FileUtils.mkdir_p("#{tmp_path}/current-repo")
+      logger.info "Changing to new directory"
       Dir.chdir("#{tmp_path}/current-repo") do
-        IO.popen("touch .gitignore && git commit -am 'Initial Empty Repository' && git push origin master") { |f| f.close }
+        logger.info "Marking as git repo"
+        GitAuth.run "git init"
+        logger.info "Touching .gitignore"
+        GitAuth.run "touch .gitignore"
+        # Configure it
+        GitAuth.run "git config push.default current"
+        logger.info "Commiting"
+        GitAuth.run "git add ."
+        GitAuth.run "git commit -am 'Initialize Empty Repository'"
+        # Push the changes to the actual repository
+        logger.info "Adding origin #{self.real_path}"
+        GitAuth.run "git remote add origin '#{self.real_path}'"
+        logger.info "Pushing..."
+        GitAuth.run "git push origin master"
       end
-      FileUtils.rm_rf(tmp_path)
+    ensure
+      logger.info "Cleaning up old tmp file"
+      FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
     end
     
     def execute_post_create_hook!
@@ -124,7 +142,9 @@ module GitAuth
       @permissions[type].uniq!
     end
     
-    def has_permissions_for(whom, type)
+    def has_permissions_for(type, whom)
+      whom = GitAuth.get_user_or_group(whom) if whom.is_a?(String)
+      logger.info "Checking if #{whom.to_s} can #{type} #{self.name}"
       !(@permissions[type] || []).detect do |reader|
         reader = GitAuth.get_user_or_group(reader)
         reader == whom || (reader.is_a?(Group) && reader.member?(whom, true))

data/lib/gitauth/user.rb

@@ -19,9 +19,10 @@
 
 module GitAuth
   class User < SaveableClass(:users)
-        
+    include GitAuth::Loggable  
+    
     def self.get(name)
-      GitAuth::Logger.debug "Getting user for the name '#{name}'"
+      logger.debug "Getting user for the name '#{name}'"
       (all || []).detect { |r| r.name == name }
     end
     
@@ -109,10 +110,10 @@ module GitAuth
     def can_execute?(command, repo)
       return if command.bad?
       if command.write?
-        GitAuth::Logger.debug "Checking if #{self.name} can push to #{repo.name}"
+        logger.debug "Checking if #{self.name} can push to #{repo.name}"
         pushable?(repo)
       else
-        GitAuth::Logger.debug "Checking if #{self.name} can pull from #{repo.name}"
+        logger.debug "Checking if #{self.name} can pull from #{repo.name}"
         pullable?(repo)
       end
     end

data/lib/gitauth/web_app.rb

@@ -24,6 +24,7 @@ GitAuth.require_vendored 'sinatra'
 require 'digest/sha2'
 module GitAuth
   class WebApp < Sinatra::Base
+    include GitAuth::Loggable
     
     cattr_accessor :current_server
     
@@ -53,11 +54,11 @@ module GitAuth
     def self.check_auth
       if !has_auth?
         if $stderr.tty?
-          GitAuth::Logger.logger.verbose = true 
+          logger.verbose = true 
           puts "For gitauth to continue, you need to provide a username and password."
           update_auth
         else
-          GitAuth::Logger.fatal "You need to provide a username and password for GitAuth to function; Please run 'gitauth webapp` once"
+          logger.fatal "You need to provide a username and password for GitAuth to function; Please run 'gitauth webapp` once"
           exit!
         end
       end
@@ -68,20 +69,20 @@ module GitAuth
       set options
       handler      = detect_rack_handler
       handler_name = handler.name.gsub(/.*::/, '')
-      GitAuth::Logger.info "Starting up web server on #{port}"
+      logger.info "Starting up web server on #{port}"
       handler.run self, :Host => host, :Port => port do |server|
         GitAuth::WebApp.current_server = server
         set :running, true
       end
     rescue Errno::EADDRINUSE => e
-      GitAuth::Logger.fatal "Server is already running on port #{port}"
+      logger.fatal "Server is already running on port #{port}"
     end
     
     def self.stop
       if current_server.present?
         current_server.respond_to?(:stop!) ? current_server.stop! : current_server.stop
       end
-      GitAuth::Logger.debug "Stopped Server."
+      logger.debug "Stopped Server."
     end
     
     use GitAuth::AuthSetupMiddleware

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brownbeagle-gitauth
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.1
+  version: 0.0.4.2
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -36,6 +36,46 @@ dependencies:
   name: Sutto-perennial
   type: :runtime
   version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rr
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="