act 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 684ed5ccb021e0950d357fa0157cdb631d1852ad
-  data.tar.gz: d1fc364445937bb80789188bb88b6119af63da22
+  metadata.gz: 2faf8a1d513d94638d664661519f8b40df95c6ca
+  data.tar.gz: 7e4c4df4a3971d1b64c138793df53526adfcbb4e
 SHA512:
-  metadata.gz: 2077bc99056dcbbc185fa82aee2eb87f5bcd744fd9fbe0e5de4ba4653f36bd85b9fca8d92ad471b23ee6c722823e5d0595a045724269fb5de2a122895f938be9
-  data.tar.gz: 86b85a404e763e410fb3a3a8c333b150a008fc1b7e822264d18e80c91dca2b885986ee3c715ac5a1d71f423f59547ad3164dd5c7a125c35c28bb1403167634c5
+  metadata.gz: 5d9ab8baa30dd2bc07755fab8a4a456c866a2b32b1cf4ed9a8f233500475348c44af6c9919cf40f30d381d4b644969b16982ad472296a68b1a1e401191ef7271
+  data.tar.gz: 2cb5dbe4bd494e7a037e294e90e7e79ae7435d830d71bfa4b90ad6b6f320f93e5fe72b7d1ee2ae650f21b6b5706275e6ebe4bf29a4a262bb84d3f082480f48eb

data/Gemfile

@@ -3,13 +3,13 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "bacon"
-  gem "mocha-on-bacon"
+  gem 'bacon'
+  gem 'mocha-on-bacon'
   gem 'prettybacon'
   gem 'rubocop'
 end
 
 group :debugging do
-  gem "kicker"
+  gem 'kicker'
 end
 

data/README.md

@@ -1,7 +1,7 @@
 # Act
 [![Build Status](https://travis-ci.org/irrationalfab/act.svg?branch=master)](https://travis-ci.org/irrationalfab/act)
 
-Allows to act on files from the command line efficiently... `cat` for the twenty first century!
+Preview files from the command line efficiently. `cat` for the twenty first century!
 
 <img src="http://cl.ly/image/0A2p320r442D/Image%202014-04-04%20at%202.59.18%20pm.png" height="50%" width="50%">
 
@@ -11,7 +11,7 @@ Allows to act on files from the command line efficiently... `cat` for the twenty
   - Support for colon syntax
   - Support for GitHub like URLs
 - Automatic syntax highlighting based on the file extension (via [Pygments](http://pygments.org))
-- Fast enoguht for the task
+- Fast enough for the task
 
 ## Installation
 

data/lib/act/command.rb

@@ -5,58 +5,81 @@ require 'active_support/core_ext/string/strip'
 module Act
   class Command < CLAide::Command
     self.command = 'act'
-    self.description = 'Act the command line tool to act on files'
+
+    self.description = <<-DOC
+      Act the command line tool to act on files
+
+      Prints the contents of the file at `PATH`.
+
+    DOC
+
+    def self.arguments
+      [
+        ['PATH', :optional],
+      ]
+    end
 
     def self.options
       [
         ['--open', 'Open the file in $EDITOR instead of printing it'],
-        ['--no-line-numbers', 'Show output without line numbers'],
-        ['--version', 'Show the version of Act'],
+        ['--prettify', "Don't prettify output"],
+        ['--line-numbers', 'Show output without line numbers'],
+        ['--lexer=NAME', 'Use the given lexer'],
       ].concat(super)
     end
 
-    def self.run(argv)
-      argv = CLAide::ARGV.new(argv)
-      if argv.flag?('version')
-        UI.puts VERSION
-        exit 0
-      end
-      super(argv)
+    def self.completion_description
+      description = super
+      # _path_files function
+      description[:paths] = :all_files
+      description
     end
 
     def initialize(argv)
+      @stdin = STDIN.read unless STDIN.tty?
       @open = argv.flag?('open')
-      @number_lines = argv.flag?('line-numbers', true)
+      @prettify = argv.flag?('prettify', false)
+      @number_lines = argv.flag?('line-numbers', false)
+      @lexer = argv.option('lexer', false)
       @file_string = argv.shift_argument
       super
     end
 
     def validate!
       super
-      help! 'A file is required.' unless @file_string
+      help! 'A file is required.' unless @file_string || @open || @stdin
     end
 
     CONTEXT_LINES = 5
 
     def run
+      if @stdin && !@open
+        cat_string(@stdin)
+        return
+      end
+
+
+      @file_string ||= '.'
       clean_file_string = pre_process_file_string(@file_string)
       file = ArgumentParser.parse_file_information(clean_file_string, CONTEXT_LINES)
 
       path_exists = File.exist?(file.path)
       unless path_exists
         inferred = infer_local_path(file.path)
-        file.path = inferred
-        path_exists = true if inferred
+        if inferred
+          file.path = inferred
+          path_exists = true
+        end
       end
 
-      if path_exists
-        if @open
-          open_file(file)
-        else
+      if @open
+        open_file(file)
+      else
+        if path_exists
           cat_file(file)
+        else
+          UI.warn '[!] File not found'
         end
-      else
-        UI.warn '[!] File not found'
       end
     end
 
@@ -85,7 +108,13 @@ module Act
       line = file.highlight_line || file.from_line
       command = Helper.open_in_editor_command(file.path, line)
       UI.puts command if self.verbose?
-      system(command)
+      if defined? Bundler
+        Bundler.with_clean_env do
+          system(command)
+        end
+      else
+        system(command)
+      end
     end
 
     # @return [void]
@@ -95,11 +124,17 @@ module Act
       if file.from_line && file.to_line
         string = Helper.select_lines(string, file.from_line, file.to_line)
       end
+      cat_string(string, file)
+    end
 
+    def cat_string(string, file = nil)
       if string
+        path = file.path if file
+        @lexer ||= Helper.lexer(path)
         string = Helper.strip_indentation(string)
-        string = Helper.syntax_highlith(string, file.path) if self.ansi_output?
-        string = Helper.add_line_numbers(string, file.from_line, file.highlight_line) if @number_lines
+        string = Helper.prettify(string, @lexer) if @prettify
+        string = Helper.syntax_highlith(string, @lexer) if self.ansi_output?
+        string = Helper.add_line_numbers(string, file.from_line, file.highlight_line) if @number_lines && file
         UI.puts "\n#{string}"
       else
         UI.warn '[!] Nothing to show'

data/lib/act/helper.rb

@@ -50,7 +50,7 @@ module Act
     # @return [String]
     #
     def self.add_line_numbers(string, start_line, highlight_line = nil)
-      start_line ||= 0
+      start_line ||= 1
       line_count = start_line
       numbered_lines = string.lines.map do |line|
         number = line_count.to_s.ljust(3)
@@ -63,12 +63,40 @@ 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'
+      else
+        if file_name
+          `pygmentize -N #{file_name}`.chomp
+        else
+          'text'
+        end
+      end
+    end
+
+    def self.prettify(string, lexer)
+      raise ArgumentError unless string
+      raise ArgumentError unless lexer
+      case lexer
+      when 'json'
+        require 'json'
+        JSON.pretty_generate(JSON.parse(string))
+      else
+        string
+      end
+    end
+
     # @return [String]
     #
-    def self.syntax_highlith(string, file_name)
-      return string if `which gen_bridge_metadata`.strip.empty?
+    def self.syntax_highlith(string, lexer)
+      raise ArgumentError unless string
+      raise ArgumentError unless lexer
+      return string if `which pygmentize`.strip.empty?
       result = nil
-      lexer = `pygmentize -N #{file_name}`.chomp
       Open3.popen3("pygmentize -l #{lexer}") do |stdin, stdout, stderr|
         stdin.write(string)
         stdin.close_write
@@ -76,5 +104,6 @@ module Act
       end
       result
     end
+
   end
 end

data/lib/act/version.rb

@@ -1,3 +1,3 @@
 module Act
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/helper_spec.rb

@@ -51,5 +51,21 @@ module Act
 
     #-------------------------------------------------------------------------#
 
+    describe 'lexer' do
+      it 'infers the lexer according to the extension using pygmentize' do
+        file_name = 'test.rb'
+        result = @subject.lexer(file_name)
+        result.should == 'rb'
+      end
+
+      it 'infers the lexer according to the file name' do
+        file_name = 'Gemfile'
+        result = @subject.lexer(file_name)
+        result.should == 'rb'
+      end
+    end
+
+    #-------------------------------------------------------------------------#
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fabio Pelosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide