Download as
Browse Code »

Commit 35600e42f9825b2244706514fc5cd40990258f2c

Authored by Rafael Manzo
1 parent 18f96d94
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Added KalibroEntities to the gem file

Showing 2 changed files with 36 additions and 6 deletions   Show diff stats
@@ -33,9 +33,12 @@ gem 'turbolinks' @@ -33,9 +33,12 @@ gem 'turbolinks'
33 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 33 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
34 gem 'jbuilder', '~> 1.2' 34 gem 'jbuilder', '~> 1.2'
35 35
36 -#For user authentication and everything else 36 +# For user authentication and everything else
37 gem 'devise', '~> 3.0.0' 37 gem 'devise', '~> 3.0.0'
38 38
  39 +# Kalibro integration
  40 +gem 'kalibro_entities', git: 'https://github.com/mezuro/kalibro_entities.git' #When the first version of KalibroEntities come out, do not keep using the git repository
  41 +
39 group :doc do 42 group :doc do
40 # bundle exec rake doc:rails generates the API under doc/api. 43 # bundle exec rake doc:rails generates the API under doc/api.
41 gem 'sdoc', require: false 44 gem 'sdoc', require: false
  1 +GIT
  2 + remote: https://github.com/mezuro/kalibro_entities.git
  3 + revision: 903dd684d9f3f515aae9703a6fbae036b55b4422
  4 + specs:
  5 + kalibro_entities (0.0.1)
  6 + savon (~> 2.3.0)
  7 +
1 GEM 8 GEM
2 remote: https://rubygems.org/ 9 remote: https://rubygems.org/
3 specs: 10 specs:
@@ -25,6 +32,9 @@ GEM @@ -25,6 +32,9 @@ GEM
25 multi_json (~> 1.3) 32 multi_json (~> 1.3)
26 thread_safe (~> 0.1) 33 thread_safe (~> 0.1)
27 tzinfo (~> 0.3.37) 34 tzinfo (~> 0.3.37)
  35 + akami (1.2.0)
  36 + gyoku (>= 0.4.0)
  37 + nokogiri (>= 1.4.0)
28 arel (4.0.0) 38 arel (4.0.0)
29 atomic (1.1.10) 39 atomic (1.1.10)
30 bcrypt-ruby (3.1.1) 40 bcrypt-ruby (3.1.1)
@@ -74,10 +84,15 @@ GEM @@ -74,10 +84,15 @@ GEM
74 railties (>= 3.0.0) 84 railties (>= 3.0.0)
75 gherkin (2.12.0) 85 gherkin (2.12.0)
76 multi_json (~> 1.3) 86 multi_json (~> 1.3)
  87 + gyoku (1.1.0)
  88 + builder (>= 2.1.2)
77 highline (1.6.19) 89 highline (1.6.19)
78 hike (1.2.3) 90 hike (1.2.3)
  91 + httpi (2.1.0)
  92 + rack
  93 + rubyntlm (~> 0.3.2)
79 i18n (0.6.4) 94 i18n (0.6.4)
80 - jbuilder (1.4.2) 95 + jbuilder (1.5.0)
81 activesupport (>= 3.0.0) 96 activesupport (>= 3.0.0)
82 multi_json (>= 1.2.0) 97 multi_json (>= 1.2.0)
83 jquery-rails (3.0.4) 98 jquery-rails (3.0.4)
@@ -89,7 +104,6 @@ GEM @@ -89,7 +104,6 @@ GEM
89 mime-types (~> 1.16) 104 mime-types (~> 1.16)
90 treetop (~> 1.4.8) 105 treetop (~> 1.4.8)
91 mime-types (1.23) 106 mime-types (1.23)
92 - mini_portile (0.5.1)  
93 minitest (4.7.5) 107 minitest (4.7.5)
94 modernizr-rails (2.6.2.3) 108 modernizr-rails (2.6.2.3)
95 multi_json (1.7.7) 109 multi_json (1.7.7)
@@ -100,8 +114,8 @@ GEM @@ -100,8 +114,8 @@ GEM
100 net-ssh (2.6.8) 114 net-ssh (2.6.8)
101 net-ssh-gateway (1.2.0) 115 net-ssh-gateway (1.2.0)
102 net-ssh (>= 2.6.5) 116 net-ssh (>= 2.6.5)
103 - nokogiri (1.6.0)  
104 - mini_portile (~> 0.5.0) 117 + nokogiri (1.5.10)
  118 + nori (2.3.0)
105 orm_adapter (0.4.0) 119 orm_adapter (0.4.0)
106 polyglot (0.3.3) 120 polyglot (0.3.3)
107 rack (1.5.2) 121 rack (1.5.2)
@@ -135,13 +149,22 @@ GEM @@ -135,13 +149,22 @@ GEM
135 rspec-core (~> 2.14.0) 149 rspec-core (~> 2.14.0)
136 rspec-expectations (~> 2.14.0) 150 rspec-expectations (~> 2.14.0)
137 rspec-mocks (~> 2.14.0) 151 rspec-mocks (~> 2.14.0)
  152 + rubyntlm (0.3.3)
138 rvm-capistrano (1.4.1) 153 rvm-capistrano (1.4.1)
139 capistrano (>= 2.0.0) 154 capistrano (>= 2.0.0)
140 - sass (3.2.9) 155 + sass (3.2.10)
141 sass-rails (4.0.0) 156 sass-rails (4.0.0)
142 railties (>= 4.0.0.beta, < 5.0) 157 railties (>= 4.0.0.beta, < 5.0)
143 sass (>= 3.1.10) 158 sass (>= 3.1.10)
144 sprockets-rails (~> 2.0.0) 159 sprockets-rails (~> 2.0.0)
  160 + savon (2.3.0)
  161 + akami (~> 1.2.0)
  162 + builder (>= 2.1.2)
  163 + gyoku (~> 1.1.0)
  164 + httpi (~> 2.1.0)
  165 + nokogiri (>= 1.4.0, < 1.6)
  166 + nori (~> 2.3.0)
  167 + wasabi (~> 3.2.0)
145 sdoc (0.3.20) 168 sdoc (0.3.20)
146 json (>= 1.1.3) 169 json (>= 1.1.3)
147 rdoc (~> 3.10) 170 rdoc (~> 3.10)
@@ -179,6 +202,9 @@ GEM @@ -179,6 +202,9 @@ GEM
179 multi_json (~> 1.0, >= 1.0.2) 202 multi_json (~> 1.0, >= 1.0.2)
180 warden (1.2.3) 203 warden (1.2.3)
181 rack (>= 1.0) 204 rack (>= 1.0)
  205 + wasabi (3.2.0)
  206 + httpi (~> 2.0)
  207 + nokogiri (>= 1.4.0, < 1.6)
182 xpath (2.0.0) 208 xpath (2.0.0)
183 nokogiri (~> 1.3) 209 nokogiri (~> 1.3)
184 210
@@ -195,6 +221,7 @@ DEPENDENCIES @@ -195,6 +221,7 @@ DEPENDENCIES
195 factory_girl_rails 221 factory_girl_rails
196 jbuilder (~> 1.2) 222 jbuilder (~> 1.2)
197 jquery-rails 223 jquery-rails
  224 + kalibro_entities!
198 modernizr-rails 225 modernizr-rails
199 rails (= 4.0.0) 226 rails (= 4.0.0)
200 rspec-rails 227 rspec-rails