lovely-rufus 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4bc1501b91f7200aa0470d05f334d920ac46357d
+  data.tar.gz: f6b4a99d363210365ec476ae344804c6b8a67511
+SHA512:
+  metadata.gz: d12aac424d760ae10388d15909c717c073af5d5e31a697c8d855606bcd5b615e7a49721229b1924a039d4d28801fa538fdf7ad519db9cdf21a89a19e200c3657
+  data.tar.gz: c6f3c5eff72842a91fc091e495d54f865f6b615b0240a1d86830bb9ab69dfa57128bac9a1dd3cf21082acbad1bcffa84ad21fd70559f53b99330a0e482548415

data/.rubocop.yml

@@ -0,0 +1,23 @@
+AccessModifierIndentation:
+  Enabled: false
+
+AndOr:
+  Enabled: false
+
+DefWithoutParentheses:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+EndAlignment:
+  Enabled: false
+
+IndentationWidth:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,27 +1,39 @@
 PATH
   remote: .
   specs:
-    lovely-rufus (0.0.2)
+    lovely-rufus (0.0.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    ffi (1.1.5)
-    listen (0.5.3)
-    minitest (4.2.0)
-    rake (0.9.2.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rerun (0.7.1)
-      listen
+    ast (1.1.0)
+    minitest (5.0.8)
+    parser (2.0.0)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rainbow (1.1.4)
+    reek (1.3.4)
+      ruby2ruby (~> 2.0.2)
+      ruby_parser (~> 3.2)
+      sexp_processor
+    rubocop (0.15.0)
+      parser (~> 2.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.1.4)
+    ruby2ruby (2.0.6)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.2.2)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.4.0)
+    slop (3.4.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
   lovely-rufus!
-  minitest (~> 4.0)
-  rake
-  rb-inotify
-  rerun
+  minitest (~> 5.0)
+  reek (~> 1.3)
+  rubocop (~> 0.15.0)

data/README.md

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

data/Rakefile

@@ -1,17 +1,18 @@
 require 'rake/testtask'
+require 'reek/rake/task'
+require 'rubocop/rake_task'
+
+task default: %i[spec rubocop]
 
 Rake::TestTask.new :spec do |task|
   task.test_files = FileList['spec/**/*_spec.rb']
   task.warning    = true
 end
 
-task default: :spec
-
-desc 'Run Lovely Rufus console'
-task :console do
-  require 'irb'
-  require_relative 'lib/lovely-rufus'
-  include LovelyRufus
-  ARGV.clear
-  IRB.start
+Reek::Rake::Task.new do |task|
+  task.config_files  = 'config/reek.yml'
+  task.fail_on_error = false
+  task.reek_opts     = '--quiet'
 end
+
+Rubocop::RakeTask.new

data/lib/lovely-rufus.rb

@@ -1,3 +1,4 @@
+require 'delegate'
 require 'optparse'
 
 require_relative 'lovely-rufus/executable'

data/lib/lovely-rufus/executable.rb

@@ -1,17 +1,25 @@
 module LovelyRufus class Executable
   def initialize args = ARGV
-    @width = 72
-    OptionParser.new do |opts|
-      opts.on '-w', '--width WIDTH', Integer, 'Wrapping width' do |width|
-        @width = width
-      end
-    end.parse! args
+    @settings = settings_from args
   end
 
   def run input = $stdin
-    puts Wrapper.new(input.read).wrapped width
+    puts Wrapper.new(input.read).wrapped settings.width
   end
 
-  attr_reader :width
-  private     :width
+  attr_reader :settings
+  private     :settings
+
+  private
+
+  def settings_from args
+    Struct.new(:width).new.tap do |settings|
+      settings.width = 72
+      OptionParser.new do |opts|
+        opts.on '-w', '--width WIDTH', Integer, 'Wrapping width' do |width|
+          settings.width = width
+        end
+      end.parse! args
+    end
+  end
 end end

data/lib/lovely-rufus/wrapper.rb

@@ -1,63 +1,93 @@
-# encoding: UTF-8
-
 module LovelyRufus class Wrapper
-
   NBSP = ' '
 
   def initialize text
-    @paras = text.split(/\n[\/#> ]*\n/).map(&:strip)
+    @paras = text.split(%r{\n[/#> ]*\n}).map { |para| Para.new para.strip }
   end
 
   def wrapped max_width = 72
     return '' if paras.all?(&:empty?)
 
     paras.map do |para|
-      best = wrap_para_to_width para, max_width
+      para.wrap_recursively max_width
+    end.join "\n\n"
+  end
+
+  attr_reader :paras
+  private     :paras
+
+  private
+
+  class Para
+    def initialize text
+      @text = text
+    end
+
+    def empty?
+      text.empty?
+    end
+
+    def wrap_recursively max_width
+      best = wrap_to_width max_width
       (max_width - 1).downto 1 do |width|
-        shorter = wrap_para_to_width para, width
+        shorter = wrap_to_width width
         break if shorter.lines.count           > best.lines.count
         break if shorter.lines.map(&:size).max > best.lines.map(&:size).max
         best = shorter
       end
       best
-    end.join "\n\n"
-  end
+    end
 
-  attr_reader :paras
-  private     :paras
+    def wrap_to_width width
+      quotes = text[/^([\/#> ]*)/]
+      leader = quotes.empty? ? '' : quotes.tr(' ', '') + ' '
+      width -= leader.size if width > leader.size
+      text.lines
+        .map { |line| line[quotes.size..-1] }.join        # drop quotes
+        .tr("\n", ' ')                                    # unwrap para
+        .gsub(/ ([^ ]) /, " \\1#{NBSP}")                  # glue 1-letter words
+        .gsub(/(.{1,#{width}})( |$\n?)/, "\\1\n")         # wrap to width
+        .tap { |par| remove_hangouts par, width }         # handle hangouts
+        .lines.map { |line| line.insert 0, leader }.join  # re-insert leader
+        .tr(NBSP, ' ')                                    # drop glue spaces
+        .chomp                                            # final touch
+    end
 
-  private
+    attr_reader :text
+    private     :text
 
-  def remove_hangouts para, width
-    lines = para.split "\n"
+    private
 
-    hangout_line = lines.each.with_index do |line, i|
-      next unless space = line.rindex(/[ #{NBSP}]/) and i < lines.size - 1
-      break i if i > 0              and space + 1 >= lines[i - 1].size
-      break i if i < lines.size - 2 and space + 1 >= lines[i + 1].size
-      break i if lines.size == 2    and space + 1 >= lines[i + 1].size
+    def find_hangout_line lines
+      lines.find.with_index do |line, i|
+        i < lines.size - 1 and
+        space = hangout_last_space(line) and
+        (hangout_to_previous_line i, lines, space or
+        hangout_to_next_line i, lines, space)
+      end
     end
 
-    if hangout_line.is_a? Integer
-      lines[hangout_line] << NBSP
-      fixed = lines.join(' ').gsub "#{NBSP} ", NBSP
-      para.replace wrap_para_to_width fixed, width
+    def hangout_last_space line
+      line.rindex(/[ #{NBSP}]/)
     end
-  end
 
-  def wrap_para_to_width para, width
-    quotes = para[/^([\/#> ]*)/]
-    leader = quotes.empty? ? '' : quotes.tr(' ', '') + ' '
-    width -= leader.size if width > leader.size
-    para
-      .lines.map { |line| line[quotes.size..-1] }.join  # drop quotes
-      .tr("\n", ' ')                                    # unwrap para
-      .gsub(/ ([^ ]) /, " \\1#{NBSP}")                  # glue 1-letter words
-      .gsub(/(.{1,#{width}})( |$\n?)/, "\\1\n")         # wrap to width
-      .tap { |par| remove_hangouts par, width }         # handle hangouts
-      .lines.map { |line| line.insert 0, leader }.join  # re-insert leader
-      .tr(NBSP, ' ')                                    # drop glue spaces
-      .chomp                                            # final touch
-  end
+    def hangout_to_next_line i, lines, space
+      (i < lines.size - 2 or lines.size == 2) and
+        space + 1 >= lines[i + 1].size
+    end
+
+    def hangout_to_previous_line i, lines, space
+      i > 0 and space + 1 >= lines[i - 1].size
+    end
 
+    def remove_hangouts para, width
+      lines = para.split "\n"
+      hangout_line = find_hangout_line lines
+      if hangout_line
+        hangout_line << NBSP
+        fixed = self.class.new lines.join(' ').gsub "#{NBSP} ", NBSP
+        para.replace fixed.wrap_to_width width
+      end
+    end
+  end
 end end

data/lovely-rufus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'lovely-rufus'
-  gem.version  = '0.0.3'
+  gem.version  = '0.0.4'
   gem.summary  = 'lovely-rufus: text wrapper'
   gem.homepage = 'http://github.com/chastell/lovely-rufus'
   gem.author   = 'Piotr Szotkowski'
@@ -10,9 +10,5 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |path| File.basename path }
   gem.test_files  = gem.files.grep %r{^spec/.*\.rb$}
 
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'minitest', '~> 4.0'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rb-inotify'
-  gem.add_development_dependency 'rerun'
+  gem.add_dependency 'lovely_rufus'
 end

data/spec/lovely-rufus/executable_spec.rb

@@ -1,31 +1,25 @@
-# encoding: UTF-8
-
 require_relative '../spec_helper'
 
 module LovelyRufus describe Executable do
+  describe '#run' do
+    it 'outputs passed text' do
+      text = StringIO.new 'some text'
+      -> { Executable.new.run text }.must_output "some text\n"
+    end
 
-  describe '.new' do
-    it 'parses passed params to fetch desired width' do
-      capture_io do
-        Executable.new.run StringIO.new 'some text'
-      end.first.must_equal "some text\n"
-
-      capture_io do
-        Executable.new(['-w', '4']).run StringIO.new 'some text'
-      end.first.must_equal "some\ntext\n"
+    it 'wraps passed text to desired width' do
+      text = StringIO.new 'some text'
+      -> { Executable.new(%w[--width 4]).run text }.must_output "some\ntext\n"
+    end
 
-      capture_io do
-        Executable.new(['--width', '4']).run StringIO.new 'some text'
-      end.first.must_equal "some\ntext\n"
+    it 'supports short arguments' do
+      text = StringIO.new 'some text'
+      -> { Executable.new(%w[-w4]).run text }.must_output "some\ntext\n"
     end
-  end
 
-  describe '#run' do
     it 'outputs properly wrapped input' do
-      capture_io do
-        Executable.new(['-w', '4']).run StringIO.new 'some more text'
-      end.first.must_equal "some\nmore\ntext\n"
+      text = StringIO.new 'some more text'
+      -> { Executable.new(%w[-w4]).run text }.must_output "some\nmore\ntext\n"
     end
   end
-
 end end

data/spec/lovely-rufus/wrapper_spec.rb

@@ -1,17 +1,18 @@
-# encoding: UTF-8
-
 require_relative '../spec_helper'
 
 module LovelyRufus describe Wrapper do
   describe '#wrapped' do
     it 'returns properly wrapped input' do
       YAML.load_file('spec/fixtures/wrapper.yml').each do |wrapping|
-        Wrapper.new(wrapping['input']).wrapped(wrapping['width'] || 72).must_equal wrapping['output']
+        width   = wrapping.fetch('width') { 72 }
+        wrapped = Wrapper.new(wrapping['input']).wrapped width
+        wrapped.must_equal wrapping['output']
       end
     end
 
     it 'silently strips trailing newlines' do
-      Wrapper.new("a problematic example\n").wrapped(13).must_equal "a problematic\nexample"
+      wrapped = Wrapper.new("a problematic example\n").wrapped 13
+      wrapped.must_equal "a problematic\nexample"
     end
 
     it 'doesn’t breeak on email-quoted single words' do

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'bundler/setup'
 require 'minitest/autorun'
-
+require 'minitest/pride'
 require 'yaml'
-
-require_relative '../lib/lovely-rufus'
+require 'lovely-rufus'

metadata

@@ -1,94 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: lovely-rufus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Piotr Szotkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: lovely_rufus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rerun
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -98,13 +31,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rvmrc
+- .rubocop.yml
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
 - bin/lovely-rufus
+- config/reek.yml
 - lib/lovely-rufus.rb
 - lib/lovely-rufus/executable.rb
 - lib/lovely-rufus/wrapper.rb
@@ -115,28 +50,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/chastell/lovely-rufus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: ! 'lovely-rufus: text wrapper'
+specification_version: 4
+summary: 'lovely-rufus: text wrapper'
 test_files:
 - spec/lovely-rufus/executable_spec.rb
 - spec/lovely-rufus/wrapper_spec.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm gemset use lovely-rufus
-bundle