munge 0.18.0 → 0.19.0

data/lib/munge/{routers → router}/add_directory_index.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Routers
+  module Router
     class AddDirectoryIndex
       def initialize(extensions:, index:)
         @extensions = extensions

data/lib/munge/{routers → router}/auto_add_extension.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Routers
+  module Router
     class AutoAddExtension
       def initialize(keep_extensions:)
         @keep_extensions = keep_extensions

data/lib/munge/{routers → router}/fingerprint.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Routers
+  module Router
     class Fingerprint
       def initialize(extensions:,
                      separator:)

data/lib/munge/{routers → router}/remove_index_basename.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Routers
+  module Router
     class RemoveBasename
       def initialize(extensions:, basenames:, keep_explicit:)
         @extensions = extensions

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.18.0".freeze
+  VERSION = "0.19.0".freeze
 end

data/lib/munge/vfs/dry_run.rb

@@ -0,0 +1,28 @@
+module Munge
+  module Vfs
+    class DryRun
+      def initialize(vfs)
+        @vfs = vfs
+      end
+
+      def read(relpath)
+        @vfs.read(relpath)
+      end
+
+      def exist?(relpath)
+        @vfs.exist?(relpath)
+      end
+
+      def write(_relpath, _content)
+      end
+
+      def stat(relpath)
+        @vfs.stat(relpath)
+      end
+
+      def tree
+        @vfs.tree
+      end
+    end
+  end
+end

data/lib/munge/vfs/filesystem.rb

@@ -0,0 +1,44 @@
+module Munge
+  module Vfs
+    class Filesystem
+      def initialize(root)
+        @root = root
+      end
+
+      def write(relpath, contents)
+        FileUtils.mkdir_p(File.dirname(File.join(@root, relpath)))
+
+        File.write(File.join(@root, relpath), contents)
+      end
+
+      def read(relpath)
+        File.read(File.join(@root, relpath))
+      end
+
+      def rm(relpath)
+        File.delete(File.join(@root, relpath))
+      end
+
+      def exist?(relpath)
+        File.exist?(File.join(@root, relpath))
+      end
+
+      def stat(relpath)
+        File.stat(File.join(@root, relpath))
+      end
+
+      def tree
+        pattern = File.join(@root, "**", "*")
+
+        files = Dir.glob(pattern).select { |path| File.file?(path) }
+
+        files.map do |file|
+          root_path = Pathname.new(@root)
+          file_path = Pathname.new(file)
+
+          file_path.relative_path_from(root_path).to_s
+        end
+      end
+    end
+  end
+end

data/lib/munge/vfs/memory.rb

@@ -0,0 +1,33 @@
+module Munge
+  module Vfs
+    class Memory
+      def initialize(fs = {})
+        @fs = fs
+      end
+
+      def write(relpath, contents)
+        @fs[relpath] = contents
+      end
+
+      def read(relpath)
+        @fs[relpath]
+      end
+
+      def rm(relpath)
+        @fs.delete(relpath)
+      end
+
+      def exist?(relpath)
+        @fs.key?(relpath)
+      end
+
+      def stat(relpath)
+        nil
+      end
+
+      def tree
+        @fs.keys
+      end
+    end
+  end
+end

data/lib/munge/write_manager/all.rb

@@ -1,26 +1,26 @@
 module Munge
   module WriteManager
     class All
-      def initialize(io)
-        @io = io
+      def initialize(vfs)
+        @vfs = vfs
         @written_routes = []
       end
 
       attr_reader :written_routes
 
-      def on_new(route, abspath, content)
-        @io.write(abspath, content)
-        @written_routes.push(abspath)
+      def on_new(_route, relpath, content)
+        @vfs.write(relpath, content)
+        @written_routes.push(relpath)
       end
 
-      def on_changed(route, abspath, content)
-        @io.write(abspath, content)
-        @written_routes.push(abspath)
+      def on_changed(_route, relpath, content)
+        @vfs.write(relpath, content)
+        @written_routes.push(relpath)
       end
 
-      def on_identical(route, abspath, content)
-        @io.write(abspath, content)
-        @written_routes.push(abspath)
+      def on_identical(_route, relpath, content)
+        @vfs.write(relpath, content)
+        @written_routes.push(relpath)
       end
     end
   end

data/lib/munge/write_manager/only_needed.rb

@@ -1,24 +1,24 @@
 module Munge
   module WriteManager
     class OnlyNeeded
-      def initialize(io)
-        @io = io
+      def initialize(vfs)
+        @vfs = vfs
         @written_routes = []
       end
 
       attr_reader :written_routes
 
-      def on_new(route, abspath, content)
-        @io.write(abspath, content)
-        @written_routes.push(abspath)
+      def on_new(_route, relpath, content)
+        @vfs.write(relpath, content)
+        @written_routes.push(relpath)
       end
 
-      def on_changed(route, abspath, content)
-        @io.write(abspath, content)
-        @written_routes.push(abspath)
+      def on_changed(_route, relpath, content)
+        @vfs.write(relpath, content)
+        @written_routes.push(relpath)
       end
 
-      def on_identical(_route, _abspath, _content)
+      def on_identical(_route, _relpath, _content)
       end
     end
   end

data/munge.gemspec

@@ -4,25 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "munge/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "munge"
-  spec.version       = Munge::VERSION
-  spec.authors       = ["Zach Ahn"]
-  spec.email         = ["zach.ahn@gmail.com"]
-
-  spec.summary       = "Static site generator aiming to simplify complex build rules"
-  spec.description   = "Documentation for this release is located in https://github.com/zachahn/munge/blob/v#{Munge::VERSION}/README.md"
-  spec.homepage      = "https://github.com/zachahn/munge"
-  spec.license       = "MIT"
-
-  spec.files         =
-    `git ls-files -z`
-      .split("\x0")
-      .select { |f| f =~ %r{^(?:exe/|lib/|seeds/|munge.gemspec|README|LICENSE|Gemfile)} }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.name = "munge"
+  spec.version = Munge::VERSION
+  spec.authors = ["Zach Ahn"]
+  spec.email = ["engineering@zachahn.com"]
+
+  spec.summary = "Static site generator aiming to simplify complex build rules"
+  spec.description =
+    "== Documentation\n" \
+    "\n" \
+    "Documentation for this release is located in " \
+    "https://github.com/zachahn/munge/blob/v#{Munge::VERSION}/README.md"
+  spec.homepage = "https://github.com/zachahn/munge"
+  spec.license = "MIT"
+
+  spec.files =
+    Dir.chdir(File.expand_path("..", __FILE__)) do
+      `git ls-files -z`
+        .split("\x0")
+        .select { |f| f =~ %r{^(?:exe/|lib/|seeds/|munge.gemspec|README|LICENSE|Gemfile)} }
+    end
+
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = ">= 2.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -44,6 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 1.99.1", "< 3.0"
   spec.add_runtime_dependency "tilt", "~> 2.0"
   spec.add_runtime_dependency "sass", "~> 3.4"
+  spec.add_runtime_dependency "fixer_upper", "~> 0.5.0"
 
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.2")
     spec.add_runtime_dependency "reel", "~> 0.6"

data/seeds/boot.rb

@@ -0,0 +1,21 @@
+def app
+  Thread.current.thread_variable_get("app")
+end
+
+def conglomerate
+  Thread.current.thread_variable_get("conglomerate")
+end
+
+def config
+  Thread.current.thread_variable_get("config")
+end
+
+def root_path
+  Thread.current.thread_variable_get("root_path")
+end
+
+Dir.glob("lib/**/*.rb").sort.each do |file|
+  if File.file?(file)
+    load file
+  end
+end

data/seeds/boot.yml

@@ -0,0 +1,10 @@
+---
+config_path: config.rb
+boot_path: boot.rb
+application_path: config/application.rb
+rules_path: rules.rb
+
+application_key: app
+conglomerate_key: conglomerate
+config_key: config
+root_path_key: root_path

data/seeds/config.rb

@@ -1,3 +1,10 @@
+config = Thread.current.thread_variable_get("config")
+
+def __end__
+  contents = File.read(__FILE__)
+  contents.split(/^__END__$/, 2).last
+end
+
 yml = YAML.safe_load(__end__)
 
 # Path to content

data/seeds/layouts/blog_archives.html.erb

@@ -1,6 +1,6 @@
 <% layout("blog.html") do %>
   <ul>
-    <% posts.each do |post| %>
+    <% instance[:posts].each do |post| %>
       <li><a href="<%= path_to(post) %>"><%= post.basename %></a></li>
     <% end %>
   </ul>

data/seeds/layouts/blog_index.html.erb

@@ -1,5 +1,5 @@
 <% layout("blog.html") do %>
-  <% posts.each do |post| %>
+  <% instance[:posts].each do |post| %>
     <%= render(post) %>
     <%= link_to(post, "Permalink") %>
   <% end %>

data/seeds/layouts/default.html.erb

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title><%= site_name %></title>
+  <title><%= globals[:site_name] %></title>
   <link rel="stylesheet" href="<%= path_to(items["assets/stylesheets/basic.css"]) %>" media="screen" charset="utf-8">
 </head>
 <body>

data/seeds/lib/routing.rb

@@ -1,29 +1,29 @@
 if ENV["MUNGE_ENV"] == "production"
-  system.router.register(
-    Routers::Fingerprint.new(
+  conglomerate.router.register(
+    Munge::Router::Fingerprint.new(
       extensions: config[:router_fingerprint_extensions],
       separator: config[:router_fingeprint_separator]
     )
   )
 end
 
-system.router.register(
-  Routers::RemoveBasename.new(
+conglomerate.router.register(
+  Munge::Router::RemoveBasename.new(
     extensions: config[:router_remove_basename_original_extensions],
     basenames: config[:router_remove_basename_route_basenames],
     keep_explicit: config[:router_remove_basename_keep_explicit]
   )
 )
 
-system.router.register(
-  Routers::AddDirectoryIndex.new(
+conglomerate.router.register(
+  Munge::Router::AddDirectoryIndex.new(
     extensions: config[:router_add_index_original_extensions],
     index: config[:router_add_index_basename]
   )
 )
 
-system.router.register(
-  Routers::AutoAddExtension.new(
+conglomerate.router.register(
+  Munge::Router::AutoAddExtension.new(
     keep_extensions: config[:router_keep_extensions]
   )
 )

data/seeds/lib/sass.rb

@@ -2,6 +2,6 @@ require "munge/go/sass"
 
 Munge::Go.add_sass_load_path!(root_path, config[:source_path], AssetRoots.stylesheets_root)
 
-Munge::Go.set_sass_system!(system)
+Munge::Go.set_sass_conglomerate!(conglomerate)
 
 Munge::Go.add_sass_functions!(AssetRoots)

data/seeds/lib/view_helpers.rb

@@ -1,12 +1,4 @@
-tilt_transformer = Transformers::TiltTransformer.new(system)
-tilt_transformer.register(Munge::Helpers::Capture)
-tilt_transformer.register(Munge::Helpers::Find)
-tilt_transformer.register(Munge::Helpers::Link)
-tilt_transformer.register(Munge::Helpers::Rendering)
-tilt_transformer.register(Munge::Helpers::Tag)
-tilt_transformer.register(Munge::Helpers::AssetPaths)
-tilt_transformer.register(Munge::Helpers::AssetTags)
-tilt_transformer.register(Munge::Helpers::Livereload)
-tilt_transformer.register(AssetRoots)
+conglomerate.processor.include(AssetRoots)
 
-system.processor.register(tilt_transformer)
+conglomerate.processor.register("erb", to: Tilt::ERBTemplate)
+conglomerate.processor.register("scss", to: Tilt::ScssTemplate)

data/seeds/rules.rb

@@ -68,4 +68,4 @@ html_pages =
     .select { |item| item.extensions.include?("html") }
     .sort_by(&:route)
 
-system.global_data[:sitemap_pages] = html_pages
+conglomerate.global_data[:sitemap_pages] = html_pages

data/seeds/src/home/index.html.erb

@@ -2,7 +2,7 @@
 title: Woohoo!
 ---
 
-<h1><%= title %></h1>
+<h1><%= instance[:title] %></h1>
 
 <h2>Getting started</h2>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,6 +288,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: fixer_upper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -302,9 +316,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.18.0/README.md
+description: |-
+  == Documentation
+
+  Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.19.0/README.md
 email:
-- zach.ahn@gmail.com
+- engineering@zachahn.com
 executables:
 - munge
 extensions: []
@@ -317,7 +334,6 @@ files:
 - lib/munge.rb
 - lib/munge/application.rb
 - lib/munge/bootloader.rb
-- lib/munge/cleaner.rb
 - lib/munge/cli.rb
 - lib/munge/cli/commands/build.rb
 - lib/munge/cli/commands/clean.rb
@@ -327,58 +343,61 @@ files:
 - lib/munge/cli/commands/view.rb
 - lib/munge/cli/dispatch.rb
 - lib/munge/config.rb
-- lib/munge/errors.rb
-- lib/munge/extras/livereload.rb
-- lib/munge/extras/livereload/messaging.rb
-- lib/munge/extras/livereload/server.rb
-- lib/munge/extras/livereload/update_client.rb
-- lib/munge/extras/livereload/update_server.rb
-- lib/munge/extras/livereload/vendor/livereload.js
-- lib/munge/formatters/default.rb
-- lib/munge/formatters/dots.rb
-- lib/munge/formatters/silent.rb
+- lib/munge/conglomerate.rb
+- lib/munge/conglomerate/collection.rb
+- lib/munge/conglomerate/item_factory.rb
+- lib/munge/conglomerate/item_factory/content_parser.rb
+- lib/munge/conglomerate/item_factory/item_identifier.rb
+- lib/munge/conglomerate/processor.rb
+- lib/munge/conglomerate/reader.rb
+- lib/munge/conglomerate/router.rb
+- lib/munge/conglomerate/router/itemish.rb
+- lib/munge/error.rb
+- lib/munge/extra/livereload.rb
+- lib/munge/extra/livereload/messaging.rb
+- lib/munge/extra/livereload/server.rb
+- lib/munge/extra/livereload/update_client.rb
+- lib/munge/extra/livereload/update_server.rb
+- lib/munge/extra/livereload/vendor/livereload.js
+- lib/munge/formatter/default.rb
+- lib/munge/formatter/dots.rb
+- lib/munge/formatter/silent.rb
+- lib/munge/function/clean.rb
+- lib/munge/function/write.rb
 - lib/munge/go/sass.rb
 - lib/munge/go/sass/asset_urls.rb
-- lib/munge/helpers/asset_paths.rb
-- lib/munge/helpers/asset_tags.rb
-- lib/munge/helpers/capture.rb
-- lib/munge/helpers/find.rb
-- lib/munge/helpers/link.rb
-- lib/munge/helpers/livereload.rb
-- lib/munge/helpers/rendering.rb
-- lib/munge/helpers/tag.rb
-- lib/munge/init.rb
-- lib/munge/io/dry_run.rb
-- lib/munge/io/filesystem.rb
-- lib/munge/io/noop.rb
+- lib/munge/helper/asset_paths.rb
+- lib/munge/helper/asset_tags.rb
+- lib/munge/helper/capture.rb
+- lib/munge/helper/data.rb
+- lib/munge/helper/define_module.rb
+- lib/munge/helper/find.rb
+- lib/munge/helper/link.rb
+- lib/munge/helper/livereload.rb
+- lib/munge/helper/rendering.rb
+- lib/munge/helper/tag.rb
 - lib/munge/item.rb
+- lib/munge/load.rb
 - lib/munge/pre_init.rb
 - lib/munge/reporter.rb
-- lib/munge/routers/add_directory_index.rb
-- lib/munge/routers/auto_add_extension.rb
-- lib/munge/routers/fingerprint.rb
-- lib/munge/routers/remove_index_basename.rb
-- lib/munge/runner.rb
-- lib/munge/system.rb
-- lib/munge/system/collection.rb
-- lib/munge/system/item_factory.rb
-- lib/munge/system/item_factory/content_parser.rb
-- lib/munge/system/item_factory/item_identifier.rb
-- lib/munge/system/processor.rb
-- lib/munge/system/readers/filesystem.rb
-- lib/munge/system/router.rb
-- lib/munge/system/router/itemish.rb
-- lib/munge/transformers/tilt_transformer.rb
+- lib/munge/router/add_directory_index.rb
+- lib/munge/router/auto_add_extension.rb
+- lib/munge/router/fingerprint.rb
+- lib/munge/router/remove_index_basename.rb
 - lib/munge/util/boolean_regex.rb
-- lib/munge/util/import.rb
 - lib/munge/util/path.rb
 - lib/munge/util/symbol_hash.rb
 - lib/munge/version.rb
+- lib/munge/vfs/dry_run.rb
+- lib/munge/vfs/filesystem.rb
+- lib/munge/vfs/memory.rb
 - lib/munge/write_manager/all.rb
 - lib/munge/write_manager/only_needed.rb
 - munge.gemspec
 - seeds/.gitignore
 - seeds/Gemfile.tt
+- seeds/boot.rb
+- seeds/boot.yml
 - seeds/config.rb
 - seeds/data.yml
 - seeds/layouts/blog.html.erb
@@ -392,7 +411,6 @@ files:
 - seeds/lib/sass.rb
 - seeds/lib/view_helpers.rb
 - seeds/rules.rb
-- seeds/setup.rb
 - seeds/src/assets/fonts/.empty_directory
 - seeds/src/assets/images/.empty_directory
 - seeds/src/assets/javascripts/.empty_directory
@@ -415,7 +433,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -423,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Static site generator aiming to simplify complex build rules