sexp_processor 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c330cf1162f2b13522bf591471d69bd2daac84
-  data.tar.gz: 9f7001a49fb152b343544319f3de1c36f94a6b08
+  metadata.gz: 11e44f6312c253038fcf1ab9039d20f03e7703e0
+  data.tar.gz: 8fdd674b9c830e9436d27941d6c041fe3e3cb7eb
 SHA512:
-  metadata.gz: 918c51196a0a5d9757b20215de228e73bb25e6df71e42aa8fa2bfcf4c3a058937ffd0bdd49e9fc9f6bbfba4d175aa935d946d8a911d91cbc6ed0a886922513ac
-  data.tar.gz: b111b71bb1145d390125f6fa287a8b837916d92974a5665fcdda44b8427554306ceed81baa8625f292cae300267c4697f0aefdf20ec32450d5fb52fd06c95af2
+  metadata.gz: 6e012cc2080b582e0c34217331594f3d0442f259828e370164147bbcfd78347490e402b66db482ab3c1205a219b8b74043c34d9c4633de768afc9f1a5fbed402
+  data.tar.gz: 293726bd82c8cb6bdbd05efbcb4046889afa9284e805c481e8532f573d1aaadc8e9eec4dfecf7cea73a3e86193cf5e0237090caa1631607d1fa63c9ee121cd1a

data.tar.gz.sig

@@ -1 +1,3 @@
-Z�
O�2ߵ�kj��lz��,���J��� wJT%��)Q��%��Q�X}�6�[�-�ɵA|#�Cpˉ�R�����K^з+ R� %~Srkk��)���CĖV����
	b6,h8��
+����*���� �kֳ��0�x�0њz�����b�������S�nYn-�(l��"�0��_���Y��
+r�2�1N��v$K��Bb��j��S����&/�$PƟ%��s��
+��A���|��3'�5;�+Ү
�e�z`��e

data/History.txt

@@ -1,3 +1,10 @@
+=== 4.8.0 / 2017-02-01
+
+* 2 minor enhancements:
+
+  * Added Sexp#line_max
+  * Extended MethodBasedSexpProcessor#in_method to take line_max and record span.
+
 === 4.7.0 / 2016-02-18
 
 * 2 minor enhancements:

data/lib/pt_testcase.rb

@@ -2,7 +2,7 @@
 
 $TESTING = true
 
-require 'minitest/unit'
+require 'minitest/test'
 require 'sexp_processor' # for deep_clone
 
 # key:
@@ -111,6 +111,8 @@ class ParseTreeTestCase < Minitest::Test
       if tversions then
         cversion = self.class.name[/#{VER_RE}/]
 
+        assert true # shut up prove_it!
+
         # can't push this up because it may be generating into an
         # abstract test class and the actual subclass is versioned.
         return "version specific test" unless tversions.include? cversion if cversion

data/lib/sexp.rb

@@ -199,6 +199,13 @@ class Sexp < Array # ZenTest FULL
     end
   end
 
+  ##
+  # Returns the maximum line number of the children of self.
+
+  def line_max
+    self.deep_each.map(&:line).max
+  end
+
   ##
   # Returns the size of the sexp, flattened.
 

data/lib/sexp_processor.rb

@@ -33,7 +33,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = "4.7.0"
+  VERSION = "4.8.0"
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -488,10 +488,11 @@ class MethodBasedSexpProcessor < SexpProcessor
   ##
   # Adds name to the method stack, for the duration of the block
 
-  def in_method(name, file, line)
+  def in_method name, file, line, line_max=nil
     method_name = Regexp === name ? name.inspect : name.to_s
     @method_stack.unshift method_name
-    @method_locations[signature] = "#{file}:#{line}"
+    line_max = "-#{line_max}" if line_max
+    @method_locations[signature] = "#{file}:#{line}#{line_max}"
     yield
   ensure
     @method_stack.shift
@@ -562,7 +563,8 @@ class MethodBasedSexpProcessor < SexpProcessor
   def process_defn(exp)
     exp.shift unless auto_shift_type # node type
     name = @sclass.empty? ? exp.shift : "::#{exp.shift}"
-    in_method name, exp.file, exp.line do
+
+    in_method name, exp.file, exp.line, exp.line_max do
       if block_given? then
         yield
       else
@@ -580,7 +582,7 @@ class MethodBasedSexpProcessor < SexpProcessor
   def process_defs(exp)
     exp.shift unless auto_shift_type # node type
     process exp.shift # recv
-    in_method "::#{exp.shift}", exp.file, exp.line do
+    in_method "::#{exp.shift}", exp.file, exp.line, exp.line_max do
       if block_given? then
         yield
       else

data/test/test_sexp.rb

@@ -48,8 +48,15 @@ class TestSexp < SexpTestCase # ZenTest FULL
     @sexp_class = Object.const_get(self.class.name[4..-1])
     @processor = SexpProcessor.new
     @sexp = @sexp_class.new(1, 2, 3)
-    @basic_sexp = s(:lasgn, :var, s(:lit, 42))
-    @complex_sexp = s(:block, s(:lasgn, :foo, s(:str, "foo")), s(:if, s(:and, s(:true), s(:lit, 1)), s(:if, s(:lvar, :foo), s(:str, "bar"), nil), s(:true)))
+    @basic_sexp = s(:lasgn, :var, s(:lit, 42).line(1)).line(1)
+    @complex_sexp = s(:block,
+                      s(:lasgn, :foo, s(:str, "foo").line(1)).line(1),
+                      s(:if, s(:and, s(:true).line(2), s(:lit, 1).line(2)).line(2),
+                        s(:if, s(:lvar, :foo).line(3),
+                          s(:str, "bar").line(3),
+                          nil).line(3),
+                        s(:true).line(5)).line(2)).line(1)
+
     @re = s(:lit, 42)
     @bad1 = s(:lit, 24)
     @bad1 = s(:blah, 42)
@@ -193,6 +200,18 @@ class TestSexp < SexpTestCase # ZenTest FULL
                  k.new(:a, k.new(:b)).inspect)
   end
 
+  def test_line
+    assert_nil @sexp.line
+    assert_equal 1, @basic_sexp.line
+    assert_equal 1, @complex_sexp.line
+  end
+
+  def test_line_max
+    assert_nil @sexp.line_max
+    assert_equal 1, @basic_sexp.line_max
+    assert_equal 5, @complex_sexp.line_max
+  end
+
   def test_mass
     assert_equal 1, s(:a).mass
     assert_equal 3, s(:a, s(:b), s(:c)).mass

data/test/test_sexp_processor.rb

@@ -327,6 +327,19 @@ class TestMethodBasedSexpProcessor < Minitest::Test
     assert_equal expected, processor.method_locations
   end
 
+  def test_in_method_line_max
+    assert_empty processor.method_stack
+
+    processor.in_method "xxx", "file.rb", 42, 44 do
+      assert_equal ["xxx"], processor.method_stack
+    end
+
+    assert_empty processor.method_stack
+
+    expected = {"main#xxx" => "file.rb:42-44"}
+    assert_equal expected, processor.method_locations
+  end
+
   def test_klass_name
     assert_equal :main, processor.klass_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,59 +20,46 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
 description: |-
   sexp_processor branches from ParseTree bringing all the generic sexp
   processing tools with it. Sexp, SexpProcessor, Environment, etc... all
@@ -105,23 +92,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: sexp_processor branches from ParseTree bringing all the generic sexp processing