white 0.1.0 → 0.2.1

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  # gem "shoulda", ">= 0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.4"
+  # gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,16 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.4)

data/Rakefile

@@ -1,8 +1,19 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "white"
   gem.homepage = "http://github.com/andreyvit/white"
   gem.license = "MIT"
@@ -10,7 +21,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Run from your project folder before committing to Git to avoid whitespace errors}
   gem.email = "andreyvit@gmail.com"
   gem.authors = ["Andrey Tarantsov"]
+  # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/white.rb

@@ -3,13 +3,14 @@ require 'optparse'
 class White
 
   def self.run args
-    extensions = %w/rb java xml md coffee js html css less yml php info install module h m txt/
+    extensions = %w/rb java xml md markdown coffee js eco html haml css less styl yml php info install module h m c txt/
     names = %w/Rakefile Cakefile/
     default_tab_size = nil
     tab_sizes = {
     }
-    exclusions = ['**/.git/**']
+    exclusions = ['**/.git/**', '**/node_modules/**/*']
     verbose = false
+    dry_run = false
 
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: white [options]"
@@ -28,13 +29,17 @@ class White
         extensions << v
       end
 
-      opts.on("-n", "--name=NAME", "Include files with the given name (e.g. -n Cakefile)") do |v|
+      opts.on("-i", "--name=NAME", "Include files with the given name (e.g. -n Cakefile)") do |v|
         names << v
       end
 
       opts.separator ""
       opts.separator "Common options:"
 
+      opts.on("-n", "--dry-run", "Don't actually change anything on disk") do
+        dry_run = true
+      end
+
       opts.on("-v", "--verbose", "Show a full list of processed files") do
         verbose = true
       end
@@ -54,6 +59,8 @@ class White
       files -= Dir[exclusion]
     end
 
+    files -= Dir['**/.keepwhitespace'].map { |f| Dir[File.join(File.dirname(f), '**/*')] }.flatten
+
     files_with_tabs = []
 
     files.each do |file|
@@ -65,10 +72,18 @@ class White
       text = File.read(file)
       original = text.dup
 
+      prev = text.dup
+      text.gsub! /\r/, ''
+      errors << "Windows line breaks" if text != prev
+
       prev = text.dup
       text.gsub! /[ \t]+$/, ''
       errors << "trailing whitespace" if text != prev
 
+      prev = text.dup
+      text.gsub! /\r/, ''
+      errors << "Windows line breaks" if text != prev
+
       if text =~ /^ *?\t[\t ]*/
         if default_tab_size == nil
           files_with_tabs << file unless files_with_tabs.include?(file)
@@ -89,7 +104,7 @@ class White
 
       if text != original
         puts "#{file} (#{errors.join(', ')})"
-        File.open(file, 'w') { |f| f.write text }
+        File.open(file, 'w') { |f| f.write text } unless dry_run
       else
         puts "#{file} OK" if verbose
       end

data/white.gemspec

@@ -0,0 +1,53 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{white}
+  s.version = "0.2.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Andrey Tarantsov}]
+  s.date = %q{2011-12-15}
+  s.description = %q{Run from your project folder before committing to Git to avoid whitespace errors}
+  s.email = %q{andreyvit@gmail.com}
+  s.executables = [%q{white}]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/white",
+    "lib/white.rb",
+    "white.gemspec"
+  ]
+  s.homepage = %q{http://github.com/andreyvit/white}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{Fix whitespace errors before committing to Git}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+    else
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    end
+  else
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: white
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andrey Tarantsov
@@ -15,10 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 +07:00
-default_executable: white
-dependencies: []
-
+date: 2011-12-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  requirement: *id001
+  prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
+  type: :development
+  requirement: *id002
+  prerelease: false
+  name: jeweler
 description: Run from your project folder before committing to Git to avoid whitespace errors
 email: andreyvit@gmail.com
 executables: 
@@ -30,13 +60,15 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - bin/white
 - lib/white.rb
-has_rdoc: true
+- white.gemspec
 homepage: http://github.com/andreyvit/white
 licenses: 
 - MIT
@@ -66,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Fix whitespace errors before committing to Git