fsorg 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68068de4061b604e9b71e8134e9f17dd1d902c0a6e7c269cbfbb0c13d6dd5d24
-  data.tar.gz: bd84015820aedcd7a7510bdc75d17655552159ff22713a0d63f396950e36e6aa
+  metadata.gz: e1ce86ca67be5d602db8974b0741160b2b3c5d9c2036af4c335c565de0729529
+  data.tar.gz: f305cfa72e0b889ceca6dda5e6046d82aabf37ed2049657c97f7c5e2654281da
 SHA512:
-  metadata.gz: 61a442489d374f4274df638384f9955323398930f6b002a550e4f288ddfffb68c1d4e596d4eb9f60c5730f57994bb64269325906ae52dec3d93153a92bb9b9d3
-  data.tar.gz: 293cbf041418dcd7b05fc63234ec5de5505c2e38c3efff48322d15525cc6240fb761deb380dcdec1bf51b39e92844852bcf0d656d5b2bdf118dbb1b98f80e156
+  metadata.gz: '080d45289d3ddcab4f72b467cd40f5958c0dc94983f84738498201f62eec41ff98438e7019e8c3389efc030176f21a9fe757a96a7f95598927063602ab285535'
+  data.tar.gz: 8cf2527ec7f16ac0bf2cd63d5d2ad4c241a783f5135d911320cbce438728cac46214c4529133581739bd4e67269ba6ff1e2b74f5dafdbd833750af7e08f7bf9f

data/lib/fsorg.rb

@@ -132,7 +132,7 @@ class Fsorg
         filepath = @document_path.parent.join(line.sub /^INCLUDE /, "")
         included_raw = File.new(filepath).read.strip
         included_fsorg = Fsorg.new(@root_directory, @data, included_raw, filepath)
-        included_fsorg.preprocess 
+        included_fsorg.preprocess
         @data = included_fsorg.data.merge @data
         output += included_fsorg.document.lines(chomp: true)
       else
@@ -145,7 +145,6 @@ class Fsorg
 
   def store_writes
     output = []
-    
 
     @document = output.join "\n"
   end
@@ -392,7 +391,7 @@ class Fsorg
       puts "#{indentation}> ".cyan.bold + dest.relative_path_from(@root_directory).to_s + (future_file[:permissions] ? " mode #{future_file[:permissions]}".yellow : "")
     end
     unless dry_run
-      dest.write deindent replace_data future_file[:content]
+      dest.write ensure_final_newline deindent replace_data future_file[:content]
       # Not using dest.chmod as the syntax for permissions is more than just integers,
       # and matches in fact the exact syntax of chmod's argument, per the manpage, chmod(1) (line "Each MODE is of the form…")
       `chmod #{future_file[:permissions]} #{dest}` if future_file[:permissions]
@@ -400,9 +399,9 @@ class Fsorg
   end
 
   def replace_data(content)
-    content.gsub /\{\{(?<variable>[^}]+?)\}\}/ do |interpolation| 
+    content.gsub /\{\{(?<variable>[^}]+?)\}\}/ do |interpolation|
       variable = interpolation[2..-3]
-      @data[variable.to_sym] 
+      @data[variable.to_sym]
     end
   end
 
@@ -452,6 +451,14 @@ def deindent(text)
   end.join "\n"
 end
 
+def ensure_final_newline(text)
+  unless text.end_with? "\n"
+    text + "\n"
+  else
+    text
+  end
+end
+
 def capture_output
   old_stdout = $stdout
   old_stderr = $stderr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fsorg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ewen Le Bihan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt