munge 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6789b26f5adfbb4e63f7765b893eb1e76d9b2cb4
-  data.tar.gz: 2b3aa5cdebf2d78b0bb5af87c17cbe198438b04f
+  metadata.gz: 182b8b1edb4fd48e071f740629c0ba64819ea1b1
+  data.tar.gz: 92fe60dcdfa3db9d725ce3d4c771608b8b06605a
 SHA512:
-  metadata.gz: fd0195d991650cc4d4fc0b149db88b5f844a15e77f19b948accf22fb8f4bd23d2f97cb8a145d776395d6df46595442f1cafb015c242ca872159addf165ccfd17
-  data.tar.gz: 78d5a5efdc0e9b2b97ad70daf23689855b8d04389e7c82bcbd0211a79e08e812d8e03a3fc12eef50b4cfcdb2beb2903868b7f3adb6a8611d588c6a4fa113f02b
+  metadata.gz: 8bffbbecdb7b150ff5fb63ece5254cf2fdbb931399fe38a85c8025804db5ae081ad53c6e3ff9ae910b1bb3190910dac61eb24dd2e3f079a627bad9c774593e31
+  data.tar.gz: 6e72c3ddb97d3f38ab1f9afb52979fe5bf7925b1b81e4a789f0e7560c72ec6f50f6803d52b5dc0e645ee15575c69f95eec8d5dbe14d78a560206d844876dfe9f

data/lib/munge.rb

@@ -5,6 +5,7 @@ require "yaml"
 require "cgi"
 
 require "tilt"
+require "fixer_upper"
 
 if Gem::Specification.find_all_by_name("pry-byebug").any?
   require "pry-byebug"
@@ -15,47 +16,47 @@ end
 # Core
 require "munge/version"
 require "munge/item"
-require "munge/errors"
+require "munge/error"
 require "munge/util/path"
 require "munge/util/symbol_hash"
 require "munge/util/boolean_regex"
-require "munge/util/import"
-require "munge/system/router"
-require "munge/system/router/itemish"
-require "munge/system/item_factory"
-require "munge/system/item_factory/content_parser"
-require "munge/system/item_factory/item_identifier"
-require "munge/system/collection"
-require "munge/system/readers/filesystem"
-require "munge/system/processor"
-require "munge/system"
-require "munge/io/dry_run"
-require "munge/io/filesystem"
-require "munge/io/noop"
+require "munge/conglomerate/router"
+require "munge/conglomerate/router/itemish"
+require "munge/conglomerate/item_factory"
+require "munge/conglomerate/item_factory/content_parser"
+require "munge/conglomerate/item_factory/item_identifier"
+require "munge/conglomerate/collection"
+require "munge/conglomerate/reader"
+require "munge/conglomerate/processor"
+require "munge/conglomerate"
+require "munge/vfs/dry_run"
+require "munge/vfs/filesystem"
+require "munge/vfs/memory"
 require "munge/write_manager/all"
 require "munge/write_manager/only_needed"
+require "munge/function/clean"
+require "munge/function/write"
 require "munge/application"
 require "munge/config"
-require "munge/runner"
 require "munge/reporter"
-require "munge/cleaner"
 require "munge/pre_init"
-require "munge/init"
 require "munge/bootloader"
+require "munge/load"
 
 # Extensions
-require "munge/helpers/asset_tags"
-require "munge/helpers/asset_paths"
-require "munge/helpers/capture"
-require "munge/helpers/find"
-require "munge/helpers/link"
-require "munge/helpers/rendering"
-require "munge/helpers/tag"
-require "munge/helpers/livereload"
-require "munge/routers/auto_add_extension"
-require "munge/routers/fingerprint"
-require "munge/routers/add_directory_index"
-require "munge/routers/remove_index_basename"
-require "munge/transformers/tilt_transformer"
+require "munge/helper/asset_tags"
+require "munge/helper/asset_paths"
+require "munge/helper/capture"
+require "munge/helper/data"
+require "munge/helper/find"
+require "munge/helper/link"
+require "munge/helper/rendering"
+require "munge/helper/tag"
+require "munge/helper/livereload"
+require "munge/helper/define_module"
+require "munge/router/auto_add_extension"
+require "munge/router/fingerprint"
+require "munge/router/add_directory_index"
+require "munge/router/remove_index_basename"
 
-require "munge/extras/livereload"
+require "munge/extra/livereload"

data/lib/munge/application.rb

@@ -2,13 +2,13 @@ module Munge
   # This class is one of the main interfaces users would interact with. This
   # provides methods to create and iterate through items.
   class Application
-    def initialize(system)
-      @system = system
+    def initialize(conglomerate)
+      @conglomerate = conglomerate
     end
 
     # @return [Array<Item>]
     def items
-      @system.items
+      @conglomerate.items
     end
 
     # @return [Array<Item>]
@@ -25,7 +25,7 @@ module Munge
     #
     # @return [Item]
     def build_virtual_item(relpath, content, **frontmatter)
-      @system.item_factory.build(relpath: relpath, content: content, frontmatter: frontmatter)
+      @conglomerate.item_factory.build(relpath: relpath, content: content, frontmatter: frontmatter)
     end
 
     # Creates an Item and inserts it into the registry of Items.
@@ -37,15 +37,15 @@ module Munge
     # @return [Array<Item>]
     def create(*args)
       item = build_virtual_item(*args)
-      @system.items.push(item)
+      @conglomerate.items.push(item)
       [item]
     end
 
-    # Returns parts of System
+    # Returns parts of Conglomerate
     #
     # @private
     def vomit(component_name)
-      @system.public_send(component_name)
+      @conglomerate.public_send(component_name)
     end
   end
 end

data/lib/munge/bootloader.rb

@@ -11,17 +11,6 @@ module Munge
       @config = Munge::PreInit.new(config_path).config
     end
 
-    # @return [Munge::Init]
-    def init
-      @init ||=
-        Init.new(
-          root_path: root_path,
-          config: config,
-          setup_path: setup_path,
-          rules_path: rules_path
-        )
-    end
-
     attr_reader :root_path
     attr_reader :setup_path
     attr_reader :rules_path

data/lib/munge/cli.rb

@@ -9,6 +9,6 @@ require "munge/cli/commands/clean"
 require "munge/cli/commands/update"
 require "munge/cli/dispatch"
 
-require "munge/formatters/default"
-require "munge/formatters/dots"
-require "munge/formatters/silent"
+require "munge/formatter/default"
+require "munge/formatter/dots"
+require "munge/formatter/silent"

data/lib/munge/cli/commands/build.rb

@@ -10,46 +10,42 @@ module Munge
         def initialize(bootloader, dry_run:, reporter:, verbosity:, build_root: nil)
           destination_root = bootloader.root_path
           config = bootloader.config
-          app = application(bootloader)
           destination = File.expand_path(build_root || config[:output_path], destination_root)
 
-          io = new_io(dry_run)
+          vfs = new_vfs(dry_run, destination)
+
+          loader = Munge::Load.new(bootloader.root_path)
 
           @runner =
-            Munge::Runner.new(
-              items: app.vomit(:items),
-              router: app.vomit(:router),
-              processor: app.vomit(:processor),
-              io: io,
-              reporter: Munge::Reporter.new(formatter: new_formatter(reporter), verbosity: verbosity.to_sym),
-              destination: destination,
-              manager: Munge::WriteManager::OnlyNeeded.new(io)
-            )
+            loader.app do |_application, conglomerate|
+              Munge::Function::Write.new(
+                conglomerate: conglomerate,
+                reporter: Munge::Reporter.new(formatter: new_formatter(reporter), verbosity: verbosity.to_sym),
+                manager: Munge::WriteManager::OnlyNeeded.new(vfs),
+                destination: vfs
+              )
+            end
         end
 
         # @return [Array<String>] list of updated items routes
         def call
-          @runner.write
+          @runner.call
         end
 
         private
 
-        def application(bootloader)
-          bootstrap = bootloader.init
-
-          bootstrap.app
-        end
+        def new_vfs(dry_run, destination)
+          fs = Munge::Vfs::Filesystem.new(destination)
 
-        def new_io(dry_run)
           if dry_run
-            Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
+            Munge::Vfs::DryRun.new(fs)
           else
-            Munge::Io::Filesystem.new
+            fs
           end
         end
 
         def new_formatter(class_name)
-          Munge::Formatters.const_get(class_name).new
+          Munge::Formatter.const_get(class_name).new
         end
       end
     end

data/lib/munge/cli/commands/clean.rb

@@ -6,54 +6,49 @@ module Munge
         def initialize(bootloader, dry_run:, reporter:, verbosity:, build_root: nil)
           destination_root = bootloader.root_path
           config = bootloader.config
-          app = application(bootloader)
           destination = File.expand_path(build_root || config[:output_path], destination_root)
-          @dry_run = dry_run
 
-          io = Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
+          memory = Munge::Vfs::Memory.new
+          vfs = new_vfs(dry_run, destination)
+
+          loader = Munge::Load.new(bootloader.root_path)
 
           @runner =
-            Munge::Runner.new(
-              items: app.vomit(:items),
-              router: app.vomit(:router),
-              processor: app.vomit(:processor),
-              io: io,
-              reporter: Munge::Reporter.new(formatter: formatter("Silent"), verbosity: :silent),
-              destination: destination,
-              manager: Munge::WriteManager::All.new(io)
-            )
+            loader.app do |_application, conglomerate|
+              Munge::Function::Write.new(
+                conglomerate: conglomerate,
+                reporter: Munge::Reporter.new(formatter: formatter("Silent"), verbosity: :silent),
+                manager: Munge::WriteManager::All.new(memory),
+                destination: memory
+              ).call
+
+              Munge::Function::Clean.new(
+                memory: memory,
+                destination: vfs
+              )
+            end
 
           @output_path = File.expand_path(build_root || config[:output_path], destination_root)
         end
 
         def call
-          io =
-            if @dry_run
-              Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
-            else
-              Munge::Io::Filesystem.new
-            end
-
-          cleaner =
-            Munge::Cleaner.new(
-              path_to_clean: @output_path,
-              paths_to_write: @runner.write,
-              io: io
-            )
-
-          cleaner.delete
+          @runner.call
         end
 
         private
 
-        def application(bootloader)
-          bootstrap = bootloader.init
-
-          bootstrap.app
+        def formatter(class_name)
+          Munge::Formatter.const_get(class_name).new
         end
 
-        def formatter(class_name)
-          Munge::Formatters.const_get(class_name).new
+        def new_vfs(dry_run, destination)
+          fs = Munge::Vfs::Filesystem.new(destination)
+
+          if dry_run
+            Munge::Vfs::DryRun.new(fs)
+          else
+            fs
+          end
         end
       end
     end

data/lib/munge/cli/commands/init.rb

@@ -32,7 +32,7 @@ module Munge
             require "bundler"
 
             ::Bundler.with_clean_env do
-              system("bundle #{command}")
+              Kernel.system("bundle #{command}")
             end
           end
         end

data/lib/munge/cli/commands/server.rb

@@ -10,13 +10,13 @@ module Munge
           @livereload =
             if livereload
               if Gem.loaded_specs.key?("reel")
-                Munge::Extras::Livereload::Main.new(true)
+                Munge::Extra::Livereload::Main.new(true)
               else
                 STDERR.puts "Gem `reel` is not installed. Check that your Ruby version is compatible"
-                Munge::Extras::Livereload::Main.new(false)
+                Munge::Extra::Livereload::Main.new(false)
               end
             else
-              Munge::Extras::Livereload::Main.new(false)
+              Munge::Extra::Livereload::Main.new(false)
             end
         end
 

data/lib/munge/cli/dispatch.rb

@@ -8,9 +8,20 @@ module Munge
       end
 
       desc "build", "Build site"
-      method_option :reporter, desc: "Set reporting formatter", default: "Default", type: :string
-      method_option :dry_run, desc: "Run without writing files", default: false, type: :boolean
-      method_option :verbosity, aliases: "-v", desc: "Preferred amount of output", enum: %w(all written silent), default: "written", type: :string
+      method_option :reporter,
+        desc: "Set reporting formatter",
+        default: "Default",
+        type: :string
+      method_option :dry_run,
+        desc: "Run without writing files",
+        default: false,
+        type: :boolean
+      method_option :verbosity,
+        aliases: "-v",
+        desc: "Preferred amount of output",
+        enum: %w(all written silent),
+        default: "written",
+        type: :string
       def build
         production!
 
@@ -18,8 +29,16 @@ module Munge
       end
 
       desc "view", "View built files"
-      method_option :port, aliases: "-p", desc: "Set port", default: 7000, type: :numeric
-      method_option :host, aliases: "-h", desc: "Set host", default: "0.0.0.0", type: :string
+      method_option :port,
+        aliases: "-p",
+        desc: "Set port",
+        default: 7000,
+        type: :numeric
+      method_option :host,
+        aliases: "-h",
+        desc: "Set host",
+        default: "0.0.0.0",
+        type: :string
       def view
         production!
 
@@ -27,9 +46,20 @@ module Munge
       end
 
       desc "server", "Run the development server"
-      method_option :livereload, desc: "Reload browser on update", default: Gem.loaded_specs.key?("reel"), type: :boolean
-      method_option :port, aliases: "-p", desc: "Set port", default: 7000, type: :numeric
-      method_option :host, aliases: "-h", desc: "Set host", default: "0.0.0.0", type: :string
+      method_option :livereload,
+        desc: "Reload browser on update",
+        default: Gem.loaded_specs.key?("reel"),
+        type: :boolean
+      method_option :port,
+        aliases: "-p",
+        desc: "Set port",
+        default: 7000,
+        type: :numeric
+      method_option :host,
+        aliases: "-h",
+        desc: "Set host",
+        default: "0.0.0.0",
+        type: :string
       def server
         development!
 
@@ -37,16 +67,29 @@ module Munge
       end
 
       desc "clean", "Remove old built files (generally unnecessary)"
-      method_option :reporter, desc: "Set reporting formatter", default: "Default", type: :string
-      method_option :dry_run, desc: "Run without writing files", default: false, type: :boolean
-      method_option :verbosity, aliases: "-v", desc: "Preferred amount of output", enum: %w(all written silent), default: "written", type: :string
+      method_option :reporter,
+        desc: "Set reporting formatter",
+        default: "Default",
+        type: :string
+      method_option :dry_run,
+        desc: "Run without writing files",
+        default: false,
+        type: :boolean
+      method_option :verbosity,
+        aliases: "-v",
+        desc: "Preferred amount of output",
+        enum: %w(all written silent),
+        default: "written",
+        type: :string
       def clean
         production!
 
         Commands::Clean.new(bootloader, **symbolized_options, build_root: ENV["BUILD_ROOT"]).call
       end
 
-      desc "update", "Use with caution: override local configs with pristine version (useful after bumping version in Gemfile)"
+      desc "update",
+        "Use with caution: override local configs with pristine version " \
+        "(useful after bumping version in Gemfile)"
       def update
         development!
 
@@ -67,7 +110,7 @@ module Munge
 
       def bootloader
         Munge::Bootloader.new(root_path: current_working_directory)
-      rescue Munge::Errors::ConfigRbNotFound => e
+      rescue Munge::Error::ConfigRbNotFound => e
         puts e.message
         exit
       end