lib/gitauth/client.rb in brownbeagle-gitauth-0.0.3.3 vs lib/gitauth/client.rb in brownbeagle-gitauth-0.0.4.0

@@ -1,11 +1,11 @@
 #--
 #   Copyright (C) 2009 Brown Beagle Software
+#   Copyright (C) 2009 Darcy Laycock <[e-mail]>
 #   Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
 #   Copyright (C) 2007, 2008 Johan Sørensen <[e-mail]>
 #   Copyright (C) 2008 Tor Arne Vestbø <[e-mail]>
-#   Copyright (C) 2008 Darcy Laycock <[e-mail]>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Affero General Public License as published by
 #   the Free Software Foundation, either version 3 of the License, or
 #   (at your option) any later version.
@@ -23,18 +23,18 @@
   class Client
     
     attr_accessor :user, :command
     
     def initialize(user_name, command)
-      GitAuth.logger.debug "Initializing client with command: #{command.inspect} and user name #{user_name.inspect}"
+      GitAuth::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}"
+      GitAuth::Logger.warn "Exiting with error: #{error}"
       $stderr.puts error
       exit! 1
     end
     
     def run!
@@ -45,11 +45,11 @@
           exec(ENV["SHELL"])
         else
           exit_with_error "SSH_ORIGINAL_COMMAND is needed, mmmkay?"
         end
       else
-        command   = Command.parse!(@command)
+        command   = Command.parse(@command)
         repo      = command.bad? ? nil : Repo.get(extract_repo_name(command))
         if command.bad?
           if user.shell_accessible?
             exec(@command)
           else
@@ -57,24 +57,29 @@
           end
         elsif repo.nil?
           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}"
+          GitAuth::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}"
+      GitAuth::Logger.fatal "Exception: #{e.class.name}: #{e.message}"
       e.backtrace.each do |l|
-        GitAuth.logger.fatal "  => #{l}"
+        GitAuth::Logger.fatal "  => #{l}"
       end
       exit_with_error "Holy crap, we've imploded cap'n!"
     end
     
     def self.start!(user, command)
+      # Gitorious does it so I should too!
+      File.umask(0022)
+      # Setup models etc
+      GitAuth.prepare
+      # Finally, create and initialize
       client = self.new(user, command)
       yield client if block_given?
       client.run!
     end
     
\ No newline at end of file