gitauth 0.0.5.2 → 0.1.0

data/lib/gitauth.rb

@@ -20,18 +20,22 @@ require 'pathname'
 
 # Prepend lib dir + any vendored lib's to the front of the load
 # path to ensure they're loaded first.
-$LOAD_PATH.unshift(*Dir[Pathname(__FILE__).dirname.join("../{lib,vendor/*/lib}").expand_path])
+$LOAD_PATH.unshift(*Dir[Pathname(__FILE__).dirname.join("../{lib,vendor/*/lib}").expand_path.to_s])
+
+require 'rubygems'
+
+gem 'perennial'
 
 require 'perennial'
 
 module GitAuth
   include Perennial
   include Loggable
-  
-  VERSION     = [0, 0, 5, 2]
+
+  VERSION     = [0, 1, 0]
   BASE_DIR    = Pathname(__FILE__).dirname.join("..").expand_path
   GITAUTH_DIR = Pathname("~/.gitauth/").expand_path
-  
+
   manifest do |m, l|
     Settings.root                  = File.dirname(__FILE__)
     Settings.default_settings_path = GITAUTH_DIR.join("settings.yml")
@@ -41,7 +45,7 @@ module GitAuth
     l.register_controller :web_app, 'GitAuth::WebApp'
     l.before_run { GitAuth.prepare }
   end
-  
+
   require 'gitauth/message'        # Basic error messages etc (as of yet unushed)
   require 'gitauth/saveable_class' # Simple YAML store for dumpables classes
   require 'gitauth/repo'           # The basic GitAuth repo object
@@ -49,22 +53,22 @@ module GitAuth
   require 'gitauth/group'          # The basic GitAuth group object (collection of users)
   require 'gitauth/command'        # Processes / filters commands
   require 'gitauth/client'         # Handles the actual SSH interaction / bringing it together
-  
+
   autoload :AuthSetupMiddleware,  'gitauth/auth_setup_middleware'
   autoload :ApacheAuthentication, 'gitauth/apache_authentication'
   autoload :WebApp,               'gitauth/web_app'
-  
+
   class << self
-    
+
     def prepare
       GitAuth::Settings.setup!
       reload_models!
     end
-    
+
     def version
       VERSION.join(".")
     end
-    
+
     def msg(type, message)
       Message.new(type, message)
     end
@@ -83,18 +87,18 @@ module GitAuth
       [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
-    
+
     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
+
+end

data/lib/gitauth/web_app.rb

@@ -23,21 +23,21 @@ require 'digest/sha2'
 module GitAuth
   class WebApp < Sinatra::Base
     include GitAuth::Loggable
-    
+
     cattr_accessor :current_server
-    
+
     def self.has_auth?
       username = GitAuth::Settings["web_username"]
       password = GitAuth::Settings["web_password_hash"]
       !(username.blank? || password.blank?)
     end
-    
+
     def self.update_auth
       raw_username = Readline.readline('GitAuth Username (default is \'gitauth\'): ')
       raw_username = 'gitauth' if raw_username.blank?
       raw_password = ''
       while raw_password.blank?
-        system "stty -echo" 
+        system "stty -echo"
         raw_password = Readline.readline('GitAuth Password: ')
         system "stty echo"
         print "\n"
@@ -45,7 +45,7 @@ module GitAuth
       end
       password_confirmation = nil
       while password_confirmation != raw_password
-        system "stty -echo" 
+        system "stty -echo"
         password_confirmation = Readline.readline('Confirm Password: ')
         system "stty echo"
         print "\n"
@@ -56,12 +56,12 @@ module GitAuth
         :web_password_hash => Digest::SHA256.hexdigest(raw_password)
       })
     end
-    
+
     def self.check_auth
       GitAuth.prepare
       if !has_auth?
         if $stderr.tty?
-          logger.verbose = true 
+          logger.verbose = true
           puts "For gitauth to continue, you need to provide a username and password."
           update_auth
         else
@@ -70,21 +70,21 @@ module GitAuth
         end
       end
     end
-    
+
     def self.run(options = {})
       check_auth
       set options
       handler      = detect_rack_handler
       handler_name = handler.name.gsub(/.*::/, '')
       logger.info "Starting up web server on #{port}"
-      handler.run self, :Host => host, :Port => port do |server|
+      handler.run self, :Port => port do |server|
         GitAuth::WebApp.current_server = server
         set :running, true
       end
     rescue Errno::EADDRINUSE => e
       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
@@ -92,17 +92,17 @@ module GitAuth
       exit!
       logger.debug "Stopped Server."
     end
-    
+
     unless GitAuth::ApacheAuthentication.setup?
-    
+
       use GitAuth::AuthSetupMiddleware
-    
+
       use Rack::Auth::Basic do |username, password|
         [username, Digest::SHA256.hexdigest(password)] == [GitAuth::Settings["web_username"], GitAuth::Settings["web_password_hash"]]
       end
-    
+
     end
-    
+
     configure do
       set :port, 8998
       set :views,  GitAuth::BASE_DIR.join("views")
@@ -110,21 +110,21 @@ module GitAuth
       set :static, true
       set :methodoverride, true
     end
-    
+
     before { GitAuth.reload_models! }
-    
+
     helpers do
       include Rack::Utils
       alias_method :h, :escape_html
-      
+
       def link_to(text, link)
         "<a href='#{u link}'>#{text}</a>"
       end
-      
+
       def u(url)
         "#{request.script_name}#{url}"
       end
-      
+
       def delete_link(text, url)
         id = "deleteable-#{Digest::SHA256.hexdigest(url.to_s)[0, 6]}"
         html =  "<div class='deletable-container' style='display: none; margin: 0; padding: 0;'>"
@@ -134,24 +134,24 @@ module GitAuth
         html << "<a href='#' onclick='if(confirm(\"Are you sure you want to do that? Deletion can not be reversed.\")) $(\"##{id}\").submit(); return false;'>#{text}</a>"
         return html
       end
-      
+
       def auto_link(member)
         member = member.to_s
         url = (member[0] == ?@ ? "/groups/#{URI.encode(member[1..-1])}" : "/users/#{URI.encode(member)}")
         return link_to(member, url)
       end
-      
+
     end
-    
+
     get '/' do
       @repos  = GitAuth::Repo.all
       @users  = GitAuth::User.all
       @groups = GitAuth::Group.all
       erb :index
     end
-    
+
     # Listing / Index Page
-    
+
     get '/repos/:name' do
       @repo = GitAuth::Repo.get(params[:name])
       if @repo.nil?
@@ -159,18 +159,18 @@ module GitAuth
       else
         read_perms, write_perms = (@repo.permissions[:read]||[]), (@repo.permissions[:write]||[])
         @all_access = read_perms & write_perms
-        @read_only  = read_perms - @all_access 
+        @read_only  = read_perms - @all_access
         @write_only = write_perms - @all_access
         erb :repo
       end
     end
-    
+
     get '/users/:name' do
       @user = GitAuth::User.get(params[:name])
       if @user.nil?
         redirect root_with_message("The given user couldn't be found.")
       else
-        repos  = GitAuth::Repo.all 
+        repos  = GitAuth::Repo.all
         read_perms  = repos.select { |r| r.readable_by?(@user)  }
         write_perms = repos.select { |r| r.writeable_by?(@user) }
         @all_access = read_perms & write_perms
@@ -180,7 +180,7 @@ module GitAuth
         erb :user
       end
     end
-    
+
     get '/groups/:name' do
       @group = GitAuth::Group.get(params[:name])
       if @group.nil?
@@ -189,9 +189,9 @@ module GitAuth
         erb :group
       end
     end
-    
+
     # Create and update repos
-    
+
     post '/repos' do
       name = params[:repo][:name]
       path = params[:repo][:path]
@@ -208,7 +208,7 @@ module GitAuth
         redirect root_with_message("There was an error adding the repository.")
       end
     end
-    
+
     post '/repos/:name' do
       repo = GitAuth::Repo.get(params[:name])
       if repo.nil?
@@ -233,7 +233,7 @@ module GitAuth
         redirect u("/repos/#{URI.encode(repo.name)}")
       end
     end
-    
+
     delete '/repos/:name' do
       repo = GitAuth::Repo.get(params[:name])
       if repo.nil?
@@ -243,9 +243,9 @@ module GitAuth
         redirect root_with_message("Repository removed.")
       end
     end
-    
+
     # Create, delete and update users
-    
+
     post '/users' do
       name  = params[:user][:name]
       admin = params[:user][:admin].to_s == "1"
@@ -256,7 +256,7 @@ module GitAuth
         redirect root_with_message("There was an error adding the requested user.")
       end
     end
-    
+
     delete '/users/:name' do
       user = GitAuth::User.get(params[:name])
       if user.nil?
@@ -266,9 +266,9 @@ module GitAuth
         redirect root_with_message("User removed.")
       end
     end
-    
+
     # Create and Update Groups
-    
+
     post '/groups' do
       if GitAuth::Group.create(params[:group][:name])
         redirect root_with_message("Group added")
@@ -276,7 +276,7 @@ module GitAuth
         redirect root_with_message("There was an error adding the requested group.")
       end
     end
-    
+
     post '/groups/:name' do
       group = GitAuth::Group.get(params[:name])
       if group.nil?
@@ -293,7 +293,7 @@ module GitAuth
         redirect u("/groups/#{URI.encode(group.name)}")
       end
     end
-    
+
     delete '/groups/:name' do
       group = GitAuth::Group.get(params[:name])
       if group.nil?
@@ -303,12 +303,12 @@ module GitAuth
         redirect root_with_message("Group removed.")
       end
     end
-    
+
     # Misc Helpers
-    
+
     def root_with_message(message)
       u("/?message=#{URI.encode(message)}")
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitauth
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.2
+  hash: 27
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,79 +15,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 +08:00
+date: 2011-06-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: perennial
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 93
+        segments: 
+        - 1
+        - 0
+        - 0
+        - 1
         version: 1.0.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: redgreen
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rr
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 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: 
@@ -120,7 +166,7 @@ files:
 - views/layout.erb
 - views/repo.erb
 - views/user.erb
-has_rdoc: false
+has_rdoc: true
 homepage: http://brownbeagle.com.au/
 licenses: []
 
@@ -130,21 +176,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: An authentication manager for Git repositories served over SSH