Indentinator 0.0.2 → 0.0.3

data/bin/indentinator

@@ -1,50 +1,112 @@
 #! /usr/bin/env ruby
+$:.unshift(File.expand_path('../../lib', __FILE__)) if $0 == __FILE__
 require 'getopt/std'
 require 'indentinator'
 include Indentinator
 
-opts = Getopt::Std.getopts('c:vV')
-@to_amount = opts['c']
+def parse_amount(val)
+  return nil if val.nil?
+  if val.to_i.to_s == val # is a number
+    ' ' * val.to_i
+  elsif val.downcase == 'tab'
+    "\t"
+  end
+end
+
+opts = Getopt::Std.getopts('ic:a:vVr')
+@from_stdin = opts['i']
+@amount = parse_amount(opts['a'])
+@to_amount = parse_amount(opts['c'])
 @very_verbose = opts['V']
-@verbose = opts['v'] or @very_verbose
+@verbose = opts['v'] || @very_verbose
+@replace = opts['r'] && !@from_stdin
 @files = ARGV
-if @files.size == 0
+
+if @files.size == 0 and not @from_stdin
   puts "Usage: 
   
   indentinator [-c INDENT_AMOUNT] <file> [<file2>...]
   
 Options:
   
-  -c    Modify the indentation amount to INDENT_AMOUNT
+  -c INDENT_AMOUNT
+        Modify the indentation amount to INDENT_AMOUNT. The value is either
+  	    a number - in which case it indicates the number of spaces to use; 
+  	    or TAB - which indicates to use tabs.
+    
+  -a AMOUNT
+        Tell me the original AMOUNT of indentation to use 
+        when converting the file's indentation. 
+        Normally, this value is inferred by looking at the input.
+  	    This option takes the same values as -c.
+    
+  -i    Read input from stdin. This will ignore any file arguments.
+    
+  -r    Replace the original file. Please back up your file or make sure you
+        are using version control. Indentinator is not responsible for
+        any damages; it just indents.
+    
   -v    Verbose output
+
   -V    Very verbose output
   
 "
   exit(0)
 end
 
-@files.each do |path|
-  begin
-    if File.directory?(path)
-      puts "#{path} is a directory."
-      next
+def process_input(text, path)
+  lines = text.split("\n")
+  if @to_amount.nil? or @amount.nil?
+    @amount = indent_amount(lines)
+  end
+  if @to_amount.nil?
+    if @amount == ''
+      puts "#{path} has no indentation."
+    elsif @amount.match(/^ *$/)
+      puts "#{path} uses #{@amount.size} spaces."
+    elsif @amount == "\t"
+      puts "#{path} uses tabs."
+    else
+      puts "#{path} uses #{@amount.gsub(' ', 'SPACE ').gsub("\t", 'TAB ').strip}. WTF?"
+    end
+  else
+    output = convert_lines(lines, @amount, @to_amount).join("\n")
+    if @replace
+      write_file(path, output)
+    else
+      puts output
     end
-    File.open(path) do |file|
-      lines = file.read.split("\n")
-      amount = indent_amount(lines)
-      if @to_amount.nil?
-        if amount == 0
-          puts "#{path} has no indentation."
-        else
-          puts "#{path} uses #{amount} spaces."
-        end
-      else
-        puts convert_lines(lines, amount, @to_amount).join("\n")
+  end
+end
+
+def read_file(path)
+  f = open(path, 'r')
+  text = f.read
+  f.close
+  text
+end
+
+def write_file(path, text)
+  f = open(path, 'w')
+  f.write(text)
+  f.close
+end
+
+if @from_stdin
+  process_file(STDIN, 'Input')
+else
+  @files.each do |path|
+    begin
+      if File.directory?(path)
+        puts "#{path} is a directory."
+        next
       end
+      text = read_file(path)
+      process_input(text, path)
+    rescue Errno::ENOENT
+      puts "Can't open #{path}"
+    rescue ArgumentError
+      puts "Failed for #{path}. Is it binary?"
     end
-  rescue Errno::ENOENT
-    puts "Can't open #{path}"
-  rescue ArgumentError
-    puts "Failed for #{path}. Is it binary?"
   end
 end

data/lib/indentinator.rb

@@ -1,28 +1,37 @@
+class String
+  def -(other)
+    self.index(other) == 0 ? self[other.size..self.size] : nil
+  end
+end
+
 module Indentinator
 
 def indent_amount(lines)
-  curr = 0
+  curr = ''
   diffs = {}
+  # loop through the lines and count each indent difference
+  # between prev and current line in `diffs`
   lines.each_with_index do |line, idx|
-    spaces = line.match(/^( *)/)[0]
-    diff = spaces.size - curr
+    whites = line.match(/^([ \t]*)/)[0]
+    diff = whites - curr
     if @very_verbose
-      puts "#{'%- 5d' % (idx + 1)}: #{diff}"
+      puts "#{'%- 5d' % (idx + 1)}: #{diff.size}" if diff
     end
-    if diff > 0
+    if diff and diff.size > 0
       diffs[diff] ||= 0
       diffs[diff] = diffs[diff] + 1
     end
-    curr = spaces.size
+    curr = whites
   end
+  # sort and pick the one w highest frequency
   if diffs.size > 0
     sorted = diffs.sort{|a, b| b[1] - a[1]}
     if @verbose
-      puts sorted.map{|p| ('%- 5d=> ' % p[0]) + p[1].to_s}.join("\n")
+      puts sorted.map{|p| ('%- 5d=> ' % p[0].size) + p[1].to_s}.join("\n")
     end
     sorted[0][0]
   else
-    0
+    ''
   end
 end
 
@@ -31,30 +40,25 @@ def convert_indentation(text, from, to)
 end
 
 def convert_lines(lines, from, to)
-  ratio = to.to_f / from
-  curr_indent_org = 0
-  curr_indent = 0
+  indents = [] # indentation stack
+  # loop through and convert line by line
   lines.map do |line|
-    if line.empty?
-      line
-    else
-      m = line.match(/^( *)(.*)$/)
-      spaces = m[1]
-      rest = m[2]
-      indent = spaces.size - curr_indent_org
-      curr_indent_org = spaces.size
-      if indent == from # standard indent
-        curr_indent += (indent * ratio).to_i
-      elsif indent > 0 # non-standard indent
-        curr_indent += indent
-      elsif indent == 0 # no indent
-        
-      else # de-indent
-        # reset back to use original indentation
-        curr_indent = (curr_indent_org * ratio).round
+    next line if line.strip.empty?
+    m = line.match(/^([ \t]*)(.*)$/)
+    whites = m[1]
+    rest = m[2]
+    diff = whites - indents.join
+    if diff.nil?
+      # no match indent, could be a de-indent or a different indent pattern
+      # find longest matching indent in stack, and pop till that point
+      indents.pop
+      while indents.size > 0 and diff.nil?
+        indents.pop
+        diff = whites - indents.join
       end
-      ' ' * curr_indent + rest
     end
+    indents.push(diff)
+    indents.map{|i| (i == from or i == "\t") ? to : i }.join + rest
   end
 end
 

data/test/tests.rb

@@ -1,5 +1,61 @@
 require 'rspec'
-require 'indentinator.rb'
+require 'indentinator'
+include Indentinator
+
+describe 'indent_amount' do
+  it "sniffs indent amount 2" do
+    text = "
+line 1
+  line 2"
+    indent_amount(text.split("\n")).should == " " * 2
+    text = "
+line 1
+    line 2"
+    indent_amount(text.split("\n")).should == " " * 4
+  end
+  
+  it "should pick most frequent indentation" do
+    text = "
+line 1
+    line 2
+        line 3
+          line 4"
+    indent_amount(text.split("\n")).should == " " * 4
+  end
+  
+  it "should support tabs" do
+    lines = [
+      "line 1",
+      "\tline 2",
+      "\t\tline 3"
+      ]
+    indent_amount(lines).should == "\t"
+  end
+  
+  it "should support tabs - adheres to frequency principle" do
+    lines = [
+      "line 1",
+      "\tline 2",
+      "\t\tline 3",
+      "        line 4"
+      ]
+    indent_amount(lines).should == "\t"
+  end
+  
+  it "should support tabs - adheres to frequency principle(2)" do
+    lines = [
+      "line 1",
+      "\tline 2",
+      "\t\tline 3",
+      "line 4",
+      "    line 5",
+      "        line 6",
+      "            line 7"
+      ]
+    indent_amount(lines).should == "    "
+  end
+end
+
 describe 'convert_file' do
   it "converts basic indentation" do
     text = "
@@ -7,7 +63,7 @@ line 1
   line 2
     line 3
 line 4"
-    convert_indentation(text, 2, 4).should == "
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == "
 line 1
     line 2
         line 3
@@ -19,7 +75,7 @@ line 4"
     text = "
 line 1
    line 2"
-    convert_indentation(text, 2, 4).should == text
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == text
   end
   
   it "retains non-standard indentation even when is 
@@ -29,7 +85,7 @@ line 1
   line 2
     line 3
         line 2"
-    convert_indentation(text, 2, 4).should == "
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == "
 line 1
     line 2
         line 3
@@ -42,7 +98,7 @@ line 1
   line 2
   line 3
   line 4"
-    convert_indentation(text, 4, 2).should == "
+    convert_indentation(text, ' ' * 4, ' ' * 2).should == "
 line 1
   line 2
   line 3
@@ -56,7 +112,7 @@ line 0
       line 2
       line 3
       line 4"
-    convert_indentation(text, 4, 2).should == "
+    convert_indentation(text, ' ' * 4, ' ' * 2).should == "
 line 0
   line 1
     line 2
@@ -70,7 +126,7 @@ line 0
           line 2
   line 3
 line 4"
-    convert_indentation(text, 2, 4).should == "
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == "
 line 0
           line 2
     line 3
@@ -85,7 +141,7 @@ line 0
       line 3
 
       line 4"
-    convert_indentation(text, 4, 2).should == "
+    convert_indentation(text, ' ' * 4, ' ' * 2).should == "
 line 0
   line 1
     line 2
@@ -101,11 +157,85 @@ line 1
         line 3
 
         line 4"
-    convert_indentation(text, 4, 2).should == "
+    convert_indentation(text, ' ' * 4, ' ' * 2).should == "
 line 1
   line 2
     line 3
 
     line 4"
   end
+
+  it "should de-indent property(ex 3)" do
+    text = "
+line 2
+    line 3
+      line 4
+    line 5"
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == "
+line 2
+    line 3
+        line 4
+    line 5"
+  end
+
+  it "should de-indent property(ex 4)" do
+    text = "
+line 2
+      line 3
+          line 4
+      line 5"
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == text
+  end
+  
+  it "should de-indent property(ex 5)" do
+    text = "
+line 1
+    line 2
+          line 3
+              line 4
+          line 5
+    line 6"
+    convert_indentation(text, ' ' * 2, ' ' * 4).should == text
+  end
+  
+  it "should support tabs" do
+    lines = [
+      "line 1",
+      "\tline 2",
+      "\tline 3",
+      "\t\tline 4"
+    ]
+    convert_lines(lines, "\t", " " * 4).should == [
+      "line 1",
+      "    line 2",
+      "    line 3",
+      "        line 4"
+    ]
+  end
+  
+  it "should support tabs (ex 2)" do
+    text = "
+line 1
+  line 2
+    line 3
+line 4"
+    convert_indentation(text, ' ' * 2, "\t").should == "
+line 1
+\tline 2
+\t\tline 3
+line 4"
+  end
+  
+  it "tabs should be converted always" do
+    lines = [
+      "line 1",
+      "  line 2",
+      "\tline 3"
+    ]
+    convert_lines(lines, ' ' * 2, ' ' * 4).should == [
+      "line 1",
+      "    line 2",
+      "    line 3"
+    ]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Indentinator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Toby Ho
@@ -15,10 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-03-26 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: getopt
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: 
 email: airportyh@gmail.com
 executables: