gritano 0.1.6 → 0.1.7

data/README.rdoc

@@ -1,4 +1,4 @@
-= Gritano v0.1.6
+= Gritano v0.1.7
 
 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 igorbonadio mykey id_rsa.pub
+  $ gritano user +key igorbonadio mykey < id_rsa.pub
 
 create bare repositories:
 

data/TODO

@@ -9,7 +9,7 @@ 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 +key username keyname key.pub
+  ssh git@host.com user +key username keyname < key.pub
   ssh git@host.com user -key username keyname
   ssh git@host.com repo add reponame.git
   ssh git@host.com repo rm reponame.git

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/gritano

@@ -14,7 +14,7 @@ def help
   gritano install
   gritano user add username
   gritano user rm username
-  gritano user +key username keyname key.pub
+  gritano user +key username keyname < key.pub
   gritano user -key username keyname
   gritano user list
   gritano user keys username
@@ -75,7 +75,7 @@ elsif ARGV.length == 0
 else
   check_gritano
   ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(Etc.getpwuid.dir, '.gritano', 'database.yml'))))
-  console = Gritano::Console.new
+  console = Gritano::Console.new(STDIN)
   console.repo_path = Etc.getpwuid.dir
   console.ssh_path = File.join(Etc.getpwuid.dir, '.ssh')
   begin

data/features/console.feature

@@ -34,7 +34,7 @@ Feature: Console operations
 	  Examples:
 	    | command                                                         | message |
 	    | user add jose                                                   | success |
-	    | user +key igorbonadio marvin features/data/keys/igorbonadio.pub | success |
+	    | user +key igorbonadio marvin                                    | success |
 	    | user -key igorbonadio eva                                       | success |
 	    | user rm igorbonadio                                             | success |
 	    | user list                                                       | success |
@@ -50,7 +50,7 @@ Feature: Console operations
 	    | repo users tmp/jeka.git                                         | success |
 	    | user add igorbonadio                                            | error   |
 	    | user rm jose                                                    | error   |
-	    | user +key igorbonadio marvin features/data/keys/arybonadio.pub  | error   |
+	    | user +key userrr marvino                                        | error   |
 	    | user -key igorbonadio marvino                                   | error   |
 	    | user keys arybonadio                                            | error   |
 	    | user repos arybonadio                                           | error   |

data/features/step_definitions/console_step.rb

@@ -1,5 +1,13 @@
+class FakeSTDIN
+  def read
+    "Your SSHKEY here..."
+  end
+end
+
 Given /^I start the gritano console$/ do
-  @console = Gritano::Console.new
+  stdin = double()
+  stdin.stub(:read).and_return("Your SSHKEY here...")
+  @console = Gritano::Console.new(stdin)
   @console.ssh_path = 'tmp'
 end
 

data/features/support/env.rb

@@ -17,6 +17,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'gritano'
 
 require 'rspec/expectations'
+require 'cucumber/rspec/doubles'
 
 require 'active_record'
 

data/gritano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2012-10-30"
+  s.date = "2012-11-02"
   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/console.rb

@@ -4,9 +4,10 @@ module Gritano
     attr_accessor :repo_path
     attr_accessor :ssh_path
     
-    def initialize
+    def initialize(stdin)
       @repo_path = nil
       @ssh_path = nil
+      @stdin = stdin
     end
     
     def execute(argv)
@@ -164,13 +165,11 @@ module Gritano
     def user_add_key(argv)
       login, key_name, key_file = argv
       user = User.find_by_login(login)
-      if File.exist?(key_file)
-        if user
-          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)
+      if user
+        key = user.keys.create(name: key_name, key: @stdin.read)
+        if key.valid?
+          File.open(File.join(@ssh_path, 'authorized_keys'), 'w').write(Key.authorized_keys)
             return [true, "Key added successfully."]
-          end
         end
       end
       return [false, "Key could not be added."]

data/spec/console_spec.rb

@@ -1,51 +1,85 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Gritano::Console do
+  
+  before(:each) do
+    stdin = double()
+    stdin.stub(:read).and_return("Your SSHKEY here...")
+    @console = Gritano::Console.new(stdin)
+  end
+  
   it "should respond to gritano user add igorbonadio" do
-    console = Gritano::Console.new
-    console.should_receive(:user_add)
-    console.execute("user add igorbonadio".split(' '))
+    @console.should_receive(:user_add)
+    @console.execute("user add igorbonadio".split(' '))
   end
   
   it "should respond to gritano user rm igorbonadio" do
-    console = Gritano::Console.new
-    console.should_receive(:user_rm)
-    console.execute("user rm igorbonadio".split(' '))
+    @console.should_receive(:user_rm)
+    @console.execute("user rm igorbonadio".split(' '))
+  end
+  
+  it "should respond to gritano user +key username keyname < key.pub" do
+    @console.should_receive(:user_add_key)
+    @console.execute("user +key igorbonadio keyname".split(' '))
+  end
+  
+  it "should respond to gritano user -key username keyname" do
+    @console.should_receive(:user_remove_key)
+    @console.execute("user -key username keyname".split(' '))
+  end
+  
+  it "should respond to gritano user list" do
+    @console.should_receive(:user_list)
+    @console.execute("user list".split(' '))
+  end
+  
+  it "should respond to gritano user keys username" do
+    @console.should_receive(:user_keys)
+    @console.execute("user keys username".split(' '))
+  end
+  
+  it "should respond to gritano user repos username" do
+    @console.should_receive(:user_repos)
+    @console.execute("user repos username".split(' '))
   end
   
   it "should respond to gritano repo add tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_add)
-    console.execute("repo add tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_add)
+    @console.execute("repo add tmp/reponame.git".split(' '))
   end
   
   it "should respond to gritano repo rm tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_rm)
-    console.execute("repo rm tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_rm)
+    @console.execute("repo rm tmp/reponame.git".split(' '))
   end
   
   it "should respond to gritano repo +read igorbonadio tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_add_read)
-    console.execute("repo +read igorbonadio tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_add_read)
+    @console.execute("repo +read igorbonadio tmp/reponame.git".split(' '))
   end
   
   it "should respond to gritano repo +write igorbonadio tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_add_write)
-    console.execute("repo +write igorbonadio tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_add_write)
+    @console.execute("repo +write igorbonadio tmp/reponame.git".split(' '))
   end
   
   it "should respond to gritano repo -read igorbonadio tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_remove_read)
-    console.execute("repo -read igorbonadio tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_remove_read)
+    @console.execute("repo -read igorbonadio tmp/reponame.git".split(' '))
   end
   
   it "should respond to gritano repo -write igorbonadio tmp/reponame.git" do
-    console = Gritano::Console.new
-    console.should_receive(:repo_remove_write)
-    console.execute("repo -write igorbonadio tmp/reponame.git".split(' '))
+    @console.should_receive(:repo_remove_write)
+    @console.execute("repo -write igorbonadio tmp/reponame.git".split(' '))
+  end
+  
+  it "should respond to gritano repo list" do
+    @console.should_receive(:repo_list)
+    @console.execute("repo list".split(' '))
+  end
+  
+  it "should respond to gritano repo users reponame.git" do
+    @console.should_receive(:repo_users)
+    @console.execute("repo users reponame.git".split(' '))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-02 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: 1774883244443288831
+      hash: -1916713309401243545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: