giteaucrat 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576669d8685ed74eb31ac2081ac4e3c8bd4f67d2
-  data.tar.gz: d54cc4d9539caff931fcb0c0702f8076fa47ee1e
+  metadata.gz: 79157ad2066d45d9c600c86afbd578d553eb0512
+  data.tar.gz: 6f5b2f2eab777ba7600cfd441c90ed5d20d6cf9a
 SHA512:
-  metadata.gz: 64058c19b1ff22d391317779fd363bf4e498eb5a641cb72219ca0bcd8e00ec50498ece45d63ad1cd1dbe4d6cf22bcd9f88875ef9b669baa1a1ff5a7ce2790763
-  data.tar.gz: 48c704f4a754f8521922b4acfa0c89ba594605a3f8e2604bd7039dde017c57ae096177458763b0add6d7bdeb549b75cb104fd6acae48606910e80bc4d1fd6060
+  metadata.gz: 5ea12ea22ce3afc00f0841e72f886288f79bc32143493ee1faec614ee0c2930619386063d99ebb83dd40ec0884f5112aec28231a0d7713677952faacb070349e
+  data.tar.gz: a250b3663e2ccd9db331f3e5c199cf527736b8ef9bd16dc1cab04350f0f45dc50c45751bcfe02f64e0ddc554d7d03a607ff59e9220c1527a75f554c1b9ae94ce

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/.travis.yml

@@ -0,0 +1,6 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.3.0
+script: bundle exec ./bin/giteaucrat

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in giteaucrat.gemspec

data/README.md

@@ -29,3 +29,7 @@ You can see all available options using:
 5. Create new Pull Request
 
 © Alexander Semyonov, 2013. See MIT-LICENSE for details
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/alsemyonov/giteaucrat/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'

data/bin/bundler

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bundler', 'bundler')

data/bin/htmldiff

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/posix-spawn-benchmark

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'posix-spawn-benchmark' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('posix-spawn', 'posix-spawn-benchmark')

data/bin/rake

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/thor

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'thor')

data/config/giteaucrat.yml

@@ -1,6 +1,17 @@
 ---
 commit_keyword: "#giteaucrat"
-copyright_owner: Alexander Semyonov
+copyright_owner: Alex Semyonov
 copyright_format: "© %{owner}, %{years}, %{license}"
 include_encoding: true
 license: MIT License
+authors:
+- name: Alex Semyonov
+  email: alex@semyonov.us
+  names:
+  - Alex Semyonov
+  - Alexander Semyonov
+  emails:
+  - alex@semyonov.us
+  - al@semyonov.us
+- name: Sergey Ukustov
+  email: sergey@ukstv.me

data/{bin → exe}/giteaucrat

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'giteaucrat'
 require 'giteaucrat/runner'
 
 Giteaucrat::Runner.start

data/giteaucrat.gemspec

@@ -1,26 +1,28 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'giteaucrat/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'giteaucrat'
-  spec.version       = Giteaucrat::VERSION
-  spec.authors       = ['Alexander Semyonov']
-  spec.email         = %w(al@semyonov.us)
-  spec.description   = %q{Automatically update copyright messages using git}
-  spec.summary       = %q{The Git bureaucrat}
-  spec.homepage      = 'http://github.com/alsemyonov/giteaucrat'
-  spec.license       = 'MIT'
+  spec.name = 'giteaucrat'
+  spec.version = Giteaucrat::VERSION
+  spec.authors = ['Alexander Semyonov']
+  spec.email = %w[al@semyonov.us]
+  spec.description = 'Automatically update copyright messages using git'
+  spec.summary = 'The Git bureaucrat'
+  spec.homepage = 'http://github.com/alsemyonov/giteaucrat'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = %w(lib)
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.require_paths = %w[lib]
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'thor'
   spec.add_dependency 'grit'
+  spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 12.0'
 end

data/lib/core_ext/grit/blame.rb

@@ -1,26 +1,36 @@
 # coding: utf-8
+# frozen_string_literal: true
+
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'grit/blame'
 
 module Grit
   class Blame
     def process_raw_blame(output)
-      lines, final = [], []
-      info, commits = {}, {}
+      lines = []
+      final = []
+      info = {}
+      commits = {}
 
       # process the output
       output.split("\n").each do |line|
         if line[0, 1] == "\t"
           lines << line[1, line.size]
         elsif m = /^(\w{40}) (\d+) (\d+)/.match(line)
-          commit_id, old_lineno, lineno = m[1], m[2].to_i, m[3].to_i
-          commits[commit_id] = nil if !commits.key?(commit_id)
+          commit_id = m[1]
+          old_lineno = m[2].to_i
+          lineno = m[3].to_i
+          commits[commit_id] = nil unless commits.key?(commit_id)
           info[lineno] = [commit_id, old_lineno]
         end
       end
 
       # load all commits in single call
-      @repo.batch(*(commits.keys - ['0'*40])).each do |commit|
+      @repo.batch(*(commits.keys - ['0' * 40])).each do |commit|
         commits[commit.id] = commit if commit
       end
 

data/lib/giteaucrat.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/version'
 

data/lib/giteaucrat/author.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat'
 require 'set'
@@ -42,9 +43,7 @@ module Giteaucrat
     end
 
     def self.to_yaml
-      all.map do |author|
-        author.to_hash
-      end.sort { |a, b| a[:name] <=> b[:name] }.to_yaml
+      all.map(&:to_hash).sort { |a, b| a[:name] <=> b[:name] }.to_yaml
     end
 
     # @return [Boolean]
@@ -57,7 +56,7 @@ module Giteaucrat
 
     def check_multiple_emails!
       if emails.count > 1 && !instance_variable_defined?(:@email)
-        STDERR.puts "#{name} has multiple emails:\n#{emails.map {|e| "* #{e}"}.join("\n")}\nPlease set right one in your giteaucrat.yml\n"
+        STDERR.puts "#{name} has multiple emails:\n#{emails.map { |e| "* #{e}" }.join("\n")}\nPlease set right one in your giteaucrat.yml\n"
       end
     end
 
@@ -129,7 +128,7 @@ module Giteaucrat
 
     # @return [Hash]
     def to_hash
-      hash = {'name' => name.to_s, 'email' => email.to_s}
+      hash = { 'name' => name.to_s, 'email' => email.to_s }
       hash['names'] = names.to_a - [name] if names.size > 1
       hash['emails'] = emails.to_a - [email] if emails.size > 1
       hash['ignored'] = true if ignored?

data/lib/giteaucrat/common.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat'
 

data/lib/giteaucrat/file.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Authors: Alexander Semyonov <al@semyonov.us> #
-#          Sergey Ukustov <sergey@ukstv.me>    #
-################################################
+##############################################
+# © Alex Semyonov, 2013—2017, MIT License    #
+# Authors: Alex Semyonov <alex@semyonov.us>  #
+#          Sergey Ukustov <sergey@ukstv.me>  #
+##############################################
 
 require 'giteaucrat'
 require 'grit'
@@ -25,13 +26,12 @@ module Giteaucrat
       @authors ||= begin
         blame = repo.git_repo.blame(name)
         lines = blame.lines
-        commits = lines.map { |line| line.commit }.uniq.find_all do |commit|
+        commits = lines.map(&:commit).uniq.find_all do |commit|
           !repo.ignored_commit?(commit)
         end
-        commits.inject(Set.new) do |authors, commit|
+        commits.each_with_object(Set.new) do |commit, authors|
           author = Author.find_by_git_person(commit.author)
           authors << author unless author.ignored?
-          authors
         end
       end
     end

data/lib/giteaucrat/formatters.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat'
 
@@ -18,8 +19,8 @@ module Giteaucrat
       '.sass' => :SassFormatter,
       '.scss' => :SassFormatter,
       '.coffee' => :CoffeeFormatter,
-      '.erl' => :ErlangFormatter,
-    }
+      '.erl' => :ErlangFormatter
+    }.freeze
 
     module_function
 

data/lib/giteaucrat/formatters/coffee_formatter.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/ruby_formatter'
 

data/lib/giteaucrat/formatters/erlang_formatter.rb

@@ -1,16 +1,17 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/coffee_formatter'
 
 module Giteaucrat
   module Formatters
     class ErlangFormatter < CoffeeFormatter
-      COMMENT_PARTS = %w(% % %)
+      COMMENT_PARTS = %w[% % %].freeze
       COPYRIGHT_REGEXP = %r{(?<ruler>%+\n)(?<copyright>(%\s*[^\s/]+.*\s%\n)+)(%\s+%?\n(?<comment>(%\s*.*%?\n)+))?\k<ruler>\n+}
     end
   end

data/lib/giteaucrat/formatters/formatter.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters'
 require 'delegate'
@@ -18,7 +19,7 @@ module Giteaucrat
         first, _, last = comment_parts
         lines = copyright_lines
 
-        max_line_size = lines.max { |a, b| a.size <=> b.size }.size
+        max_line_size = lines.max_by(&:size).size
         max_line_size += 1 if max_line_size.odd?
 
         lines = lines.map do |line|
@@ -59,13 +60,11 @@ module Giteaucrat
 
       def remove_copyright!
         if contents =~ HASHBANG_REGEXP
-          @hashbang = $1
+          @hashbang = Regexp.last_match(1)
           contents.sub!(HASHBANG_REGEXP, '')
         end
         contents.sub!(self.class.const_get(:COPYRIGHT_REGEXP), '')
-        if $~ && $~[:comment]
-          parse_comment($~[:comment])
-        end
+        parse_comment($LAST_MATCH_INFO[:comment]) if $LAST_MATCH_INFO && $LAST_MATCH_INFO[:comment]
       end
 
       def parse_comment(comment)
@@ -73,9 +72,7 @@ module Giteaucrat
         @copyright_lines = nil
       end
 
-      def comment_lines
-        @comment_lines
-      end
+      attr_reader :comment_lines
 
       def comment?
         !!@comment_lines
@@ -101,9 +98,9 @@ module Giteaucrat
 
           lines << repo.copyright_label
 
-          if owner || authors.size > 0
-            authors_label = (authors.size > 1) ? 'Authors: ' : 'Author: '
-            author_names = (authors - [owner]).map { |a| a.identifier }.sort
+          if owner || !authors.empty?
+            authors_label = authors.size > 1 ? 'Authors: ' : 'Author: '
+            author_names = (authors - [owner]).map(&:identifier).sort
             prepend = ' ' * authors_label.size
             lines << "#{authors_label}#{owner.identifier}"
             author_names.each do |author|

data/lib/giteaucrat/formatters/java_formatter.rb

@@ -1,16 +1,17 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/formatter'
 
 module Giteaucrat
   module Formatters
     class JavaFormatter < Formatter
-      COMMENT_PARTS = %w(/* * */)
+      COMMENT_PARTS = %w[/* * */].freeze
 
       COPYRIGHT_REGEXP = %r{/\*(?<ruler>\*+)\n(?<copyrights>(\s\*\s*[^\s\*]+.*\n)+)(\s\*\s*\*?\n(?<comment>(\s\*\s?.*\*?\n)+))?(\s\g<ruler>\**/\n+)}
 

data/lib/giteaucrat/formatters/python_formatter.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/ruby_formatter'
 

data/lib/giteaucrat/formatters/ruby_formatter.rb

@@ -1,16 +1,17 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/formatter'
 
 module Giteaucrat
   module Formatters
     class RubyFormatter < Formatter
-      COMMENT_PARTS = %w(# # #)
+      COMMENT_PARTS = %w[# # #].freeze
 
       # @return [String]
       CODING_REGEXP = /\A((#\s*.*coding:\s*[^\s]+)\s*\n+)?/
@@ -30,7 +31,7 @@ module Giteaucrat
       def remove_copyright!
         super
         contents.sub!(CODING_REGEXP, '')
-        @encoding = $2 if $2
+        @encoding = Regexp.last_match(2) if Regexp.last_match(2)
       end
 
       def parse_comment(comment)

data/lib/giteaucrat/formatters/sass_formatter.rb

@@ -1,16 +1,17 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat/formatters/coffee_formatter'
 
 module Giteaucrat
   module Formatters
     class SassFormatter < CoffeeFormatter
-      COMMENT_PARTS = %w(// // //)
+      COMMENT_PARTS = %w[// // //].freeze
       COPYRIGHT_REGEXP = %r{(?<ruler>//+\n)(?<copyright>(//\s*[^\s/]+.*\s//\n)+)(//\s+//?\n(?<comment>(//\s*.*//?\n)+))?\k<ruler>\n+}
     end
   end

data/lib/giteaucrat/repo.rb

@@ -1,9 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+##############################################
+# © Alex Semyonov, 2013—2017, MIT License    #
+# Authors: Alex Semyonov <alex@semyonov.us>  #
+#          Sergey Ukustov <sergey@ukstv.me>  #
+##############################################
 
 require 'giteaucrat'
 require 'grit'
@@ -13,12 +15,8 @@ module Giteaucrat
     include Common
 
     def self.defaults=(options = {})
-      if options[:git]
-        Grit::Git.git_binary = options[:git]
-      end
-      if options[:git_timeout]
-        Grit::Git.git_timeout = options[:git_timeout]
-      end
+      Grit::Git.git_binary = options[:git] if options[:git]
+      Grit::Git.git_timeout = options[:git_timeout] if options[:git_timeout]
     end
 
     def git_repo
@@ -52,21 +50,17 @@ module Giteaucrat
     end
 
     def write_copyrights!
-      files.each do |file|
-        file.write_copyright!
-      end
+      files.each(&:write_copyright!)
     end
 
     # @return [<String>]
     def patterns
-      @patterns || %w(app/**/*.rb lib/**/*.rb script/**/*.rb spec/**/*.rb test/**/*.rb)
+      @patterns || %w[app/**/*.rb lib/**/*.rb script/**/*.rb spec/**/*.rb test/**/*.rb]
     end
 
     attr_writer :patterns
 
-    def patterns=(patterns)
-      @patterns = patterns
-    end
+    attr_writer :patterns
 
     def timeout
       Grit::Git.git_timeout
@@ -90,8 +84,7 @@ module Giteaucrat
       end
     end
 
-    def config=(*)
-    end
+    def config=(*); end
 
     # @return [Number]
     def copyright_year
@@ -108,10 +101,10 @@ module Giteaucrat
 
     # @return [String]
     def copyright_label
-      @copyright_label ||= copyright_format.
-        gsub('%{years}', [copyright_year, Time.now.year].compact.join('—')).
-        gsub('%{owner}', copyright_owner).
-        gsub('%{license}', license || '')
+      @copyright_label ||= copyright_format
+                           .gsub('%{years}', [copyright_year, Time.now.year].compact.join('—'))
+                           .gsub('%{owner}', copyright_owner)
+                           .gsub('%{license}', license || '')
     end
 
     # @return [Regexp]
@@ -143,6 +136,5 @@ module Giteaucrat
         find_git_repo(::File.expand_path(::File.join(directory, '..')))
       end
     end
-
   end
 end

data/lib/giteaucrat/runner.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 require 'giteaucrat'
 require 'thor'
@@ -12,49 +13,49 @@ require 'yaml'
 module Giteaucrat
   class Runner < Thor
     class_option :git, group: :git
-    class_option :timeout, default: 30, group: :git
+    class_option :timeout, default: 30, group: :git, type: :numeric
     class_option :path, default: Dir.pwd, desc: 'Path to project that needs some bureaucracy.'
     class_option :config,
                  default: ::File.join(Dir.pwd, 'config', 'giteaucrat.yml'),
                  desc: 'Giteaucrat configuration',
                  group: :giteaucrat
     class_option :commit_keyword,
-                 aliases: %w(-i),
+                 aliases: %w[-i],
                  default: '#giteaucrat',
                  desc: 'Commit keyword to prepend giteaucrat commits (to ignore authorship of this commit)',
                  group: :giteaucrat
     class_option :copyright_owner,
-                 aliases: %w(-o),
+                 aliases: %w[-o],
                  default: `git config user.name`.chomp,
                  desc: 'Company or owner name to put in copyright header',
                  group: :giteaucrat
     class_option :copyright_year,
-                 aliases: %w(-y),
+                 aliases: %w[-y],
                  type: :numeric,
                  desc: 'Start year of copyright',
                  group: :giteaucrat
     class_option :copyright_format,
-                 aliases: %w(-f),
+                 aliases: %w[-f],
                  default: '© %{owner}, %{years}',
                  desc: 'Start year of copyright',
                  group: :giteaucrat
     class_option :license,
-                 aliases: %w(-l),
+                 aliases: %w[-l],
                  desc: 'License to put in copyright footer'
     class_option :include_encoding,
                  type: :boolean,
                  default: true,
-                 aliases: %w(-e),
+                 aliases: %w[-e],
                  desc: 'Put encoding in copyright footer',
                  group: :giteaucrat
     class_option :commit,
                  type: :boolean,
-                 aliases: %w(-c),
+                 aliases: %w[-c],
                  desc: 'Commit updated copyrights',
                  group: :giteaucrat
     class_option :patterns,
                  type: :array,
-                 aliases: %w(-f),
+                 aliases: %w[-f],
                  desc: 'Files to copyright',
                  group: :giteaucrat
 
@@ -71,7 +72,6 @@ module Giteaucrat
 
     def defaults
       @defaults ||= begin
-        YAML::ENGINE.yamler = 'syck'
         Encoding.default_external = 'utf-8'
         Encoding.default_internal = 'utf-8'
 
@@ -83,8 +83,10 @@ module Giteaucrat
           options.merge!(config)
         end
 
-        config = options.inject({}) do |config, (key, value)|
-          config[key] = value unless %w(config git path timeout commit).include?(key); config
+        config = options.each_with_object({}) do |(key, value), result|
+          unless %w[config git path timeout commit].include?(key)
+            result[key] = value
+          end
         end.to_yaml
 
         unless ::File.file?(options[:config])
@@ -93,7 +95,7 @@ module Giteaucrat
         end
 
         Dir.chdir(path)
-        Repo.defaults = {git: options[:git], git_timeout: options[:timeout]}
+        Repo.defaults = { git: options[:git], git_timeout: options[:timeout].to_s }
         options
       end
     end

data/lib/giteaucrat/version.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 
-################################################
-# © Alexander Semyonov, 2013—2013, MIT License #
-# Author: Alexander Semyonov <al@semyonov.us>  #
-################################################
+############################################
+# © Alex Semyonov, 2013—2017, MIT License  #
+# Author: Alex Semyonov <alex@semyonov.us> #
+############################################
 
 module Giteaucrat
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,87 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: giteaucrat
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexander Semyonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 description: Automatically update copyright messages using git
 email:
 - al@semyonov.us
-executables:
-- giteaucrat
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - MIT-LICENSE
 - README.md
 - Rakefile
-- bin/giteaucrat
+- bin/bundler
+- bin/htmldiff
+- bin/ldiff
+- bin/posix-spawn-benchmark
+- bin/rake
+- bin/thor
 - config/giteaucrat.yml
+- exe/giteaucrat
 - giteaucrat.gemspec
 - lib/core_ext/grit/blame.rb
 - lib/giteaucrat.rb
@@ -109,19 +115,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The Git bureaucrat
 test_files: []
-has_rdoc: