act 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 626ce8cd7e573620e8fe2b43549afb1cc4f65b58
-  data.tar.gz: 78164113d48edf33d4437457e78c3bcb76ebe577
+  metadata.gz: b08ce5a70e4451a521ed09fb58f04628cdb0422b
+  data.tar.gz: 84a6c6195590c0bde72933cbba111fce91644822
 SHA512:
-  metadata.gz: 767f83cbaab9409a310b798ba02eb8c3b0d11ca9bea3edcf702a4a9d75486b7c5def2f37a22358304d8efd9880c2e442c6f33b58380376ec92d520cc9eddee7d
-  data.tar.gz: 72c0c6840315a642727fd6b220a15c575b7bed615bc336158a81bc59df5a9c9daa3bc377516a1cbe3395fbe50ead9aec6675e26f24826bcd45a5b2ea792054cc
+  metadata.gz: 47c0d81edde860d3fc822d1218210a412c6af8ae786beaa197891e6ff6721b584e08e68a904d11e99b15ad6d3034d193080baa10ed182810dea12a22c9fcbcc0
+  data.tar.gz: 8f43c7b2ac9fd87964b36f6862ef1d68bda02380193802837be39084b505db37c3c2332c94de42ec5a664ea315fe31c10347b38a15bf82a882fcaba5988473c4

data/act.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Act::VERSION
   spec.authors       = ["Fabio Pelosin"]
   spec.email         = ["fabiopelosin@gmail.com"]
-  spec.summary       = %q{Act the command line tool to act on files.}
+  spec.summary       = %q{Act, the command line tool to act on files.}
   spec.homepage      = "https://github.com/irrationalfab/act"
   spec.license       = "MIT"
 
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "claide", "~> 0.5"
   spec.add_runtime_dependency "colored", "~> 1.2"
+  spec.add_runtime_dependency "rouge", '~> 1.7'
   spec.add_runtime_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.5"

data/lib/act/command.rb

@@ -15,7 +15,7 @@ module Act
 
     def self.arguments
       [
-        ['PATH', :optional],
+        CLAide::Argument.new('PATH', false),
       ]
     end
 
@@ -23,7 +23,8 @@ module Act
       [
         ['--open', 'Open the file in $EDITOR instead of printing it'],
         ['--prettify', 'Prettify output'],
-        ['--line-numbers', 'Show output without line numbers'],
+        ['--always-color', 'Always color the output'],
+        ['--line-numbers', 'Show output with line numbers'],
         ['--lexer=NAME', 'Use the given lexer'],
       ].concat(super)
     end
@@ -41,6 +42,7 @@ module Act
       @prettify = argv.flag?('prettify', false)
       @number_lines = argv.flag?('line-numbers', false)
       @lexer = argv.option('lexer', false)
+      @always_color = argv.flag?('always-color')
       @file_string = argv.shift_argument
       super
     end
@@ -130,12 +132,12 @@ module Act
     def cat_string(string, file = nil)
       if string
         path = file.path if file
-        @lexer ||= Helper.lexer(path)
+        @lexer ||= Helper.lexer(path, string)
         string = Helper.strip_indentation(string)
         string = Helper.prettify(string, @lexer) if @prettify
-        string = Helper.syntax_highlith(string, @lexer) if self.ansi_output?
+        string = Helper.syntax_highlight(string, @lexer) if ansi_output? || @always_color
         string = Helper.add_line_numbers(string, file.from_line, file.highlight_line) if @number_lines && file
-        UI.puts "\n#{string}"
+        UI.puts UI.tty? ? "\n#{string}" : string
       else
         UI.warn '[!] Nothing to show'
       end

data/lib/act/helper.rb

@@ -1,6 +1,7 @@
 require 'colored'
 require 'active_support/core_ext/string/strip'
 require 'open3'
+require 'rouge'
 
 module Act
   module Helper
@@ -63,18 +64,11 @@ module Act
       numbered_lines.join
     end
 
-    def self.lexer(file_name)
-      case file_name
-      when 'Gemfile', 'Rakefile', 'Podfile'
-        'rb'
-      when 'Podfile.lock', 'Gemfile.lock'
-        'yaml'
+    def self.lexer(file_name, string = nil)
+      if string
+        Rouge::Lexer.guess(:filename => file_name, :source => string).tag
       else
-        if file_name
-          `pygmentize -N #{file_name}`.chomp
-        else
-          'text'
-        end
+        Rouge::Lexer.guess_by_filename(file_name).tag
       end
     end
 
@@ -92,21 +86,9 @@ module Act
 
     # @return [String]
     #
-    def self.syntax_highlith(string, lexer)
-      raise ArgumentError unless string
-      raise ArgumentError unless lexer
-      return string if `which pygmentize`.strip.empty?
-      result = nil
-      Open3.popen3("pygmentize -l #{lexer} -O encoding=utf8") do |stdin, stdout, stderr, wait_thr|
-        stdin.write(string)
-        stdin.close_write
-        result = stdout.read
-        unless wait_thr.value.success?
-          warn '[!] Syntax highlighting via the pygmentize tool failed'
-          result = string
-        end
-      end
-      result
+    def self.syntax_highlight(string, lexer)
+      formatter = Rouge::Formatters::Terminal256.new(:theme => 'monokai')
+      Rouge.highlight(string, lexer, formatter)
     end
 
   end

data/lib/act/user_interface.rb

@@ -9,6 +9,10 @@ module Act
     def self.warn(message)
       STDERR.puts message
     end
+
+    def self.tty?
+      STDOUT.tty?
+    end
   end
 
   UI = UserInterface

data/lib/act/version.rb

@@ -1,3 +1,3 @@
 module Act
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/helper_spec.rb

@@ -52,16 +52,23 @@ module Act
     #-------------------------------------------------------------------------#
 
     describe 'lexer' do
-      it 'infers the lexer according to the extension using pygmentize' do
+      it 'infers the lexer according to the extension' do
         file_name = 'test.rb'
         result = @subject.lexer(file_name)
-        result.should == 'rb'
+        result.should == 'ruby'
+      end
+
+      it 'infers the lexer according to the text' do
+        file_name = 'rm'
+        text = "#!/usr/bin/ruby\n\nrequire 'set'\nputs 'hello'\n3.tap { p 3 }"
+        result = @subject.lexer(file_name, text)
+        result.should == 'ruby'
       end
 
       it 'infers the lexer according to the file name' do
         file_name = 'Gemfile'
         result = @subject.lexer(file_name)
-        result.should == 'rb'
+        result.should == 'ruby'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fabio Pelosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -127,10 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Act the command line tool to act on files.
+summary: Act, the command line tool to act on files.
 test_files:
 - spec/argument_parser_spec.rb
 - spec/command_spec.rb