giteaucrat 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODNkZDAzYzkzMmVmNjg3MmFhNjNkNWY1MWFjZjYxNmRiMjY1ODAwZA==
+    MzJhZmY2NTQ5ZmEzYjY5NjYzZTNiOTkwNDRkMDEyYjUwYzRmMTBlZA==
   data.tar.gz: !binary |-
-    ZGVkODczNTJmZTg4MjM2MDcwNzk3YWZmMDQ0YTU4ZDllMjdjZGViZQ==
+    MDc0ZTNlMDc5OTM4NjU3MmNiOTg5NmQzODE5OTYyYTZiYmM4ZDE4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2NlOTgwMWQ5MWQ3NTMzNmRmN2I4NzdkNjgxNWRlNzhiOTVhMWIzYmNkMzlk
-    MzM2NGQ3ZGM0MjhiZTg4ODM1ZGIyMWRlNDAxNGU3YjkyMTliOGJkYzcwMzAy
-    ZWRiODdjMjdhMGM2MTczNGQzNTJmNTI5MjEwNzZlODBiOTY1ZTQ=
+    MWZjYWE2Y2YwZTNjNjFlZTExN2EzZGJhMTU5ZTg2YTQ1YmYwNDE0ODMxMTJk
+    N2Q1MDUwMDM1MmU5NWZmZGM1ZWUxODY0OTFhYjMzZmQ0YTU4NGMzMDk5MzQy
+    Mzg3YWI5MmUyZDQ2YThjN2E2OWFkNDYxNzRiZWU0OTliODhiMGE=
   data.tar.gz: !binary |-
-    YTgyMzNmNThlYTE5NjNmNGU1MmZkN2Q4ODc4YmJhMzU1OGJiOTE1MjMzMmRk
-    NWQ1OGMxY2I4NWRjZTU4NDdjZjMzOGVmNDlmMTYwNWI5MjNjOGI2Yzc4NDA1
-    MzgwMTAzNWYwYWEwOTczYWMzZmMyNzUwZDRkNzI1NDk0NGMwNGU=
+    Njk1MDYwMDYzN2Y4MjMwYzRmY2Q2NzI1YmE1ZTk0OTI5ZmUwOWFkMDllYjlh
+    ZTE5M2MxZDlmZDEwZDVjNzZhYTVlODI5ZDgxNTE2NzU2Y2ZlN2NjZGJmYzBm
+    YTVmMTFkOTQ3ZmU2MWY4YmM2NjExY2EwYjVhYmZhOTllNThhZTY=

data/lib/giteaucrat/formatters/coffee_formatter.rb

@@ -10,8 +10,8 @@ require 'giteaucrat/formatters/ruby_formatter'
 module Giteaucrat
   module Formatters
     class CoffeeFormatter < RubyFormatter
-      def include_encoding?
-        false
+      def encoding
+        nil
       end
 
       def add_copyright!

data/lib/giteaucrat/formatters/formatter.rb

@@ -11,6 +11,8 @@ require 'delegate'
 module Giteaucrat
   module Formatters
     class Formatter < SimpleDelegator
+      HASHBANG_REGEXP = /\A(#!.*)\n/
+
       # @return [String]
       def format_copyright
         first, _, last = comment_parts
@@ -56,6 +58,10 @@ module Giteaucrat
       end
 
       def remove_copyright!
+        if contents =~ HASHBANG_REGEXP
+          @hashbang = $1
+          contents.sub!(HASHBANG_REGEXP, '')
+        end
         contents.sub!(self.class.const_get(:COPYRIGHT_REGEXP), '')
         if $~ && $~[:comment]
           parse_comment($~[:comment])
@@ -79,6 +85,7 @@ module Giteaucrat
       def write_copyright!
         remove_copyright!
         add_copyright!
+        @contents = [@hashbang, contents].compact.join("\n")
         write_contents(contents)
       end
 

data/lib/giteaucrat/formatters/ruby_formatter.rb

@@ -13,12 +13,12 @@ module Giteaucrat
       COMMENT_PARTS = %w(# # #)
 
       # @return [String]
-      CODING_REGEXP = /\A(#\s*.*coding:\s*utf-8\s*\n+)?/
+      CODING_REGEXP = /\A((#\s*.*coding:\s*[^\s]+)\s*\n+)?/
       COPYRIGHT_REGEXP = /(?<ruler>##+#\n)(?<copyright>(#\s*[^\s#]+.*\s#\n)+)(#\s+#?\n(?<comment>(#\s*.*#?\n)+))?\k<ruler>\n+/
 
       def format_copyright
         copyright = super
-        copyright = "# coding: utf-8\n\n#{copyright}" if include_encoding?
+        copyright = [encoding, copyright].compact.join("\n\n")
         copyright
       end
 
@@ -29,17 +29,8 @@ module Giteaucrat
 
       def remove_copyright!
         super
-        contents.sub!(CODING_REGEXP, '') if include_encoding?
-      end
-
-      def add_copyright!
-        if !include_encoding? && !!(contents =~ CODING_REGEXP)
-          lines = contents.split(/\n/).to_a
-          lines.insert(1, format_copyright)
-          @contents = lines.join("\n")
-        else
-          super
-        end
+        contents.sub!(CODING_REGEXP, '')
+        @encoding = $2 if $2
       end
 
       def parse_comment(comment)
@@ -53,6 +44,10 @@ module Giteaucrat
       def include_encoding?
         repo.include_encoding?
       end
+
+      def encoding
+        @encoding || (include_encoding? && '# coding: utf-8' || nil)
+      end
     end
   end
 end

data/lib/giteaucrat/version.rb

@@ -6,5 +6,5 @@
 ################################################
 
 module Giteaucrat
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: giteaucrat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexander Semyonov