utils 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1467f044dbcbbbc4a271c12d9075aba3eb03f4fef444418eaf03f730450b894d
-  data.tar.gz: 9955f17eaeddfed9d6130dfe6805f78bebb5265cab3d0597afd4d31e49e91663
+  metadata.gz: 5c2e2fbdc130decfb576faf32be9adbc99de6517bd79b752408f6605fc4a9d36
+  data.tar.gz: a6d5d6857dd83b51cf9b33dea7dc1bc2d7be22531eb7c25628d4884bb0ef9f5b
 SHA512:
-  metadata.gz: a8fee251d57b62a6d255342bc73585256d25dbbf955e9c029c9a600ea2b3a0d419868cb9e652311ee95bcec13c73b0a18298b1f1de930e80b27937fb56b710a8
-  data.tar.gz: 91747c469da5305344b8b914d79065406bb650a7c3cb786fe87052b69f1164cb01b44d63a194cede1331e39ae6ea74246802208dbd866b805ade8812ac0cd1d0
+  metadata.gz: '080b67ed1a27784fbe1368ebf3cbad9865872ccb63b5ce84653dc7fbf08ca31b20e49a19fbaede5f00b0a2dc8a9245b2dd6d5c7b58d5970f5babaa04fa4f8c85'
+  data.tar.gz: fd80c9b73e39b2233ea9e36ca2efeb530064c2cc5452098318f9d8f1066e0aeaf2d829c4b099ed091f7a2f901506342fe063cd0b5b371bc82fea6a983b41dbad

data/VERSION

@@ -1 +1 @@
-0.22.1
+0.23.0

data/bin/irb_connect

@@ -14,8 +14,7 @@ Options are
 
   -e CODE       CODE is execute on the remote irb
   -l PATH       load file PATH into remote irb context
-  -r HOSTNAME   name of the remote host (defaults to #{Utils::IRB::Service.hostname})
-  -p PORTNUMBER number of the remote port (defaults to #{Utils::IRB::Service.port})
+  -u URL        druby url to connect to
   -h            display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -24,10 +23,10 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
 end
 
 
-$opts = go 'e:r:p:l:h'
+$opts = go 'e:u:l:h'
 $opts[?h] and usage
 
-proxy = Utils::IRB::Service.connect($opts[?r], $opts[?p])
+proxy = Utils::IRB::Service.connect($opts[?u])
 case
 when load_path = $opts[?l]
   proxy.load(load_path)

data/bin/path

@@ -35,4 +35,4 @@ end
 
 path.uniq!
 
-puts "#{'export ' if $opt[?e]}PATH=#{path * path_separator}"
+puts "#{'export ' if $opts[?e]}PATH=#{path * path_separator}"

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.22.1'
+  VERSION         = '0.23.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.22.1 ruby lib
+# stub: utils 0.23.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.22.1"
+  s.version = "0.23.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2020-02-11"
+  s.date = "2020-09-25"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["discover".freeze, "classify".freeze, "sedit".freeze, "irb_connect".freeze, "ascii7".freeze, "path".freeze, "enum".freeze, "unquarantine_apps".freeze, "ssh-tunnel".freeze, "xmp".freeze, "brakeman2err".freeze, "search".freeze, "chroot-exec".freeze, "edit".freeze, "tmproc".freeze, "json_check".freeze, "edit_wait".freeze, "errf".freeze, "untest".freeze, "blameline".freeze, "remote_copy".freeze, "git-empty".freeze, "create_cstags".freeze, "vacuum_firefox_sqlite".freeze, "same_files".freeze, "chroot-libs".freeze, "git-versions".freeze, "strip_spaces".freeze, "number_files".freeze, "rssr".freeze, "serve".freeze, "vcf2alias".freeze, "on_change".freeze, "utils-utilsrc".freeze, "myex".freeze, "long_lines".freeze, "dialog-pick".freeze, "probe".freeze, "create_tags".freeze]
+  s.executables = ["discover".freeze, "classify".freeze, "sedit".freeze, "irb_connect".freeze, "ascii7".freeze, "path".freeze, "enum".freeze, "ssh-tunnel".freeze, "search".freeze, "edit".freeze, "json_check".freeze, "edit_wait".freeze, "untest".freeze, "blameline".freeze, "git-empty".freeze, "create_cstags".freeze, "git-versions".freeze, "strip_spaces".freeze, "number_files".freeze, "serve".freeze, "vcf2alias".freeze, "on_change".freeze, "utils-utilsrc".freeze, "myex".freeze, "long_lines".freeze, "probe".freeze, "create_tags".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/brakeman2err".freeze, "bin/chroot-exec".freeze, "bin/chroot-libs".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/dialog-pick".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/errf".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/remote_copy".freeze, "bin/rssr".freeze, "bin/same_files".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/tmproc".freeze, "bin/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".freeze, "bin/vcf2alias".freeze, "bin/xmp".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
+  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vcf2alias".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
   s.homepage = "http://github.com/flori/utils".freeze
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.1.2".freeze
+  s.rubygems_version = "3.1.4".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Florian Frank
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -118,36 +118,24 @@ executables:
 - ascii7
 - path
 - enum
-- unquarantine_apps
 - ssh-tunnel
-- xmp
-- brakeman2err
 - search
-- chroot-exec
 - edit
-- tmproc
 - json_check
 - edit_wait
-- errf
 - untest
 - blameline
-- remote_copy
 - git-empty
 - create_cstags
-- vacuum_firefox_sqlite
-- same_files
-- chroot-libs
 - git-versions
 - strip_spaces
 - number_files
-- rssr
 - serve
 - vcf2alias
 - on_change
 - utils-utilsrc
 - myex
 - long_lines
-- dialog-pick
 - probe
 - create_tags
 extensions: []
@@ -178,18 +166,13 @@ files:
 - VERSION
 - bin/ascii7
 - bin/blameline
-- bin/brakeman2err
-- bin/chroot-exec
-- bin/chroot-libs
 - bin/classify
 - bin/create_cstags
 - bin/create_tags
-- bin/dialog-pick
 - bin/discover
 - bin/edit
 - bin/edit_wait
 - bin/enum
-- bin/errf
 - bin/git-empty
 - bin/git-versions
 - bin/irb_connect
@@ -200,21 +183,14 @@ files:
 - bin/on_change
 - bin/path
 - bin/probe
-- bin/remote_copy
-- bin/rssr
-- bin/same_files
 - bin/search
 - bin/sedit
 - bin/serve
 - bin/ssh-tunnel
 - bin/strip_spaces
-- bin/tmproc
-- bin/unquarantine_apps
 - bin/untest
 - bin/utils-utilsrc
-- bin/vacuum_firefox_sqlite
 - bin/vcf2alias
-- bin/xmp
 - lib/utils.rb
 - lib/utils/config_file.rb
 - lib/utils/editor.rb
@@ -235,7 +211,7 @@ files:
 homepage: http://github.com/flori/utils
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Utils - Some useful command line utilities
@@ -254,8 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Some useful command line utilities
 test_files: []

data/bin/brakeman2err

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'utils'
-require 'json'
-require 'tins/xt'
-require 'tins/go'
-include Tins::GO
-require 'infobar'
-
-opts = go 'ce'
-if opts[?c]
-  brakeman = `bundle exec which brakeman`.full? or fail "cannot find brakeman in path"
-  Infobar.busy(label: 'Computing brakeman results') do
-    system 'bundle exec brakeman -q -i config/brakeman.yml -o .brakeman.json 2>/dev/null' or fail "calling brakeman failed"
-  end
-else
-  results = JSON File.read('.brakeman.json'), object_class: JSON::GenericObject
-  if opts[?e]
-    puts "Found #{results.errors.size} errors and #{results.warnings.size} warnings.",
-      "_" * 80
-      for error in results.errors
-        puts error.location, "Error #{error.error.inspect}"
-      end
-  else
-    puts "Found #{results.warnings.size} warnings.", "_" * 80
-  end
-  for warning in results.warnings
-    puts "#{warning.file}:#{warning.line}",
-      "#{warning.warning_type} (#{warning.confidence}) #{warning.message.inspect}",
-      warning.code, "See: #{warning.link}"
-  end
-
-end

data/bin/chroot-exec

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-include FileUtils
-
-dir = ARGV.shift or fail 'require directory to chroot into'
-prg = ARGV.shift || '/bin/bash'
-system "mount -t proc none #{dir}/proc"
-system "mount -o bind /dev #{dir}/dev"
-File.exist?(resolv = "#{dir}/etc/resolv.conf") and
-  cp resolv, resolv + '.bak'
-cp '/etc/resolv.conf', resolv
-system "chroot #{dir} #{prg}"
-system "umount #{dir}/proc"
-system "umount #{dir}/dev"

data/bin/chroot-libs

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-include FileUtils::Verbose
-
-msg = "Usage: #$0 EXECUTABLE DIR [LIB ..]"
-executable = ARGV.shift or fail msg
-dir = ARGV.shift or fail msg
-dir = File.expand_path dir
-mkdir_p dir
-
-unless executable.start_with? '/'
-  executable = `which #{executable}`.chomp
-end
-libs = `ldd #{executable}`.gsub(/^(?:.*?\s+=>\s+|\s+)(.*?)\(.*/, '\1').lines.grep(/\S/).map { |x| x.strip }
-libs.concat ARGV
-cd dir do
-  cp executable, File.basename(executable)
-  for l in libs
-    begin
-      cp l, File.basename(l)
-    rescue Errno::ENOENT => e
-      warn "Caught #{e.class}: #{e}"
-    end
-  end
-end

data/bin/dialog-pick

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-text=${1:-Pick}
-tags=`cat`
-lines=$(tput lines)
-columns=$(tput cols)
-
-result=$(dialog --no-items --menu "$text" $((lines - 5)) $((columns - 5)) $((lines - 10)) $tags 2>&1 1>/dev/tty)
-exitcode=$?
-echo $result
-exit $exitcode

data/bin/errf

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'term/ansicolor'
-
-class String
-  include Term::ANSIColor
-end
-
-file = ARGV.shift
-name = ARGV.shift
-ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -Iext:lib:test:tests"
-
-STDOUT.sync = true
-begin
-  output =
-    if name
-      IO.popen("testrb -p '' -n #{name} #{file}", 'r')
-    else
-      IO.popen("testrb -p '' #{file}", 'r')
-    end
-  until output.eof?
-    line = output.readline.uncolored
-    new_line = line.chomp
-    if new_line.sub!(%r(^(?:\s|[\/\[])*([^:]+):(\d+):(.*))) { "#$1:#$2:#$3" }
-      puts new_line
-    else
-      puts line
-    end
-  end
-ensure
-  output and output.close
-end

data/bin/remote_copy

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'socket'
-
-copy_remote_host_port = ENV['COPY_REMOTE_HOST_PORT'] and
-  copy_remote_host_port =~ /\A([^:]+):([^:]+)\z/ or
-  fail "environment variable COPY_REMOTE_HOST_PORT of form host:port required"
-copy_remote_host, copy_remote_port = $1, $2
-
-clipboard = TCPSocket.new(copy_remote_host, copy_remote_port)
-until STDIN.eof?
-  clipboard.write STDIN.read(1 << 16)
-end

data/bin/rssr

@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rss'
-require 'tins'
-require 'open-uri'
-require 'term/ansicolor'
-
-
-class String
-  include Term::ANSIColor
-
-  def wrap(cols: Tins::Terminal.cols)
-    split(?\n).each do |line|
-      line.size > cols and line.gsub!(/(.{1,#{cols}})(\s+|$)/, "\\1\n")
-      line.strip!
-    end * ?\n
-  end
-end
-
-IO.popen(ENV.fetch('PAGER', `which less`.chomp << ' -r'), 'w') do |pager|
-  url = ARGV.shift
-  open(url) do |rss|
-    feed = RSS::Parser.parse(rss)
-    pager.puts "Feed: #{feed.channel.title}",
-      ?– * Tins::Terminal.cols
-    feed.items.sort_by { |item| -item.date.to_f }.each do |item|
-      pager.puts(
-        "Title: #{item.title.bright_blue}",
-        "Link: #{item.link.red}",
-        "Date: #{item.date.strftime('%FT%T%z')}",
-        "",
-        item.description.wrap.chomp.white,
-        ?– * Tins::Terminal.cols
-      )
-    end
-  end
-end

data/bin/same_files

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'utils'
-require 'tins/find'
-include Utils::MD5
-
-def find_same(*paths)
-  files = Hash.new { |h,k| h[k] = {} }
-  Tins::Find.find(*paths) do |filename|
-    file_stat = File.stat(filename)
-    if file_stat.file?
-      size = file_stat.size
-      $DEBUG and warn "Encountered '#{filename}' (#{size} bytes)."
-      files[size][filename] = true
-    end
-  end
-
-  files = files.inject({}) do |h, (_,fs)|
-    keys = fs.keys
-    if keys.size >= 2
-      keys.each { |k| h[k] = true }
-    end
-    h
-  end.keys
-
-  md5s = Hash.new { |h,k| h[k] = [] }
-  for filename in files
-    md5sum = md5 filename
-    md5s[md5sum] << filename
-  end
-  files = md5s.values
-  files.reject! { |fs| fs.size < 2 }
-  files
-end
-
-puts find_same(*ARGV).map { |fs| [ fs.size, fs ] }.sort.map { |c, fs|
-  "#{c}\t#{fs.sort.map { |f| "'#{f}'" } * "\t"}"
-}

data/bin/tmproc

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-require 'tins'
-
-filename = ARGV.shift || 'Procfile'
-procfile = YAML.load_file(filename)
-
-unless ENV['TMUX']
-  name = File.basename(Dir.pwd)
-  exec 'tmux', 'new-session', '-s', name, '-n', ?s, '-A', $0, filename
-end
-
-tmux_pane = ENV.fetch('TMUX_PANE')
-lines     = Tins::Terminal.lines
-
-procfile.each_value do |process|
-  system "(tmux select-pane -t #{tmux_pane} \\; split-window -l #{lines / procfile.size} #{process}) &"
-end
-
-exec 'tmux', 'new-window', '-n', 'e', 'edit', ?;, 'split-window', '-h', 'bundle', 'exec', 'probe', '-l'

data/bin/unquarantine_apps

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-include FileUtils::Verbose
-
-prefix = ARGV.shift || ''
-directory = File.join(prefix, 'Applications')
-if File.directory?(directory)
-  cd directory do
-    STDERR.puts 'xattr -rd com.apple.quarantine'
-    system 'xattr -rd com.apple.quarantine'
-  end
-end

data/bin/vacuum_firefox_sqlite

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-include FileUtils
-
-case `uname -s`.chomp
-when 'Darwin'
-  profiles="#{ENV['HOME']}/Library/Application Support/Firefox/Profiles"
-else
-  profiles="#{ENV['HOME']}/.mozilla/firefox"
-end
-
-cd profiles do
-  for p in Dir['*.default']
-    cd p do
-      for db in Dir['*.sqlite']
-        print "Vacuuming #{db}..."
-        system "sqlite3 #{db} VACUUM"
-        puts "done."
-      end
-    end
-  end
-end

data/bin/xmp

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-require 'open3'
-
-class String
-  unless method_defined?(:lines)
-    def lines
-      self
-    end
-  end
-end
-
-MARKER = "!XMP#{Time.new.to_i}_#{rand(1000000)}!"
-XMPRE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] => (.*)')
-VAR = "_xmp_#{Time.new.to_i}_#{rand(1000000)}"
-WARNING_RE = /-:([0-9]+): warning: (.*)/
-interpreter = ARGV
-interpreter << 'ruby' << '-w' if interpreter.empty?
-
-IO.popen(interpreter.first, 'w') do |script|
-  script.write <<-TEST
-    begin
-      require 'rubygems'
-    rescue LoadError
-      exit 1
-    end
-    exit 0
-  TEST
-end
-if $?.exitstatus == 1
-  ENV['RUBYOPT'] = ENV['RUBYOPT'].gsub(/-rr?ubygems/i, '')
-end
-code = STDIN.read
-
-idx = 0
-newcode = code.gsub(/^(.*) # =>.*/) do |l|
-  expr = $1
-  (/^\s*#/ =~ l) ? l :
-  %!((#{VAR} = (#{expr}); $stderr.puts("#{MARKER}[#{idx+=1}] => " + #{VAR}.inspect) || #{VAR}))!
-end
-stdin, stdout, stderr = Open3::popen3(*interpreter)
-stdin.puts newcode
-stdin.close
-output = stderr.readlines
-
-results = Hash.new{|h,k| h[k] = []}
-output.grep(XMPRE).each do |line|
-  result_id, result = XMPRE.match(line).captures
-  results[result_id.to_i] << result
-end
-
-idx = 0
-annotated = code.gsub(/^(.*) # =>.*/) do |l|
-  expr = $1
-  (/^\s*#/ =~ l) ? l : "#{expr} # => " + (results[idx+=1] || []).join(", ")
-end.gsub(/ # !>.*/, '').gsub(/# (>>|~>)[^\n]*\n/m, "");
-
-warnings = {}
-output.join.lines.grep(WARNING_RE).map do |x|
-  md = WARNING_RE.match(x)
-  warnings[md[1].to_i] = md[2]
-end
-idx = 0
-annotated = annotated.lines.map do |line|
-  w = warnings[idx+=1]
-  w ? (line.chomp + " # !> #{w}") : line
-end
-puts annotated
-output.reject!{|x| /^-:[0-9]+: warning/.match(x)}
-if exception = /^-:[0-9]+:.*/m.match(output.join)
-  puts exception[0].map{|line| "# ~> " + line }
-end
-if (s = stdout.read) != ""
-  puts "# >> #{s.inspect}"
-end