brownbeagle-gitauth 0.0.3.3 → 0.0.4.0

data/lib/gitauth.rb

@@ -1,6 +1,6 @@
 #--
 #   Copyright (C) 2009 Brown Beagle Software
-#   Copyright (C) 2008 Darcy Laycock <sutto@sutto.net>
+#   Copyright (C) 2009 Darcy Laycock <sutto@sutto.net>
 #
 #   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
@@ -16,64 +16,84 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-
-require 'logger'
-require 'yaml'
+require 'pathname'
 require 'ostruct'
 
 module GitAuth
   
-  BASE_DIR    = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-  GITAUTH_DIR = File.expand_path("~/.gitauth/")
+  VERSION     = [0, 0, 4, 0]
+  BASE_DIR    = Pathname.new(__FILE__).dirname.join("..").expand_path
+  LIB_DIR     = BASE_DIR.join("lib", "gitauth")
+  GITAUTH_DIR = Pathname.new("~/.gitauth/").expand_path
   
-  def self.logger
-    @logger ||= ::Logger.new(File.join(GITAUTH_DIR, "gitauth.log"))
+  # This is the first declaration because we need it so that we can
+  # load a vendored version of perennial if present.
+  def self.require_vendored(lib)
+    vendored_path = BASE_DIR.join("vendor", lib, "lib", "#{lib}.rb")
+    if File.exist?(vendored_path)
+      $:.unshift File.dirname(vendored_path)
+      require lib
+    else
+      require 'rubygems' unless defined?(Gem)
+      require lib
+    end
   end
   
-  def self.settings
-    @settings ||= OpenStruct.new(YAML.load_file(File.join(GITAUTH_DIR, "settings.yml")))
-  end
+  require_vendored 'perennial'
+  include Perennial
+  include Loggable
   
-  def self.reload_settings!
-    @settings = nil
-  end
+  require LIB_DIR.join("settings")
   
-  def self.get_user_or_group(name)
-    return nil if name.to_s.strip.empty?
-    return (name =~ /^@/ ? Group : User).get(name)
+  %w(message saveable_class repo user command client group).each do |file|
+    require LIB_DIR.join(file)
   end
   
-  def self.has_git?
-    !`which git`.strip.empty?
+  autoload :AuthSetupMiddleware, LIB_DIR.join('auth_setup_middleware').to_s
+  autoload :WebApp,              LIB_DIR.join('web_app').to_s
+  
+  manifest do |m, l|
+    Settings.root                  = File.dirname(__FILE__)
+    Settings.default_settings_path = GITAUTH_DIR.join("settings.yml")
+    Logger.default_logger_path     = GITAUTH_DIR.join("gitauth.log")
+    l.before_run { GitAuth.each_model(:load!) }
+    l.register_controller :web_app, 'GitAuth::WebApp'
   end
   
-  def self.setup!
-    unless File.exist?(GITAUTH_DIR) && File.directory?(GITAUTH_DIR)
-      $stderr.puts "GitAuth not been setup, please run: gitauth install"
-      exit! 1
+  class << self
+    
+    def prepare
+      Settings.setup
+      reload_models!
     end
-    dir = File.expand_path(File.join(File.dirname(__FILE__), "gitauth"))
-    %w(saveable_class repo user command client group).each do |file|
-      require File.join(dir, file)
+    
+    def version
+      VERSION.join(".")
     end
-    # Load the users and repositories from a YAML File.
-    GitAuth::Repo.load!
-    GitAuth::User.load!
-    GitAuth::Group.load!
-  end
-  
-  def self.serve_web!
-    self.setup!
-    require File.join(File.expand_path(File.join(File.dirname(__FILE__), "gitauth")), "web_app")
-    GitAuth::WebApp.run!
-  end
-  
-  def self.force_setup!
-    @settings = nil
-    GitAuth::Repo.all  = nil
-    GitAuth::User.all = nil
-    GitAuth::Group.all = nil
-    self.setup!
+    
+    def msg(type, message)
+      Message.new(type, message)
+    end
+
+    def get_user_or_group(name)
+      name = name.to_s.strip
+      return if name.empty?
+      (name =~ /^@/ ? Group : User).get(name)
+    end
+
+    def has_git?
+      !`which git`.blank?
+    end
+
+    def each_model(method = nil, &blk)
+      [Repo, User, Group].each { |m| m.send(method) } if method.present?
+      [Repo, User, Group].each(&blk) unless blk.nil?
+    end
+    
+    def reload_models!
+      each_model(:load!)
+    end
+    
   end
   
 end

data/public/gitauth.css

@@ -277,7 +277,6 @@ br.clear { clear: both; }
   color: #C55E25;
 }
 
-
 #repository-details code {
   display: block;
   white-space: pre;
@@ -285,5 +284,29 @@ br.clear { clear: both; }
   font-family: Consolas, Lucida Console, Monaco, monospace;
   background: #F4F4F4;
   margin: 0.25em 0;
-  
+}
+
+#error-container {
+  padding: 1em 3em 1.5em;
+}
+
+#error-container h2 {
+  font-size: 1.5em;
+  text-align: center;
+  font-weight: bold;
+  padding: 0 0 0.5em;
+  color: red;
+}
+
+#error-container p {
+  font-size: 1.2em;
+  line-height: 1.5em;
+  color: #222;
+  text-align: center;
+}
+
+#error-container p code {
+  font-style: italic;
+  color: black;
+  font-weight: bold;
 }

data/resources/messages.yml

@@ -0,0 +1,9 @@
+error:
+  hook_failed: "Your GitAuth post-create hook, located at ~/.gitauth/post-create, failed to run successfully."
+  unknown: "An unknown error has occured"
+warning:
+  unknown: "Ruh-roh, something went wrong"
+notice:
+  unknown: ""
+  skipped_post_create: "Post create hook didn't exist"
+  post_create_hook_run: "Post create hook successfully was run"

data/views/auth_setup.erb

@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang='en-US' xml:lang='en-US' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <title>GitAuth</title>
+    <link rel="stylesheet" type="text/css" href="/gitauth.css" media="screen" />
+  </head>
+  <body>
+    <div id="container">
+      <div id="header">
+        <h1><a href="/">GitAuth Admin Area</a></h1>
+      </div>
+      <div id="contents">
+        <div id='error-container'>
+          <h2>Ruh-roh Scooby!</h2>
+          <p>
+            It looks like you need to setup a username and password for GitAuth to function
+            correctly. Please log in the computer running this GitAuth install and run
+            <code>gitauth web-app</code> manually once. Thanks!
+          </p>
+        </div>
+      </div>
+      <div id="footer">
+        Powered by GitAuth v<%= GitAuth.version %>
+      </div>
+    </div>
+  </body>
+</html>

data/views/clone_repo.erb

@@ -0,0 +1,22 @@
+<% repo_url = "git@#{request.host}:#{h params[:repo_name]}.git" %>
+<div id="repository-details">
+  <h3>Congratulations! Your repository was added!</h3>
+  <p>
+    If you have an existing local git repository you wish to push, try...
+  </p>
+  <code>  cd your-repo
+  git remote add origin <%= repo_url %>
+  git push origin master</code>
+  <p>
+    Otherwise, to initialize an empty repository:
+  </p>
+  <code>  mkdir your-repo
+  cd your-repo
+  git init
+  touch .gitignore
+  git add .gitignore
+  git commit -m "Added blank .gitignore to initialize repository"
+  git remote add origin <%= repo_url %>
+  git push origin master</code>
+  <p>And you should be good to go! <a href="#" onclick="$('#repository-details').slideUp(); return false;">(close instructions)</a></p>
+</div>

data/views/layout.erb

@@ -20,7 +20,7 @@
         <%= yield %>
       </div>
       <div id="footer">
-        Powered by GitAuth.
+        Powered by GitAuth v<%= GitAuth.version %>
       </div>
     </div>
   </body>

metadata

@@ -1,78 +1,71 @@
 --- !ruby/object:Gem::Specification 
 name: brownbeagle-gitauth
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.3
+  version: 0.0.4.0
 platform: ruby
 authors: 
 - Darcy Laycock
-- Alex Pooley
-- Matt Didcoe
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
-default_executable: gitauth
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
-description: Git Authentication Server
+date: 2009-09-06 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: A library to enable per user / group authentication on a read / write basis for git repositories running over ssh
 email: sutto@sutto.net
 executables: 
 - gitauth
 - gitauth-shell
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
+files: 
 - LICENSE
+- README.rdoc
+- Rakefile
 - USAGE
-files: 
+- bin
 - bin/gitauth
 - bin/gitauth-shell
+- config.ru
+- gitauth.gemspec
+- lib
+- lib/gitauth
+- lib/gitauth.rb
+- lib/gitauth/auth_setup_middleware.rb
 - lib/gitauth/client.rb
 - lib/gitauth/command.rb
 - lib/gitauth/group.rb
+- lib/gitauth/message.rb
 - lib/gitauth/repo.rb
 - lib/gitauth/saveable_class.rb
+- lib/gitauth/settings.rb
 - lib/gitauth/user.rb
 - lib/gitauth/web_app.rb
-- lib/gitauth.rb
-- LICENSE
+- public
 - public/gitauth.css
 - public/gitauth.js
 - public/jquery.js
-- README.rdoc
-- USAGE
+- resources
+- resources/messages.yml
+- vendor
+- views
+- views/auth_setup.erb
+- views/clone_repo.erb
 - views/group.erb
 - views/index.erb
 - views/layout.erb
 - views/repo.erb
 - views/user.erb
 has_rdoc: false
-homepage: http://github.com/brownbeagle/gitauth
+homepage: http://brownbeagle.com.au/
+licenses: 
 post_install_message: 
-rdoc_options: 
-- --inline-source
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,9 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Git Authentication Server
+specification_version: 3
+summary: An authentication manager for Git repositories served over SSH
 test_files: []