gritano 0.1.7 → 0.2.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= Gritano v0.1.7
+= Gritano v0.2.0
 
 Gritano is the simplest way to configure a git server over ssh. You can create repositories and manage user access using this practical tool.
 
@@ -34,6 +34,18 @@ create bare repositories:
 and control access:
 
   $ gritano repo +read proj.git igorbonadio
+  
+== User Access
+
+Gritano 0.2.0 introduced a new feature that enables users to execute some simple commands:
+
+  $ ssh git@host.com repos
+  
+  $ ssh git@host.com keys
+  
+  $ ssh git@host.com key add mykey < id_rsa.pub
+  
+  $ ssh git@host.com key rm mykey
 
 == Contributing to Gritano
  

data/TODO

@@ -1,10 +1,3 @@
-v0.2.0
-- acesso do usuário via ssh
-  ssh git@host.com repos
-  ssh git@host.com keys
-  ssh git@host.com +key keyname < key.pub
-  ssh git@host.com -key keyname
-  
 v0.3.0
 - acesso administrativo via ssh
   ssh git@host.com user add username
@@ -27,4 +20,7 @@ v0.4.0
     ssh git@host.com repo +read reponame.git username
     ssh git@host.com repo +write reponame.git username
     ssh git@host.com repo -read reponame.git username
-    ssh git@host.com repo -write reponame.git username
+    ssh git@host.com repo -write reponame.git username
+    
+v1.0.0
+- melhorar sistema de dependencias

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/bin/gritano-check

@@ -4,14 +4,45 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'gritano'
 
+def help
+  puts "
+  ssh user@host command
+  
+  Examples:
+  ssh git@host.com repos
+  ssh git@host.com keys
+  ssh git@host.com key add keyname < key.pub
+  ssh git@host.com key rm keyname
+  
+  --
+  v#{File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')).readlines.join}"
+end
+
 ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(Etc.getpwuid.dir, '.gritano', 'database.yml'))))
 
 login = ARGV[0]
-access, git_command, repo = Gritano::Command.eval(ENV['SSH_ORIGINAL_COMMAND'])
-user = Gritano::User.find_by_login(login)
-repository = Gritano::Repository.find_by_name(repo)
-if user and repository
-  if user.check_access(repository, access)
-    exec "#{git_command} #{File.join(repository.full_path)}"
+command = Gritano::Command.eval(ENV['SSH_ORIGINAL_COMMAND'])
+begin
+  case command[:access]
+    when :read, :write then
+      user = Gritano::User.find_by_login(login)
+      repository = Gritano::Repository.find_by_name(command[:repo])
+      if user and repository
+        if user.check_access(repository, command[:access])
+          exec "#{command[:command]} #{File.join(repository.full_path)}"
+        end
+      end
+    when :user_cmd
+      cmd = command[:command]
+      if cmd.start_with? "+key" or cmd.start_with? "-key"
+        tmp = cmd.split(" ")
+        tmp = tmp[0..-2] + [login] + tmp[-1..-1]
+        cmd = tmp.join(" ")
+      else
+        cmd = cmd + " " + login
+      end
+      exec "gritano user #{cmd}"
   end
+rescue
+  puts help
 end

data/features/command.feature

@@ -4,9 +4,13 @@ Feature: Command
 	I want to know if a command is a read/write command
 	
 	Scenario Outline: Write command
-	  When I receive a "<command>" command
-	  Then I should see that it is a "<access>" access to "<repo>"
+	  When I receive a "<original_command>" command
+	  Then I should see that it is a "<access>": "<command>" "<repo>"
 	  Examples:
-	    | command                   | access | repo     |
-	    | git-receive-pack proj.git | write  | proj.git |
-	    | git-upload-pack proj.git  | read   | proj.git |
+	    | original_command          | access   | command          | repo     |
+	    | git-receive-pack proj.git | write    | git-receive-pack | proj.git |
+	    | git-upload-pack proj.git  | read     | git-upload-pack  | proj.git |
+	    | repos                     | user_cmd | repos            |          |
+	    | keys                      | user_cmd | keys             |          |
+	    | key add keyname           | user_cmd | +key keyname     |          |
+	    | key rm keyname            | user_cmd | -key keyname     |          |

data/features/step_definitions/command_step.rb

@@ -1,8 +1,9 @@
 When /^I receive a "(.*?)" command$/ do |cmd|
-  @access, @git_command, @repo = Gritano::Command.eval(cmd)
+  @command = Gritano::Command.eval(cmd)
 end
 
-Then /^I should see that it is a "(.*?)" access to "(.*?)"$/ do |access, repo|
-  @access.to_s.should be == access
-  @repo.to_s.should be == repo
+Then /^I should see that it is a "(.*?)": "(.*?)" "(.*?)"$/ do |access, command, repo|
+  @command[:access].to_s.should be == access
+  @command[:command].to_s.should be == command
+  @command[:repo].to_s.should be == repo if repo
 end

data/gritano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2012-11-02"
+  s.date = "2012-11-07"
   s.description = "Gritano is the simplest way to configure your git server over ssh. You can create repositories and manage user access."
   s.email = "igorbonadio@gmail.com"
   s.executables = ["gritano", "gritano-check"]

data/lib/gritano/command.rb

@@ -3,9 +3,15 @@ module Gritano
     def self.eval(cmd)
       case cmd
         when /^git-receive-pack/ then
-          return :write, "git-receive-pack", self.repo(cmd)
+          return {access: :write, command: "git-receive-pack", repo: self.repo(cmd)}
         when /^git-upload-pack/ then
-          return :read, "git-upload-pack", self.repo(cmd)
+          return {access: :read, command: "git-upload-pack", repo: self.repo(cmd)}
+        when /^repos/, /^keys/ then 
+          return {access: :user_cmd, command: cmd}
+        when /^key add/ then
+          return {access: :user_cmd, command: '+' + cmd.sub(' add', '')}
+        when /^key rm/ then
+          return {access: :user_cmd, command: '-' + cmd.sub(' rm', '')}
       end
     end
     

data/spec/command_spec.rb

@@ -2,16 +2,40 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Gritano::Command do
   it 'should interpret git-receive-pack' do
-    access, git_command, repo = Gritano::Command.eval("git-receive-pack 'teste.git'")
-    access.to_s.should be == "write"
-    git_command.should be == "git-receive-pack"
-    repo.to_s.should be == "teste.git"
+    command = Gritano::Command.eval("git-receive-pack 'teste.git'")
+    command[:access].to_s.should be == "write"
+    command[:command].should be == "git-receive-pack"
+    command[:repo].to_s.should be == "teste.git"
   end
   
   it 'should interpret git-upload-pack' do
-    access, git_command, repo = Gritano::Command.eval("git-upload-pack 'teste.git'")
-    access.to_s.should be == "read"
-    git_command.should be == "git-upload-pack"
-    repo.to_s.should be == "teste.git"
+    command = Gritano::Command.eval("git-upload-pack 'teste.git'")
+    command[:access].to_s.should be == "read"
+    command[:command].should be == "git-upload-pack"
+    command[:repo].to_s.should be == "teste.git"
+  end
+  
+  it 'should interpret repos' do
+    command = Gritano::Command.eval("repos")
+    command[:access].to_s.should be == "user_cmd"
+    command[:command].should be == "repos"
+  end
+  
+  it 'should interpret keys' do
+    command = Gritano::Command.eval("keys")
+    command[:access].to_s.should be == "user_cmd"
+    command[:command].should be == "keys"
+  end
+  
+  it 'should interpret key add keyname' do
+    command = Gritano::Command.eval("key add keyname")
+    command[:access].to_s.should be == "user_cmd"
+    command[:command].should be == "+key keyname"
+  end
+  
+  it 'should interpret -key keyname' do
+    command = Gritano::Command.eval("key rm keyname")
+    command[:access].to_s.should be == "user_cmd"
+    command[:command].should be == "-key keyname"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1916713309401243545
+      hash: -1582708146400304202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: