[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki/vagrant)

2015-10-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fixed Style/StringLiterals RuboCop offense
..


Fixed Style/StringLiterals RuboCop offense

Bug: T106220
Change-Id: I512044e683c671373c935708dbd65788465a19da
---
M .rubocop_todo.yml
M features/step_definitions/roles_steps.rb
M features/support/hooks.rb
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant/config.rb
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/forward_port.rb
M lib/mediawiki-vagrant/git-update.rb
M lib/mediawiki-vagrant/hiera.rb
M lib/mediawiki-vagrant/import-dump.rb
M lib/mediawiki-vagrant/paste-puppet.rb
M lib/mediawiki-vagrant/roles/enable.rb
M lib/mediawiki-vagrant/roles/list.rb
M lib/mediawiki-vagrant/run-tests.rb
M lib/mediawiki-vagrant/settings/definitions.rb
M lib/mediawiki-vagrant/setup.rb
16 files changed, 79 insertions(+), 85 deletions(-)

Approvals:
  Dduvall: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4e85f76..339e23d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -145,12 +145,6 @@
 - 'support/completion.rb'
 - 'support/setup.rb'
 
-# Offense count: 95
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
diff --git a/features/step_definitions/roles_steps.rb 
b/features/step_definitions/roles_steps.rb
index 322a8e5..7868c4c 100644
--- a/features/step_definitions/roles_steps.rb
+++ b/features/step_definitions/roles_steps.rb
@@ -16,7 +16,7 @@
 end
 
 Given(/^the settings for the "(.*?)" role are:$/) do |role, settings|
-  FileUtils.mkdir_p(@mwv.path("puppet/modules/role/settings"))
+  FileUtils.mkdir_p(@mwv.path('puppet/modules/role/settings'))
   @mwv.path("puppet/modules/role/settings/#{role}.yaml").open('w') { |io| 
io.write(settings) }
 end
 
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 100ccec..c2503fa 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -11,7 +11,7 @@
   FileUtils.mkdir_p('tmp/testenv/home')
   FileUtils.mkdir_p('tmp/testenv/mwv')
 
-  excludes = "--exclude=/Gemfile --exclude=/vendor --exclude=/.git 
--exclude=/tmp"
+  excludes = '--exclude=/Gemfile --exclude=/vendor --exclude=/.git 
--exclude=/tmp'
   system("rsync -a #{excludes} --filter='dir-merge,- .gitignore' ./ 
'tmp/testenv/mwv/'")
 end
 
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 679d4db..fb3f2b0 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -19,10 +19,10 @@
   end
   col, *cols = roles.each_slice((roles.size/3.0).ceil).to_a
   col.zip(*cols) do |a,b,c|
-puts sprintf("%-26s %-26s %-26s", a, b, c)
+puts sprintf('%-26s %-26s %-26s', a, b, c)
   end
   puts "\nRoles marked with '*' are enabled."
-  puts "Note that roles enabled by dependency are not marked."
+  puts 'Note that roles enabled by dependency are not marked.'
   puts 'Use "labs-vagrant enable-role" & "labs-vagrant disable-role" to 
customize.'
 
 when 'reset-roles'
diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb
index c41f24f..dcab194 100644
--- a/lib/mediawiki-vagrant/config.rb
+++ b/lib/mediawiki-vagrant/config.rb
@@ -1,7 +1,7 @@
-require "mediawiki-vagrant/plugin_environment"
-require "mediawiki-vagrant/settings/definitions"
-require "mediawiki-vagrant/settings_plugin"
-require "optparse"
+require 'mediawiki-vagrant/plugin_environment'
+require 'mediawiki-vagrant/settings/definitions'
+require 'mediawiki-vagrant/settings_plugin'
+require 'optparse'
 
 module MediaWikiVagrant
   # Provides a command-line interface for configuration of MediaWiki-Vagrant
@@ -12,7 +12,7 @@
 include SettingsPlugin
 
 def self.synopsis
-  "configures mediawiki-vagrant settings"
+  'configures mediawiki-vagrant settings'
 end
 
 def execute
@@ -25,29 +25,29 @@
   }
 
   opts = OptionParser.new do |o|
-o.banner = "Usage: vagrant config [options] [name] [value]"
-o.separator ""
-o.separator "Options:"
-o.separator ""
+o.banner = 'Usage: vagrant config [options] [name] [value]'
+o.separator ''
+o.separator 'Options:'
+o.separator ''
 
-o.on("--all", "Configure all settings") do
+o.on('--all', 'Configure all settings') do
   options[:interactive] = true
 end
 
-o.on("--required", "Configure only required settings") do
+o.on('--required', 'Configure only required settings') do
   options[:interactive] = true
   options[:required] = true
 end
 
-o.on("--list", "List all settings") do
+o.on('--list', 'List all settings') do
   options[:list] = true
 end
 
-

[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki/vagrant)

2015-09-24 Thread Zfilipin (Code Review) 
Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/240664

Change subject: Fixed Style/StringLiterals RuboCop offense
..

Fixed Style/StringLiterals RuboCop offense

Bug: T106220
Change-Id: I512044e683c671373c935708dbd65788465a19da
---
M .rubocop_todo.yml
M features/step_definitions/roles_steps.rb
M features/support/hooks.rb
M lib/labs-vagrant.rb
M lib/mediawiki-vagrant/config.rb
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/forward_port.rb
M lib/mediawiki-vagrant/git-update.rb
M lib/mediawiki-vagrant/hiera.rb
M lib/mediawiki-vagrant/import-dump.rb
M lib/mediawiki-vagrant/paste-puppet.rb
M lib/mediawiki-vagrant/roles/enable.rb
M lib/mediawiki-vagrant/roles/list.rb
M lib/mediawiki-vagrant/run-tests.rb
M lib/mediawiki-vagrant/settings/definitions.rb
M lib/mediawiki-vagrant/setup.rb
16 files changed, 77 insertions(+), 83 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/64/240664/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index dabb35b..bf70ad5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -144,9 +144,3 @@
 - 'mediawiki-vagrant.gemspec'
 - 'support/completion.rb'
 - 'support/setup.rb'
-
-# Offense count: 95
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
diff --git a/features/step_definitions/roles_steps.rb 
b/features/step_definitions/roles_steps.rb
index 322a8e5..7868c4c 100644
--- a/features/step_definitions/roles_steps.rb
+++ b/features/step_definitions/roles_steps.rb
@@ -16,7 +16,7 @@
 end
 
 Given(/^the settings for the "(.*?)" role are:$/) do |role, settings|
-  FileUtils.mkdir_p(@mwv.path("puppet/modules/role/settings"))
+  FileUtils.mkdir_p(@mwv.path('puppet/modules/role/settings'))
   @mwv.path("puppet/modules/role/settings/#{role}.yaml").open('w') { |io| 
io.write(settings) }
 end
 
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 100ccec..c2503fa 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -11,7 +11,7 @@
   FileUtils.mkdir_p('tmp/testenv/home')
   FileUtils.mkdir_p('tmp/testenv/mwv')
 
-  excludes = "--exclude=/Gemfile --exclude=/vendor --exclude=/.git 
--exclude=/tmp"
+  excludes = '--exclude=/Gemfile --exclude=/vendor --exclude=/.git 
--exclude=/tmp'
   system("rsync -a #{excludes} --filter='dir-merge,- .gitignore' ./ 
'tmp/testenv/mwv/'")
 end
 
diff --git a/lib/labs-vagrant.rb b/lib/labs-vagrant.rb
index 679d4db..fb3f2b0 100755
--- a/lib/labs-vagrant.rb
+++ b/lib/labs-vagrant.rb
@@ -19,10 +19,10 @@
   end
   col, *cols = roles.each_slice((roles.size/3.0).ceil).to_a
   col.zip(*cols) do |a,b,c|
-puts sprintf("%-26s %-26s %-26s", a, b, c)
+puts sprintf('%-26s %-26s %-26s', a, b, c)
   end
   puts "\nRoles marked with '*' are enabled."
-  puts "Note that roles enabled by dependency are not marked."
+  puts 'Note that roles enabled by dependency are not marked.'
   puts 'Use "labs-vagrant enable-role" & "labs-vagrant disable-role" to 
customize.'
 
 when 'reset-roles'
diff --git a/lib/mediawiki-vagrant/config.rb b/lib/mediawiki-vagrant/config.rb
index 5b43883..3940dbf 100644
--- a/lib/mediawiki-vagrant/config.rb
+++ b/lib/mediawiki-vagrant/config.rb
@@ -1,7 +1,7 @@
-require "mediawiki-vagrant/plugin_environment"
-require "mediawiki-vagrant/settings/definitions"
-require "mediawiki-vagrant/settings_plugin"
-require "optparse"
+require 'mediawiki-vagrant/plugin_environment'
+require 'mediawiki-vagrant/settings/definitions'
+require 'mediawiki-vagrant/settings_plugin'
+require 'optparse'
 
 module MediaWikiVagrant
   # Provides a command-line interface for configuration of MediaWiki-Vagrant
@@ -12,7 +12,7 @@
 include SettingsPlugin
 
 def self.synopsis
-  "configures mediawiki-vagrant settings"
+  'configures mediawiki-vagrant settings'
 end
 
 def execute
@@ -25,29 +25,29 @@
   }
 
   opts = OptionParser.new do |o|
-o.banner = "Usage: vagrant config [options] [name] [value]"
-o.separator ""
-o.separator "Options:"
-o.separator ""
+o.banner = 'Usage: vagrant config [options] [name] [value]'
+o.separator ''
+o.separator 'Options:'
+o.separator ''
 
-o.on("--all", "Configure all settings") do
+o.on('--all', 'Configure all settings') do
   options[:interactive] = true
 end
 
-o.on("--required", "Configure only required settings") do
+o.on('--required', 'Configure only required settings') do
   options[:interactive] = true
   options[:required] = true
 end
 
-o.on("--list", "List all settings") do
+o.on('--list', 'List all settings') do
   options[:list] = true
 end
 
-o.on("--get NAME", "Get a configured setting") do |name|
+o.on('--get NAME', 'Get a