wirb 2.1.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5aa1b145bd66701a8ead0252b2be8415f2f9bcbc
-  data.tar.gz: f5b4097bcb145cf9b68c39a1f219a51084297b76
+SHA256:
+  metadata.gz: 5bb7682a36323e7f6091949c181a0d0dba6749959d8fe8722786c78f68b4b965
+  data.tar.gz: b09786d2784b0bfffa33a2106537a756ae442b79495accfe5038e42ca6e0573d
 SHA512:
-  metadata.gz: c431f78171be2217d2e17ac2a5f0dd649752d9dbd14e540f10b83ea6418ff735288c931ea5e3d7c699204a6c2edc0d327250925a4f443c3cb401c4f6b0ccd602
-  data.tar.gz: 1e725e28a73953fcd6313c1667667873a132b24a2a8b5fe0f1a3ff14c8feb242ae031e1b8bbcddfa79a8e3028d16ca3f62f771cf650f079ac237c9ac9207b73d
+  metadata.gz: cde9e32b55bdcb44d9f8b39211198aa426ef7c23b0e95bea38dddf0cbd6ea2a13531a07687f753a32201dd91f6eeed5d18ded3dd9e9df27892e5530fc92a38f9
+  data.tar.gz: 387112604206f5727d2df2689efc2077e642eefc467242523f1b7caa12d6d3f1bfd7683b88acc90de6eb4716c4453c3770593d4cd7200c3fc8783da740b302f5

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.2.2
+* Relax Ruby version requirement to allow 3.0
+
+## 2.2.1
+* Fix new timestamp matching
+
+## 2.2.0
+* Support Ruby 2.7
+
+## 2.1.2
+* Fix Gem.datadir deprecation
+
+## 2.1.1
+* Relax paint dependency (allow paint versions >= 2.0)
+
 ## 2.1.0
 * New color schema: ultra
 

data/COPYING.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2015 Jan Lelis <mail@janlelis.de>
+Copyright (C) 2011-2020 Jan Lelis <https://janlelis.com>
 Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a

data/README.md

@@ -1,23 +1,20 @@
-## WIRB Interactive Ruby [![version](https://badge.fury.io/rb/wirb.svg)](http://badge.fury.io/rb/wirb) [<img src="https://travis-ci.org/janlelis/wirb.png" />](https://travis-ci.org/janlelis/wirb)
+## WIRB Interactive Ruby [![version](https://badge.fury.io/rb/wirb.svg)](https://badge.fury.io/rb/wirb) [<img src="https://github.com/janlelis/wirb/workflows/Test/badge.svg" />](https://github.com/janlelis/wirb/actions?query=workflow%3ATest)
 
-**WIRB** syntax highlights Ruby objects.
+The **WIRB** gem syntax highlights Ruby objects. Works best as your default REPL inspector (see usage section below), but does not require IRB.
 
-Supported Rubies: 2.3, 2.2, 2.1, 2.0, jruby, rubinius.
+Supported Rubies: 3.0, 2.7, 2.6, 2.5
 
-Legacy Rubies (1.9, 1.8): Use [WIRB 1.0](https://github.com/janlelis/wirb/tree/1.0.3)
-
-[Example output](https://travis-ci.org/janlelis/wirb/jobs/56299603)
+Older Rubies, should work: 2.4, 2.3, 2.2, 2.1, 2.0, rubinius
 
+Ancient Rubies (1.9, 1.8): Please use [WIRB 1.0](https://github.com/janlelis/wirb/tree/1.0.3)
 
 ## Features
 
-* Syntax highlighting for Ruby objects
+* Syntax highlighting for inspected Ruby objects
 * No monkey patches anywhere
-* Support for generic objects, especially enumerators, and nested generic
-  objects
-* Can be used without IRB
-* Supports stdlib objects, like `Set`
-* Custom color schemas via YAML
+* Support for generic objects, especially enumerators, and nested generic objects
+* Supports common standard library objects, like `Set`
+* Color schemas customizable via YAML
 
 ## Install
 
@@ -25,56 +22,54 @@ Install the gem with:
 
     $ gem install wirb
 
+Or add it to your Gemfile:
+
+   gem 'wirb'
+
 ## Usage
 
 To start IRB with WIRB activated for one session, do:
 
     $ irb -r wirb --inspect wirb
 
-To activate WIRB permanently, you'll need to add this to the `~/.irbrc` file:
+To activate WIRB permanently, you can add this to the `~/.irbrc` file:
 
     require 'wirb'
     Wirb.start
 
+Another way would be to use [Irbtools](https://irb.tools), which activate WIRB automatically.
+
+## `Kernel#wp`
+
+WIRB comes with a pretty printing utility (similar to awesome_print):
+
+    require 'wirb/wp'
+    wp some_object
+
 ### Bundled Schemas
 
-These are the bundled color schemas. You can load one with `Wirb.load_schema
-:name`
+These are the bundled color schemas. You can load one with `Wirb.load_schema(:name)`
 
 * `:classic` (default)
 * `:colorless` (only uses :bright, :underline and :inverse effect)
-* `:ultra` (matches the colorscheme from
-    [Ultra](https://github.com/venantius/ultra) over in Clojure-land)
+* `:ultra` (by @venantius, matches the colorscheme from [Ultra](https://github.com/venantius/ultra) over in Clojure-land)
 
 ### Usage with Rails
 
-See [the solution in this issue](https://github.com/janlelis/wirb/issues/12#issuecomment-249492524).
-
-## `Kernel#wp`
-
-You can use WIRB like awesome_print to highlight any objects using `wp`:
-
-    require 'wirb/wp'
-    wp some_object
+If you run into problems using WIRB with Rails, try [the solution in this issue](https://github.com/janlelis/wirb/issues/12#issuecomment-249492524).
 
 ## Also See
 
 * Gem that allows you to configure views for specific objects:
   [hirb](https://github.com/cldwalker/hirb)
-* WIRB is part of: [irbtools](https://github.com/janlelis/irbtools)
-* RIPL is an IRB alternative, syntax highlighting plugin (uses wirb by
-  default):
-  [ripl-color_result](https://github.com/janlelis/ripl-color_result)
+* WIRB is part of: [Irbtools](https://github.com/janlelis/irbtools)
 * More about terminal colors: [Paint](https://github.com/janlelis/paint)
-* [Wirble](http://pablotron.org/software/wirble/): WIRB's predecessor
-
 
 ## Credits
 
-Copyright (c) 2011-2015 Jan Lelis <http://janlelis.com> see COPYING for
-details.
+Copyright (c) 2011-2020 Jan Lelis <https://janlelis.com> see COPYING for details.
 
-Influenced by code from: Copyright (C) 2006-2009 Paul Duncan
-<pabs@pablotron.org>
+First tokenizer version was based on the [wirble](https://rubygems.org/gems/wirble) gem:
+Copyright (C) 2006-2009 Paul Duncan <pabs@pablotron.org>
 
 [All contributors](https://github.com/janlelis/wirb/contributors)

data/Rakefile

@@ -1,14 +1,12 @@
 require 'rake'
 require 'fileutils'
-require "rspec/core/rake_task"
+
 task :default => :spec
 task :test    => :spec
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = [
-     '--color',
-    '-r ' + File.expand_path( File.join( 'spec', 'spec_helper') ),
-  ]
+desc "Run tests"
+task :spec do
+  sh "rspec"
 end
 
 def gemspec
@@ -24,7 +22,7 @@ end
 
 desc "Install the gem locally"
 task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-rdoc --no-ri}
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-doc}
 end
 
 desc "Generate the gemspec"

data/lib/wirb/schema_builder.rb

@@ -14,7 +14,8 @@ module Wirb
 
      def self.resolve_schema_yaml(yaml_path)
        if yaml_path.is_a? Symbol # bundled themes
-         [yaml_path.to_s, YAML.load_file(File.join(Gem.datadir('wirb'), "#{yaml_path}.yml"))]
+         datadir = Gem.loaded_specs['wirb'].datadir
+         [yaml_path.to_s, YAML.load_file(File.join(datadir, "#{yaml_path}.yml"))]
        else
          [File.basename(yaml_path).gsub(/\.yml$/, ''), YAML.load_file(yaml_path)]
        end

data/lib/wirb/tokenizer.rb

@@ -239,7 +239,7 @@ module Wirb
         when :time # via regex, state needs to be triggered somewhere else
           peek = chars[i..-1].join
           if [
-            /^\d+-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (?:[+-]\d{4}|[a-z]{3})/i,               # 1.9 / UTC
+            /^\d+-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d{,9})? (?:[+-]\d{4}|[a-z]{3})/i,
           ].any?{ |regex|
             ( @token + peek ) =~ regex
           } # found, adjust parsing-pointer:
@@ -400,10 +400,10 @@ module Wirb
           if c =~ /[x0-9a-f]/
             @token << c
           else
-            if c == '@'
+            if c == '@' || c == ' ' && nc != "@"
               pass_state[:remove]
               push_state[:object_line]
-              pass[:object_line_prefix, '@']
+              pass[:object_line_prefix, c]
             else
               pass_state[:remove, :repeat]
             end

data/lib/wirb/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wirb
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.2'
 end

data/spec/tokenizer_number_spec.rb

@@ -79,31 +79,6 @@ describe tokenizer(__FILE__) do
     ]
   end
 
-=begin
-  only18 do
-    please do check Rational(2,3)
-      tokens.should == [
-        [:class, "Rational"],
-        [:open_rational, "("],
-        [:number, "2"],
-        [:rational_separator, ","],
-        [:whitespace, " "],
-        [:number, "3"],
-        [:close_rational, ")"],
-      ]
-
-      # modifying the world, see https://github.com/janlelis/wirb/issues#issue/1
-      require 'mathn'
-      check Rational(2,3)
-      tokens.should == [
-        [:number, "2"],
-        [:rational_separator, "/"],
-        [:number, "3"],
-      ]
-    end
-  end
-=end
-
   please do check (1/0.0)
     tokens.should == [
       [:special_number, "Infinity"],

data/spec/tokenizer_object_spec.rb

@@ -11,33 +11,60 @@ describe tokenizer(__FILE__) do
       [:object_address, OBJECT_ID],
       [:close_object, ">"],
     ]
- end
+  end
 
   please do check proc{}
-    tokens.should be_like [
-      [:open_object, "#<"],
-      [:object_class, "Proc"],
-      [:object_description_prefix, ":"],
-      [:object_address, OBJECT_ID],
-      [:object_line_prefix, "@"],
-      [:object_line, /.*tokenizer_object_spec.rb:/],
-      [:object_line_number, /\d+/],
-      [:close_object, ">"],
-    ]
+    if RUBY_VERSION >= "2.7"
+      tokens.should be_like [
+        [:open_object, "#<"],
+        [:object_class, "Proc"],
+        [:object_description_prefix, ":"],
+        [:object_address, OBJECT_ID],
+        [:object_line_prefix, " "], # changed in 2.7
+        [:object_line, /.*tokenizer_object_spec.rb:/],
+        [:object_line_number, /\d+/],
+        [:close_object, ">"],
+      ]
+    else
+      tokens.should be_like [
+        [:open_object, "#<"],
+        [:object_class, "Proc"],
+        [:object_description_prefix, ":"],
+        [:object_address, OBJECT_ID],
+        [:object_line_prefix, "@"],
+        [:object_line, /.*tokenizer_object_spec.rb:/],
+        [:object_line_number, /\d+/],
+        [:close_object, ">"],
+      ]
+    end
   end
 
   please do check lambda{}
-    tokens.should be_like [
-      [:open_object, "#<"],
-      [:object_class, "Proc"],
-      [:object_description_prefix, ":"],
-      [:object_address, OBJECT_ID],
-      [:object_line_prefix, "@"],
-      [:object_line, /.*tokenizer_object_spec.rb:/],
-      [:object_line_number, /\d+/],
-      [:object_description, " (lambda)"],
-      [:close_object, ">"],
-    ]
+    if RUBY_VERSION >= "2.7"
+      tokens.should be_like [
+        [:open_object, "#<"],
+        [:object_class, "Proc"],
+        [:object_description_prefix, ":"],
+        [:object_address, OBJECT_ID],
+        [:object_line_prefix, " "],  # changed in 2.7
+        [:object_line, /.*tokenizer_object_spec.rb:/],
+        [:object_line_number, /\d+/],
+        [:object_description, " (lambda)"],
+        [:close_object, ">"],
+      ]
+    else
+      tokens.should be_like [
+        [:open_object, "#<"],
+        [:object_class, "Proc"],
+        [:object_description_prefix, ":"],
+        [:object_address, OBJECT_ID],
+        [:object_line_prefix, "@"],
+        [:object_line, /.*tokenizer_object_spec.rb:/],
+        [:object_line_number, /\d+/],
+        [:object_description, " (lambda)"],
+        [:close_object, ">"],
+      ]
+    end
   end
 
   please do check StringScanner.new('wirb')

data/spec/tokenizer_time_spec.rb

@@ -1,14 +1,17 @@
 describe tokenizer(__FILE__) do
   after :each do check_value end
 
-  please do now = Time.now
-            check [Time.now, Time.now]
+
+  please do
+    now = Time.now
+    now2 = Time.now
+    check [now, now2]
     tokens.should == [
       [:open_array, "["],
-      [:time, now.to_s],
+      [:time, now.inspect],
       [:comma, ","],
       [:whitespace, " "],
-      [:time, now.to_s],
+      [:time, now2.inspect],
       [:close_array, "]"],
     ]
   end

data/wirb.gemspec

@@ -5,16 +5,16 @@ Gem::Specification.new do |s|
   s.name        = "wirb"
   s.version     = Wirb::VERSION.dup
   s.authors     = ["Jan Lelis"]
-  s.email       = "mail@janlelis.de"
+  s.email       = ["hi@ruby.consulting"]
   s.homepage    = "https://github.com/janlelis/wirb"
   s.summary     = "WIRB Interactive Ruby"
-  s.description =  "WIRB highlights inspected Ruby objects. It is based on the original Wirble. You can create new color schemas using yaml."
-  s.required_ruby_version = '~> 2.0'
+  s.description =  "WIRB syntax highlights inspected Ruby objects"
+  s.required_ruby_version = '>= 2.0', '< 4.0'
   s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,md} ext/**/*.{rb,c} data/**/*.yml]) + %w{Rakefile wirb.gemspec}
   s.extra_rdoc_files = ["README.md", "CHANGELOG.md", "COPYING.txt"]
   s.license = 'MIT'
-  s.add_dependency 'paint', '>= 0.9', '< 2.0'
+  s.add_dependency 'paint', '>= 0.9', '< 3.0'
   s.add_development_dependency 'rspec', '~> 2.14'
-  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'ruby_engine', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wirb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: ruby_engine
   requirement: !ruby/object:Gem::Requirement
@@ -72,9 +72,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: WIRB highlights inspected Ruby objects. It is based on the original Wirble.
-  You can create new color schemas using yaml.
-email: mail@janlelis.de
+description: WIRB syntax highlights inspected Ruby objects
+email:
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -124,17 +124,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: WIRB Interactive Ruby