Skip to content
This repository has been archived by the owner on Jun 13, 2019. It is now read-only.

Commit

Permalink
Rubocop: IndentHash
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Holzhauer committed Sep 17, 2014
1 parent 5acc6ea commit 0db49c1
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 67 deletions.
6 changes: 0 additions & 6 deletions .rubocop_todo.yml
Expand Up @@ -78,12 +78,6 @@ Style/HashSyntax:
Style/IfUnlessModifier:
Enabled: false

# Offense count: 14
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/IndentHash:
Enabled: false

# Offense count: 2
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
Expand Down
52 changes: 26 additions & 26 deletions easybib/tests/test_config.rb
Expand Up @@ -109,10 +109,10 @@ def test_config_with_rds_to_ini
# Fixnum to string error happens
fake_node = get_fakenode_config
fake_node.set['deploy']['some_app']['database'] = {
'host' => 'some.db.tld',
'user' => 'dbuser',
'port' => 1234
}
'host' => 'some.db.tld',
'user' => 'dbuser',
'port' => 1234
}

assert_equal(
"[deployed_application]
Expand Down Expand Up @@ -165,13 +165,13 @@ def test_config_to_nginx
def test_config_to_nginx_empty_settings
fake_node = Chef::Node.new
fake_node.set['deploy'] = {
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld'],
'deploy_to' => '/tmp/bla',
'document_root' => 'www'
}
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld'],
'deploy_to' => '/tmp/bla',
'document_root' => 'www'
}
}

fake_node.set['opsworks'] = { 'stack' => { 'name' => 'opsworks-stack' } }
fake_node.set['easybib_deploy'] = { 'envtype' => 'playground' }
Expand All @@ -190,11 +190,11 @@ def test_config_to_nginx_empty_settings
def test_config_vagrantenv
fake_node = Chef::Node.new
fake_node.set['deploy'] = {
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld']
}
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld']
}
}

fake_node.set['vagrant'] = { 'applications' => { 'some_app' => { 'app_root_location' => '/some_path', 'doc_root_location' => '/some_path/foo' } } }
fake_node.set['easybib_deploy'] = { 'envtype' => 'playground' }
Expand Down Expand Up @@ -238,23 +238,23 @@ def test_config_to_php
def get_fakenode_config
fake_node = Chef::Node.new
fake_node.set['deploy'] = {
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld'],
'deploy_to' => '/tmp/bla',
'document_root' => 'www'
}
'some_app' => {
'application' => 'some_app',
'domains' => ['foo.tld', 'bar.tld'],
'deploy_to' => '/tmp/bla',
'document_root' => 'www'
}
}
fake_node.set['some_app'] = {
'env' => {
'bla' => {
'somekey' => 'somevalue',
'somegroup' => {
'someotherkey' => 'someothervalue'
}
'env' => {
'bla' => {
'somekey' => 'somevalue',
'somegroup' => {
'someotherkey' => 'someothervalue'
}
}
}
}

fake_node.set['opsworks'] = { 'stack' => { 'name' => 'opsworks-stack' } }
fake_node.set['easybib_deploy'] = { 'envtype' => 'playground' }
Expand Down
58 changes: 29 additions & 29 deletions nginx-app/attributes/default.rb
Expand Up @@ -20,39 +20,39 @@

# module specific configuration for assets
default["nginx-app"]["js_modules"] = {
"debugger" => "debugger",
"notes" => "notebook",
"cms" => "cms",
"bibanalytics" => "bibanalytics",
"sharing" => "sharing",
"kb" => "kb",
"infolit" => "infolit",
"schoolanalytics" => "schoolanalytics",
"students" => "students",
"pearson" => "pearson",
"folders" => "folders"
"debugger" => "debugger",
"notes" => "notebook",
"cms" => "cms",
"bibanalytics" => "bibanalytics",
"sharing" => "sharing",
"kb" => "kb",
"infolit" => "infolit",
"schoolanalytics" => "schoolanalytics",
"students" => "students",
"pearson" => "pearson",
"folders" => "folders"
}
default["nginx-app"]["img_modules"] = {
"notes" => "notebook",
"outline" => "notebook",
"paperlink" => "paperlink",
"infolit" => "infolit",
"braintree" => "braintree",
"pearson" => "pearson",
"folders" => "folders"
"notes" => "notebook",
"outline" => "notebook",
"paperlink" => "paperlink",
"infolit" => "infolit",
"braintree" => "braintree",
"pearson" => "pearson",
"folders" => "folders"
}
default["nginx-app"]["css_modules"] = {
"debugger" => "debugger",
"notes" => "notebook",
"cms" => "cms",
"bibanalytics" => "bibanalytics",
"sharing" => "sharing",
"kb" => "kb",
"infolit" => "infolit",
"schoolanalytics" => "schoolanalytics",
"braintree" => "braintree",
"pearson" => "pearson",
"folders" => "folders"
"debugger" => "debugger",
"notes" => "notebook",
"cms" => "cms",
"bibanalytics" => "bibanalytics",
"sharing" => "sharing",
"kb" => "kb",
"infolit" => "infolit",
"schoolanalytics" => "schoolanalytics",
"braintree" => "braintree",
"pearson" => "pearson",
"folders" => "folders"
}

default["nginx-app"]["cache"] = {
Expand Down
12 changes: 6 additions & 6 deletions php-xdebug/attributes/default.rb
Expand Up @@ -2,10 +2,10 @@
default["xdebug"]["version"] = nil

default["xdebug"]["config"] = {
"scream" => 1,
"show_exception_trace" => 0,
"remote_enable" => 1,
"remote_handler" => "dbgp",
"remote_connect_back" => 1,
"idekey" => "XDEBUG_PHPSTORM"
"scream" => 1,
"show_exception_trace" => 0,
"remote_enable" => 1,
"remote_handler" => "dbgp",
"remote_connect_back" => 1,
"idekey" => "XDEBUG_PHPSTORM"
}

0 comments on commit 0db49c1

Please sign in to comment.