tabs2spaces 0.0.6 → 0.0.7

data/README.md

@@ -30,13 +30,25 @@ Parameters
 	tabs2paces -n NUMBER -p "PATTERN" -i
 
 NUMBER: number of spaces to replace the tab by default is 2 (OPTIONAL)
+
 PATTERN: Pattern to determine the files by default is "*.rb", use "*.js" (OPTIONAL)
+
 INVERSED: -i parameter set the script to convert spaces into tabs using NUMBER y PATTERN 
 
 Sintaxis
 
 	tabs2paces [options] DIRECTORY
 
+### switch between indentation schemes
+	
+if you want to convert all the files in a folder from indentation scheme.
+
+Example: If yours files are using 2 spaces indentation and you want to switch to 4 spaces indentation
+
+	tabs2spaces -n 2 --convert 4
+
+That will convert your 2 spaces indentation in 4 spaces indentation
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -3,8 +3,8 @@ require "bundler/gem_tasks"
 desc 'Tags version, pushes to remote, and pushes gem'
 task :release => :build do
   sh "git tag v#{Tabs2spaces::VERSION}"
-  sh "git push github master"
-  sh "git push github v#{Tabs2spaces::VERSION}"
-  sh "gem push mercadopago-api-#{Tabs2spaces::VERSION}.gem"
+  sh "git push origin master"
+  sh "git push origin v#{Tabs2spaces::VERSION}"
+  sh "gem push tabs2spaces-#{Tabs2spaces::VERSION}.gem"
 end
 

data/bin/tabs2spaces

@@ -11,6 +11,8 @@ options = {
 }
 OptionParser.new do |opts|
   opts.banner = "Usage: tabs2spaces.rb [options] DIRECTORY"
+  opts.separator ""
+  opts.separator "Optional configuration"
 
   opts.on("-n", "--number [NUMBER]", Integer, "Number of spaces to remplace a tab (default: 2)") do |number|
     options[:number] = number
@@ -23,6 +25,26 @@ OptionParser.new do |opts|
   opts.on("-i", "--[no-]inversed", "Do the inverse process, convert spaces into tabs") do |inverse|
     options[:inversed] = inverse
   end
+
+  opts.separator ""
+  opts.separator "Options to convert between to spaces indentation schemes"
+
+  opts.on("--convert [NUMBER]", Integer, "Convert indentation scheme from -n to --convert") do |convertion|
+    options[:convertion] = convertion
+  end
+
+  opts.separator ""
+  opts.separator "Common Options"
+
+  opts.on_tail("-h", "--help", "Show help") do
+    puts opts
+    exit
+  end
+  
+  opts.on_tail("--version", "Show version") do
+    puts "Tabs2spaces" + Tabs2spaces::VERSION
+    exit
+  end
 end.parse!
 
 tabs2spaces = Tabs2spaces::Converter.new(ARGV[0], options)

data/lib/tabs2spaces.rb

@@ -9,12 +9,13 @@ module Tabs2spaces
     end
 
     def file_expand(file)
+      number = @options[:number]
       unless @options[:inversed]
         puts "Expanding tabs on: " + file
-        return `expand -i -t #{@options[:number]} #{file}` 
+        return `expand -i -t #{number} #{file}` 
       else
         puts "Unexpanding spaces on: " + file
-        return `unexpand --first-only -t #{@options[:number]} #{file}`
+        return `unexpand --first-only -t #{number} #{file}`
       end
     end
 
@@ -30,17 +31,40 @@ module Tabs2spaces
       end
     end
 
-    def convert
+    def file_expand_and_write(file)
+      file_write file, file_expand(file)
+    end
+
+    def folder_expand_and_write(folder)
+      files = File.join(@folder, '**', @options[:pattern])
+      Dir.glob(files).each do |file|
+        file_expand_and_write file
+      end
+    end
+
+    def simple_convert
       unless File.directory?(@folder)
-        new_file = file_expand @folder
-        file_write @folder, new_file
+        file_expand_and_write @folder
       else
-        folder = File.join(@folder, '**', @options[:pattern])
-        Dir.glob(folder).each do |file|
-          new_file = file_expand file
-          file_write file, new_file
-        end
+        folder_expand_and_write(@folder)
       end
     end
+
+    def convert_between 
+      @options[:inversed] = true
+      simple_convert
+      @options[:inversed] = false
+      @options[:number] = @options[:convertion]
+      simple_convert
+    end
+
+    def convert
+      if @options[:convertion].nil?
+        simple_convert
+      else
+        convert_between
+      end
+    end
+
   end
 end

data/lib/tabs2spaces/version.rb

@@ -1,3 +1,4 @@
 module Tabs2spaces
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabs2spaces
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler