hamlit 2.13.2-java → 2.14.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c157cfa69dafaafe52824f77e7d8b42678ba3710dd09bbb5808a714cfda759a
-  data.tar.gz: 1e734a39a56edf5cd3898d9245506dd865e15734cc590c990c72350f20e48ae6
+  metadata.gz: 9163c80fc74063f1aab7a0b3e70dcfc6e2287394403430984f6a81c6889e1a6f
+  data.tar.gz: fa89e8eccdc02d3e60b6e5978663ac91a7b1ee491903017fb2e1233168992bd1
 SHA512:
-  metadata.gz: 6ab77e54fe32548c307d1f1fef0356915be976313721ec70bd33877f5063f5a953c00b722b267af01668ea33c05daef9e07d8c7732936126ca1d06791c81161f
-  data.tar.gz: 57aea5e83ec4a34fd5bd41878b687f13e987c4a2d8a7bec1b7823d86755332f49084d20a61a88ecbdadd7278d9ef1517a871b1b8a338cad02f765bc4862f56d4
+  metadata.gz: 455784941d0c600eee62032bba661c0aee671f10883b56509200635f4f3cf128f783c1a3184089ad9260ed362e5c720efe28b10518ac9a5f146c8d138a35e83e
+  data.tar.gz: ab336937b54d70b05b071b707aeafe811bf7b2ce126f804d50ed34ea60695249b517e49a6b1d498e6d29cc67ed170d5609148ae232aadde322ce45a5145676eb

data/.github/workflows/test.yml

@@ -21,10 +21,16 @@ jobs:
           - ruby:2.5
           - ruby:2.6
           - ruby:2.7
+          - ruby:3.0
           # TODO: add jruby and truffleruby
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-gems-
       - run: apt-get update && apt-get install -y nodejs # For execjs
       - name: bundle install
-        run: bundle install -j$(nproc) --retry 3
+        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
       - run: bundle exec rake test

data/.gitignore

@@ -13,6 +13,6 @@
 *.bundle
 *.so
 *.su
-*.o
 *.a
+*.o
 *.swp

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.14.0](https://github.com/k0kubun/hamlit/compare/v2.13.2...v2.14.0) - 2021-01-07
+
+### Changed
+
+- CLI changes
+  - Remove `-c` shorthand of `--color`.
+  - Make `--color` default. Please use `--no-color` to disable it.
+  - `--color` uses IRB instead of Pry for syntax highlight.
+     - Syntax highlight of `hamlit compile` is enabled only with IRB of Ruby 2.7+.
+     - Syntax highlight of `hamlit parse` / `hamlit temple` is enabled only with IRB of Ruby 3.1+.
+
 ## [2.13.2](https://github.com/k0kubun/hamlit/compare/v2.13.1...v2.13.2) - 2020-12-27
 
 ### Added

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/hamlit.svg)](http://badge.fury.io/rb/hamlit)
 [![Build Status](https://travis-ci.org/k0kubun/hamlit.svg?branch=master)](https://travis-ci.org/k0kubun/hamlit)
+[![test](https://github.com/k0kubun/hamlit/workflows/test/badge.svg)](https://github.com/k0kubun/hamlit/actions?query=workflow%3Atest)
 
 Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation.
 

data/lib/hamlit/cli.rb

@@ -18,20 +18,20 @@ module Hamlit
 
     desc 'compile HAML', 'Show compile result'
     option :actionview, type: :boolean, default: false, aliases: %w[-a]
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
     def compile(file)
       code = generate_code(file)
       puts_code(code, color: options[:color])
     end
 
     desc 'temple HAML', 'Show temple intermediate expression'
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
     def temple(file)
       pp_object(generate_temple(file), color: options[:color])
     end
 
     desc 'parse HAML', 'Show parse result'
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
     def parse(file)
       pp_object(generate_ast(file), color: options[:color])
     end
@@ -107,20 +107,28 @@ module Hamlit
       render(args.first.to_s)
     end
 
-    def puts_code(code, color: false)
+    def puts_code(code, color: true)
+      begin
+        require 'irb/color'
+      rescue LoadError
+        color = false
+      end
       if color
-        require 'pry'
-        puts Pry.Code(code).highlighted
+        puts IRB::Color.colorize_code(code)
       else
         puts code
       end
     end
 
     # Enable colored pretty printing only for development environment.
-    def pp_object(arg, color: false)
+    def pp_object(arg, color: true)
+      begin
+        require 'irb/color_printer'
+      rescue LoadError
+        color = false
+      end
       if color
-        require 'pry'
-        Pry::ColorPrinter.pp(arg)
+        IRB::ColorPrinter.pp(arg)
       else
         require 'pp'
         pp(arg)

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.13.2'
+  VERSION = '2.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.0
 platform: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement