method_source 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1118a4c5ca09e1fc6975b68f403928990625f5f
-  data.tar.gz: 300af8354d67837579d383bdc15459b1515421b1
+  metadata.gz: bb42b7f77ca24259bb26b26ff3e862d051d33aa9
+  data.tar.gz: '01769899a37ee328c75cd352fa560212c83f051a'
 SHA512:
-  metadata.gz: eda821b401319fb84c65668d1e627e403315e67fa0932cf04cc6eda25ce032ed1fece20ccb4268568b1d56d1110373050281ae05f86894beeda2f47dd890e1a1
-  data.tar.gz: 26d6010ff8487756651bf30e449d59fe1cf2729c778db676ce398cce1a6299ddc74c38305fd0b0ced24bd7b7cb7ad4806a3e20f992d58af1861021f6a9943fd6
+  metadata.gz: 6f8a3cc1ce051ad79750c4aa096f5e54c0fb7730908c669bd215f1ec98433dfa29bbfd383716344235c0a1dff5abd054d87e4c3b96fc5744b02ad120b4a26fd0
+  data.tar.gz: 649cf3eb91ab3fc6c1d2e32736a3a37f90abdfb7334db2b4f3e4d51e9a45a93ca03bd769a230c49230473f2b92f8dcbd4e72f255d8709e7991b01d0945587dff

data/.travis.yml

@@ -16,11 +16,12 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
-  - 2.4.1
+  - 2.4.2
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby
     - rvm: jruby-head
     - rvm: rbx-3
   fast_finish: true

data/Rakefile

@@ -19,6 +19,7 @@ def apply_spec_defaults(s)
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.require_path = 'lib'
+  s.license = 'MIT'
 
   s.add_development_dependency("rspec","~>3.6")
   s.add_development_dependency("rake", "~>0.9")

data/lib/method_source/code_helpers.rb

@@ -1,6 +1,9 @@
 module MethodSource
 
   module CodeHelpers
+    # @return [Boolean]
+    JRUBY_9200 = (defined?(JRUBY_VERSION) || false) && JRUBY_VERSION == '9.2.0.0'
+
     # Retrieve the first expression starting on the given line of the given file.
     #
     # This is useful to get module or method source code.
@@ -29,6 +32,26 @@ module MethodSource
 
       extract_first_expression(relevant_lines, options[:consume])
     rescue SyntaxError => e
+      # JRuby 9.2.0.0 breaks #source_location for Procs (it reports line number
+      # as the last line of the Proc). This raises SyntaxError.
+      # See https://github.com/pry/pry/issues/1804 for details.
+      #
+      # To fix this, this hack rewinds source location one step at a time and
+      # tries to see if the new location is a complete expression.
+      #
+      # TODO: delete this once latest JRuby version is bumped.
+      # See https://github.com/banister/method_source/issues/52
+      if JRUBY_9200 && line_number > 0
+        loop do
+          line_number -= 1
+
+          # Skip empty lines since they are not real expressions.
+          break unless lines[line_number - 1] == "\n"
+        end
+
+        retry
+      end
+
       raise if options[:strict]
 
       begin

data/lib/method_source/version.rb

@@ -1,3 +1,3 @@
 module MethodSource
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/method_source.gemspec

@@ -1,34 +1,35 @@
 # -*- encoding: utf-8 -*-
+# stub: method_source 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "method_source"
-  s.version = "0.8.1"
+  s.name = "method_source".freeze
+  s.version = "0.9.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mair (banisterfiend)"]
-  s.licenses = ['MIT']
-  s.date = "2012-10-17"
-  s.description = "retrieve the sourcecode for a method"
-  s.email = "jrmair@gmail.com"
-  s.files = [".gemtest", ".travis.yml", ".yardopts", "Gemfile", "LICENSE", "README.markdown", "Rakefile", "lib/method_source.rb", "lib/method_source/code_helpers.rb", "lib/method_source/source_location.rb", "lib/method_source/version.rb", "method_source.gemspec", "spec/method_source/code_helpers_spec.rb", "spec/method_source_spec.rb", "spec/spec_helper.rb"]
-  s.homepage = "http://banisterfiend.wordpress.com"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "retrieve the sourcecode for a method"
-  s.test_files = ["spec/method_source/code_helpers_spec.rb", "spec/method_source_spec.rb", "spec/spec_helper.rb"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["John Mair (banisterfiend)".freeze]
+  s.date = "2018-11-02"
+  s.description = "retrieve the sourcecode for a method".freeze
+  s.email = "jrmair@gmail.com".freeze
+  s.files = [".gemtest".freeze, ".travis.yml".freeze, ".yardopts".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.markdown".freeze, "Rakefile".freeze, "lib/method_source.rb".freeze, "lib/method_source/code_helpers.rb".freeze, "lib/method_source/source_location.rb".freeze, "lib/method_source/version.rb".freeze, "method_source.gemspec".freeze, "spec/method_source/code_helpers_spec.rb".freeze, "spec/method_source_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.homepage = "http://banisterfiend.wordpress.com".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.14".freeze
+  s.summary = "retrieve the sourcecode for a method".freeze
+  s.test_files = ["spec/method_source/code_helpers_spec.rb".freeze, "spec/method_source_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 3.6"])
-      s.add_development_dependency(%q<rake>, ["~> 0.9"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.6"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 0.9"])
     else
-      s.add_dependency(%q<rspec>, ["~> 3.6"])
-      s.add_dependency(%q<rake>, ["~> 0.9"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.6"])
+      s.add_dependency(%q<rake>.freeze, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 3.6"])
-    s.add_dependency(%q<rake>, ["~> 0.9"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.6"])
+    s.add_dependency(%q<rake>.freeze, ["~> 0.9"])
   end
 end

data/spec/method_source_spec.rb

@@ -31,7 +31,7 @@ describe MethodSource do
     @hello_comment = "# A comment for hello\n# It spans two lines and is indented by 2 spaces\n"
     @lambda_comment = "# This is a comment for MyLambda\n"
     @lambda_source = "MyLambda = lambda { :lambda }\n"
-    @proc_source = "MyProc = Proc.new { :proc }\n"
+    @proc_source = "MyProc = Proc.new do\n\n\nend\n"
     @hello_instance_evaled_source = "  def hello_\#{name}(*args)\n    send_mesg(:\#{name}, *args)\n  end\n"
     @hello_instance_evaled_source_2 = "  def \#{name}_two()\n    if 44\n      45\n    end\n  end\n"
     @hello_class_evaled_source = "  def hello_\#{name}(*args)\n    send_mesg(:\#{name}, *args)\n  end\n"

data/spec/spec_helper.rb

@@ -49,9 +49,11 @@ def comment_test5; end
 
 # This is a comment for MyLambda
 MyLambda = lambda { :lambda }
-MyProc = Proc.new { :proc }
+MyProc = Proc.new do
 
 
+end
+
 name = "name"
 
 M.instance_eval <<-METHOD, __FILE__, __LINE__ + 1
@@ -98,4 +100,3 @@ EOF
 # class_eval without filename and lineno + 1 parameter
 
 M.class_eval "def #{name}_three; @tempfile.#{name}; end"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_source
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,7 +60,8 @@ files:
 - spec/method_source_spec.rb
 - spec/spec_helper.rb
 homepage: http://banisterfiend.wordpress.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: retrieve the sourcecode for a method