Lint: Layout/IndentationConsistency

Author: aried3r

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-02-14 11:15:10 +0100 using RuboCop version 0.64.0.
+# on 2019-02-14 11:18:12 +0100 using RuboCop version 0.64.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -39,7 +39,7 @@ Layout/AlignParameters:
     - 'lib/vips/object.rb'
     - 'spec/vips_spec.rb'
 
-# Offense count: 238
+# Offense count: 265
 # Cop supports --auto-correct.
 Layout/CommentIndentation:
   Enabled: false
@@ -67,7 +67,7 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/spec_helper.rb'
     - 'spec/vips_spec.rb'
 
-# Offense count: 31
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
@@ -76,11 +76,8 @@ Layout/EmptyLinesAroundClassBody:
     - 'example/inheritance_with_refcount.rb'
     - 'lib/vips/gobject.rb'
     - 'lib/vips/gvalue.rb'
-    - 'lib/vips/image.rb'
     - 'lib/vips/interpolate.rb'
     - 'lib/vips/methods.rb'
-    - 'lib/vips/object.rb'
-    - 'lib/vips/operation.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -133,12 +130,14 @@ Layout/IndentHash:
     - 'lib/vips/object.rb'
     - 'lib/vips/operation.rb'
 
-# Offense count: 811
+# Offense count: 85
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, rails
-Layout/IndentationConsistency:
-  Enabled: false
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/vips/image.rb'
+    - 'lib/vips/object.rb'
+    - 'lib/vips/operation.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -221,6 +220,15 @@ Layout/TrailingBlankLines:
     - 'spec/image_spec.rb'
     - 'spec/vips_spec.rb'
 
+# Offense count: 227
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/vips/image.rb'
+    - 'lib/vips/object.rb'
+    - 'lib/vips/operation.rb'
+
 # Offense count: 2
 Lint/HandleExceptions:
   Exclude:

example/daltonize8.rb

@@ -29,7 +29,7 @@
 alpha = nil
 if im.bands == 4
   alpha = im[3]
-    im = im.extract_band 0, :n => 3
+  im = im.extract_band 0, :n => 3
 end
 
 begin

example/example2.rb

@@ -18,11 +18,11 @@
 
 n.times do |i|
   puts ""
-    puts "call #{i} ..."
-    out = Vips::Operation.call "black", [200, 300]
-    if out.width != 200 or out.height != 300
-      puts "bad image result from black"
-    end
+  puts "call #{i} ..."
+  out = Vips::Operation.call "black", [200, 300]
+  if out.width != 200 or out.height != 300
+    puts "bad image result from black"
+  end
 end
 
 puts ""

example/example3.rb

@@ -13,7 +13,7 @@
 
 1.times do |i|
   puts "loop #{i} ..."
-    im = Vips::Image.new_from_file ARGV[0]
-    im = im.embed 100, 100, 3000, 3000, :extend => :mirror
-    im.write_to_file "x.v"
+  im = Vips::Image.new_from_file ARGV[0]
+  im = im.embed 100, 100, 3000, 3000, :extend => :mirror
+  im.write_to_file "x.v"
 end

example/example4.rb

@@ -13,6 +13,6 @@
 
 ARGV.each do |filename|
   im = Vips::Image.new_from_file filename
-    profile = im.get_value "icc-profile-data"
-    puts "profile has #{profile.length} bytes"
+  profile = im.get_value "icc-profile-data"
+  puts "profile has #{profile.length} bytes"
 end

example/inheritance_with_refcount.rb

@@ -83,12 +83,12 @@ class ManagedStruct < FFI::ManagedStruct
 
       def initialize(ptr)
         log "GLib::GObject::ManagedStruct.new: #{ptr}"
-          super
+        super
       end
 
       def self.release(ptr)
         log "GLib::GObject::ManagedStruct.release: unreffing #{ptr}"
-          GLib::g_object_unref(ptr) unless ptr.null?
+        GLib::g_object_unref(ptr) unless ptr.null?
       end
 
     end
@@ -99,7 +99,7 @@ class Struct < FFI::Struct
 
       def initialize(ptr)
         log "GLib::GObject::Struct.new: #{ptr}"
-          super
+        super
       end
 
     end
@@ -111,7 +111,7 @@ def initialize(ptr)
       # need the unref
     def initialize(ptr)
       log "GLib::GObject.initialize: ptr = #{ptr}"
-        @struct = ffi_managed_struct.new(ptr)
+      @struct = ffi_managed_struct.new(ptr)
     end
 
       # access to the cast struct for this class
@@ -161,13 +161,13 @@ module Vips
 
   def self.get_error
     errstr = Vips::vips_error_buffer
-      Vips::vips_error_clear
-      errstr
+    Vips::vips_error_clear
+    errstr
   end
 
   if Vips::vips_init($0) != 0
     puts Vips::get_error
-      exit 1
+    exit 1
   end
 
   at_exit {
@@ -180,7 +180,7 @@ def self.get_error
   def self.showall
     if $vips_debug
       GC.start
-        vips_object_print_all
+      vips_object_print_all
     end
   end
 
@@ -214,7 +214,7 @@ class Struct < GLib::GObject::Struct
 
       def initialize(ptr)
         log "Vips::VipsObject::Struct.new: #{ptr}"
-          super
+        super
       end
 
     end
@@ -224,7 +224,7 @@ class ManagedStruct < GLib::GObject::ManagedStruct
 
       def initialize(ptr)
         log "Vips::VipsObject::ManagedStruct.new: #{ptr}"
-          super
+        super
       end
 
     end
@@ -248,7 +248,7 @@ class Struct < VipsObject::Struct
 
       def initialize(ptr)
         log "Vips::VipsImage::Struct.new: #{ptr}"
-          super
+        super
       end
 
     end
@@ -258,7 +258,7 @@ class ManagedStruct < VipsObject::ManagedStruct
 
       def initialize(ptr)
         log "Vips::VipsImage::ManagedStruct.new: #{ptr}"
-          super
+        super
       end
 
     end
@@ -276,11 +276,11 @@ def self.new_partial
 puts "creating image"
 begin
   x = Vips::VipsImage.new_partial
-    puts "x = #{x}"
-    puts ""
-    puts "x[:parent] = #{x[:parent]}"
-    puts ""
-    puts "x[:parent][:description] = #{x[:parent][:description]}"
-    puts ""
+  puts "x = #{x}"
+  puts ""
+  puts "x[:parent] = #{x[:parent]}"
+  puts ""
+  puts "x[:parent][:description] = #{x[:parent][:description]}"
+  puts ""
 end
 

example/thumb.rb

@@ -10,21 +10,21 @@
 def via_memory(filename, thumbnail_width)
   data = IO.binread(filename)
 
-    thumb = Vips::Image.thumbnail_buffer data, thumbnail_width, crop: 'centre'
+  thumb = Vips::Image.thumbnail_buffer data, thumbnail_width, crop: 'centre'
 
-    thumb.write_to_buffer '.jpg'
+  thumb.write_to_buffer '.jpg'
 end
 
 # benchmark thumbnail via files
 def via_files(filename, thumbnail_width)
   thumb = Vips::Image.thumbnail filename, thumbnail_width, crop: 'centre'
 
-    thumb.write_to_buffer '.jpg'
+  thumb.write_to_buffer '.jpg'
 end
 
 ARGV.each do |filename|
   puts "processing #{filename} ..."
-    thumb = via_memory(filename, 500)
+  thumb = via_memory(filename, 500)
     # thumb = via_files(filename, 500)
 end
 

example/watermark.rb

@@ -17,21 +17,21 @@
 if im.bands >= 4 and im.interpretation == :cmyk
     # cmyk image
   n_visible_bands = 4
-    text_colour = [0, 255, 0, 0]
+  text_colour = [0, 255, 0, 0]
 elsif im.bands >= 3
     # rgb image
   n_visible_bands = 3
-    text_colour = [255, 0, 0]
+  text_colour = [255, 0, 0]
 else
     # mono image
   n_visible_bands = 1
-    text_colour = 255
+  text_colour = 255
 end
 
 # split into image and alpha
 if im.bands - n_visible_bands > 0
   alpha = im.extract_band n_visible_bands, :n => im.bands - n_visible_bands
-    im = im.extract_band 0, :n => n_visible_bands
+  im = im.extract_band 0, :n => n_visible_bands
 else
   alpha = nil
 end

example/wobble.rb

@@ -14,20 +14,20 @@ def wobble
 
         # make a version with (0, 0) at the centre, negative values up
         # and left, positive down and right
-        centre = index - [width / 2, height / 2]
+      centre = index - [width / 2, height / 2]
 
         # to polar space, so each pixel is now distance and angle in degrees
-        polar = centre.polar
+      polar = centre.polar
 
         # scale sin(distance) by 1/distance to make a wavey pattern
-        d = ((polar[0] * 3).sin * 10000) / (polar[0] + 1)
+      d = ((polar[0] * 3).sin * 10000) / (polar[0] + 1)
 
         # and back to rectangular coordinates again to make a set of
         # vectors we can apply to the original index image
-        index += d.bandjoin(polar[1]).rect
+      index += d.bandjoin(polar[1]).rect
 
         # finally, use our modified index image to distort!
-        mapim index
+      mapim index
     end
   end
 end

lib/vips.rb

@@ -73,26 +73,26 @@ class << self
   def self.remove_log_handler
     if @glib_log_handler_id != 0 && @glib_log_domain
       g_log_remove_handler @glib_log_domain, @glib_log_handler_id
-        @glib_log_handler_id = nil
+      @glib_log_handler_id = nil
     end
   end
 
   def self.set_log_domain domain
     GLib::remove_log_handler
 
-      @glib_log_domain = domain
+    @glib_log_domain = domain
 
       # forward all glib logging output from this domain to a Ruby logger
-      if @glib_log_domain
-          # disable this feature for now
-          #
-          # libvips background worker threads can issue warnings, and
-          # since the main thread is blocked waiting for libvips to come back
-          # from an ffi call, you get a deadlock on the GIL
-          #
-          # to fix this, we need a way for g_log() calls from libvips workers
-          # to be returned via the main thread
-          #
+    if @glib_log_domain
+        # disable this feature for now
+        #
+        # libvips background worker threads can issue warnings, and
+        # since the main thread is blocked waiting for libvips to come back
+        # from an ffi call, you get a deadlock on the GIL
+        #
+        # to fix this, we need a way for g_log() calls from libvips workers
+        # to be returned via the main thread
+        #
 
 #             @glib_log_handler_id = g_log_set_handler @glib_log_domain,
 #                 LOG_LEVEL_DEBUG |
@@ -104,13 +104,13 @@ def self.set_log_domain domain
 #                 LOG_FLAG_FATAL | LOG_FLAG_RECURSION,
 #                 LOG_HANDLER, nil
 
-          # we must remove any handlers on exit, since libvips may log stuff
-          # on shutdown and we don't want LOG_HANDLER to be invoked
-          # after Ruby has gone
-        at_exit {
-          GLib::remove_log_handler
-        }
-      end
+        # we must remove any handlers on exit, since libvips may log stuff
+        # on shutdown and we don't want LOG_HANDLER to be invoked
+        # after Ruby has gone
+      at_exit {
+        GLib::remove_log_handler
+      }
+    end
 
   end
 
@@ -487,7 +487,7 @@ def initialize msg = nil
         @details = msg
       elsif Vips::vips_error_buffer != ""
         @details = Vips::vips_error_buffer
-          Vips::vips_error_clear
+        Vips::vips_error_clear
       else
         @details = nil
       end
@@ -575,9 +575,9 @@ def self.set_debug debug
     # True if this is at least libvips x.y
   def self.at_least_libvips?(x, y)
     major = version(0)
-      minor = version(1)
+    minor = version(1)
 
-      major > x || (major == x && minor >= y)
+    major > x || (major == x && minor >= y)
   end
 
   LIBRARY_VERSION = Vips::version_string