hamlit 2.13.2 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc8030c410cd15d25db47c6a69ffb977ea32d7ce65e77cbdae3658c11456caa
-  data.tar.gz: 922dccdfef223350790f605c76df0e8efb1f866d8d7b291a15ef1caaa4985499
+  metadata.gz: 3a301e3719b15a8bd389c69273087c6133a0f64a50794e256106c65fb402a652
+  data.tar.gz: f5548a7ca946d6339a4767c13fc4dfcf8779274a95d179dccabf4ceb269aa35e
 SHA512:
-  metadata.gz: d055eeb98d94ce58784bbf6686b38c6ccdf4465a8ec56381b6c81ab137e6b6b9d193b7eb224f9b45115cbaa7a26432ceae90b8af4e5b4b59d068d7098e773507
-  data.tar.gz: 3d24de3051c7bebea572b3f5f749f22bc6774212de8c6267b264162dae5d7e38b45bdb5a10e6dd0aec44936ba93db14bcda37ac4cd1a9f3b66fad76650fdd717
+  metadata.gz: c5858d26f7573e085d1da827a3d9eee1a6c8252e8a6a0459a8e1022dc99a2cb15cce1bd4931ffc2df26815e85a717df0fd119f3585d605aaeb67a5c7c38021df
+  data.tar.gz: 6fa9187e20778096808fce4e997df74c67b9d980ba4219baf55b64f9930b87c3b35b21a74c50355c6a443750e6d5465d6b6977dd322aeea5bdc7ecdb57d44519

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,24 @@ 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.1](https://github.com/k0kubun/hamlit/compare/v2.14.0...v2.14.1) - 2021-01-07
+
+### Added
+
+- Add `-c` option to `hamlit compile` that works like `haml -c` [#166](https://github.com/k0kubun/hamlit/issues/166)
+  *Thanks to @knightq*
+
+## [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

@@ -13,25 +13,33 @@ module Hamlit
     def render(file)
       process_load_options
       code = generate_code(file)
-      puts eval(code)
+      puts eval(code, binding, file)
     end
 
     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
+    option :check, type: :boolean, default: false, aliases: %w[-c]
     def compile(file)
       code = generate_code(file)
+      if options[:check]
+        if error = validate_ruby(code, file)
+          abort error.message.split("\n").first
+        end
+        puts "Syntax OK"
+        return
+      end
       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,24 +115,40 @@ 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)
       end
     end
+
+    def validate_ruby(code, file)
+      begin
+        eval("BEGIN {return nil}; #{code}", binding, file)
+      rescue ::SyntaxError # Not to be confused with Hamlit::SyntaxError
+        $!
+      end
+    end
   end
 end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.1
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+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
   name: temple
@@ -376,7 +376,7 @@ homepage: https://github.com/k0kubun/hamlit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -391,8 +391,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation
 test_files: []