gritano 0.2.2 → 0.3.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= Gritano v0.2.2
+= Gritano v0.3.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.
 
@@ -11,6 +11,14 @@ Gritano is the simplest way to configure a git server over ssh. You can create r
 
   $ gem install gritano
   
+== Update
+
+If you are using a previous version, you should update your instalation:
+  
+  $ gem install gritano
+  
+  $ gritano update
+  
 == Usage
 
 First of all you should create a git user who will be responsible for store and manipulate repositories. Lets suppose we are logged as this user.
@@ -22,6 +30,10 @@ All you need to do to set up Gritano is
 After that you can add users:
 
   $ gritano user add igorbonadio
+  
+add administrator rights to this user:
+
+  $ gritano user addadmin igorbonadio
 
 add user's public keys:
 
@@ -35,9 +47,13 @@ and control access:
 
   $ gritano repo addread proj.git igorbonadio
   
+For more information, execute
+
+  $ gritano help
+  
 == User Access
 
-Gritano 0.2.0 introduced a new feature that enables users to execute some simple commands:
+Gritano 0.2.0 introduced a new feature that enables users to execute some simple commands via ssh:
 
   $ ssh git@host.com repos
   
@@ -46,6 +62,32 @@ Gritano 0.2.0 introduced a new feature that enables users to execute some simple
   $ ssh git@host.com addkey mykey < id_rsa.pub
   
   $ ssh git@host.com rmkey mykey
+  
+For more information, execute
+
+  $ ssh git@host.com help
+  
+== Admin Access
+
+Starting from Gritano 0.3.0, administrators can execute commands via ssh:
+
+  $ ssh git@hot.com user add username
+  
+  $ ssh git@hot.com user rm username
+  
+  $ ssh git@hot.com user addkey username keyname < key.pub
+  
+  $ ssh git@hot.com user rmkey username keyname
+  
+  $ ssh git@hot.com repo add reponame.git
+  
+  $ ssh git@hot.com repo rm reponame.git
+  
+  $ ssh git@hot.com repo list
+  
+For more information, execute
+
+  $ ssh git@host.com admin help
 
 == Contributing to Gritano
  

data/TODO

@@ -1,19 +1,6 @@
-v0.2.2
-- uniformizar o uso de add e rm
-
-v0.3.0
-- acesso administrativo via ssh
-  ssh git@host.com user add username
-  ssh git@host.com user rm username
-  ssh git@host.com user addkey username keyname < key.pub
-  ssh git@host.com user rmkey username keyname
-  ssh git@host.com repo add reponame.git
-  ssh git@host.com repo rm reponame.git
-  ssh git@host.com repo addread reponame.git username
-  ssh git@host.com repo addwrite reponame.git username
-  ssh git@host.com repo rmread reponame.git username
-  ssh git@host.com repo rmwrite reponame.git username
-  
-v0.4.0
+Outros
 - usuário pode (ou não) criar repositorios via ssh
-  ssh git@host.com repo add reponame.git
+  ssh git@host.com newrepo reponame.git
+  ssh git@host.com rmrepo reponame.git
+- Stream de mensagens via ssh
+- Melhorar specs e features

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/gritano

@@ -12,10 +12,13 @@ def help
   
   Examples:
   gritano install
+  gritano update
   gritano user add username
   gritano user rm username
   gritano user addkey username keyname < key.pub
   gritano user rmkey username keyname
+  gritano user addadmin username
+  gritano user rmadmin username
   gritano user list
   gritano user keys username
   gritano user repos username
@@ -32,6 +35,11 @@ def help
   v#{File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')).readlines.join}"
 end
 
+def migrate
+  ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(Etc.getpwuid.dir, '.gritano', 'database.yml'))))
+  ActiveRecord::Migrator.migrate(File.join(File.dirname(__FILE__),'../db/migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil )
+end
+
 def install
   Dir.mkdir(File.join(Etc.getpwuid.dir, '.gritano')) unless File.exist?(File.join(Etc.getpwuid.dir, '.gritano'))
   Dir.mkdir(File.join(Etc.getpwuid.dir, '.ssh')) unless File.exist?(File.join(Etc.getpwuid.dir, '.ssh'))
@@ -39,8 +47,7 @@ def install
     f.write("adapter: sqlite3\ndatabase: #{File.join(Etc.getpwuid.dir, '.gritano', 'database.db')}\n")
   end
   FileUtils.rm(File.join(Etc.getpwuid.dir, '.gritano', 'database.db')) if File.exist?(File.join(Etc.getpwuid.dir, '.gritano', 'database.db'))
-  ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(Etc.getpwuid.dir, '.gritano', 'database.yml'))))
-  ActiveRecord::Migrator.migrate(File.join(File.dirname(__FILE__),'../db/migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil )
+  migrate
 end
 
 def version
@@ -65,6 +72,8 @@ check_git
 if ARGV.length == 1
   if ARGV[0] =='install'
     install
+  elsif ARGV[0] =='update'
+    migrate
   elsif ARGV[0] =='version'
     version
   else

data/bin/gritano-check

@@ -13,6 +13,7 @@ def help
   ssh git@host.com keys
   ssh git@host.com addkey keyname < key.pub
   ssh git@host.com rmkey keyname
+  ssh git@host.com admin help
   
   --
   v#{File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')).readlines.join}"
@@ -42,6 +43,14 @@ begin
         cmd = cmd + " " + login
       end
       exec "gritano user #{cmd}"
+    when :admin_cmd
+      cmd = command[:command]
+      user = Gritano::User.find_by_login(login)
+      if user.admin?
+        exec "gritano #{cmd}"
+      else
+        puts "access denied"
+      end
   end
 rescue
   puts help

data/db/migrate/005_add_admin_to_users.rb

@@ -0,0 +1,10 @@
+class AddAdminToUsers < ActiveRecord::Migration
+  def up
+    add_column :users, :admin, :boolean, :default => false
+  end
+  
+  def down
+    remove_column :users, :admin
+  end
+end
+

data/features/command.feature

@@ -7,10 +7,26 @@ Feature: Command
 	  When I receive a "<original_command>" command
 	  Then I should see that it is a "<access>": "<command>" "<repo>"
 	  Examples:
-	    | 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             |          |
-	    | addkey keyname            | user_cmd | addkey keyname   |          |
-	    | rmkey keyname             | user_cmd | rmkey keyname    |          |
+	    | 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                                |          |
+	    | addkey keyname                      | user_cmd  | addkey keyname                      |          |
+	    | rmkey keyname                       | user_cmd  | rmkey keyname                       |          |
+	    | user add username                   | admin_cmd | user add username                   |          |
+	    | user rm username                    | admin_cmd | user rm username                    |          |
+	    | user addkey username keyname        | admin_cmd | user addkey username keyname        |          |
+	    | user rmkey username keyname         | admin_cmd | user rmkey username keyname         |          |
+	    | user list                           | admin_cmd | user list                           |          |
+	    | user keys username                  | admin_cmd | user keys username                  |          |
+	    | user repos username                 | admin_cmd | user repos username                 |          |
+	    | repo add reponame.git               | admin_cmd | repo add reponame.git               |          |
+	    | repo rm reponame.git                | admin_cmd | repo rm reponame.git                |          |
+	    | repo addread reponame.git username  | admin_cmd | repo addread reponame.git username  |          |
+	    | repo addwrite reponame.git username | admin_cmd | repo addwrite reponame.git username |          |
+	    | repo rmread reponame.git username   | admin_cmd | repo rmread reponame.git username   |          |
+	    | repo rmwrite reponame.git username  | admin_cmd | repo rmwrite reponame.git username  |          |
+	    | repo list                           | admin_cmd | repo list                           |          |
+	    | repo users reponame.git             | admin_cmd | repo users reponame.git             |          |
+	    | admin help                          | admin_cmd | help                                |          |

data/features/console.feature

@@ -5,9 +5,9 @@ Feature: Console operations
   
   Background:
     Given the following users exist:
-      | login       |
-      | igorbonadio |
-      | jessicaeto  |
+      | login       | admin |
+      | igorbonadio | true  |
+      | jessicaeto  | false |
       
     And the following keys exist:
       | login       | key |
@@ -40,6 +40,8 @@ Feature: Console operations
       | user list                                | success |
       | user keys igorbonadio                    | success |
       | user repos igorbonadio                   | success |
+      | user addadmin igorbonadio                | success |
+      | user rmadmin igorbonadio                 | success |
       | repo add tmp/p-lang.git                  | success |
       | repo rm tmp/jeka.git                     | success |
       | repo addread tmp/gritano.git jessicaeto  | success |
@@ -54,6 +56,8 @@ Feature: Console operations
       | user rmkey igorbonadio marvino           | error   |
       | user keys arybonadio                     | error   |
       | user repos arybonadio                    | error   |
+      | user addadmin arybonadio                 | error   |
+      | user rmadmin arybonadio                  | error   |
       | repo add tmp/jeka.git                    | error   |
       | repo rm tmp/p-lang.git                   | error   |
       | repo addread tmp/gritano.git arybonadio  | error   |

data/gritano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2012-11-22"
+  s.date = "2012-11-24"
   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"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "db/migrate/002_create_repositories.rb",
     "db/migrate/003_create_permissions.rb",
     "db/migrate/004_create_keys.rb",
+    "db/migrate/005_add_admin_to_users.rb",
     "features/command.feature",
     "features/console.feature",
     "features/data/keys/full_authorized_keys",

data/lib/gritano/command.rb

@@ -8,6 +8,10 @@ module Gritano
           return {access: :read, command: "git-upload-pack", repo: self.repo(cmd)}
         when /^repos/, /^keys/, /^addkey/, /^rmkey/ then 
           return {access: :user_cmd, command: cmd}
+        when /^user/, /^repo/ then
+          return {access: :admin_cmd, command: cmd}
+        when /^admin help/ then
+          return {access: :admin_cmd, command: 'help'}
       end
     end
     

data/lib/gritano/console.rb

@@ -186,5 +186,29 @@ module Gritano
       end
       return [false, "Key could not be removed."]
     end
+    
+    def user_addadmin(argv)
+      login, = argv
+      user = User.find_by_login(login)
+      if user
+        user.admin = true
+        if user.save
+          return [true, "Now, user #{login} is an administrator"]
+        end
+      end
+      return [false, "User #{login} could not be modified"]
+    end
+    
+    def user_rmadmin(argv)
+      login, = argv
+      user = User.find_by_login(login)
+      if user
+        user.admin = false
+        if user.save
+          return [true, "Now, user #{login} is not an administrator"]
+        end
+      end
+      return [false, "User #{login} could not be modified"]
+    end
   end
 end

data/spec/console_spec.rb

@@ -82,4 +82,14 @@ describe Gritano::Console do
     @console.should_receive(:repo_users)
     @console.execute("repo users reponame.git".split(' '))
   end
+  
+  it "should respond to gritano user addadmin igorbonadio" do
+    @console.should_receive(:user_addadmin)
+    @console.execute("user addadmin igorbonadio".split(' '))
+  end
+  
+  it "should respond to gritano user rmadmin igorbonadio" do
+    @console.should_receive(:user_rmadmin)
+    @console.execute("user rmadmin igorbonadio".split(' '))
+  end
 end

data/spec/model_user_spec.rb

@@ -14,6 +14,16 @@ describe Gritano::User do
     user2.should be_invalid
   end
   
+  it 'can be a administrator' do
+    user = Gritano::User.new(login: 'login', admin: true)
+    user.should be_admin
+  end
+  
+  it 'can not be a administrator' do
+    user = Gritano::User.new(login: 'login', admin: false)
+    user.should_not be_admin
+  end
+  
   it 'should add read access to a repository' do
     user = Gritano::User.create(login: 'test')
     repo = Gritano::Repository.create(name: 'tmp/repo.git')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -198,6 +198,7 @@ files:
 - db/migrate/002_create_repositories.rb
 - db/migrate/003_create_permissions.rb
 - db/migrate/004_create_keys.rb
+- db/migrate/005_add_admin_to_users.rb
 - features/command.feature
 - features/console.feature
 - features/data/keys/full_authorized_keys
@@ -245,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1441150842107261050
+      hash: -3218000762772631933
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: