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

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

Change subject: Fixed Style/IndentationWidth RuboCop offense
..


Fixed Style/IndentationWidth RuboCop offense

RuboCop actually missed many of these offenses which required manual
review and cleanup.

Bug: T106220
Change-Id: I0390db5f2c6259329cb3aae520162bee0fc9f209
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
M Rakefile
M Vagrantfile
M mediawiki-vagrant.gemspec
M support/packager/package.rb
M support/setup.rb
9 files changed, 217 insertions(+), 223 deletions(-)

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.rubocop.yml b/.rubocop.yml
index b8f7361..c8f54ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@
   Exclude:
 - 'mediawiki/**/*'
 - 'mediawiki-*/**/*'
+- 'puppet/modules/activemq/**/*'
 - 'puppet/modules/cdh/**/*'
 - 'puppet/modules/mariadb/**/*'
 - 'puppet/modules/nginx/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bf68d1f..58da8c5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -75,12 +75,6 @@
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 45
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
diff --git a/Gemfile b/Gemfile
index 7ebd66f..fb190d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@
   # https://github.com/mitchellh/vagrant/issues/5546
   gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
 
-  gem 'rubocop', '~> 0.32.1', require: false
+  gem 'rubocop', '~> 0.33.0', require: false
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc27be..01f2b48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@
 PATH
   remote: .
   specs:
-mediawiki-vagrant (0.7.1)
+mediawiki-vagrant (0.10.0)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +31,7 @@
 akami (1.2.2)
   gyoku (>= 0.4.0)
   nokogiri
-ast (2.0.0)
+ast (2.1.0)
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
@@ -127,7 +127,7 @@
   diff-lcs (>= 1.2.0, < 2.0)
   rspec-support (~> 3.2.0)
 rspec-support (3.2.0)
-rubocop (0.32.1)
+rubocop (0.33.0)
   astrolabe (~> 1.3)
   parser (>= 2.2.2.5, < 3.0)
   powerpack (~> 0.1)
@@ -169,6 +169,6 @@
   mediawiki-vagrant!
   pry-byebug
   rspec (~> 3.1, >= 3.1.0)
-  rubocop (~> 0.32.1)
+  rubocop (~> 0.33.0)
   vagrant!
   yard (~> 0.8, >= 0.8.7.6)
diff --git a/Rakefile b/Rakefile
index 9da5752..1813787 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@
 PuppetLint::RakeTask.new(:lint) do |config|
   gitmodules = File.expand_path('../.gitmodules', __FILE__)
   config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) {
-  "#{$1}/**/*.pp"
+"#{$1}/**/*.pp"
   }
   config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
 end
diff --git a/Vagrantfile b/Vagrantfile
index 5032800..2d58012 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,9 +37,9 @@
 setup = Vagrant::Util::Platform.windows? ? 'setup.bat' : 'setup.sh'
 
 if gemspec.nil?
-raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run 
`#{setup}`."
+  raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run 
`#{setup}`."
 else
-installed = gemspec.version
+  installed = gemspec.version
 latest = Gem::Version.new(MediaWikiVagrant::VERSION)
 requirement = Gem::Requirement.new("~> 
#{latest.segments.first(2).join('.')}")
 
@@ -52,213 +52,212 @@
 settings = mwv.load_settings
 
 Vagrant.configure('2') do |config|
-config.vm.hostname = 'mediawiki-vagrant.dev'
-config.package.name = 'mediawiki.box'
+  config.vm.hostname = 'mediawiki-vagrant.dev'
+  config.package.name = 'mediawiki.box'
 
-config.ssh.forward_agent = settings[:forward_agent]
-config.ssh.forward_x11 = settings[:forward_x11]
+  config.ssh.forward_agent = settings[:forward_agent]
+  config.ssh.forward_x11 = settings[:forward_x11]
 
-# Default VirtualBox provider
-config.vm.provider :virtualbox do |_vb, override|
-override.vm.box = 'trusty-cloud'
-override.vm.box_url = 
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
-override.vm.box_download_insecure = true
+  # Default VirtualBox provider
+  config.vm.provider :virtualbox do |_vb, override|
+override.vm.box = 'trusty-cloud'
+override.vm.box_url = 
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+override.vm.box_download_insecure = true
 
-override.vm.network :private_network, ip: settings[:static_ip]
+override.vm.network :private_network, ip: settings[:static_ip]
+  end
+
+  # VMWare Fusion provider. Enable with `--provider=vmwar

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

2015-08-27 Thread Dduvall (Code Review) 
Dduvall has uploaded a new change for review.

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

Change subject: Fixed Style/IndentationWidth RuboCop offense
..

Fixed Style/IndentationWidth RuboCop offense

RuboCop actually missed many of these offenses which required manual
review and cleanup.

Bug: T106220
Change-Id: I0390db5f2c6259329cb3aae520162bee0fc9f209
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
M Rakefile
M Vagrantfile
M mediawiki-vagrant.gemspec
M support/packager/package.rb
M support/setup.rb
9 files changed, 217 insertions(+), 223 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/23/234323/1

diff --git a/.rubocop.yml b/.rubocop.yml
index b8f7361..c8f54ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,7 @@
   Exclude:
 - 'mediawiki/**/*'
 - 'mediawiki-*/**/*'
+- 'puppet/modules/activemq/**/*'
 - 'puppet/modules/cdh/**/*'
 - 'puppet/modules/mariadb/**/*'
 - 'puppet/modules/nginx/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bf68d1f..58da8c5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -75,12 +75,6 @@
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 45
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/LeadingCommentSpace:
diff --git a/Gemfile b/Gemfile
index 7ebd66f..fb190d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@
   # https://github.com/mitchellh/vagrant/issues/5546
   gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
 
-  gem 'rubocop', '~> 0.32.1', require: false
+  gem 'rubocop', '~> 0.33.0', require: false
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc27be..01f2b48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@
 PATH
   remote: .
   specs:
-mediawiki-vagrant (0.7.1)
+mediawiki-vagrant (0.10.0)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +31,7 @@
 akami (1.2.2)
   gyoku (>= 0.4.0)
   nokogiri
-ast (2.0.0)
+ast (2.1.0)
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
@@ -127,7 +127,7 @@
   diff-lcs (>= 1.2.0, < 2.0)
   rspec-support (~> 3.2.0)
 rspec-support (3.2.0)
-rubocop (0.32.1)
+rubocop (0.33.0)
   astrolabe (~> 1.3)
   parser (>= 2.2.2.5, < 3.0)
   powerpack (~> 0.1)
@@ -169,6 +169,6 @@
   mediawiki-vagrant!
   pry-byebug
   rspec (~> 3.1, >= 3.1.0)
-  rubocop (~> 0.32.1)
+  rubocop (~> 0.33.0)
   vagrant!
   yard (~> 0.8, >= 0.8.7.6)
diff --git a/Rakefile b/Rakefile
index 9da5752..1813787 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@
 PuppetLint::RakeTask.new(:lint) do |config|
   gitmodules = File.expand_path('../.gitmodules', __FILE__)
   config.ignore_paths = IO.readlines(gitmodules).grep(/\s*path\s*=\s*(\S+)/) {
-  "#{$1}/**/*.pp"
+"#{$1}/**/*.pp"
   }
   config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
 end
diff --git a/Vagrantfile b/Vagrantfile
index 5032800..2d58012 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,9 +37,9 @@
 setup = Vagrant::Util::Platform.windows? ? 'setup.bat' : 'setup.sh'
 
 if gemspec.nil?
-raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run 
`#{setup}`."
+  raise "The mediawiki-vagrant plugin hasn't been installed yet. Please run 
`#{setup}`."
 else
-installed = gemspec.version
+  installed = gemspec.version
 latest = Gem::Version.new(MediaWikiVagrant::VERSION)
 requirement = Gem::Requirement.new("~> 
#{latest.segments.first(2).join('.')}")
 
@@ -52,213 +52,212 @@
 settings = mwv.load_settings
 
 Vagrant.configure('2') do |config|
-config.vm.hostname = 'mediawiki-vagrant.dev'
-config.package.name = 'mediawiki.box'
+  config.vm.hostname = 'mediawiki-vagrant.dev'
+  config.package.name = 'mediawiki.box'
 
-config.ssh.forward_agent = settings[:forward_agent]
-config.ssh.forward_x11 = settings[:forward_x11]
+  config.ssh.forward_agent = settings[:forward_agent]
+  config.ssh.forward_x11 = settings[:forward_x11]
 
-# Default VirtualBox provider
-config.vm.provider :virtualbox do |_vb, override|
-override.vm.box = 'trusty-cloud'
-override.vm.box_url = 
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
-override.vm.box_download_insecure = true
+  # Default VirtualBox provider
+  config.vm.provider :virtualbox do |_vb, override|
+override.vm.box = 'trusty-cloud'
+override.vm.box_url = 
'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+override.vm.box_download_insecure = true
 
-override.vm.network :private_network, ip: settings[:static_ip]
+override.vm.network :private_network, ip: settings[:static_ip]
+  end
+
+  # VMWare Fusi