rubocop-yast 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9d34ebc702b4f960ea9052af25796369d11d60
-  data.tar.gz: 0562543d6aca25bd76a0f933fcfd8670cde680cf
+  metadata.gz: 3d00eb7bb7017508fb7e10339707ed05352c97b4
+  data.tar.gz: 6d1d791795cf496f8e1b00c69f65a832b37b9f5b
 SHA512:
-  metadata.gz: 8f8c2c95efd7d2e58b78258fae535b1e3c671dbfdb3a108daf9231ae7224f46d21b81912622951635065c0c5364faaa0f509b68b95815992427412e8ee6a5784
-  data.tar.gz: 9fe4dfebd32eea8427cf671018187e60361d99fdb5089e3e4c1d35c2db30278ac11689a1823b233bf5e5dadb5f45e53b37828977dc8e85354d46acbc5392d06e
+  metadata.gz: 9e050ac199100b6740ecf3c6dcc845524e6acce8eb4f64507d86b3b20028c5bac08f0f1892d2c745ee92179677898791690ec1c989fd40fbb0f186d76fa07fec
+  data.tar.gz: 963c8dff14a5cc3962f5eb72f5d7d52c05c86dde5c8070327329b432dde65dcb66415378d5b18d9a35e56b47eaf50349caff58eca7ceefb0190d6c1d47a36054

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+## 0.0.9 (2016-01-26)
+
+### Changes
+
+- Fixed: does not translate a `begin`-body when a `rescue` contains a `retry`.
+
 ## 0.0.8 (2015-12-11)
 
 ### New Features

data/lib/rubocop/yast/track_variable_scope.rb

@@ -3,11 +3,6 @@
 require "rubocop/yast/niceness"
 require "rubocop/yast/variable_scope"
 
-# We have encountered code that does satisfy our simplifying assumptions,
-# translating it would not be correct.
-class TooComplexToTranslateError < Exception
-end
-
 module RuboCop
   module Yast
     # This module tracks variable usage
@@ -143,18 +138,17 @@ module RuboCop
         # (:rescue, begin-block, resbody..., else-block-or-nil)
         begin_body, *rescue_bodies, else_body = *node
 
-        # FIXME: the transaction must be rolled back
-        # by the TooComplexToTranslateError
-        # @source_rewriter.transaction do
+        if rescue_bodies.any? { |r| descendant?(r, :retry) }
+          # do not process if a retry may cause a loop
+          return node
+        end
+
         process(begin_body)
         process(else_body)
         rescue_bodies.each do |r|
           process(r)
         end
-        #  end
-        node
-      rescue TooComplexToTranslateError
-        warn "begin-rescue is too complex to translate due to a retry"
+
         node
       end
 
@@ -180,13 +174,16 @@ module RuboCop
         node
       end
 
-      def on_retry(_node)
-        # that makes the :rescue a loop, top-down data-flow fails
-        raise TooComplexToTranslateError
-      end
-
       private
 
+      # does node have a particular type as a descendant?
+      def descendant?(node, descendant_type)
+        on_node(descendant_type, node) do
+          return true           # short circuit, returns from the method
+        end
+        false
+      end
+
       def oops(node, exception)
         puts "Node exception @ #{node.loc.expression}"
         puts "Offending node: #{node.inspect}"

data/lib/rubocop/yast/version.rb

@@ -3,6 +3,6 @@
 module RuboCop
   # Yast plugin settings
   module Yast
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-yast
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ladislav Slezák
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop