license_header 0.0.2 → 0.0.3

data/bin/license_header

@@ -64,14 +64,14 @@ opts = OptionParser.new do |opts|
 
   opts.on_tail('-h', '--help', "Show this message") do
     puts opts
-    exit
+    exit 1
   end
 end
 opts.parse!
 
-if command.nil? or options[:header].nil? or ARGV.empty?
+if command.nil? or ARGV.empty?
   puts opts
-  exit
+  exit 1
 end
 
 targets = ARGV.collect do |spec|
@@ -91,6 +91,10 @@ when :audit
   $stderr.puts "#{files[:invalid].length} files have invalid headers"
   $stderr.puts files[:invalid].join("\n") if options[:verbose]
 when :update
+  if options[:header].nil?
+    put opts
+    exit 1
+  end
   $stderr.puts "#{invalid.length} files have missing or incorrect headers"
   auditor.process_files(:update, *  invalid) do |file, format|
     response = getYyn("Update header in #{file}?")

data/lib/license_header/auditor.rb

@@ -4,21 +4,23 @@ require 'fileutils'
 # block as a header.
 
 module LicenseHeader
-  # For each language you can define three variables
+  # For each language you can define five variables
   #
   # :pre will be prepended to the header
   # :each will be prepended to each line of the header
   # :post will be appended to the end of the file
+  # :sep determines whether an empty line should separate the header from the body
+  # :exts lists the extensions the syntax will apply to
   #
   # Only :each is required; if the other two are not provided they will be
   # ignored
   LANGUAGE_SYNTAX = { 
-    :css        => { :pre => '/* ',  :each => ' * ', :post => '*/',  :exts => %w(.css .scss)            },
-    :erb        => { :pre => '<%#',  :each => '',    :post => '%>',  :exts => %w(.erb)                  },
-    :haml       => { :pre => '-#',   :each => '  ',                  :exts => %w(.haml)                 },
-    :html       => { :pre => '<!--', :each => '',    :post => '-->', :exts => %w(.html)                 },
-    :javascript => { :pre => '/* ',  :each => ' * ', :post => '*/',  :exts => %w(.js .json)             },
-    :ruby       => {                 :each => '# ',                  :exts => %w(.rb .rake .coffee .pp) },
+    :css        => { :pre => '/* ',  :each => ' * ', :post => '*/',  :sep => true,  :exts => %w(.css .scss)            },
+    :erb        => { :pre => '<%#',  :each => '',    :post => '%>',  :sep => false, :exts => %w(.erb)                  },
+    :haml       => { :pre => '-#',   :each => '  ',                  :sep => true,  :exts => %w(.haml)                 },
+    :html       => { :pre => '<!--', :each => '',    :post => '-->', :sep => false, :exts => %w(.html)                 },
+    :javascript => { :pre => '/* ',  :each => ' * ', :post => '*/',  :sep => true,  :exts => %w(.js .json)             },
+    :ruby       => {                 :each => '# ',                  :sep => true,  :exts => %w(.rb .rake .coffee .pp) },
   }
 
   class Auditor
@@ -96,8 +98,9 @@ module LicenseHeader
       if end_of_license.nil?
         return false
       else
-        extra_lines = format[:post].nil? ? 1 : 2
-        source_file.shift(end_of_license+extra_lines+1)
+        end_of_license += 1 if format[:post]
+        end_of_license += 1 if format[:sep]
+        source_file.shift(end_of_license+1)
         return true
       end
     end
@@ -123,19 +126,18 @@ module LicenseHeader
     # Javascript that uses /* */ syntax
     def initialize_headers
       @headers = LANGUAGE_SYNTAX.clone
-      base = File.read(@header)
+      base = File.read(@header) rescue nil
       # Break each line down so we can do easy manipulation to create our new
       # versions
-      license_terms = base.split(/\n/)
+      license_terms = base.nil? ? [] : base.split(/\n/)
 
       @headers.each_pair do |lang,syntax|
         syntax[:header] = []
         syntax[:header] << syntax[:pre] unless syntax[:pre].nil?
-        syntax[:header] << "#{syntax[:each]}--- BEGIN LICENSE_HEADER BLOCK ---"
         syntax[:header] += license_terms.collect {|line| syntax[:each] + line }
         syntax[:header] << "#{syntax[:each]}---  #{'E'}ND LICENSE_HEADER BLOCK  ---"
         syntax[:header] << syntax[:post] unless syntax[:post].nil?
-        syntax[:header] << ""
+        syntax[:header] << "" if syntax[:sep]
       end
     end
   end

data/lib/license_header/version.rb

@@ -1,3 +1,3 @@
 module LicenseHeader
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_header
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -86,18 +86,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3490609554518163732
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3490609554518163732
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -106,3 +100,4 @@ specification_version: 3
 summary: This gem will assist in making sure that all files have the right license
   block as a header.
 test_files: []
+has_rdoc: