gritano 0.9.4 → 0.10.0

data/Gemfile

@@ -8,6 +8,7 @@ gem 'sqlite3', ">= 1.3.6"
 gem 'grit', ">= 2.5.0"
 gem 'terminal-table', ">= 1.4.5"
 gem "sshd_config"
+gem 'bcrypt-ruby'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bcrypt-ruby (3.0.1)
     builder (3.0.4)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -63,6 +64,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.2.8)
+  bcrypt-ruby
   bundler (>= 1.0)
   cucumber (>= 1.2.1)
   database_cleaner (>= 0.8.0)

data/TODO

@@ -1,10 +1,9 @@
-v0.10.0:
+v0.11.0:
  ☐ permitir/barrar acesso remoto ao terminal do administrador
 
-v0.11.0:
+v0.12.0:
  ☐ novos tipos de permissão
 
 futuro:
  ☐ divulgar
- ☐ interface gráfica via web
- ☐ git via https
+ ☐ interface gráfica via web

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.10.0

data/db/migrate/007_add_password_to_users.rb

@@ -0,0 +1,10 @@
+class AddPasswordToUsers < ActiveRecord::Migration
+  def up
+    add_column :users, :crypted_password, :string, :default => nil
+  end
+  
+  def down
+    remove_column :users, :crypted_password
+  end
+end
+

data/features/data/local_help.txt

@@ -14,6 +14,7 @@
   gritano user:key:list username
   gritano user:repo:list username
   gritano user:add username [email admin]*
+  gritano user:password:set username
   gritano user:rm username
   gritano user:email:update username email@server.com
   gritano user:email:get username

data/features/data/remote_commands/admin_help_igorbonadio.txt

@@ -14,6 +14,7 @@
   ssh git@host.com admin:user:key:list username
   ssh git@host.com admin:user:repo:list username
   ssh git@host.com admin:user:add username [email admin]*
+  ssh git@host.com admin:user:password:set username
   ssh git@host.com admin:user:rm username
   ssh git@host.com admin:user:email:update username email@server.com
   ssh git@host.com admin:user:email:get username

data/features/data/remote_commands/admin_help_jessicaeto.txt

@@ -14,6 +14,7 @@
   ssh git@host.com admin:user:key:list username
   ssh git@host.com admin:user:repo:list username
   ssh git@host.com admin:user:add username [email admin]*
+  ssh git@host.com admin:user:password:set username
   ssh git@host.com admin:user:rm username
   ssh git@host.com admin:user:email:update username email@server.com
   ssh git@host.com admin:user:email:get username

data/gritano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "0.9.4"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2013-04-18"
+  s.date = "2013-05-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-pub-key", "gritano-remote"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "db/migrate/004_create_keys.rb",
     "db/migrate/005_add_admin_to_users.rb",
     "db/migrate/006_add_email_to_users.rb",
+    "db/migrate/007_add_password_to_users.rb",
     "features/data/config_true.yml",
     "features/data/local_commands/addon_list.txt",
     "features/data/local_commands/addon_ssh_install.txt",
@@ -282,6 +283,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<grit>, [">= 2.5.0"])
       s.add_runtime_dependency(%q<terminal-table>, [">= 1.4.5"])
       s.add_runtime_dependency(%q<sshd_config>, [">= 0"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<cucumber>, [">= 1.2.1"])
@@ -295,6 +297,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<grit>, [">= 2.5.0"])
       s.add_dependency(%q<terminal-table>, [">= 1.4.5"])
       s.add_dependency(%q<sshd_config>, [">= 0"])
+      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<cucumber>, [">= 1.2.1"])
@@ -309,6 +312,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<grit>, [">= 2.5.0"])
     s.add_dependency(%q<terminal-table>, [">= 1.4.5"])
     s.add_dependency(%q<sshd_config>, [">= 0"])
+    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.11.0"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<cucumber>, [">= 1.2.1"])

data/lib/gritano/cli.rb

@@ -33,5 +33,26 @@ module Gritano
         return "invalid"
       end
     end
+
+    def CLI.check_password(login, password, home_dir = Etc.getpwuid.dir, repo_dir = Etc.getpwuid.dir)
+      ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(home_dir, '.gritano', 'database.yml'))))
+      user = User.find_by_login(login)
+      if user
+        return user.password == password
+      end
+      return false
+    end
+
+    def CLI.check_access(login, repo, access, home_dir = Etc.getpwuid.dir, repo_dir = Etc.getpwuid.dir)
+      ActiveRecord::Base.establish_connection(YAML::load(File.open(File.join(home_dir, '.gritano', 'database.yml'))))
+      user = User.find_by_login(login)
+      if user
+        repo = Gritano::Repository.find_by_name(repo)
+        if repo
+          return user.check_access(repo, access)
+        end
+      end
+      return false
+    end
   end
 end

data/lib/gritano/console/executor.rb

@@ -1,4 +1,5 @@
 require "terminal-table"
+require 'io/console'
 
 module Gritano
   module Console
@@ -84,6 +85,35 @@ module Gritano
         return [false, "#{user.errors.full_messages.join(", ")}."]
       end
 
+      add_command "user:password:set", "username" do |argv|
+        login, = argv
+        user = User.find_by_login(login)
+        if user.crypted_password == nil
+          puts "You have not set your password yet."
+          print "Please, set one now: "
+          user.password = @stdin.noecho(&:gets).gsub("\n", "")
+          puts
+          if user.save
+            return [true, "Done!"]
+          end
+        else
+          print "Before you start, enter you current password: "
+          if user.password == @stdin.noecho(&:gets).gsub("\n", "")
+            puts
+            print "Now, enter you new password: "
+            user.password = @stdin.noecho(&:gets).gsub("\n", "")
+            puts
+            if user.save
+              return [true, "Done!"]
+            end
+          else
+            puts
+            return [false, "Password you entered do not match."]
+          end
+        end
+        return [false, "Password could not be changed."]
+      end
+
       add_command "user:rm", "username" do |argv|
         login, = argv
         user = User.find_by_login(login)

data/lib/gritano/models/user.rb

@@ -1,11 +1,24 @@
+require 'bcrypt'
+
 module Gritano
   class User < ActiveRecord::Base
+    include BCrypt
+
     validates :login, presence: true
     validates_uniqueness_of :login
     
     has_many :permissions
     has_many :repositories, through: :permissions
     has_many :keys
+
+    def password
+      @password ||= Password.new(crypted_password)
+    end
+
+    def password=(new_password)
+      @password = Password.create(new_password)
+      self.crypted_password = @password
+    end
     
     def add_access(repo, access)
       change_access(repo, "add", access)

data/spec/model_user_spec.rb

@@ -92,5 +92,15 @@ module Gritano
       user.add_access(repo, :write).should be_true
       user.check_access(repo, :write).should be_true
     end
+
+    it "can have a password" do
+      user = User.create(login: 'user', password: '123')
+      user.should be_valid
+    end
+
+    it "can if a password is valid" do
+      user = User.create(login: 'user', password: '123')
+      user.password.should be == '123'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +253,7 @@ files:
 - db/migrate/004_create_keys.rb
 - db/migrate/005_add_admin_to_users.rb
 - db/migrate/006_add_email_to_users.rb
+- db/migrate/007_add_password_to_users.rb
 - features/data/config_true.yml
 - features/data/local_commands/addon_list.txt
 - features/data/local_commands/addon_ssh_install.txt
@@ -479,7 +496,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3505922859375147179
+      hash: -1458194907486604045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: