hamlit 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ec14e388895690831d2699c9d2bf4f8d3c37f3
-  data.tar.gz: 0151505b707e2808531677275487282eb9603fea
+  metadata.gz: 2cee8b3d62bf9479cc9787e47bba7c4cdc7e51df
+  data.tar.gz: 9845f57cf95715759f6e9ff5e51f7aba5d2ccfd0
 SHA512:
-  metadata.gz: f94ea2e429770cd4cd28879a2300bd59877b25a8ce4be65a4c87834b9ba0098a992380b1c371db466c412817c598757273f8c863f76fd4e0e1de8a50ed286fe6
-  data.tar.gz: f0889755f2165762003d9e5d8092b4a88f7a22cb23900f0da9f51ed4559156eae17547f5dee51fe62a80080389019c42d611aab224debe3c237ae1c345fff0cd
+  metadata.gz: 71ca2927c45f44b7ec808d514f99ca522251813afd026962d4ebee7cb4944bd6b2157a334a6c7d3ca48273324ba7b8728bc24575fee2772aa9583b88647549b6
+  data.tar.gz: 7f6788475f225077b149d34b01884e6689cd862ded4dc7e40024a8949061990d987bb6da6f33c362fc4c7b5022a384d19c0d60c38aef78164c8f1298c7eb03eb

data/CHANGELOG.md

@@ -4,11 +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.8.3](https://github.com/k0kubun/hamlit/compare/v2.8.2...v2.8.3) - 2017-06-19
+
+### Added
+
+- Add `--color` option to `hamlit parse` and `hamlit temple` commands too.
+
 ## [2.8.2](https://github.com/k0kubun/hamlit/compare/v2.8.1...v2.8.2) - 2017-06-19
 
 ### Added
 
-- Add `--no-color` option to disable coloring in `hamlit compile` command
+- Add `--color` option to opt-in coloring in `hamlit compile` command
   [#111](https://github.com/k0kubun/hamlit/issues/111).
 
 ## [2.8.1](https://github.com/k0kubun/hamlit/compare/v2.8.0...v2.8.1) - 2017-04-03

data/lib/hamlit/cli.rb

@@ -21,21 +21,19 @@ module Hamlit
     option :color, type: :boolean, default: false, aliases: %w[-c]
     def compile(file)
       code = generate_code(file)
-      if options[:color]
-        colored_puts generate_code(file)
-      else
-        puts code
-      end
+      puts_code(code, color: options[:color])
     end
 
     desc 'temple HAML', 'Show temple intermediate expression'
+    option :color, type: :boolean, default: false, aliases: %w[-c]
     def temple(file)
-      pp generate_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]
     def parse(file)
-      pp generate_ast(file)
+      pp_object(generate_ast(file), color: options[:color])
     end
 
     desc 'version', 'Show the used hamlit version'
@@ -101,18 +99,24 @@ module Hamlit
       render(args.first.to_s)
     end
 
-    def colored_puts(code)
-      require 'pry'
-      puts Pry.Code(code).highlighted
+    def puts_code(code, color: false)
+      if color
+        require 'pry'
+        puts Pry.Code(code).highlighted
+      else
+        puts code
+      end
     end
 
     # Enable colored pretty printing only for development environment.
-    def pp(arg)
-      require 'pry'
-      Pry::ColorPrinter.pp(arg)
-    rescue LoadError
-      require 'pp'
-      super(arg)
+    def pp_object(arg, color: false)
+      if color
+        require 'pry'
+        Pry::ColorPrinter.pp(arg)
+      else
+        require 'pp'
+        pp(arg)
+      end
     end
   end
 end

data/lib/hamlit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Takashi Kokubun