Merge pull request #174 from mezuro/doc

Doc

Merge pull request #174 from mezuro/doc
Doc
marcheing
2 parents 0b8e6a29 e1dc0164
Showing 3 changed files with 18 additions and 21 deletions Show diff stats
README.rdoc
app/views/layouts/application.html.erb
public/humans.txt
@@ -32,7 +32,7 @@ Mezuro project aims provide a platform to compare projects and metric techniques
 * Ruby version
-  2.1.2
+  2.2.0
   You can easily install it through the Ruby Version Manager - RVM. Instructions on how to do it can be found at http://rvm.io
@@ -57,18 +57,15 @@ Mezuro project aims provide a platform to compare projects and metric techniques
 * Services (job queues, cache servers, search engines, etc.)
-  Kalibro Web Service 1.0 r6
-  You can find a script to install it on Ubuntu at https://gist.github.com/m45t3r/0c4ad3b5700c6364abf1/f77701622ddc1d54d84757cc9ab59811e0ad6124 (if you're brave https://gist.github.com/rafamanzo/6179925/ shows a unstable script with JBoss instead of Tomcat)
-
-  Kalibro Gatekeeper
-  You can find a script to install it on any machine with Rails on https://gist.github.com/rafamanzo/9859244. After running this script, run ```unset BUNDLE_GEMFILE```.
-  By default Mezuro will expect it to be running on port 8081 at localhost.
-  In order to run it as expected, run: ```RAILS_ENV=local rails s -p 8081```.
-
   Kalibro Processor
   You can find it at https://github.com/mezuro/kalibro_processor
   By default Mezuro will expect it to be running on port 8082 at localhost.
-  In order to run it as expected, run on two different terminal instances: ```rails s -p 8082```; and ```rake jobs:work```.
+  In order to run it as expected, run on two different terminal instances: ```RAILS_ENV=local rails s -p 8082```; and ```RAILS_ENV=local rake jobs:work```.
+
+  Kalibro Configurations
+  You can find it at https://github.com/mezuro/kalibro_configurations
+  By default Mezuro will expect it to be running on port 8083 at localhost.
+  In order to run it as expected, run on two different terminal instances: ```rails s -p 8083```.
 * Deployment instructions
@@ -107,7 +107,7 @@
       </div><!--/row-->
       <footer>
-        <div class="footer-left">&copy; <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2014</div>
+        <div class="footer-left">&copy; <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2015</div>
         <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
       </footer>
@@ -3,19 +3,25 @@
 # TEAM
-    Copyright 2013-2014
+    Copyright 2013-2015
     -------------------
-      Alessandro Palmeira (alessandro.palmeira at gmail.com)
       Daniel Paulino Alves (danpaulalves at gmail.com)
       Diego de Araújo Martinez Camarinha (diegoamc90 at gmail.com)
       Heitor Reis Ribeiro (marcheing at gmail.com)
       Paulo Meirelles (paulo at softwarelivre.org)
       Rafael Reggiani Manzo (rr.manzo at gmail.com)
-      Renan Fichberg (rfichberg at gmail.com)
 # THANKSs
+    Former team members
+    ---------------------------------------------------------
+      Alessandro Palmeira (alessandro.palmeira at gmail.com)
+      Fellipe Souto Sampaio (fllsouto at gmail.com)
+      Guilherme Rojas (guilhermehrojas at gmail.com)
+      João M. M. Silva (jaodsilv at linux.ime.usp.br)
+      Renan Fichberg (rfichberg at gmail.com)
+
     UnB Software Evolution Team 2014
     ---------------------------------------------------------
       Beatriz Rezener (beatrizrezener at gmail.com)
@@ -31,12 +37,6 @@
       Renan Costa (renan2727 at hotmail.com)
       Vinicius Vieira (vvieira17 at gmail.com)
-    Former team members
-    ---------------------------------------------------------
-      Fellipe Souto Sampaio (fllsouto at gmail.com)
-      Guilherme Rojas (guilhermehrojas at gmail.com)
-      João M. M. Silva (jaodsilv at linux.ime.usp.br)
-
     USP Lab XP course 2014
     ---------------------------------------------------------
       Daniel Miranda (danielkza2 at gmail.com)
@@ -113,4 +113,4 @@
       Glyphicons
     Kalibro
-      kalibro-gem
+      kalibro_client
	@@ -107,7 +107,7 @@		@@ -107,7 +107,7 @@
107	</div><!--/row-->	107	</div><!--/row-->
108		108
109	<footer>	109	<footer>
110	- <div class="footer-left">© <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2014</div>	110	+ <div class="footer-left">© <%= link_to 'The Mezuro Team', '/humans.txt' %> 2013-2015</div>
111	<div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>	111	<div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
112	</footer>	112	</footer>
113		113