gritano 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,4 +1,4 @@
-= Gritano v0.1.1
+= Gritano v0.1.2
 
 Gritano is the simplest way to configure a git server over ssh. You can create repositories and manage user access using this practical tool.
 
@@ -25,7 +25,7 @@ After that you can add users:
 
 add user's public keys:
 
-  $ gritano user +key mykey id_rsa.pub
+  $ gritano user +key igorbonadio mykey id_rsa.pub
 
 create bare repositories:
 

data/TODO

@@ -0,0 +1 @@
+- melhorar mensagens de retorno

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/gritano

@@ -46,6 +46,13 @@ def check_git
   end
 end
 
+def check_gritano
+  unless File.exist?(File.join(Etc.getpwuid.dir, '.gritano'))
+    puts "Error: First run 'gritano install'"
+    exit
+  end
+end
+
 check_git
 if ARGV.length == 1
   if ARGV[0] =='install'
@@ -58,15 +65,17 @@ if ARGV.length == 1
 elsif ARGV.length == 2 or ARGV.length == 0
   help
 else
+  check_gritano
   ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(Etc.getpwuid.dir, '.gritano', 'database.yml'))))
   console = Gritano::Console.new
   console.repo_path = Etc.getpwuid.dir
   console.ssh_path = File.join(Etc.getpwuid.dir, '.ssh')
   begin
-    if console.execute(ARGV)
-      puts "command executed successfully"
+    cmd_return = console.execute(ARGV)
+    if cmd_return[0]
+      puts "success: #{cmd_return[1]}"
     else
-      puts "an error occurred"
+      puts "error: #{cmd_return[1]}"
     end
   rescue NoMethodError
     puts help

data/features/step_definitions/console_step.rb

@@ -10,5 +10,5 @@ end
 Then /^I should see a (success|error) message$/ do |ret|
   expected_output = true if ret == 'success'
   expected_output = false if ret == 'error'
-  @output.should be == expected_output
+  @output[0].should be == expected_output
 end

data/gritano.gemspec

@@ -0,0 +1,114 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "gritano"
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Igor Bonadio"]
+  s.date = "2012-09-22"
+  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"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc",
+    "TODO"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/gritano",
+    "bin/gritano-check",
+    "db/database.yml",
+    "db/migrate/001_create_users.rb",
+    "db/migrate/002_create_repositories.rb",
+    "db/migrate/003_create_permissions.rb",
+    "db/migrate/004_create_keys.rb",
+    "features/command.feature",
+    "features/console.feature",
+    "features/data/keys/full_authorized_keys",
+    "features/data/keys/igorbonadio.pub",
+    "features/data/keys/igorbonadio_authorized_keys",
+    "features/data/keys/jessicaeto.pub",
+    "features/data/keys/jessicaeto_authorized_keys",
+    "features/keys.feature",
+    "features/polices.feature",
+    "features/step_definitions/command_step.rb",
+    "features/step_definitions/console_step.rb",
+    "features/step_definitions/keys_steps.rb",
+    "features/step_definitions/polices_steps.rb",
+    "features/support/database_cleaner.rb",
+    "features/support/env.rb",
+    "gritano.gemspec",
+    "lib/gritano.rb",
+    "lib/gritano/command.rb",
+    "lib/gritano/console.rb",
+    "lib/gritano/models.rb",
+    "lib/gritano/models/key.rb",
+    "lib/gritano/models/permission.rb",
+    "lib/gritano/models/repository.rb",
+    "lib/gritano/models/user.rb",
+    "spec/command_spec.rb",
+    "spec/console_spec.rb",
+    "spec/model_key_spec.rb",
+    "spec/model_repository_spec.rb",
+    "spec/model_user_spec.rb",
+    "spec/spec_helper.rb",
+    "tmp/.gitignore"
+  ]
+  s.homepage = "http://github.com/igorbonadio/gritano"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Gritano is a tool to configure your git server over ssh"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<grit>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<grit>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<grit>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+  end
+end
+

data/lib/gritano/console.rb

@@ -16,8 +16,8 @@ module Gritano
     def user_add(argv)
       login, = argv
       user = User.new(login: login)
-      return true if user.save
-      return false
+      return [true, "User #{login} added."] if user.save
+      return [false, "#{user.errors.full_messages.join(", ")}."]
     end
     
     def user_rm(argv)
@@ -25,17 +25,17 @@ module Gritano
       user = User.find_by_login(login)
       if user
         if user.destroy
-          return true 
+          return [true, "User #{login} removed."] 
         end
       end
-      return false
+      return [false, "User #{login} could not be removed."]
     end
     
     def repo_add(argv)
       name, = argv
       repo = Repository.new(name: name, path: @repo_path)
-      return true if repo.save
-      return false
+      return [true, "Repository #{name} created successfully."] if repo.save
+      return [false, "Repository #{name} could not be created."]
     end
     
     def repo_rm(argv)
@@ -43,10 +43,10 @@ module Gritano
       repo = Repository.find_by_name(name)
       if repo
         if repo.destroy
-          return true
+          return [true, "Repository #{name} removed successfully."]
         end
       end
-      return false
+      return [false, "Repository #{name} could not be removed."]
     end
     
     def repo_add_read(argv)
@@ -54,9 +54,9 @@ module Gritano
       user = User.find_by_login(login)
       repo = Repository.find_by_name(repo_name)
       if repo and user
-        return user.add_access(repo, :read)
+        return [true, "User #{login} has read access to #{repo_name}."] if user.add_access(repo, :read)
       end
-      return false
+      return [false, "An error occurred. Permissions was not modified."]
     end
     
     def repo_add_write(argv)
@@ -64,9 +64,9 @@ module Gritano
       user = User.find_by_login(login)
       repo = Repository.find_by_name(repo_name)
       if repo and user
-        return user.add_access(repo, :write)
+        return [true, "User #{login} has write access to #{repo_name}."] if user.add_access(repo, :write)
       end
-      return false
+      return [false, "An error occurred. Permissions was not modified."]
     end
     
     def repo_remove_read(argv)
@@ -74,9 +74,9 @@ module Gritano
       user = User.find_by_login(login)
       repo = Repository.find_by_name(repo_name)
       if repo and user
-        return user.remove_access(repo, :read)
+        return [true, "User #{login} has not read access to #{repo_name}."] if user.remove_access(repo, :read)
       end
-      return false
+      return [false, "An error occurred. Permissions was not modified."]
     end
     
     def repo_remove_write(argv)
@@ -84,9 +84,9 @@ module Gritano
       user = User.find_by_login(login)
       repo = Repository.find_by_name(repo_name)
       if repo and user
-        return user.remove_access(repo, :write)
+        return [true, "User #{login} has not write access to #{repo_name}."] if user.remove_access(repo, :write)
       end
-      return false
+      return [false, "An error occurred. Permissions was not modified."]
     end
     
     def user_add_key(argv)
@@ -97,11 +97,11 @@ module Gritano
           key = user.keys.create(name: key_name, key: File.open(key_file).readlines.join)
           if key.valid?
             File.open(File.join(@ssh_path, 'authorized_keys'), 'w').write(Key.authorized_keys)
-            return true
+            return [true, "Key added successfully."]
           end
         end
       end
-      return false
+      return [false, "Key could not be added."]
     end
     
     def user_remove_key(argv)
@@ -110,10 +110,10 @@ module Gritano
       if key
         if key.destroy
           File.open(File.join(@ssh_path, 'authorized_keys'), 'w').write(Key.authorized_keys)
-          return true
+          return [true, "Key removed successfully."]
         end
       end
-      return false
+      return [false, "Key could not be removed."]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -213,6 +213,7 @@ files:
 - features/step_definitions/polices_steps.rb
 - features/support/database_cleaner.rb
 - features/support/env.rb
+- gritano.gemspec
 - lib/gritano.rb
 - lib/gritano/command.rb
 - lib/gritano/console.rb
@@ -244,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3868573402934525831
+      hash: 4053165706733328578
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: