method_source 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3ceddabc464d5453097a8c60ed8250ff7c0459
-  data.tar.gz: c002c999c368493393f55670cc014fae332364a6
+  metadata.gz: e1118a4c5ca09e1fc6975b68f403928990625f5f
+  data.tar.gz: 300af8354d67837579d383bdc15459b1515421b1
 SHA512:
-  metadata.gz: a29c92a32800423eddce9e4cb5ec13c9e50bdafacf634c08908e331baeb602be8655781bf464f9dbc87c74fb80e7ce4919dd63efcff67cdf1f57445259afb3bf
-  data.tar.gz: def76a2656612ce913098502cea143eb8a56263904a87ae27fe95f9f4d43b93aa0444ac7ad2023c4b381a14a3614cf6b5400f6abbc25f8b03bcee1206c6a5e76
+  metadata.gz: eda821b401319fb84c65668d1e627e403315e67fa0932cf04cc6eda25ce032ed1fece20ccb4268568b1d56d1110373050281ae05f86894beeda2f47dd890e1a1
+  data.tar.gz: 26d6010ff8487756651bf30e449d59fe1cf2729c778db676ce398cce1a6299ddc74c38305fd0b0ced24bd7b7cb7ad4806a3e20f992d58af1861021f6a9943fd6

data/.travis.yml

@@ -1,12 +1,29 @@
+# To use rbx environment.
+dist: trusty
+bundler_args: "--verbose"
+before_install:
+  - gem update --system
+  - which bundle || gem install bundler
+  - gem update bundler
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - ree
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-3
   - jruby
-
+  - jruby-head
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.1
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-3
+  fast_finish: true
 notifications:
   irc: "irc.freenode.org#pry"
   recipients:

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/README.markdown

@@ -1,4 +1,4 @@
-method_source
+method_source [![Build Status](https://travis-ci.org/banister/method_source.svg?branch=master)](https://travis-ci.org/banister/method_source)
 =============
 
 (C) John Mair (banisterfiend) 2011

data/Rakefile

@@ -20,16 +20,17 @@ def apply_spec_defaults(s)
   s.description = s.summary
   s.require_path = 'lib'
 
-  s.add_development_dependency("bacon","~>1.1.0")
+  s.add_development_dependency("rspec","~>3.6")
   s.add_development_dependency("rake", "~>0.9")
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
   s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- test/*`.split("\n")
+  s.test_files = `git ls-files -- spec/*`.split("\n")
 end
 
-task :test do
-  sh "bacon -q #{direc}/test/test.rb #{direc}/test/test_code_helpers.rb"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.ruby_opts = %w[-w]
 end
 
 desc "reinstall gem"
@@ -39,7 +40,7 @@ task :reinstall => :gems do
 end
 
 desc "Set up and run tests"
-task :default => [:test]
+task :default => [:spec]
 
 desc "Build the gemspec file"
 task :gemspec => "ruby:gemspec"

data/lib/method_source/code_helpers.rb

@@ -6,14 +6,14 @@ module MethodSource
     # This is useful to get module or method source code.
     #
     # @param [Array<String>, File, String] file  The file to parse, either as a File or as
-    # @param [Fixnum]  line_number  The line number at which to look.
+    # @param [Integer]  line_number  The line number at which to look.
     #                             NOTE: The first line in a file is
     #                           line 1!
     # @param [Hash] options The optional configuration parameters.
     # @option options [Boolean] :strict  If set to true, then only completely
     #   valid expressions are returned. Otherwise heuristics are used to extract
     #   expressions that may have been valid inside an eval.
-    # @option options [Fixnum] :consume  A number of lines to automatically
+    # @option options [Integer] :consume  A number of lines to automatically
     #   consume (add to the expression buffer) without checking for validity.
     # @return [String]  The first complete expression
     # @raise [SyntaxError]  If the first complete expression can't be identified
@@ -46,7 +46,7 @@ module MethodSource
     #
     # @param [Array<String>, File, String] file  The file to parse, either as a File or as
     #                                            a String or an Array of lines.
-    # @param [Fixnum]  line_number  The line number at which to look.
+    # @param [Integer]  line_number  The line number at which to look.
     #                             NOTE: The first line in a file is line 1!
     # @return [String]  The comment
     def comment_describing(file, line_number)
@@ -84,7 +84,7 @@ module MethodSource
     # Get the first expression from the input.
     #
     # @param [Array<String>]  lines
-    # @param [Fixnum] consume A number of lines to automatically
+    # @param [Integer] consume A number of lines to automatically
     #   consume (add to the expression buffer) without checking for validity.
     # @yield a clean-up function to run before checking for complete_expression
     # @return [String]  a valid ruby expression

data/lib/method_source/source_location.rb

@@ -111,7 +111,7 @@ module MethodSource
           case
           when klass == Symbol
             return :a.method(name).source_location
-          when klass == Fixnum
+          when klass == Integer
             return 0.method(name).source_location
           when klass == TrueClass
             return true.method(name).source_location

data/lib/method_source/version.rb

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

data/method_source.gemspec

@@ -6,28 +6,29 @@ Gem::Specification.new do |s|
 
   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", "test/test.rb", "test/test_code_helpers.rb", "test/test_helper.rb"]
+  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 = ["test/test.rb", "test/test_code_helpers.rb", "test/test_helper.rb"]
+  s.test_files = ["spec/method_source/code_helpers_spec.rb", "spec/method_source_spec.rb", "spec/spec_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bacon>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.6"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
-      s.add_dependency(%q<bacon>, ["~> 1.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 3.6"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<bacon>, ["~> 1.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 3.6"])
     s.add_dependency(%q<rake>, ["~> 0.9"])
   end
 end

data/{test/test_code_helpers.rb → spec/method_source/code_helpers_spec.rb}

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe MethodSource::CodeHelpers do
   before do
     @tester = Object.new.extend(MethodSource::CodeHelpers)
@@ -17,9 +19,9 @@ describe MethodSource::CodeHelpers do
   ].each do |lines|
     it "should not raise an error on broken lines: #{lines.join("\\n")}" do
       1.upto(lines.size - 1) do |i|
-        @tester.complete_expression?(lines[0...i].join("\n") + "\n").should == false
+        expect(@tester.complete_expression?(lines[0...i].join("\n") + "\n")).to be_falsy
       end
-      @tester.complete_expression?(lines.join("\n")).should == true
+      expect(@tester.complete_expression?(lines.join("\n"))).to be_truthy
     end
   end
 
@@ -33,9 +35,9 @@ describe MethodSource::CodeHelpers do
     ["o = Object.new.tap{ def o.render;","'MEH'", "}"] # in this case the syntax error is "expecting keyword_end".
   ]).compact.each do |foo|
     it "should raise an error on invalid syntax like #{foo.inspect}" do
-      lambda{
+      expect {
         @tester.complete_expression?(foo.join("\n"))
-      }.should.raise(SyntaxError)
+      }.to raise_error(SyntaxError)
     end
   end
 end

data/{test/test.rb → spec/method_source_spec.rb}

@@ -1,26 +1,25 @@
-direc = File.expand_path(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'bacon'
-require "#{direc}/../lib/method_source"
-require "#{direc}/test_helper"
+require 'spec_helper'
 
 describe MethodSource do
 
   describe "source_location (testing 1.8 implementation)" do
     it 'should return correct source_location for a method' do
-      method(:hello).source_location.first.should =~ /test_helper/
+      expect(method(:hello).source_location.first).to match(/spec_helper/)
     end
 
     it 'should not raise for immediate instance methods' do
-      [Symbol, Fixnum, TrueClass, FalseClass, NilClass].each do |immediate_class|
-        lambda { immediate_class.instance_method(:to_s).source_location }.should.not.raise
+      [Symbol, Integer, TrueClass, FalseClass, NilClass].each do |immediate_class|
+        expect do
+          immediate_class.instance_method(:to_s).source_location
+        end.not_to raise_error
       end
     end
 
     it 'should not raise for immediate methods' do
       [:a, 1, true, false, nil].each do |immediate|
-        lambda { immediate.method(:to_s).source_location }.should.not.raise
+        expect do
+          immediate.method(:to_s).source_location
+        end.not_to raise_error
       end
     end
   end
@@ -40,49 +39,55 @@ describe MethodSource do
   end
 
   it 'should define methods on Method and UnboundMethod and Proc' do
-    Method.method_defined?(:source).should == true
-    UnboundMethod.method_defined?(:source).should == true
-    Proc.method_defined?(:source).should == true
+    expect(Method.method_defined?(:source)).to be_truthy
+    expect(UnboundMethod.method_defined?(:source)).to be_truthy
+    expect(Proc.method_defined?(:source)).to be_truthy
   end
 
   describe "Methods" do
     it 'should return source for method' do
-      method(:hello).source.should == @hello_source
+      expect(method(:hello).source).to eq(@hello_source)
     end
 
     it 'should return source for a method defined in a module' do
-      M.instance_method(:hello).source.should == @hello_module_source
+      expect(M.instance_method(:hello).source).to eq(@hello_module_source)
     end
 
     it 'should return source for a singleton method as an instance method' do
-      class << $o; self; end.instance_method(:hello).source.should == @hello_singleton_source
+      expect(class << $o
+        self
+      end.instance_method(:hello).source).to eq(@hello_singleton_source)
     end
 
     it 'should return source for a singleton method' do
-      $o.method(:hello).source.should == @hello_singleton_source
+      expect($o.method(:hello).source).to eq(@hello_singleton_source)
     end
 
     it 'should return a comment for method' do
-      method(:hello).comment.should == @hello_comment
+      expect(method(:hello).comment).to eq(@hello_comment)
     end
 
     # These tests fail because of http://jira.codehaus.org/browse/JRUBY-4576
     unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
       it 'should return source for an *_evaled method' do
-        M.method(:hello_name).source.should == @hello_instance_evaled_source
-        M.method(:name_two).source.should == @hello_instance_evaled_source_2
-        M.instance_method(:hello_name).source.should == @hello_class_evaled_source
-        M.instance_method(:hi_name).source.should == @hi_module_evaled_source
+        expect(M.method(:hello_name).source).to eq(@hello_instance_evaled_source)
+        expect(M.method(:name_two).source).to eq(@hello_instance_evaled_source_2)
+        expect(M.instance_method(:hello_name).source).to eq(@hello_class_evaled_source)
+        expect(M.instance_method(:hi_name).source).to eq(@hi_module_evaled_source)
       end
     end
 
     it "should raise error for evaled methods that do not pass __FILE__ and __LINE__ + 1 as its arguments" do
-      lambda { M.instance_method(:name_three).source }.should.raise MethodSource::SourceNotFoundError
+      expect do
+        M.instance_method(:name_three).source
+      end.to raise_error(MethodSource::SourceNotFoundError)
     end
 
     if !is_rbx?
       it 'should raise for C methods' do
-        lambda { method(:puts).source }.should.raise MethodSource::SourceNotFoundError
+        expect do
+          method(:puts).source
+        end.to raise_error(MethodSource::SourceNotFoundError)
       end
     end
   end
@@ -90,19 +95,19 @@ describe MethodSource do
   # if RUBY_VERSION =~ /1.9/ || is_rbx?
   describe "Lambdas and Procs" do
     it 'should return source for proc' do
-      MyProc.source.should == @proc_source
+      expect(MyProc.source).to eq(@proc_source)
     end
 
     it 'should return an empty string if there is no comment' do
-      MyProc.comment.should == ''
+      expect(MyProc.comment).to eq('')
     end
 
     it 'should return source for lambda' do
-      MyLambda.source.should == @lambda_source
+      expect(MyLambda.source).to eq(@lambda_source)
     end
 
     it 'should return comment for lambda' do
-      MyLambda.comment.should == @lambda_comment
+      expect(MyLambda.comment).to eq(@lambda_comment)
     end
   end
   # end
@@ -116,23 +121,23 @@ describe MethodSource do
     end
 
     it "should correctly extract multi-line comments" do
-      method(:comment_test1).comment.should == @comment1
+      expect(method(:comment_test1).comment).to eq(@comment1)
     end
 
     it "should correctly strip leading whitespace before comments" do
-      method(:comment_test2).comment.should == @comment2
+      expect(method(:comment_test2).comment).to eq(@comment2)
     end
 
     it "should keep empty comment lines" do
-      method(:comment_test3).comment.should == @comment3
+      expect(method(:comment_test3).comment).to eq(@comment3)
     end
 
     it "should ignore blank lines between comments" do
-      method(:comment_test4).comment.should == @comment4
+      expect(method(:comment_test4).comment).to eq(@comment4)
     end
 
     it "should align all comments to same indent level" do
-      method(:comment_test5).comment.should == @comment5
+      expect(method(:comment_test5).comment).to eq(@comment5)
     end
   end
 end

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,3 +1,6 @@
+require 'method_source'
+require 'rspec'
+
 def is_rbx?
   defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: method_source
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: retrieve the sourcecode for a method
@@ -44,9 +44,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .travis.yml
-- .yardopts
+- ".gemtest"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.markdown
@@ -56,9 +56,9 @@ files:
 - lib/method_source/source_location.rb
 - lib/method_source/version.rb
 - method_source.gemspec
-- test/test.rb
-- test/test_code_helpers.rb
-- test/test_helper.rb
+- spec/method_source/code_helpers_spec.rb
+- spec/method_source_spec.rb
+- spec/spec_helper.rb
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 metadata: {}
@@ -68,21 +68,21 @@ 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.0.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: retrieve the sourcecode for a method
 test_files:
-- test/test.rb
-- test/test_code_helpers.rb
-- test/test_helper.rb
+- spec/method_source/code_helpers_spec.rb
+- spec/method_source_spec.rb
+- spec/spec_helper.rb