lovely_rufus 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8fb34baf376b3462f33b6f1866510f0b2edb5d47
-  data.tar.gz: 4b8d09f47df793d1a0e66b2d8915329df803ca6a
+SHA256:
+  metadata.gz: be467f0b20918a42ef34081961d5522dcb7eaa6b6d7f2a0c9a8e9c0287642ef1
+  data.tar.gz: d4636e37e170298535f91232c0be8f97d5136b845eae4b3d87e9678130a62875
 SHA512:
-  metadata.gz: 817ef5f32ccf7e0d137389a99ab27960e2389efdbc2d467a2d84ed51bb2bcfe5bb8409d93d3bfd7b3c533ee0225d3677ae49fa56de633f05cbb4b4eb23a9c901
-  data.tar.gz: 9b600aced8c77520706c3b464dba74af1f3e98d68830e2859bcd7e6dd808eec5701fd36267ca5dff00328feb37e80efbcbe0572069c4191d7cb91271ceceb48c
+  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,18 +1,24 @@
-Style/AndOr:
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+
+Bundler/GemFilename:
   Enabled: false
 
-Style/Documentation:
+Gemspec/DevelopmentDependencies:
   Enabled: false
 
-Style/FileName:
-  Exclude:
-    - bin/lovely-rufus
+Metrics/BlockLength:
+  AllowedMethods: describe
 
-Style/Not:
+Naming/HeredocDelimiterCase:
   Enabled: false
 
-Style/SingleLineBlockParams:
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Style/Documentation:
   Enabled: false
 
-Style/SpaceAfterNot:
+Style/FrozenStringLiteralComment:
   Enabled: false

data/.tool-versions

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

data/.travis.yml

@@ -1,7 +1,14 @@
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle
 language: ruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 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,10 +1,9 @@
-# frozen_string_literal: true
-
+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'
@@ -13,7 +12,6 @@ end
 
 Reek::Rake::Task.new do |task|
   task.fail_on_error = false
-  task.reek_opts     = '--no-wiki-links'
 end
 
 RuboCop::RakeTask.new do |task|

data/bin/lovely-rufus

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
-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/{Gemfile → gems.rb}

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
 gemspec

data/lib/lovely_rufus/cli_wrapper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'settings'
 require_relative 'text_wrapper'
 

data/lib/lovely_rufus/layers/basic_wrapper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../wrap'
 require_relative 'layer'
 

data/lib/lovely_rufus/layers/code_comment_stripper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'quote_stripper'
 
 module LovelyRufus

data/lib/lovely_rufus/layers/email_quote_stripper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'quote_stripper'
 
 module LovelyRufus
@@ -11,7 +9,7 @@ module LovelyRufus
       private
 
       def fixed_quote
-        quote.empty? ? '' : quote.delete(' ') + ' '
+        quote.empty? ? '' : "#{quote.delete(' ')} "
       end
     end
   end

data/lib/lovely_rufus/layers/hangout_wrapper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../wrap'
 require_relative 'basic_wrapper'
 require_relative 'layer'
@@ -25,48 +23,49 @@ module LovelyRufus
         end
 
         def hangout?
-          exists? and not (last? and useless_fix?)
+          exists? and useful_fix?
         end
 
         private
 
-        attr_reader :last, :lower, :upper
+        attr_reader :lower, :upper
 
         def exists?
           last_space = upper.chomp.rindex(/\p{space}/)
           last_space and last_space >= lower.chomp.size
         end
 
-        alias last? last
+        def last?
+          @last
+        end
+
+        def useful_fix?
+          return true unless last?
 
-        def useless_fix? # rubocop:disable Metrics/AbcSize
           cut = upper.chomp.rindex(/\p{space}/)
-          upper_after = upper[0...cut] + "\n"
-          lower_after = upper[(cut + 1)..-1] + lower
-          lower_after.chomp.rindex(/\p{space}/) > upper_after.size
+          upper_after = "#{upper[0...cut]}\n"
+          lower_after = upper[(cut + 1)..] + lower
+          lower_after.chomp.rindex(/\p{space}/) <= upper_after.size
         end
       end
 
+      # :reek:DuplicateMethodCall
       def hangout_line
-        lines.each_cons(2).with_index do |(upper, lower), index|
-          finder = HangoutFinder.new(upper, lower, index == lines.size - 2)
-          return upper if finder.hangout?
+        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
 
-      def lines
-        @lines ||= wrap.lines
-      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,9 +1,7 @@
-# frozen_string_literal: true
-
 module LovelyRufus
   module Layers
     class Layer
-      def initialize(next_layer = -> (wrap) { wrap })
+      def initialize(next_layer = ->(wrap) { wrap })
         @next_layer = next_layer
       end
 

data/lib/lovely_rufus/layers/one_letter_gluer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../wrap'
 require_relative 'layer'
 
@@ -9,7 +7,7 @@ module LovelyRufus
       # :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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../wrap'
 require_relative 'layer'
 
@@ -23,7 +21,7 @@ module LovelyRufus
       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/settings.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'optparse'
 
 module LovelyRufus

data/lib/lovely_rufus/text_wrapper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'layers/basic_wrapper'
 require_relative 'layers/code_comment_stripper'
 require_relative 'layers/email_quote_stripper'
@@ -9,19 +7,21 @@ require_relative 'wrap'
 
 module LovelyRufus
   class TextWrapper
-    QUOTES = %r{^([>/#])(\1| )*}
-
-    def self.chain
-      layers = [Layers::CodeCommentStripper, Layers::EmailQuoteStripper,
-                Layers::OneLetterGluer, Layers::BasicWrapper,
-                Layers::HangoutWrapper]
-      identity = -> (wrap) { wrap }
-      layers.reverse.reduce(identity) { |inner, outer| outer.new(inner) }
+    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
 
-    def self.wrap(text, width: 72)
-      new(Wrap[text, width: width]).call
-    end
+    QUOTES = %r{^([>/#])(\1| )*}
 
     def initialize(wrap)
       @wrap = wrap
@@ -29,7 +29,7 @@ module LovelyRufus
 
     def call
       paras.map do |para|
-        self.class.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
 

data/lib/lovely_rufus/wrap.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'forwardable'
 
 module LovelyRufus
@@ -7,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,10 +1,6 @@
-# frozen_string_literal: true
-
 require_relative 'lovely_rufus/text_wrapper'
 
 module LovelyRufus
-  NBSP = "\u00A0"
-
   module_function
 
   def wrap(text, text_wrapper: TextWrapper, width: 72)

data/lovely_rufus.gemspec

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'English'
 require 'pathname'
 
@@ -9,27 +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.1'
+  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_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',           '~> 11.0'
-  gem.add_development_dependency 'reek',           '~> 4.0'
-  gem.add_development_dependency 'rerun',          '~> 0.11.0'
-  gem.add_development_dependency 'rubocop',        '~> 0.42.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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'stringio'
 require_relative '../test_helper'
 require_relative '../../lib/lovely_rufus/cli_wrapper'
@@ -9,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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../../test_helper'
 require_relative '../../../lib/lovely_rufus/layers/basic_wrapper'
 require_relative '../../../lib/lovely_rufus/wrap'
@@ -10,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
@@ -22,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
@@ -37,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
@@ -46,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