Download as
Browse Code »

Commit a38b2ae2d0affd4bcc4c8096bc68a6224c058f34

Authored by Diego de Araújo Martinez Camarinha
2 parents a1e68d33 6d6d45b8
Exists in colab

Merge pull request #359 from mezuro/master 

Release version 1.1.0
Showing 7 changed files with 19 additions and 1 deletions   Show diff stats
@@ -26,6 +26,7 @@ before_script: @@ -26,6 +26,7 @@ before_script:
26 - bash install.sh 26 - bash install.sh
27 - popd 27 - popd
28 - cp config/database.yml.sample config/database.yml 28 - cp config/database.yml.sample config/database.yml
  29 + - cp config/kalibro.yml.sample config/kalibro.yml
29 # Do not run setup as the Kalibro services are up and this is not even necessary! 30 # Do not run setup as the Kalibro services are up and this is not even necessary!
30 - bundle exec rake db:create 31 - bundle exec rake db:create
31 - bundle exec rake db:migrate 32 - bundle exec rake db:migrate
@@ -2,6 +2,14 @@ @@ -2,6 +2,14 @@
2 2
3 Prezento is the web interface for Mezuro. 3 Prezento is the web interface for Mezuro.
4 4
  5 +The version numbers below try to follow the conventions at http://semver.org/.
  6 +
  7 +## Unreleased
  8 +
  9 +## v1.1.0 - 01/06/2016
  10 +
  11 +- Always load Kalibro service addresses from file
  12 +
5 ## v1.0.1 - 11/05/2016 13 ## v1.0.1 - 11/05/2016
6 14
7 - Fix kalibro services address init under production 15 - Fix kalibro services address init under production
@@ -25,6 +25,7 @@ Dir.chdir APP_ROOT do @@ -25,6 +25,7 @@ Dir.chdir APP_ROOT do
25 unless File.exist?("config/database.yml") 25 unless File.exist?("config/database.yml")
26 run "cp config/database.yml.sample config/database.yml" 26 run "cp config/database.yml.sample config/database.yml"
27 run "cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml" 27 run "cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml"
  28 + run "cp config/kalibro.yml.sample config/kalibro.yml"
28 end 29 end
29 30
30 puts "\n== Preparing database ==".green 31 puts "\n== Preparing database ==".green
config/environments/development.rb
  Diff comments   View file @a38b2ae
@@ -44,4 +44,7 @@ Rails.application.configure do @@ -44,4 +44,7 @@ Rails.application.configure do
44 44
45 # Raises error for missing translations 45 # Raises error for missing translations
46 # config.action_view.raise_on_missing_translations = true 46 # config.action_view.raise_on_missing_translations = true
  47 +
  48 + # Kalibro URL
  49 + Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
47 end 50 end
config/environments/test.rb
  Diff comments   View file @a38b2ae
@@ -45,4 +45,7 @@ Rails.application.configure do @@ -45,4 +45,7 @@ Rails.application.configure do
45 45
46 # Raises error for missing translations 46 # Raises error for missing translations
47 # config.action_view.raise_on_missing_translations = true 47 # config.action_view.raise_on_missing_translations = true
  48 +
  49 + # Kalibro URL
  50 + Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
48 end 51 end
config/kalibro.yml.sample 0 → 100644
  Diff comments   View file @a38b2ae
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +processor_address: "http://localhost:8082"
  2 +configurations_address: "http://localhost:8083"
features/support/header.rb
  Diff comments   View file @a38b2ae
@@ -13,6 +13,6 @@ module HeaderUtils @@ -13,6 +13,6 @@ module HeaderUtils
13 # The call 'headers.each(&method(:set_header))' breaks on ruby 2.0.0-p598, which is the 13 # The call 'headers.each(&method(:set_header))' breaks on ruby 2.0.0-p598, which is the
14 # default version on CentOS 7. When that SO updates ruby, this should be reverted to 14 # default version on CentOS 7. When that SO updates ruby, this should be reverted to
15 # the more concise syntax. 15 # the more concise syntax.
16 - headers.each { |key, value| method(:set_header).call(key, value) } 16 + headers.each { |key, value| set_header(key, value) }
17 end 17 end
18 end 18 end