#1 Update to method_source 1.0.0
Merged 3 years ago by pvalena. Opened 3 years ago by pvalena.
rpms/ pvalena/rubygem-method_source rebase  into  master

file modified
+1 -4
@@ -1,4 +1,1 @@ 

- /method_source-0.7.1.gem

- /method_source-0.8.gem

- /method_source-0.8.1.gem

- /method_source-0.8.2.gem

+ /method_source-*.gem

@@ -1,13 +0,0 @@ 

- diff --git a/test/test.rb b/test/test.rb

- index 4743a50..b99f717 100644

- --- a/test/test.rb

- +++ b/test/test.rb

- @@ -13,7 +13,7 @@

-      end

-  

-      it 'should not raise for immediate instance methods' do

- -      [Symbol, Fixnum, TrueClass, FalseClass, NilClass].each do |immediate_class|

- +      [Symbol, Integer, TrueClass, FalseClass, NilClass].each do |immediate_class|

-          lambda { immediate_class.instance_method(:to_s).source_location }.should.not.raise

-        end

-      end

@@ -1,52 +0,0 @@ 

- diff --git a/lib/method_source/code_helpers.rb b/lib/method_source/code_helpers.rb

- index 6c1d53e..9d9da55 100644

- --- a/lib/method_source/code_helpers.rb

- +++ b/lib/method_source/code_helpers.rb

- @@ -6,14 +6,14 @@ module CodeHelpers

-      # 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 @@ def expression_at(file, line_number, options={})

-      #

-      # @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 @@ def complete_expression?(str)

-      # 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

- diff --git a/lib/method_source/source_location.rb b/lib/method_source/source_location.rb

- index 1e2a22a..7629869 100644

- --- a/lib/method_source/source_location.rb

- +++ b/lib/method_source/source_location.rb

- @@ -111,7 +111,7 @@ def source_location

-            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

file modified
+14 -19
@@ -3,21 +3,16 @@ 

  

  Summary: Retrieve the source code for a method

  Name: rubygem-%{gem_name}

- Version: 0.8.2

- Release: 12%{?dist}

+ Version: 1.0.0

+ Release: 1%{?dist}

  License: MIT

  URL: http://banisterfiend.wordpress.com

  Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem

  

- # Fix Fixnum/Bignum deprecated warning for Ruby 2.4.0.

- # https://github.com/banister/method_source/commit/05ce7fc

- Patch0: rubygem-method_source-0.8.2-fix-fixnum-bignum-warnings.patch

- Patch1: rubygem-method_source-0.8.2-fix-fixnum-bignum-warnings-tests.patch

- 

  BuildRequires: ruby(release)

  BuildRequires: rubygems-devel

  BuildRequires: ruby

- BuildRequires: %{_bindir}/bacon

+ BuildRequires: rubygem(rspec)

  BuildArch: noarch

  

  %description
@@ -33,14 +28,12 @@ 

  Documentation for %{name}

  

  %prep

- %setup -q -c -T

- %gem_install -n %{SOURCE0}

- 

- pushd .%{gem_instdir}

- %patch0 -p1

- popd

+ %setup -q -n %{gem_name}-%{version}

  

  %build

+ gem build ../%{gem_name}-%{version}.gemspec

+ %gem_install

+ 

  

  %install

  mkdir -p %{buildroot}%{gem_dir}
@@ -49,10 +42,7 @@ 

  

  %check

  pushd .%{gem_instdir}

- 

- cat %{PATCH1} | patch -p1

- 

- bacon test/test.rb

+ rspec spec

  popd

  

  
@@ -68,11 +58,16 @@ 

  %doc %{gem_docdir}

  %{gem_instdir}/Gemfile

  %doc %{gem_instdir}/README.markdown

+ %doc %{gem_instdir}/CHANGELOG.md

  %{gem_instdir}/Rakefile

  %{gem_instdir}/method_source.gemspec

- %{gem_instdir}/test

+ %{gem_instdir}/spec

  

  %changelog

+ * Fri Oct 30 04:22:11 CET 2020 Pavel Valena <pvalena@redhat.com> - 1.0.0-1

+ - Update to method_source 1.0.0.

+   Resolves: rhbz#1495844

+ 

  * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-12

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (method_source-0.8.2.gem) = 44cf12bf0e47101f4e91b91b62c54e5403c827be5999b739a930e74c4449861a254631935f6a60430912316767fcc74e3f947075b0b0d994dc864bfdb935af1e

+ SHA512 (method_source-1.0.0.gem) = d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa

also enhance .spec and .gitignore files.

Resolves: rhbz#1495844


To have latest method_source gem in Fedora.

Up-to-date Koji scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=55491395

Up-to-date Copr build:
https://copr.fedorainfracloud.org/coprs/build/1767473

Checks:

  • Tests: ok
  • Syntax check: ok
  • Reverse dependencies: ok
  • Smoke test: ok
  • rpmlint: ok

Update log: https://git.io/JkmZJ
Test log: https://git.io/JkmZT
gem2rpm diff: https://git.io/JkmZk

While removing the patches from use, you don't remove them from the repo.

rebased onto bd0cbf2

3 years ago

Good catch! Thanks! Fixed, retested, LGTM.

Pull-Request has been merged by pvalena

3 years ago