gritano 2.0.0 → 2.0.1

data/Gemfile

@@ -4,6 +4,9 @@ gem "thor", "~> 0.18.1"
 gem "terminal-table", "~> 1.4.5"
 gem "gritano-core", "~> 2.0.0"
 gem "sqlite3", "~> 1.3.7"
+gem "rainbow", "~> 1.1.4"
+gem "highline", "~> 1.6.19"
+gem 'activesupport', "~> 4.0.0.rc1"
 
 group :development do
   gem "rspec", "~> 2.13.0"

data/Gemfile.lock

@@ -40,6 +40,7 @@ GEM
     guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
+    highline (1.6.19)
     i18n (0.6.4)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -61,6 +62,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rainbow (1.1.4)
     rake (10.0.4)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
@@ -93,9 +95,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 4.0.0.rc1)
   gritano-core (~> 2.0.0)
   guard-rspec
+  highline (~> 1.6.19)
   jeweler (~> 1.8.4)
+  rainbow (~> 1.1.4)
   rdoc (~> 4.0.0)
   rspec (~> 2.13.0)
   simplecov (~> 0.7.0)

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "gritano"
-  gem.homepage = "http://github.com/igorbonadio/gritano"
+  gem.homepage = "http://gritano.org"
   gem.license = "MIT"
   gem.summary = %Q{Gritano is a tool to configure git servers over ssh}
   gem.description = %Q{Gritano is a tool to configure git servers over ssh}

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/bin/gritano

@@ -5,10 +5,21 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'gritano'
 require 'etc'
 
+def line(text, cols)
+  "% #{text}#{' ' * (cols - (text.length + 3))}%"
+end
+
+def table(lines)
+  cols = HighLine.new.output_cols
+  (['%' * cols] + lines.map { |l| line(l, cols) } + ['%' * cols]).join("\n")
+end
+
 begin
   load File.join(Etc.getpwuid.dir, '.gritano/local.gritano')
 rescue LoadError => e
-  puts "WARNING: GRITANO IS NOT INSTALLED." unless ARGV[0] == 'init'
+  unless ARGV[0] == 'init'
+    puts table(['WARNING!', 'GRITANO IS NOT INSTALLED']).color(:yellow)
+  end
 end
 
 Gritano::CLI::Console::Local.start

data/gritano.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gritano"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Bonadio"]
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     "templates/local.gritano",
     "templates/remote.gritano"
   ]
-  s.homepage = "http://github.com/igorbonadio/gritano"
+  s.homepage = "http://gritano.org"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.25"
@@ -69,6 +69,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<terminal-table>, ["~> 1.4.5"])
       s.add_runtime_dependency(%q<gritano-core>, ["~> 2.0.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.7"])
+      s.add_runtime_dependency(%q<rainbow>, ["~> 1.1.4"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.6.19"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.0.0.rc1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.13.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -79,6 +82,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<terminal-table>, ["~> 1.4.5"])
       s.add_dependency(%q<gritano-core>, ["~> 2.0.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.7"])
+      s.add_dependency(%q<rainbow>, ["~> 1.1.4"])
+      s.add_dependency(%q<highline>, ["~> 1.6.19"])
+      s.add_dependency(%q<activesupport>, ["~> 4.0.0.rc1"])
       s.add_dependency(%q<rspec>, ["~> 2.13.0"])
       s.add_dependency(%q<rdoc>, ["~> 4.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -90,6 +96,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<terminal-table>, ["~> 1.4.5"])
     s.add_dependency(%q<gritano-core>, ["~> 2.0.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.7"])
+    s.add_dependency(%q<rainbow>, ["~> 1.1.4"])
+    s.add_dependency(%q<highline>, ["~> 1.6.19"])
+    s.add_dependency(%q<activesupport>, ["~> 4.0.0.rc1"])
     s.add_dependency(%q<rspec>, ["~> 2.13.0"])
     s.add_dependency(%q<rdoc>, ["~> 4.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/lib/gritano/console/remote.rb

@@ -48,7 +48,7 @@ module Gritano
               end
               Local.start(command)
             else
-              render_text "you are not an admin!"
+              render_text "you are not an admin!", :error
             end
           end
         end

data/lib/gritano/helpers.rb

@@ -6,7 +6,7 @@ module Gritano
         if instance.save
           render_text "#{model.name.split(':')[-1].downcase} was successfully created."
         else
-          render_text "an error occurred."
+          render_text "an error occurred.", :error
         end
       end
 
@@ -14,7 +14,7 @@ module Gritano
         if instance.update_attributes(params)
           render_text "#{instance.class.name.split(':')[-1].downcase} was successfully updated."
         else
-          render_text "an error occurred."
+          render_text "an error occurred.", :error
         end
       end
 
@@ -24,7 +24,7 @@ module Gritano
           instance.destroy
           render_text "#{model.name.split(':')[-1].downcase} was successfully destroyed."
         else
-          render_text "#{model.name.split(':')[-1].downcase} doens't exist."
+          render_text "#{model.name.split(':')[-1].downcase} doens't exist.", :error
         end
       end
 
@@ -32,7 +32,7 @@ module Gritano
         unless variables.index(nil)
           block.call(*variables)
         else
-          render_text "an error occurred"
+          render_text "an error occurred", :error
         end
       end
 
@@ -40,7 +40,7 @@ module Gritano
         if user.send("#{add_or_rm}_access", repo, read_or_write)
           render_text "done"
         else
-          render_text "an error occurred"
+          render_text "an error occurred", :error
         end
       end
 

data/lib/gritano/renderer.rb

@@ -1,35 +1,45 @@
 module Gritano
   module CLI
     module Renderer
-      def render_text(text)
-        puts text
+      def render_text(text, level = :success)
+        if level == :success
+          puts text.color(:green)
+        elsif level == :warning
+          puts text.color(:yellow)
+        else
+          puts text.color(:red)
+        end
       end
 
       def render_table(elements, *attributes)
-        attributes_hash = {}
-        attributes.each do |a|
-          if a.respond_to?(:keys)
-            attributes_hash = attributes_hash.merge(a)
-          else
-            attributes_hash[a] = nil
+        if elements.count > 0
+          attributes_hash = {}
+          attributes.each do |a|
+            if a.respond_to?(:keys)
+              attributes_hash = attributes_hash.merge(a)
+            else
+              attributes_hash[a] = nil
+            end
           end
-        end
-        table = Terminal::Table.new do |t|
-          t << attributes_hash.map { |key, value| key }
-          t << :separator
-          elements.each do |element|
-            row = []
-            attributes_hash.each do |attribute, params|
-              if params
-                row << element.send(attribute, params)
-              else
-                row << element.send(attribute)
+          table = Terminal::Table.new do |t|
+            t << attributes_hash.map { |key, value| key }
+            t << :separator
+            elements.each do |element|
+              row = []
+              attributes_hash.each do |attribute, params|
+                if params
+                  row << element.send(attribute, params)
+                else
+                  row << element.send(attribute)
+                end
               end
+              t.add_row row
             end
-            t.add_row row
           end
+          render_text table.to_s
+        else
+          render_text "there aren't #{elements.model.name.split(':')[-1].pluralize.downcase}", :warning
         end
-        render_text table
       end
     end
   end

data/lib/gritano.rb

@@ -2,6 +2,9 @@ root_path = File.expand_path(File.dirname(__FILE__))
 
 require "gritano-core"
 require 'terminal-table'
+require 'rainbow'
+require "highline/import"
+require 'active_support/inflector'
 
 require File.join(root_path, 'gritano/thor')
 require File.join(root_path, 'gritano/renderer')

data/spec/gritano/helpers_spec.rb

@@ -27,7 +27,7 @@ module Gritano::CLI
         model.should_receive(:new).with(params).and_return(instance)
         model.stub(:name).and_return("Module::Class")
         instance.should_receive(:save).and_return(false)
-        @object.should_receive(:render_text).with(/an error occurred/)
+        @object.should_receive(:render_text).with(/an error occurred/, :error)
         @object.create_model(model, params)
       end
     end
@@ -45,7 +45,7 @@ module Gritano::CLI
         instance = double("Instance")
         params = {param: 'value'}
         instance.should_receive(:update_attributes).with(params).and_return(false)
-        @object.should_receive(:render_text).with(/an error occurred/)
+        @object.should_receive(:render_text).with(/an error occurred/, :error)
         @object.update_model(instance, params)
       end
     end
@@ -67,7 +67,7 @@ module Gritano::CLI
         params = {param: 'value'}
         model.should_receive(:where).with(params).and_return([])
         model.stub(:name).and_return("Module::Class")
-        @object.should_receive(:render_text).with(/doens't exist/)
+        @object.should_receive(:render_text).with(/doens't exist/, :error)
         @object.destroy_model(model, params)
       end
     end
@@ -82,7 +82,7 @@ module Gritano::CLI
       it "should not use nil objects" do
         obj = double("Nil")
         obj.should_not_receive(:touch)
-        @object.should_receive(:render_text).with(/an error occurred/)
+        @object.should_receive(:render_text).with(/an error occurred/, :error)
         @object.use_if_not_nil(nil) { obj.touch }
       end
     end
@@ -100,7 +100,7 @@ module Gritano::CLI
         user = double("User")
         repo = double("Repo")
         user.should_receive(:send).and_return(false)
-        @object.should_receive(:render_text).with(/an error occurred/)
+        @object.should_receive(:render_text).with(/an error occurred/, :error)
         @object.try_change_access(user, repo, :add, :read)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritano
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.7
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.19
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.19
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +250,7 @@ files:
 - templates/local.gritano
 - templates/remote.gritano
 - TODO
-homepage: http://github.com/igorbonadio/gritano
+homepage: http://gritano.org
 licenses:
 - MIT
 post_install_message: 
@@ -217,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4020475070474021160
+      hash: -420660352722020068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: