licit 0.1 → 0.2

data/lib/licit/command.rb

@@ -11,9 +11,12 @@ class Licit::Command
   end
 
   def check(licenser)
+    has_errors = false
     (licenser.check_files | licenser.check_headers).each do |severity, file, message|
       puts message
+      has_errors = true if severity == :error
     end
+    exit (has_errors ? 1 : 0)
   end
 
   def fix(licenser)

data/lib/licit/licenser.rb

@@ -49,13 +49,21 @@ class Licit::Licenser
   def fix_headers
     each_source_file do |source_file|
       if not check_file_header(source_file)
-        source = File.read source_file
+        source_lines = File.readlines source_file
+
+
+
         File.open source_file, 'w' do |f|
+          while should_skip? source_lines.first
+            f.write source_lines.shift
+          end
           header.each_line do |header_line|
             f.write "# #{header_line}"
           end
           f.write "\n"
-          f.write source
+          source_lines.each do |line|
+            f.write line
+          end
         end
       end
     end
@@ -71,10 +79,15 @@ class Licit::Licenser
   end
 
   def check_file_header(file)
+    at_beginning = true
     File.open(file, 'r') do |f|
       begin
         header.each_line do |header_line|
-          file_line = f.readline
+          begin
+            file_line = f.readline
+          end while at_beginning && should_skip?(file_line)
+          at_beginning = false
+
           return false unless file_line.start_with? '#'
           file_line = file_line[1..-1].strip
           return false if file_line != header_line.chomp
@@ -86,6 +99,13 @@ class Licit::Licenser
     true
   end
 
+  def should_skip? line
+    line = line.strip
+    return true if line.empty?
+    return true if line.start_with? '#!'
+    return line =~ /^#\s*(encoding|coding)/
+  end
+
   def files
     Dir.chdir(files_dir) do
       return Dir['**']

data/lib/licit/version.rb

@@ -1,3 +1,3 @@
 module Licit
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/spec/dir2/subdir/test3.rb

@@ -0,0 +1,21 @@
+#!/bin/env ruby
+#encoding: utf8
+
+# Copyright Line
+#
+# This file is part of FooBar.
+#
+# FooBar is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FooBar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FooBar.  If not, see <http://www.gnu.org/licenses/>.
+
+puts "Hello world"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: licit
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70171008169820 !ruby/object:Gem::Requirement
+  requirement: &70251677218640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171008169820
+  version_requirements: *70251677218640
 description: Apply public licenses to files in ruby projects
 email:
 - jwajnerman@manas.com.ar
@@ -45,6 +45,7 @@ files:
 - spec/command_spec.rb
 - spec/dir2/subdir/test1.rb
 - spec/dir2/subdir/test2.rb
+- spec/dir2/subdir/test3.rb
 - spec/dir2/test.rb
 - spec/dir3/licit.yml
 - spec/licenser_spec.rb
@@ -80,6 +81,7 @@ test_files:
 - spec/command_spec.rb
 - spec/dir2/subdir/test1.rb
 - spec/dir2/subdir/test2.rb
+- spec/dir2/subdir/test3.rb
 - spec/dir2/test.rb
 - spec/dir3/licit.yml
 - spec/licenser_spec.rb