lovely_rufus 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a8a7506b842cfa774ae330401ec749a62a747f45
-  data.tar.gz: 2b87ba178ae72ff65d1d5fc0034e8b792af0cc72
+SHA256:
+  metadata.gz: be467f0b20918a42ef34081961d5522dcb7eaa6b6d7f2a0c9a8e9c0287642ef1
+  data.tar.gz: d4636e37e170298535f91232c0be8f97d5136b845eae4b3d87e9678130a62875
 SHA512:
-  metadata.gz: f001a856ce6dbf2352e041c0523fa279dfb7f29c887e943341fe788e94df76686a2122e0570a872b24911751a059a6c51599d17ac5573af011a537e330dbb30d
-  data.tar.gz: 1be429a0ad375e82961bbfa99bc230577b81ccc5cc192c494922cbdbb5b4556d8e879348c44228f506ce26ba60801b249a71c8d022b787ff4afe19d565b137f5
+  metadata.gz: 9f2c2b19b693943371a4f2a5c8a5250bf84660442a8f169349f9d6b16ee6820460ffe52feb22deb5ee8c705864879d45fed15639fd6eadddc206b3d3da65bde3
+  data.tar.gz: 3769f17bce00f125f70abef732e6c934c5cdf7a1844296583daa7d1de099eaf155464b271b56c30a770770a167304929d0b9ad6e01c64c4b63e67dde5f85a9c2

data/.overcommit.yml

@@ -0,0 +1,4 @@
+PreCommit:
+  RakeTarget:
+    enabled: true
+    targets: [default]

data/.reek.yml

@@ -0,0 +1,3 @@
+detectors:
+  IrresponsibleModule:
+    enabled: false

data/.rubocop.yml

@@ -1,12 +1,24 @@
-Style/AndOr:
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+
+Bundler/GemFilename:
   Enabled: false
 
-Style/Documentation:
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
+Metrics/BlockLength:
+  AllowedMethods: describe
+
+Naming/HeredocDelimiterCase:
   Enabled: false
 
-Style/FileName:
-  Exclude:
-    - bin/lovely-rufus
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
 
-Style/SingleLineBlockParams:
+Style/FrozenStringLiteralComment:
   Enabled: false

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.6

data/.travis.yml

@@ -1,6 +1,14 @@
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle
 language: ruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 rvm:
-  - ruby-2.1
-  - ruby-2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
-sudo: false

data/README.md

@@ -64,4 +64,4 @@ Lovely Rufus was created as a [Ruby Mendicant University](http://blog.majesticse
 
 ---
 
-© MMX-MMXV Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)
+© MMX-MMXIX Piotr Szotkowski <chastell@chastell.net>, licensed under AGPL-3.0 (see LICENCE)

data/Rakefile

@@ -1,8 +1,9 @@
+require 'bundler/setup'
 require 'rake/testtask'
 require 'reek/rake/task'
 require 'rubocop/rake_task'
 
-task default: %i(test rubocop reek)
+task default: %i[test rubocop reek]
 
 Rake::TestTask.new do |task|
   task.pattern = 'test/**/*_test.rb'

data/bin/lovely-rufus

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/lovely_rufus'
 require_relative '../lib/lovely_rufus/cli_wrapper'
 
 LovelyRufus::CLIWrapper.new.run

data/gems.locked

@@ -0,0 +1,99 @@
+PATH
+  remote: .
+  specs:
+    lovely_rufus (1.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    dry-configurable (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.2)
+      concurrent-ruby (~> 1.0)
+      logger
+      zeitwerk (~> 2.6)
+    dry-inflector (1.1.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.4)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    json (2.12.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
+    minitest-focus (1.4.0)
+      minitest (>= 4, < 6)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    reek (6.4.0)
+      dry-schema (~> 1.13.0)
+      logger (~> 1.6)
+      parser (~> 3.3.0)
+      rainbow (>= 2.0, < 4.0)
+      rexml (~> 3.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rubocop (1.75.6)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lovely_rufus!
+  minitest (~> 5.6)
+  minitest-focus (~> 1.1)
+  mocha (~> 2.7)
+  rake (~> 13.0)
+  reek (~> 6.0)
+  rubocop (~> 1.0)
+
+BUNDLED WITH
+   2.5.23

data/lib/lovely_rufus/cli_wrapper.rb

@@ -12,6 +12,8 @@ module LovelyRufus
       puts text_wrapper.wrap(stream.read, width: settings.width)
     end
 
-    private_attr_reader :settings, :text_wrapper
+    private
+
+    attr_reader :settings, :text_wrapper
   end
 end

data/lib/lovely_rufus/layers/basic_wrapper.rb

@@ -4,10 +4,12 @@ require_relative 'layer'
 module LovelyRufus
   module Layers
     class BasicWrapper < Layer
+      # :reek:FeatureEnvy
       def call(wrap)
+        width     = wrap.width
         unwrapped = wrap.text.tr("\n", ' ').strip
-        wrapped   = unwrapped.gsub(/(.{1,#{wrap.width}})( |$\n?)/, "\\1\n")
-        next_layer.call(Wrap[wrapped, width: wrap.width])
+        wrapped   = unwrapped.gsub(/(.{1,#{width}})( |$\n?)/, "\\1\n")
+        next_layer.call(Wrap[wrapped, width: width])
       end
     end
   end

data/lib/lovely_rufus/layers/code_comment_stripper.rb

@@ -5,9 +5,7 @@ module LovelyRufus
     class CodeCommentStripper < QuoteStripper
       QUOTES = %r{^\s*(//|#) }
 
-      private
-
-      alias_method :fixed_quote, :quote
+      alias fixed_quote quote
     end
   end
 end

data/lib/lovely_rufus/layers/email_quote_stripper.rb

@@ -2,13 +2,14 @@ require_relative 'quote_stripper'
 
 module LovelyRufus
   module Layers
+    # :reek:UnusedPrivateMethod
     class EmailQuoteStripper < QuoteStripper
       QUOTES = /^>[> ]*/
 
       private
 
       def fixed_quote
-        quote.size > 0 ? quote.delete(' ') + ' ' : ''
+        quote.empty? ? '' : "#{quote.delete(' ')} "
       end
     end
   end

data/lib/lovely_rufus/layers/hangout_wrapper.rb

@@ -11,47 +11,61 @@ module LovelyRufus
         next_layer.call(final)
       end
 
-      private_attr_reader :wrap
-
       private
 
-      module HangoutFinder
-        module_function
+      attr_reader :wrap
 
-        def between?(line_a, line_b)
-          last_space = line_a.chomp.rindex(/\p{space}/)
-          last_space and last_space >= line_b.chomp.size
+      class HangoutFinder
+        def initialize(upper, lower, last)
+          @upper = upper
+          @lower = lower
+          @last  = last
         end
 
-        def reverse?(line_a, line_b)
-          cut = line_a.chomp.rindex(/\p{space}/)
-          a_after = line_a[0...cut] + "\n"
-          b_after = line_a[(cut + 1)..-1] + line_b
-          b_after.chomp.rindex(/\p{space}/) > a_after.size
+        def hangout?
+          exists? and useful_fix?
         end
-      end
 
-      def hangout_line
-        lines.each_cons(2).with_index do |(a, b), i|
-          if HangoutFinder.between?(a, b)
-            return a unless i == lines.size - 2 and HangoutFinder.reverse?(a, b)
-          end
+        private
+
+        attr_reader :lower, :upper
+
+        def exists?
+          last_space = upper.chomp.rindex(/\p{space}/)
+          last_space and last_space >= lower.chomp.size
+        end
+
+        def last?
+          @last
+        end
+
+        def useful_fix?
+          return true unless last?
+
+          cut = upper.chomp.rindex(/\p{space}/)
+          upper_after = "#{upper[0...cut]}\n"
+          lower_after = upper[(cut + 1)..] + lower
+          lower_after.chomp.rindex(/\p{space}/) <= upper_after.size
         end
       end
 
-      def lines
-        @lines ||= wrap.lines
+      # :reek:DuplicateMethodCall
+      def hangout_line
+        wrap.lines.each_cons(2).with_index do |(upper, lower), index|
+          finder = HangoutFinder.new(upper, lower, index == wrap.lines.size - 2)
+          return index if finder.hangout?
+        end
       end
 
+      # :reek:TooManyStatements
       def rewrapped
-        hangout_line[-1] = NBSP
+        index = hangout_line
+        new_lines = wrap.lines.dup
+        new_lines[index] = "#{new_lines[index][0...-1]} "
+        unfolded = Wrap[new_lines.join, width: wrap.width]
+        wrapped = BasicWrapper.new.call(unfolded)
         HangoutWrapper.new.call(wrapped)
       end
-
-      def wrapped
-        unfolded = Wrap[lines.join, width: wrap.width]
-        BasicWrapper.new.call(unfolded)
-      end
     end
   end
 end

data/lib/lovely_rufus/layers/layer.rb

@@ -1,15 +1,17 @@
 module LovelyRufus
   module Layers
     class Layer
-      def initialize(next_layer = -> (wrap) { wrap })
+      def initialize(next_layer = ->(wrap) { wrap })
         @next_layer = next_layer
       end
 
       def call(_wrap)
-        fail 'Layer subclasses must define #call that takes a Wrap'
+        raise 'Layer subclasses must define #call that takes a Wrap'
       end
 
-      private_attr_reader :next_layer
+      private
+
+      attr_reader :next_layer
     end
   end
 end

data/lib/lovely_rufus/layers/one_letter_gluer.rb

@@ -4,9 +4,10 @@ require_relative 'layer'
 module LovelyRufus
   module Layers
     class OneLetterGluer < Layer
+      # :reek:FeatureEnvy
       def call(wrap)
         pattern = /(?<=\p{space})(&|\p{letter})\p{space}/
-        text    = wrap.text.gsub(pattern, "\\1\\2#{NBSP}")
+        text    = wrap.text.gsub(pattern, '\1\2 ')
         next_layer.call(Wrap[text, width: wrap.width])
       end
     end

data/lib/lovely_rufus/layers/quote_stripper.rb

@@ -11,17 +11,17 @@ module LovelyRufus
         Wrap[quoted, width: wrapped.width + fixed_quote.size]
       end
 
-      private_attr_reader :wrap
-
       private
 
+      attr_reader :wrap
+
       def quote
         starts = wrap.lines.map { |line| line[self.class::QUOTES] }.uniq
         starts.size == 1 ? starts.first || '' : ''
       end
 
       def stripped_wrap
-        stripped_text = wrap.lines.map { |line| line[quote.size..-1] }.join
+        stripped_text = wrap.lines.map { |line| line[quote.size..] }.join
         Wrap[stripped_text, width: wrap.width - fixed_quote.size]
       end
     end

data/lib/lovely_rufus/text_wrapper.rb

@@ -7,33 +7,35 @@ require_relative 'wrap'
 
 module LovelyRufus
   class TextWrapper
-    QUOTES = %r{^([>/#])(\1| )*}
-
-    def self.wrap(text, width: 72)
-      new(Wrap[text, width: width]).call
+    class << self
+      def chain
+        layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
+                  Layers::OneLetterGluer, Layers::BasicWrapper,
+                  Layers::HangoutWrapper]
+        identity = ->(wrap) { wrap }
+        layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
+      end
+
+      def wrap(text, width: 72)
+        new(Wrap[text, width: width]).call
+      end
     end
 
+    QUOTES = %r{^([>/#])(\1| )*}
+
     def initialize(wrap)
       @wrap = wrap
     end
 
     def call
       paras.map do |para|
-        chain.call(Wrap[para, width: wrap.width]).text.tr(NBSP, ' ')
+        self.class.chain.call(Wrap[para, width: wrap.width]).text.tr(' ', ' ')
       end.join("\n")
     end
 
-    private_attr_reader :wrap
-
     private
 
-    def chain
-      layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
-                Layers::OneLetterGluer, Layers::BasicWrapper,
-                Layers::HangoutWrapper]
-      identity = -> (wrap) { wrap }
-      layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
-    end
+    attr_reader :wrap
 
     def paras
       wrap.text.split(/\n#{QUOTES}?\n/).reject { |par| par[/^(#{QUOTES}| )$/] }

data/lib/lovely_rufus/wrap.rb

@@ -5,7 +5,7 @@ module LovelyRufus
     extend Forwardable
 
     def initialize(text = '', width: 72)
-      super text, width
+      super(text, width)
     end
 
     delegate lines: :text

data/lib/lovely_rufus.rb

@@ -1,9 +1,6 @@
-require 'private_attr/everywhere'
 require_relative 'lovely_rufus/text_wrapper'
 
 module LovelyRufus
-  NBSP = "\u00A0"
-
   module_function
 
   def wrap(text, text_wrapper: TextWrapper, width: 72)

data/lovely_rufus.gemspec

@@ -7,29 +7,22 @@ Gem::Specification.new do |gem|
                     'paragraphs of text.'
   gem.email       = 'chastell@chastell.net'
   gem.homepage    = 'http://github.com/chastell/lovely_rufus'
-  gem.license     = 'AGPL-3.0'
+  gem.license     = 'AGPL-3.0-or-later'
   gem.name        = 'lovely_rufus'
   gem.summary     = 'lovely_rufus: text wrapper'
-  gem.version     = '1.0.0'
+  gem.version     = '1.1.0'
 
-  gem.required_ruby_version = '~> 2.1'
+  gem.required_ruby_version = '~> 3.0'
 
   gem.files       = `git ls-files -z`.split("\0")
   gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename(path) }
-  gem.test_files  = gem.files.grep(%r{^test/.*\.rb$})
 
-  gem.cert_chain  = ['certs/chastell.pem']
-  if Pathname.new($PROGRAM_NAME).basename == Pathname.new('gem')
-    gem.signing_key = Pathname.new('~/.ssh/gem-private_key.pem').expand_path
-  end
-
-  gem.add_dependency 'private_attr', '~> 1.1'
-
-  gem.add_development_dependency 'bogus',          '~> 0.1.4'
   gem.add_development_dependency 'minitest',       '~> 5.6'
   gem.add_development_dependency 'minitest-focus', '~> 1.1'
-  gem.add_development_dependency 'rake',           '~> 10.1'
-  gem.add_development_dependency 'reek',           '~> 3.1'
-  gem.add_development_dependency 'rerun',          '~> 0.11.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.35.0'
+  gem.add_development_dependency 'mocha',          '~> 2.7'
+  gem.add_development_dependency 'rake',           '~> 13.0'
+  gem.add_development_dependency 'reek',           '~> 6.0'
+  gem.add_development_dependency 'rubocop',        '~> 1.0'
+
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/lovely_rufus/cli_wrapper_test.rb

@@ -7,20 +7,20 @@ module LovelyRufus
     describe '#run' do
       let(:stream)       { StringIO.new(text)                          }
       let(:text)         { "all right: stop, collaborate and listen\n" }
-      let(:text_wrapper) { fake(:text_wrapper, as: :class)             }
+      let(:text_wrapper) { mock.quacks_like(TextWrapper)               }
 
       it 'reads the passed stream to TextWrapper and prints the results' do
-        stub(text_wrapper).wrap(text, width: 72) { text }
+        text_wrapper.stubs(:wrap).with(text, width: 72).returns(text)
         _(lambda do
           CLIWrapper.new(text_wrapper: text_wrapper).run stream
         end).must_output text
       end
 
       it 'accepts the desired width and passes it to TextWrapper' do
+        text_wrapper.expects(:wrap).with(text, width: 22).returns(text)
         capture_io do
-          CLIWrapper.new(%w(--width=22), text_wrapper: text_wrapper).run stream
+          CLIWrapper.new(%w[--width=22], text_wrapper: text_wrapper).run stream
         end
-        _(text_wrapper).must_have_received :wrap, [text, { width: 22 }]
       end
     end
   end

data/test/lovely_rufus/layers/basic_wrapper_test.rb

@@ -8,8 +8,8 @@ module LovelyRufus
       describe '#call' do
         it 'wraps text to the given width' do
           text = 'I go crazy when I hear a cymbal and a hi-hat ' \
-            'with a souped-up tempo'
-          wrap = <<-end.dedent
+                 'with a souped-up tempo'
+          wrap = <<~end
             I go crazy when I hear
             a cymbal and a hi-hat
             with a souped-up tempo
@@ -20,7 +20,7 @@ module LovelyRufus
 
         it 'extends past the given width when necessary' do
           text = 'I’m killing your brain like a poisonous mushroom'
-          wrap = <<-end.dedent
+          wrap = <<~end
             I’m
             killing
             your
@@ -35,7 +35,7 @@ module LovelyRufus
         end
 
         it 'rewraps a String from zero' do
-          text = <<-end.dedent
+          text = <<~end
             turn off
             the lights and I’ll glow
           end
@@ -44,9 +44,9 @@ module LovelyRufus
         end
 
         it 'passes the fixed text to the next layer and returns its outcome' do
-          final = fake(:wrap)
-          layer = fake(:layer)
-          mock(layer).call(Wrap["I\nO\nU\n", width: 2]) { final }
+          final = mock.quacks_like_instance_of(Wrap)
+          layer = mock.quacks_like_instance_of(Layer)
+          layer.expects(:call).with(Wrap["I\nO\nU\n", width: 2]).returns(final)
           call = BasicWrapper.new(layer).call(Wrap['I O U', width: 2])
           _(call).must_equal final
         end

data/test/lovely_rufus/layers/code_comment_stripper_test.rb

@@ -7,20 +7,20 @@ module LovelyRufus
     describe CodeCommentStripper do
       describe '#call' do
         it 'strips comments and adjusts width before calling the next layer' do
-          commented = <<-end.dedent
+          commented = <<~end
             # to the extreme I rock a mic like a vandal
             # light up a stage and wax a chump like a candle
           end
-          uncommented = <<-end.dedent
+          uncommented = <<~end
             to the extreme I rock a mic like a vandal
             light up a stage and wax a chump like a candle
           end
-          CodeCommentStripper.must_pass_to_next Wrap[commented,   width: 72],
-                                                Wrap[uncommented, width: 70]
+          _(CodeCommentStripper).must_pass_to_next Wrap[commented,   width: 72],
+                                                   Wrap[uncommented, width: 70]
         end
 
         it 'adds comments back in (and adjusts width) before returning' do
-          text = <<-end.dedent
+          text = <<~end
             # take heed, ’cause I’m a lyrical poet
             # Miami’s on the scene just in case you didn’t know it
           end
@@ -29,7 +29,7 @@ module LovelyRufus
         end
 
         it 'does not touch non-commented texts' do
-          text = <<-end.dedent
+          text = <<~end
             my town, that created all the bass sound
             enough to shake and kick holes in the ground
           end
@@ -43,46 +43,46 @@ module LovelyRufus
         end
 
         it 'strips // code comments' do
-          commented = <<-end.dedent
+          commented = <<~end
             // so fast other DJs say ‘damn!’
             // if my rhyme was a drug I’d sell it by the gram
           end
-          uncommented = <<-end.dedent
+          uncommented = <<~end
             so fast other DJs say ‘damn!’
             if my rhyme was a drug I’d sell it by the gram
           end
-          CodeCommentStripper.must_pass_to_next Wrap[commented,   width: 72],
-                                                Wrap[uncommented, width: 69]
+          _(CodeCommentStripper).must_pass_to_next Wrap[commented,   width: 72],
+                                                   Wrap[uncommented, width: 69]
         end
 
         it 'only considers homogenous characters as comments' do
-          commented = <<-end.dedent
+          commented = <<~end
             # /if there was a problem,
             # yo – I’ll solve it!/
           end
-          uncommented = <<-end.dedent
+          uncommented = <<~end
             /if there was a problem,
             yo – I’ll solve it!/
           end
-          CodeCommentStripper.must_pass_to_next Wrap[commented,   width: 72],
-                                                Wrap[uncommented, width: 70]
+          _(CodeCommentStripper).must_pass_to_next Wrap[commented,   width: 72],
+                                                   Wrap[uncommented, width: 70]
         end
 
         it 'strips initial space indentation' do
           indented = Wrap['  // check out the hook', width: 72]
           passed   = Wrap['check out the hook',      width: 67]
-          CodeCommentStripper.must_pass_to_next indented, passed
+          _(CodeCommentStripper).must_pass_to_next indented, passed
         end
 
         it 'strips initial tab indentation' do
           indented = Wrap["\t# while my DJ revolves it", width: 72]
           stripped = Wrap['while my DJ revolves it',     width: 69]
-          CodeCommentStripper.must_pass_to_next indented, stripped
+          _(CodeCommentStripper).must_pass_to_next indented, stripped
         end
 
         it 'pays proper homage to K&R' do
           not_commented = Wrap['#define ASSERT(msg, cond) // TODO']
-          CodeCommentStripper.must_pass_to_next not_commented, not_commented
+          _(CodeCommentStripper).must_pass_to_next not_commented, not_commented
         end
       end
     end

data/test/lovely_rufus/layers/email_quote_stripper_test.rb

@@ -7,20 +7,20 @@ module LovelyRufus
     describe EmailQuoteStripper do
       describe '#call' do
         it 'strips quotes and adjusts width before calling the next layer' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             > to the extreme I rock a mic like a vandal
             > light up a stage and wax a chump like a candle
           end
-          unquoted = <<-end.dedent
+          unquoted = <<~end
             to the extreme I rock a mic like a vandal
             light up a stage and wax a chump like a candle
           end
-          EmailQuoteStripper.must_pass_to_next Wrap[quoted,   width: 72],
-                                               Wrap[unquoted, width: 70]
+          _(EmailQuoteStripper).must_pass_to_next Wrap[quoted,   width: 72],
+                                                  Wrap[unquoted, width: 70]
         end
 
         it 'adds quotes back in (and adjusts width) before returning' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             > take heed, ’cause I’m a lyrical poet
             > Miami’s on the scene just in case you didn’t know it
           end
@@ -29,7 +29,7 @@ module LovelyRufus
         end
 
         it 'does not touch non-quoted texts' do
-          plain = <<-end.dedent
+          plain = <<~end
             my town, that created all the bass sound
             enough to shake and kick holes in the ground
           end
@@ -43,38 +43,38 @@ module LovelyRufus
         end
 
         it 'strips multilevel quotes' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             >> ’cause my style’s like a chemical spill
             >> feasible rhymes that you can vision and feel
           end
-          unquoted = <<-end.dedent
+          unquoted = <<~end
             ’cause my style’s like a chemical spill
             feasible rhymes that you can vision and feel
           end
-          EmailQuoteStripper.must_pass_to_next Wrap[quoted,   width: 72],
-                                               Wrap[unquoted, width: 69]
+          _(EmailQuoteStripper).must_pass_to_next Wrap[quoted,   width: 72],
+                                                  Wrap[unquoted, width: 69]
         end
 
         it 'strips broken quotes properly' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             > > >conducted and formed this is a hell of a concept
             > > >we make it hype and you want to step with this
           end
-          unquoted = <<-end.dedent
+          unquoted = <<~end
             conducted and formed this is a hell of a concept
             we make it hype and you want to step with this
           end
-          EmailQuoteStripper.must_pass_to_next Wrap[quoted,   width: 72],
-                                               Wrap[unquoted, width: 68]
+          _(EmailQuoteStripper).must_pass_to_next Wrap[quoted,   width: 72],
+                                                  Wrap[unquoted, width: 68]
         end
 
         it 'fixes broken quotes when adding them back in' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             > > >Shay plays on the fade,
             > > >slice like a ninja
             > > >cut like a razor blade
           end
-          fixed = <<-end.dedent
+          fixed = <<~end
             >>> Shay plays on the fade,
             >>> slice like a ninja
             >>> cut like a razor blade
@@ -84,16 +84,16 @@ module LovelyRufus
         end
 
         it 'only considers homogenous characters as comments' do
-          quoted = <<-end.dedent
+          quoted = <<~end
             > /if there was a problem,
             > yo – I’ll solve it!/
           end
-          unquoted = <<-end.dedent
+          unquoted = <<~end
             /if there was a problem,
             yo – I’ll solve it!/
           end
-          EmailQuoteStripper.must_pass_to_next Wrap[quoted,   width: 72],
-                                               Wrap[unquoted, width: 70]
+          _(EmailQuoteStripper).must_pass_to_next Wrap[quoted,   width: 72],
+                                                  Wrap[unquoted, width: 70]
         end
       end
     end

data/test/lovely_rufus/layers/hangout_wrapper_test.rb

@@ -7,11 +7,11 @@ module LovelyRufus
     describe HangoutWrapper do
       describe '#call' do
         it 'removes hangouts from the text' do
-          text = <<-end.dedent
+          text = <<~end
             I go crazy when I hear a cymbal and
             a hi-hat with a souped-up tempo
           end
-          wrap = <<-end.dedent
+          wrap = <<~end
             I go crazy when I hear a cymbal
             and a hi-hat with a souped-up tempo
           end
@@ -20,15 +20,15 @@ module LovelyRufus
         end
 
         it 'passes the fixed text to the next layer and returns its outcome' do
-          final = fake(:wrap)
-          layer = fake(:layer)
-          mock(layer).call(any(Wrap)) { final }
+          final = mock.quacks_like_instance_of(Wrap)
+          layer = mock.quacks_like_instance_of(Layer)
+          layer.expects(:call).with(instance_of(Wrap)).returns(final)
           wrapped = HangoutWrapper.new(layer).call(Wrap["I O\nU", width: 4])
           _(wrapped).must_equal final
         end
 
         it 'doesn’t let the last line to hang out' do
-          text = <<-end.dedent
+          text = <<~end
             Just found out the Finnish term for grammar Nazi is pilkunnussija.
             Direct translation: comma fucker. You’re welcome.
           end

data/test/lovely_rufus/layers/one_letter_gluer_test.rb

@@ -21,9 +21,9 @@ module LovelyRufus
         end
 
         it 'passes the fixed text to the next layer and returns its outcome' do
-          final = fake(:wrap)
-          layer = fake(:layer)
-          mock(layer).call(Wrap['I O U', width: 69]) { final }
+          final = mock.quacks_like_instance_of(Wrap)
+          layer = mock.quacks_like_instance_of(Layer)
+          layer.expects(:call).with(Wrap['I O U', width: 69]).returns(final)
           glued = OneLetterGluer.new(layer).call(Wrap['I O U', width: 69])
           _(glued).must_equal final
         end

data/test/lovely_rufus/settings_test.rb

@@ -9,11 +9,11 @@ module LovelyRufus
       end
 
       it 'can be set via --width' do
-        _(Settings.new(%w(--width=42)).width).must_equal 42
+        _(Settings.new(%w[--width=42]).width).must_equal 42
       end
 
       it 'can be set via -w' do
-        _(Settings.new(%w(-w 42)).width).must_equal 42
+        _(Settings.new(%w[-w 42]).width).must_equal 42
       end
     end
   end

data/test/lovely_rufus/text_wrapper_test.rb

@@ -7,8 +7,8 @@ module LovelyRufus
     describe '.wrap' do
       it 'wraps the passed String to 72 characters by default' do
         short = 'all right: stop, collaborate and listen'
-        long  = short + ' – Ice is back with a brand new invention'
-        wrap  = <<-end.dedent
+        long  = "#{short} – Ice is back with a brand new invention"
+        wrap  = <<~end
           all right: stop, collaborate and listen
           – Ice is back with a brand new invention
         end
@@ -18,12 +18,12 @@ module LovelyRufus
 
       it 'wraps the passed String to the given number of characters' do
         input = 'something grabs a hold of me tightly; ' \
-          'flow like a harpoon – daily and nightly'
-        _(TextWrapper.wrap(input, width: 40)).must_equal <<-end.dedent
+                'flow like a harpoon – daily and nightly'
+        _(TextWrapper.wrap(input, width: 40)).must_equal <<~end
           something grabs a hold of me tightly;
           flow like a harpoon – daily and nightly
         end
-        _(TextWrapper.wrap(input, width: 21)).must_equal <<-end.dedent
+        _(TextWrapper.wrap(input, width: 21)).must_equal <<~end
           something grabs
           a hold of me tightly;
           flow like a harpoon
@@ -32,7 +32,7 @@ module LovelyRufus
       end
 
       it 'rewraps a String from zero' do
-        broken = <<-end.dedent
+        broken = <<~end
           turn off
           the lights and I’ll glow
         end
@@ -43,7 +43,7 @@ module LovelyRufus
       it 'supports all the example use-cases' do
         path = File.expand_path('text_wrapper_test.yml', __dir__)
         YAML.load_file(path).each do |spec|
-          width = spec.fetch('width') { 72 }
+          width = spec.fetch('width', 72)
           wrap  = "#{spec['output']}\n"
           _(TextWrapper.wrap(spec['input'], width: width)).must_equal wrap
         end

data/test/lovely_rufus_test.rb

@@ -1,19 +1,21 @@
 require_relative 'test_helper'
 require_relative '../lib/lovely_rufus'
+require_relative '../lib/lovely_rufus/text_wrapper'
 
 describe LovelyRufus do
   describe '.wrap' do
-    let(:text_wrapper) { fake(:text_wrapper, as: :class) }
+    let(:text_wrapper) { mock.quacks_like(LovelyRufus::TextWrapper) }
 
     it 'offloads the wrapping to TextWrapper' do
-      stub(text_wrapper).wrap('Ice Ice Baby', width: 7) { "Ice Ice\nBaby\n" }
+      text_wrapper.stubs(:wrap).with('Ice Ice Baby', width: 7)
+                  .returns("Ice Ice\nBaby\n")
       _(LovelyRufus.wrap('Ice Ice Baby', text_wrapper: text_wrapper, width: 7))
         .must_equal "Ice Ice\nBaby\n"
     end
 
     it 'wraps the passed String to 72 characters by default' do
+      text_wrapper.expects(:wrap).with('Ice Ice Baby', width: 72)
       LovelyRufus.wrap 'Ice Ice Baby', text_wrapper: text_wrapper
-      _(text_wrapper).must_have_received :wrap, ['Ice Ice Baby', { width: 72 }]
     end
   end
 end

data/test/test_helper.rb

@@ -1,28 +1,25 @@
 ENV['MT_NO_EXPECTATIONS'] = 'true'
-require 'bundler/setup'
 require 'minitest/autorun'
 require 'minitest/focus'
 require 'minitest/pride'
-require 'bogus/minitest/spec'
-require 'lovely_rufus'
+require 'mocha/minitest'
 require_relative '../lib/lovely_rufus/layers/layer'
 require_relative '../lib/lovely_rufus/wrap'
 
-Bogus.configure do |config|
-  config.search_modules << LovelyRufus << LovelyRufus::Layers
-end
-
-class String
-  def dedent
-    gsub(/^#{scan(/^ +/).min}/, '')
-  end
+Mocha.configure do |config|
+  config.display_matching_invocations_on_failure = true
+  config.strict_keyword_argument_matching = true
+  config.stubbing_method_on_non_mock_object = :prevent
+  config.stubbing_method_unnecessarily = :prevent
+  config.stubbing_non_existent_method = :prevent
+  config.stubbing_non_public_method = :prevent
 end
 
 module CustomAssertions
   def assert_passes_to_next(subject, called_with, to_be_passed)
-    next_layer = fake(:layer, call: LovelyRufus::Wrap.new)
+    next_layer = mock.quacks_like_instance_of(LovelyRufus::Layers::Layer)
+    next_layer.expects(:call).with(to_be_passed).returns(LovelyRufus::Wrap.new)
     subject.new(next_layer).call called_with
-    assert_received next_layer, :call, [to_be_passed]
   end
 end
 

metadata

@@ -1,65 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lovely_rufus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Szotkowski
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMREwDwYDVQQDDAhjaGFz
-  dGVsbDEYMBYGCgmSJomT8ixkARkWCGNoYXN0ZWxsMRMwEQYKCZImiZPyLGQBGRYD
-  bmV0MB4XDTE1MTEwOTIxMTMwOVoXDTE2MTEwODIxMTMwOVowQjERMA8GA1UEAwwI
-  Y2hhc3RlbGwxGDAWBgoJkiaJk/IsZAEZFghjaGFzdGVsbDETMBEGCgmSJomT8ixk
-  ARkWA25ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcf6OF3mi6D
-  UedwY2A6fYEQF2bJVYQxV8fWHA5Q2R6y7Eg0hM80Q0yod7pJxlJTpnAPzuIl1u4y
-  hhfa/Vz0u6PVRhBYQ/Bcj9UEwgiXcy3P4ybINDeDt7GRVs3R9rRoT1aAsb5RCS0z
-  u/JKS2RcAS5XPpFow3Cfs5A/pM2NLsR/zeiaKg8rRB59A/tWw26F+YTaWfPAPFGv
-  d6af29NKWQh+EPkX1JwwtSwjKfVOeFr0csC6QLWKpp1z/7Lla8d3px426Ccjca0I
-  5VwtQeZ5LClTjqaYyH7vSojpOtgRuvVKspZ2jfe1KZq9jz//a/rSUrFcPlEQuXQp
-  i8E3TKoJrW0CAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFLi/J921Nb53s8GKtKptC08QmHnwMCAGA1UdEQQZMBeBFWNoYXN0ZWxsQGNo
-  YXN0ZWxsLm5ldDAgBgNVHRIEGTAXgRVjaGFzdGVsbEBjaGFzdGVsbC5uZXQwDQYJ
-  KoZIhvcNAQEFBQADggEBAA+rUbXujzqDv8WE7kkiJadQhxldq/cRhaJDMKSWF3/H
-  6PL/Me8zq8Ok7/pQtxBvAhKcy3DdsH0q5pyPHoMrYySxEo9lNXLvwCPsi21rR53b
-  2w5rBytYCxrhsXISKwCkBYwVwtICafZ8VtRbD3pgnsPv+9NYJJ/rN4Z34doWM7oK
-  CAfY6o0LcY+qmvqLvqpweyoO73wkfKGUSz1a09dJfAP5aIREQDvpYrWx2ZoDrAct
-  srwnZ6g5uTvNbd0I1SnvnCJJ5y5iPvJIBlnGb3QZ77y2XXCOy3Yc0rjK7A8bQt5t
-  xOlyYMPKhWx2IqEip+J7PBpBwMnxIPhTcNlFOj8mSa0=
-  -----END CERTIFICATE-----
-date: 2015-11-10 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-05-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: private_attr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: bogus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -89,61 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: reek
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rerun
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: '1.0'
 description: An executable and a Ruby library for wrapping paragraphs of text.
 email: chastell@chastell.net
 executables:
@@ -151,17 +101,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".reek"
+- ".overcommit.yml"
+- ".reek.yml"
 - ".rubocop.yml"
-- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
-- Gemfile
-- Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
 - bin/lovely-rufus
 - certs/chastell.pem
+- gems.locked
+- gems.rb
 - lib/lovely_rufus.rb
 - lib/lovely_rufus/cli_wrapper.rb
 - lib/lovely_rufus/layers/basic_wrapper.rb
@@ -189,9 +140,10 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/chastell/lovely_rufus
 licenses:
-- AGPL-3.0
-metadata: {}
-post_install_message: 
+- AGPL-3.0-or-later
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,28 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.0
-signing_key: 
+rubygems_version: 3.5.23
+signing_key:
 specification_version: 4
 summary: 'lovely_rufus: text wrapper'
-test_files:
-- test/lovely_rufus/cli_wrapper_test.rb
-- test/lovely_rufus/layers/basic_wrapper_test.rb
-- test/lovely_rufus/layers/code_comment_stripper_test.rb
-- test/lovely_rufus/layers/email_quote_stripper_test.rb
-- test/lovely_rufus/layers/hangout_wrapper_test.rb
-- test/lovely_rufus/layers/one_letter_gluer_test.rb
-- test/lovely_rufus/settings_test.rb
-- test/lovely_rufus/text_wrapper_test.rb
-- test/lovely_rufus/wrap_test.rb
-- test/lovely_rufus_test.rb
-- test/test_helper.rb
-has_rdoc: 
+test_files: []

data/.reek

@@ -1,2 +0,0 @@
-IrresponsibleModule:
-  enabled: false

data/.ruby-version

@@ -1 +0,0 @@
-2.2

data/Gemfile.lock

@@ -1,85 +0,0 @@
-PATH
-  remote: .
-  specs:
-    lovely_rufus (1.0.0)
-      private_attr (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract_type (0.0.7)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    bogus (0.1.6)
-      dependor (>= 0.0.4)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    dependor (1.0.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.11)
-    ffi (1.9.10)
-    ice_nine (0.11.1)
-    listen (3.0.4)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.8.2)
-    minitest-focus (1.1.2)
-      minitest (>= 4, < 6)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    private_attr (1.1.0)
-    procto (0.0.2)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    reek (3.6.0)
-      parser (~> 2.2, >= 2.2.2.5)
-      private_attr (~> 1.1)
-      rainbow (~> 2.0)
-      unparser (~> 0.2.2)
-    rerun (0.11.0)
-      listen (~> 3.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.7.5)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    unparser (0.2.4)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.2)
-      procto (~> 0.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bogus (~> 0.1.4)
-  lovely_rufus!
-  minitest (~> 5.6)
-  minitest-focus (~> 1.1)
-  rake (~> 10.1)
-  reek (~> 3.1)
-  rerun (~> 0.11.0)
-  rubocop (~> 0.35.0)
-
-BUNDLED WITH
-   1.10.6

data.tar.gz.sig

@@ -1,3 +0,0 @@
-9�q
->�8�'����b+k��JHg�&1�Z��W�)v�`��$e���r���9q2�J_�������O�_L��_��B�:�i�p�>��s�E�U�R',:Ǖ��J�d���$��!������3�j�:�u(z��#�>��s�͚�kh�s�=�IG�	מ�=�v��������=Ъ?�kBiO�
ې�
-Mfe�;(y�m���-���2}�x������i��1��i��K�@�+̺H�f�cE�ҥ}�ņ�g�G�