brownbeagle-gitauth 0.0.2 → 0.0.3

data/bin/gitauth

@@ -93,7 +93,7 @@ class GitAuthRunner < Thor
       $stderr.puts "Please log in as the correct user and re-run"
       exit! 1
     end
-    if !GitAuth::Repo.has_git?
+    if !GitAuth.has_git?
       $stderr.puts "'git' was not found in your path - please install it before continuing."
       exit! 1
     end

data/lib/gitauth.rb

@@ -43,6 +43,10 @@ module GitAuth
     return (name =~ /^@/ ? Group : User).get(name)
   end
   
+  def self.has_git?
+    !`which git`.strip.empty?
+  end
+  
   def self.setup!
     unless File.exist?(GITAUTH_DIR) && File.directory?(GITAUTH_DIR)
       $stderr.puts "GitAuth not been setup, please run: gitauth install"

data/lib/gitauth/command.rb

@@ -34,7 +34,7 @@ module GitAuth
     # Standard Commands
     READ_COMMANDS  = ["git-upload-pack", "git upload-pack"]
     WRITE_COMMANDS = ["git-receive-pack", "git receive-pack"]
-    PATH_REGEXP    = /^'([\w\_\-\.\+]+(\.git)?)'$/i.freeze
+    PATH_REGEXP    = /^'([\w\_\-\~\.\+\/]+\/)?([\w\_\-\.\+]+(\.git)?)'$/i.freeze
     
     attr_reader :path, :verb, :command
     
@@ -73,7 +73,7 @@ module GitAuth
         raise BadCommandError
       end
       if PATH_REGEXP =~ @argument
-        @path = $1
+        @path = $2
         raise BadCommandError unless @path
       else
         raise BadCommandError

data/lib/gitauth/repo.rb

@@ -83,7 +83,7 @@ module GitAuth
     end
     
     def create_repo!
-      return false if !self.class.has_git?
+      return false if !GitAuth.has_git?
       path = self.real_path
       unless File.exist?(path) && File.directory?(path)
         FileUtils.mkdir_p(path)
@@ -101,9 +101,5 @@ module GitAuth
       self.class.save!
     end
     
-    def self.has_git?
-      !`which git`.strip.empty?
-    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/views/repo.erb

@@ -35,6 +35,7 @@
     <div class="row">
       <label for="repo_all"> Read &amp; Write Access:</label>
       <textarea name="repo[all]" id="repo_all" cols="38" rows="5"><%= @all_access.join("\n") %></textarea>
+      <p class="hint">One user / group per line, groups starting with @'s</p>
     </div>
     
     <div class="row">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brownbeagle-gitauth
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Darcy Laycock