gritano 0.9.2 → 0.9.3

data/TODO

@@ -1,14 +1,2 @@
-v0.9.1:
- ✔ mostrar admin -> gritano user:admin igorbonadio @done (13-03-25 21:28)
- ✔ mostrar admin no user:list @done (13-03-25 21:28)
-
-v0.9.2:
- ✔ permitir ao usuario mudar seu email @done (13-03-27 16:30)
- ✔ arrumar specs @done (13-03-25 22:08)
- ✔ travis-ci @done (13-03-26 12:12)
-
 v0.10.0:
- ☐ recuperação de senha via email
-
-v1.0.0:
- ☐ refatorar e preparar para o lançamento oficial!!!!
+ ☐ recuperar e adicionar pub.keys

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/gritano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
-  s.date = "2013-03-27"
+  s.date = "2013-04-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"]
@@ -236,6 +236,7 @@ Gem::Specification.new do |s|
     "gritano.gemspec",
     "lib/gritano.rb",
     "lib/gritano/cli.rb",
+    "lib/gritano/config.rb",
     "lib/gritano/console.rb",
     "lib/gritano/console/base.rb",
     "lib/gritano/console/executor.rb",
@@ -250,6 +251,7 @@ Gem::Specification.new do |s|
     "lib/gritano/plugin.rb",
     "lib/gritano/plugin/ssh.rb",
     "spec/cli_spec.rb",
+    "spec/config_spec.rb",
     "spec/console_base_spec.rb",
     "spec/console_executor_spec.rb",
     "spec/console_gritano_spec.rb",
@@ -257,7 +259,6 @@ Gem::Specification.new do |s|
     "spec/console_remote_spec.rb",
     "spec/console_spec.rb",
     "spec/data/help_command_name.txt",
-    "spec/model_config_spec.rb",
     "spec/model_key_spec.rb",
     "spec/model_permission_spec.rb",
     "spec/model_repository_spec.rb",

data/lib/gritano.rb

@@ -5,4 +5,5 @@ require "fileutils"
 require File.join(ROOT_PATH, '/gritano/models')
 require File.join(ROOT_PATH, '/gritano/console')
 require File.join(ROOT_PATH, '/gritano/cli')
-require File.join(ROOT_PATH, '/gritano/plugin')
+require File.join(ROOT_PATH, '/gritano/plugin')
+require File.join(ROOT_PATH, '/gritano/config')

data/lib/gritano/config.rb

@@ -0,0 +1,36 @@
+module Gritano
+  class Config
+    def initialize(config_file)
+      @config_file = config_file
+      load
+    end
+
+    def load
+      unless File.exist?(@config_file)
+        File.open(@config_file, "w").close
+      end
+      @config = YAML::load(File.open(@config_file))
+      unless @config
+        @config = Hash.new
+      end
+    end
+
+    def remove(parameter)
+      @config.delete(parameter.to_s)
+    end
+
+    def save
+      File.open(@config_file, "w") do |f|
+        f.write(@config.to_yaml)
+      end
+    end
+
+    def method_missing(name, *args, &block)
+      if name[-1] == '='
+        @config[name.to_s[0..-2]] = args[0]
+      else
+        @config[name.to_s]
+      end
+    end
+  end
+end

data/lib/gritano/plugin/ssh.rb

@@ -8,14 +8,18 @@ module Gritano
     end
     
     def on_add
-      File.open(File.join(@home_dir, '.gritano', 'config.yml'), "w").write({'ssh' => true}.to_yaml)
+      config = Config.new(File.join(@home_dir, '.gritano', 'config.yml'))
+      config.ssh = true
+      config.save
       File.open(File.join(@ssh_path, 'authorized_keys'), "w").write('')
       gritano_pub_key_path = `which gritano-pub-key`[0..-2]
       `ln -s #{gritano_pub_key_path} #{File.join(@home_dir, '.gritano', 'gritano-pub-key')}`
     end
     
     def on_remove
-      File.open(File.join(@home_dir, '.gritano', 'config.yml'), "w").write({'ssh' => false}.to_yaml)
+      config = Config.new(File.join(@home_dir, '.gritano', 'config.yml'))
+      config.ssh = false
+      config.save
       File.open(File.join(@ssh_path, 'authorized_keys'), 'w').write(Key.authorized_keys)
       FileUtils.rm(File.join(@home_dir, '.gritano', 'gritano-pub-key')) if File.exist?(File.join(@home_dir, '.gritano', 'gritano-pub-key'))
     end
@@ -23,10 +27,14 @@ module Gritano
     def self.check_install
       home = Etc.getpwuid.dir
       if File.exist?(File.join(home, '.gritano', 'config.yml'))
-        config = YAML::load(File.open(File.join(home, '.gritano', 'config.yml')))
-        return config['ssh']
+        config = Config.new(File.join(home, '.gritano', 'config.yml'))
+        if config.ssh
+          return config.ssh
+        else
+          return false
+        end
       else
-        return false
+          return false
       end
     end
     

data/spec/config_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+module Gritano
+  describe Config do
+    it "should get parameters" do
+      config = Config.new(File.join(".gritano", "config.yml"))
+      config.ssh.should be == false
+    end
+
+    it "should add parameters" do
+      FileUtils.mkdir_p('tmp')
+      if File.exist?(File.join("tmp", "config_test.yml"))
+        FileUtils.rm(File.join("tmp", "config_test.yml"))
+      end
+      config = Config.new(File.join("tmp", "config_test.yml"))
+      config.ssh.should be == nil
+      config.ssh = true
+      config.ssh.should be == true
+    end
+
+    it "should remove parameters" do
+      FileUtils.mkdir_p('tmp')
+      if File.exist?(File.join("tmp", "config_test.yml"))
+        FileUtils.rm(File.join("tmp", "config_test.yml"))
+      end
+      config = Config.new(File.join("tmp", "config_test.yml"))
+
+      config.ssh = true
+      config.ssh.should be == true
+
+      config.remove(:ssh)
+      config.ssh.should be == nil
+    end
+
+    it "should modify parameters" do
+      FileUtils.mkdir_p('tmp')
+      if File.exist?(File.join("tmp", "config_test.yml"))
+        FileUtils.rm(File.join("tmp", "config_test.yml"))
+      end
+      config = Config.new(File.join("tmp", "config_test.yml"))
+      config.ssh.should be == nil
+      config.ssh = true
+      config.ssh.should be == true
+      config.ssh = false
+      config.ssh.should be == false
+    end
+
+    it "should save a config file" do
+      FileUtils.mkdir_p('tmp')
+      if File.exist?(File.join("tmp", "config_test.yml"))
+        FileUtils.rm(File.join("tmp", "config_test.yml"))
+      end
+      config = Config.new(File.join("tmp", "config_test.yml"))
+      config.ssh = true
+      config.email = {login: 'igor', smtp: 'smtp.igor.com'}
+      config.save
+
+      config2 = Config.new(File.join("tmp", "config_test.yml"))
+      config2.ssh.should be == true
+      config2.email[:login].should be == "igor"
+      config2.email[:smtp].should be == "smtp.igor.com"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -433,6 +433,7 @@ files:
 - gritano.gemspec
 - lib/gritano.rb
 - lib/gritano/cli.rb
+- lib/gritano/config.rb
 - lib/gritano/console.rb
 - lib/gritano/console/base.rb
 - lib/gritano/console/executor.rb
@@ -447,6 +448,7 @@ files:
 - lib/gritano/plugin.rb
 - lib/gritano/plugin/ssh.rb
 - spec/cli_spec.rb
+- spec/config_spec.rb
 - spec/console_base_spec.rb
 - spec/console_executor_spec.rb
 - spec/console_gritano_spec.rb
@@ -454,7 +456,6 @@ files:
 - spec/console_remote_spec.rb
 - spec/console_spec.rb
 - spec/data/help_command_name.txt
-- spec/model_config_spec.rb
 - spec/model_key_spec.rb
 - spec/model_permission_spec.rb
 - spec/model_repository_spec.rb
@@ -478,7 +479,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3682968172895747783
+      hash: 2612279300761584941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/model_config_spec.rb

@@ -1,10 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-module Gritano
-  describe "Config" do
-    it "should have a ssh configuration" do
-      config = YAML::load(File.open(File.join('.gritano', 'config.yml')))
-      config['ssh'].should be_false
-    end
-  end
-end