Skip to content

Commit

Permalink
Merge pull request #379 from roomorama/release/0.11.2
Browse files Browse the repository at this point in the history
Release/0.11.2
  • Loading branch information
keang authored Sep 22, 2016
2 parents 82b47c0 + b03198e commit a5e9010
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ This file summarises the most important changes that went live on each release
of Concierge. Please check the Wiki entry on the release process to understand
how this file is formatted and how the process works.

## [0.11.2] - 2016-09-22
### Fixed
- Atleisure config being paresed as boolean by YAML

## [0.11.1] - 2016-09-22
### Added
- Add `rake hosts:create` to, well, create hosts
Expand Down
4 changes: 2 additions & 2 deletions config/credentials/production.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atleisure:
username: <%= ENV["ATLEISURE_USERNAME"] %>
password: <%= ENV["ATLEISURE_PASSWORD"] %>
test_mode: <%= ENV["ATLEISURE_TEST_MODE"] %>
test_mode: "<%= ENV['ATLEISURE_TEST_MODE'] %>"

kigo:
subscription_key: <%= ENV["KIGO_SUBSCRIPTION_KEY"] %>
Expand Down Expand Up @@ -43,4 +43,4 @@ saw:
poplidays:
url: <%= ENV["POPLIDAYS_URL"] %>
client_key: <%= ENV["POPLIDAYS_CLIENT_KEY"] %>
passphrase: <%= ENV["POPLIDAYS_PASSPHRASE"] %>
passphrase: <%= ENV["POPLIDAYS_PASSPHRASE"] %>
4 changes: 2 additions & 2 deletions config/credentials/staging.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
atleisure:
username: <%= ENV["ATLEISURE_USERNAME"] %>
password: <%= ENV["ATLEISURE_PASSWORD"] %>
test_mode: <%= ENV["ATLEISURE_TEST_MODE"] %>
test_mode: "<%= ENV['ATLEISURE_TEST_MODE'] %>"

kigo:
subscription_key: <%= ENV["KIGO_SUBSCRIPTION_KEY"] %>
Expand Down Expand Up @@ -43,4 +43,4 @@ saw:
poplidays:
url: <%= ENV["POPLIDAYS_URL"] %>
client_key: <%= ENV["POPLIDAYS_CLIENT_KEY"] %>
passphrase: <%= ENV["POPLIDAYS_PASSPHRASE"] %>
passphrase: <%= ENV["POPLIDAYS_PASSPHRASE"] %>
4 changes: 3 additions & 1 deletion config/credentials/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ supplier:
password: "p4ssw0rd"
token: <%= ENV["_TEST_PARTNER_TOKEN"] %>
test_mode: false
quoted_mode: "No"
bool_mode: No

jtb:
id: "123"
Expand Down Expand Up @@ -49,4 +51,4 @@ saw:
poplidays:
url: 'www.example.org'
client_key: "123"
passphrase: "123"
passphrase: "123"
2 changes: 1 addition & 1 deletion lib/concierge/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Concierge
VERSION = "0.11.1"
VERSION = "0.11.2"
end
2 changes: 2 additions & 0 deletions spec/lib/concierge/credentials_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ def self.reset!
expect(credentials.username).to eq "roomorama"
expect(credentials.password).to eq "p4ssw0rd"
expect(credentials.token).to be_nil
expect(credentials.bool_mode).to eq false
expect(credentials.quoted_mode).to eq "No"
end

it "uses environment variables if defined" do
Expand Down

0 comments on commit a5e9010

Please sign in to comment.