fsorg 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de7035273a930e84018355538d364b68016be1d6dc015269e00867a6cb0b72b
-  data.tar.gz: 167a486eaa81c1315c9dab96cf5c1536277a871d40a20c3f8d5dded4d13e8e0f
+  metadata.gz: ddcf3941d7eb4d9fc41fff221b3b178121564c52a8bfe29aabc2b30a8e0e70d7
+  data.tar.gz: a7b50828bdccb1a2afc8ed7911fec2c5ef6f4ebe846d86be774438c7480c8e10
 SHA512:
-  metadata.gz: eb062a7c0e9722ff75aee01f2703bd29b0caa54668c093bceca3e4b865940da4251c79d06b01e74456730332f586c541325033e33d1e12be5623a03fca2df9c8
-  data.tar.gz: 5cf687f4913525c92a17ba1c094e9b27fcdf2641fdf8aecbe35655c2b75d6b8b321b251fce5c72591b16a3f15b121dcf148872e5d64cd35568b9f1660e06c0c4
+  metadata.gz: de9ff6a647a0640cac2cc1d7ea297834b70cc9eab702f2be37565acf340cfdaaa9d35353edd6a86979131c18686f348840d7716c597d7516613f1be5e937553f
+  data.tar.gz: 238a5c6b2d33689d66675ea1204b0babd74da5513471c8addd1f90263e8073680c464211d16b69bde824d11e49d7e6aa48a35cf6eb3af4f7b78653a8e4754450

data/lib/fsorg.rb

@@ -21,7 +21,6 @@ class Fsorg
     @document = document
     @current_line = 0
     @current_depth = -1
-    @to_write = [] # [ { :path, :content, :permissions } ]
   end
 
   def from_relative_to_root(path)
@@ -47,7 +46,6 @@ class Fsorg
     # TODO process_see
     process_for
     process_if
-    store_writes
     turn_puts_into_runs
     ask_missing_variables
     process_root
@@ -134,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
@@ -147,25 +145,7 @@ class Fsorg
 
   def store_writes
     output = []
-    current = {}
-    inside_write_directive = -> { !current.keys.empty? }
-
-    @document.lines(chomp: true).each_with_index do |line, index|
-      @current_line = index + 1
-      if inside_write_directive.()
-        if line.strip == "}"
-          @to_write << current
-          current = {}
-        else
-          current[:content] += line + "\n"
-        end
-      elsif /^WRITE(\s+INTO)?\s+(?<destination>.+?)(?:\s+MODE\s+(?<permissions>.+?))?\s*\{$/.match line.strip
-        current = $~.named_captures.transform_keys(&:to_sym)
-        current[:content] = ""
-      else
-        output << line
-      end
-    end
+    
 
     @document = output.join "\n"
   end
@@ -292,7 +272,7 @@ class Fsorg
   end
 
   def ask_missing_variables
-    (@document + @to_write.map { |f| f[:content] }.join(" ")).scan /\{\{(?<variable>[^}]+?)\}\}/ do |variable|
+    @document.scan /\{\{(?<variable>[^}]+?)\}\}/ do |variable|
       unless @data.include? variable[0].to_sym
         @data[variable[0].to_sym] = :ask
       end
@@ -338,16 +318,12 @@ class Fsorg
     @data[:HERE]
   end
 
-  def execute_writes(dry_run, quiet)
-    @to_write.each do |future_file|
-      do_write future_file, dry_run, quiet
-    end
-  end
-
   def walk(dry_run, quiet, verbose)
     current_path = [@root_directory]
-    current_path_as_pathname = -> { current_path.reduce(Pathname.new "") { |path, fragment| path.join fragment } }
     @data[:HERE] = @root_directory
+    file_to_write = {}
+    inside_write_directive = -> { !file_to_write.keys.empty? }
+    current_path_as_pathname = -> { current_path.reduce(Pathname.new "") { |path, fragment| path.join fragment } }
 
     if verbose
       puts "Data is #{@data.except :HERE}".light_black
@@ -361,7 +337,17 @@ class Fsorg
         line = line.gsub "{{#{key}}}", value.to_s
       end
 
-      if /^(?<leaf>.+?)\s+\{/ =~ line.strip
+      if inside_write_directive.()
+        if line.strip == "}"
+          do_write file_to_write, dry_run, quiet
+          file_to_write = {}
+        else
+          file_to_write[:content] += line + "\n"
+        end
+      elsif /^WRITE(\s+INTO)?\s+(?<destination>.+?)(?:\s+MODE\s+(?<permissions>.+?))?\s*\{$/.match line.strip
+        file_to_write = $~.named_captures.transform_keys(&:to_sym)
+        file_to_write[:content] = ""
+      elsif /^(?<leaf>.+?)\s+\{/ =~ line.strip
         current_path << leaf
         @data[:HERE] = current_path_as_pathname.()
         if verbose
@@ -384,11 +370,6 @@ class Fsorg
         do_run command, current_location, environment, dry_run, quiet, verbose
       end
     end
-
-    @current_depth = 0
-    # TODO do writes alongside other operations
-    puts ("Writing files " + "─" * 40).light_black
-    execute_writes dry_run, quiet
   end
 
   def do_mkpath(path, dry_run, quiet)
@@ -401,14 +382,17 @@ class Fsorg
   end
 
   def do_write(future_file, dry_run, quiet)
-    dest = from_relative_to_root future_file[:destination]
-    do_mkpath dest.parent, dry_run, quiet
+    indentation = "  " * @current_depth
+    dest = from_relative_to_root(current_location) / future_file[:destination]
+    unless dest.parent.relative_path_from(@root_directory).to_s == "."
+      do_mkpath dest.parent, dry_run, quiet
+    end
 
     unless quiet
-      puts "> ".cyan.bold + dest.relative_path_from(@root_directory).to_s + (future_file[:permissions] ? " mode #{future_file[:permissions]}".yellow : "")
+      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 replace_data future_file[:content]
+      dest.write 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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fsorg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ewen Le Bihan