copyright-header 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86579d97ed6939bdd76b21106c3d7e6817dc991c
-  data.tar.gz: 3d132331d64df527a04634d5ccdc453408040986
+  metadata.gz: b0ace4d67de56456beed033ec3836b7709c0beb3
+  data.tar.gz: 8df770cacdc38b799c4a7f5231844a8f7253e140
 SHA512:
-  metadata.gz: 3a04d27fa2a14cb007f14426980a76de835a862314f8b9c5babd23321fc83bc56ced7b05197daa3b86ad376a83dd2007de0cdfde8eee23707e1624c59c6cf6fb
-  data.tar.gz: bd9050dee1f25ef32ef7791496fed538d5cc05d61291332c07022766d50a277b5fe94f7ec21f6d1054fffb8820a83da5eb01d4923a6dbad02beccd2dbdc256fb
+  metadata.gz: f604381db7c850be272543b5d8c412b01208abb3243303cedb6d3a82b6ff1758a4555aaa48835dbe11feb58a9ea10beebe05951a646cb08bffbe45d6da4f77b3
+  data.tar.gz: 94e757d6f666d779c121109c1cb590a0d06d2b05c4fa280eaf5b987326e6209a342abcb9b1696d6f09148c3cfcaa16ed2f519e9e065179d76cf9da2836422b30

data/Dockerfile

@@ -0,0 +1,19 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && \
+    apt-get -y install ruby ruby-dev git make build-essential libicu-dev zlib1g-dev cmake pkg-config
+
+ADD . /tmp/copyright-header/
+ADD .git /tmp/copyright-header/.git
+
+WORKDIR /tmp/copyright-header/
+
+RUN gem build copyright-header.gemspec && \
+    gem install copyright-header-*.gem && \
+    rm -rf /tmp/copyright-header
+
+VOLUME ["/usr/src"]
+
+WORKDIR /usr/src
+
+ENTRYPOINT ["/usr/local/bin/copyright-header"]

data/Makefile

@@ -0,0 +1,35 @@
+COPYRIGHT_CMD ?= copyright-header
+#COPYRIGHT_CMD ?= docker run --rm --volume `pwd`:$(COPYRIGHT_OUTPUT_DIR) osterman/copyright-header
+COPYRIGHT_LICENSE ?= GPL3
+COPYRIGHT_HOLDER ?= Erik Osterman <e@osterman.com>
+COPYRIGHT_YEAR ?= 2012-2016
+COPYRIGHT_SOFTWARE ?= Copyright Header
+COPYRIGHT_SOFTWARE_DESCRIPTION ?= A utility to manipulate copyright headers on source code files
+COPYRIGHT_OUTPUT_DIR ?= /usr/src
+COPYRIGHT_WORD_WRAP ?= 100
+
+remove-copyright:
+	$(COPYRIGHT_CMD) \
+    --license $(COPYRIGHT_LICENSE)  \
+    --remove-path lib/:bin/ \
+    --guess-extension \
+    --copyright-holder '$(COPYRIGHT_HOLDER)' \
+    --copyright-software '$(COPYRIGHT_SOFTWARE)' \
+    --copyright-software-description '$(COPYRIGHT_SOFTWARE_DESCRIPTION)' \
+    --copyright-year $(COPYRIGHT_YEAR) \
+    --word-wrap $(COPYRIGHT_WORD_WRAP) \
+    --output-dir $(COPYRIGHT_OUTPUT_DIR)
+
+add-copyright:
+	$(COPYRIGHT_CMD) \
+    --license $(COPYRIGHT_LICENSE)  \
+    --add-path lib/:bin/ \
+    --guess-extension \
+    --copyright-holder '$(COPYRIGHT_HOLDER)' \
+    --copyright-software '$(COPYRIGHT_SOFTWARE)' \
+    --copyright-software-description '$(COPYRIGHT_SOFTWARE_DESCRIPTION)' \
+    --copyright-year $(COPYRIGHT_YEAR) \
+    --word-wrap $(COPYRIGHT_WORD_WRAP) \
+    --output-dir $(COPYRIGHT_OUTPUT_DIR)
+
+

data/bin/copyright-header

@@ -1,24 +1,23 @@
 #!/usr/bin/env ruby
 #
 # Copyright Header - A utility to manipulate copyright headers on source code files
-# Copyright (C) 2012 Erik Osterman <e@osterman.com>
-# 
+# Copyright (C) 2012-2016 Erik Osterman <e@osterman.com>
+#
 # This file is part of Copyright Header.
-# 
+#
 # Copyright Header 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.
-# 
+#
 # Copyright Header 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 Copyright Header.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 $:.unshift(File.expand_path('.')) # Ruby 1.9 doesn't have . in the load path...
 $:.push(File.expand_path('lib/')) 
 

data/copyright-header.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = CopyrightHeader::VERSION
   s.authors     = ["Erik Osterman"]
   s.email       = ["e@osterman.com"]
-  s.licenses    = ["GPL-3"]
+  s.licenses    = ["GPL-3.0"]
   s.homepage    = "https://github.com/osterman/copyright-header"
   s.summary     = %q{A utility to insert copyright headers into various types of source code files}
   s.description = %q{A utility which is able to recursively insert and remove copyright headers from source code files based on file extensions.}

data/lib/copyright_header.rb

@@ -1,19 +1,19 @@
 #
 # Copyright Header - A utility to manipulate copyright headers on source code files
-# Copyright (C) 2012 Erik Osterman <e@osterman.com>
-# 
+# Copyright (C) 2012-2016 Erik Osterman <e@osterman.com>
+#
 # This file is part of Copyright Header.
-# 
+#
 # Copyright Header 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.
-# 
+#
 # Copyright Header 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 Copyright Header.  If not, see <http://www.gnu.org/licenses/>.
 #

data/lib/copyright_header/command_line.rb

@@ -1,19 +1,19 @@
 #
 # Copyright Header - A utility to manipulate copyright headers on source code files
-# Copyright (C) 2012 Erik Osterman <e@osterman.com>
-# 
+# Copyright (C) 2012-2016 Erik Osterman <e@osterman.com>
+#
 # This file is part of Copyright Header.
-# 
+#
 # Copyright Header 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.
-# 
+#
 # Copyright Header 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 Copyright Header.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -141,4 +141,4 @@ module CopyrightHeader
       @parser.execute
     end
   end
-end
+end

data/lib/copyright_header/parser.rb

@@ -1,19 +1,19 @@
 #
 # Copyright Header - A utility to manipulate copyright headers on source code files
-# Copyright (C) 2012 Erik Osterman <e@osterman.com>
-# 
+# Copyright (C) 2012-2016 Erik Osterman <e@osterman.com>
+#
 # This file is part of Copyright Header.
-# 
+#
 # Copyright Header 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.
-# 
+#
 # Copyright Header 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 Copyright Header.  If not, see <http://www.gnu.org/licenses/>.
 #
@@ -118,7 +118,10 @@ module CopyrightHeader
     def remove(license)
       if has_copyright?
         text = self.format(license)
-        @contents.gsub!(/#{Regexp.escape(text)}/, '')
+        # Due to editors messing with whitespace, we'll make this more of a fuzzy match and use \s to match whitespace
+        pattern = Regexp.escape(text).gsub(/\\[ n]/, '\s*').gsub(/\\s*$/, '\s')
+        exp = Regexp.new(pattern)
+        @contents.gsub!(exp, '')
         @contents
       else
         STDERR.puts "SKIP #{@file}; copyright not detected"
@@ -261,4 +264,4 @@ module CopyrightHeader
       end
     end
   end
-end
+end

data/lib/copyright_header/version.rb

@@ -1,22 +1,22 @@
 #
 # Copyright Header - A utility to manipulate copyright headers on source code files
-# Copyright (C) 2012 Erik Osterman <e@osterman.com>
-# 
+# Copyright (C) 2012-2016 Erik Osterman <e@osterman.com>
+#
 # This file is part of Copyright Header.
-# 
+#
 # Copyright Header 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.
-# 
+#
 # Copyright Header 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 Copyright Header.  If not, see <http://www.gnu.org/licenses/>.
 #
 module CopyrightHeader
-  VERSION = "1.0.19"
+  VERSION = "1.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copyright-header
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Erik Osterman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-linguist
@@ -39,8 +39,10 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - AUTHORS
+- Dockerfile
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - bin/copyright-header
@@ -60,7 +62,7 @@ files:
 - licenses/MIT.erb
 homepage: https://github.com/osterman/copyright-header
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []