usmu 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791ae5716ab52a70b114d8f87c45bc688295357c
-  data.tar.gz: f11f2fee7b666f8da24326cffc5bc9cfa3cd65e0
+  metadata.gz: 415fda7fa65950566050fe558aff9697e8df2b96
+  data.tar.gz: 6c92092df34a7adc1d5e9131195c44da183f3aeb
 SHA512:
-  metadata.gz: 1f19d5144efe8075372e7a94ed66216c6f6a075ec1f65bcab2793eda85d2e847ee9e27b6ac31fd7f02204dbc4c1245e5c180428f59a40c5d8f3b976b949fb18b
-  data.tar.gz: fee8b703d2b8985bccb0f6724371d71260570ec66ab1fbcfea351ac318cabab289674e84720c57ea74ee9ab30521402ff6421d9f0f36c155135003fd25df59a3
+  metadata.gz: dc70d6d676bf29b4337dbf7983f5ed5c5abf0a3f42e2394d590dd4495291f16257ee119778b4d40e5a6e3a25ef99babad13561c148c0043e78704faca1cd78ec
+  data.tar.gz: 0297b97ea1638910ff4729206d7835bc48d66de9d7d32a2655215e216b80900f3a4886d77b01fd94bcdabb34f4e4ab9994a903af3ceece8e40b5be79d2d29950

data/.travis.yml

@@ -1,18 +1,13 @@
 language: ruby
+before_install: gem update bundler
+install: bundle install --jobs 3 --retry 3 --without mutant
 script: rake ci
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
   - ruby-head
-  #- mruby-head
-  #- rbx-2.1
-  #- rbx-2.2
-  #- rbx-2.3
-  - rbx-2.4
-  - jruby
-  - jruby-head
+  - rbx
 matrix:
   include:
     - rvm: jruby
@@ -20,14 +15,10 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS='--2.0'
   allow_failures:
-    - rvm: 1.9.3
     - rvm: jruby
     - rvm: jruby-head
     - rvm: mruby-head
-    - rvm: rbx-2.1
-    - rvm: rbx-2.2
-    - rvm: rbx-2.3
-    - rvm: rbx-2.4
+    - rvm: rbx
 addons:
   code_climate:
     repo_token: 5ac0735331c1749a461eae94f89cd2011cc001979f9941d7241f97caeff7bde1

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Usmu Change Log
 
+## 1.1.0
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* [\[\#21\]][GH-21] Cleanup Usmu::Configuration (1bc417de24e34c8694be4a2e8bf83d18898eec56)
+* [\[\#21\]][GH-21] Properly stub out tests for SiteGenerator (503233c7eab33f7d98714d185a1aefb70f02c73b)
+* [\[\#21\]][GH-21] Cover SiteGenerator (e91d4e2b42738f7107ed0ed3e03aa7ed6abfe17d)
+* Bump dependency modules (df1559e8ef3931e1c64530937d3361cbc330aafe)
+* [\[#5\]][GH-5] WIP initial pass at allowing alter hooks (6a474db9032974bdac53870a3e690c983af434ff)
+* [\[\#21\]][GH-21] Add an initial suite of tests for CorePlugin (d02e14aceaa24ac5708fb51bab5254f016bafa71)
+* Update usage information with basic info in the README (86f525f861d4e80aea4a54e9a7f8fbbfbf472125)
+* [\[#31\]][GH-31] Move source folder of init-site (b2e56277591468b57c45976506df603d6d7ed7d1)
+* [\[#32\]][GH-32] Fix issues with the init-site (f4c577f4b25855e3ccc928c004edc3d924ba66b5)
+* Cache the list of renderables and allow that list to be altered (990cf0bdf4353638af8b5f2f6f89a5f6338182ea)
+* Fix tests (c4089e426abc24d399f352483fab5aa61657b3ab)
+
+  [GH-5]:  https://github.com/usmu/usmu/issues/5
+  [GH-21]: https://github.com/usmu/usmu/issues/21
+  [GH-31]: https://github.com/usmu/usmu/issues/31
+  [GH-32]: https://github.com/usmu/usmu/issues/32
+
 ## 1.0.0
 
 Matthew Scharley <matt.scharley@gmail.com>

data/Gemfile

@@ -13,8 +13,5 @@ end
 gemspec name: 'usmu'
 
 gem 'codeclimate-test-reporter', group: :test, require: nil
-
-if RUBY_VERSION.to_f >= 2 && RUBY_VERSION.to_f < 2.2 && RUBY_ENGINE == 'ruby'
-  gem 'mutant', '~> 0.7', :group => :development
-  gem 'mutant-rspec', '~> 0.7', :group => :development
-end
+gem 'mutant', '~> 0.8', group: 'mutant'
+gem 'mutant-rspec', '~> 0.8', group: 'mutant'

data/README.md

@@ -23,7 +23,20 @@ to generate locally if you don't wish to use the web-based editor.
 
 ## Usage
 
-TODO: Write usage instructions here
+You can generate a new basic website using `usmu init`.
+
+    $ usmu init site-name
+
+This will create a new site in the `site-name` folder. You can now use `usmu generate` to build the test site.
+
+    $ cd site-name
+    $ usmu generate
+
+You can also use `usmu serve` to get a live server that you can use to test changes you make. This will not modify any
+files in your output folder but will instead dynamically generate and serve content directly from your files. Note,
+this is in no way secure and it is highly recommended to only deploy static versions of your website.
+
+    $ usmu serve
 
 ## Compatibility
 

data/Rakefile

@@ -27,19 +27,15 @@ task :test => [:clean, :spec, :mutant]
 desc 'Run mutation tests'
 task :mutant, [:target] => [:clean] do |t,args|
   old = ENV.delete('CODECLIMATE_REPO_TOKEN')
-  if `which mutant 2>&1 > /dev/null; echo \$?`.to_i != 0
-    puts 'Mutant isn\'t supported on your platform. Please run these tests on MRI <= 2.1.5.'
-  else
-    sh 'bundle', 'exec', 'mutant',
-       '--include', 'lib',
-       '--require', 'usmu',
-       '--require', 'usmu/deployment',
-       '--use', 'rspec',
-       # Interfaces and documentation classes
-       '--ignore-subject', 'Usmu::Deployment::RemoteFileInterface*',
-       '--ignore-subject', 'Usmu::Plugin::CoreHooks*',
-       args[:target] || 'Usmu*'
-  end
+  sh 'bundle', 'exec', 'mutant',
+     '--include', 'lib',
+     '--require', 'usmu',
+     '--require', 'usmu/deployment',
+     '--use', 'rspec',
+     # Interfaces and documentation classes
+     '--ignore-subject', 'Usmu::Deployment::RemoteFileInterface*',
+     '--ignore-subject', 'Usmu::Plugin::CoreHooks*',
+     args[:target] || 'Usmu*'
   ENV['CODECLIMATE_REPO_TOKEN'] = old unless old.nil?
 end
 

data/lib/usmu/configuration.rb

@@ -141,7 +141,7 @@ module Usmu
     def excluded?(filename)
       exclude.each do |f|
         f += '**/*' if f.end_with? '/'
-        return true if File.fnmatch(f, filename, FILE_GLOB_FLAGS)
+        return true if File.fnmatch(f, filename, File::FNM_EXTGLOB | File::FNM_PATHNAME)
       end
       false
     end

data/lib/usmu/plugin/core.rb

@@ -1,4 +1,6 @@
 require 'fileutils'
+require 'rack'
+require 'usmu/ui/rack_server'
 
 module Usmu
   class Plugin
@@ -30,7 +32,7 @@ module Usmu
         end
 
         c.command(:serve) do |command|
-          command.syntax = 'usmu server'
+          command.syntax = 'usmu serve'
           command.description = 'Serve files processed files directly. This won\'t update files on disk, but you will be able to view your website as rendered.'
           command.action &method(:command_serve)
         end
@@ -41,6 +43,9 @@ module Usmu
       # @param [Array<String>] args arguments passed by the user.
       # @param [Hash] options options parsed by Commander
       def command_generate(args, options)
+        raise 'This command does not take arguments' unless args.empty?
+        raise 'Invalid options' unless options.inspect.start_with? '<Commander::Command::Options '
+
         @ui.configuration.generator.generate
       end
 
@@ -52,6 +57,7 @@ module Usmu
         @log.info("Usmu v#{Usmu::VERSION}")
         @log.info('')
 
+        raise 'Invalid options' unless options.inspect.start_with? '<Commander::Command::Options '
         if args.length > 1
           @log.fatal('Only one path allowed to be initialised at a time.')
           raise
@@ -65,18 +71,21 @@ module Usmu
       end
 
       def command_serve(args, options)
+        raise 'This command does not take arguments' unless args.empty?
+        raise 'Invalid options' unless options.inspect.start_with? '<Commander::Command::Options '
+
         configuration = @ui.configuration
         @log.info('Starting webserver...')
-        require 'rack'
-        require 'usmu/ui/rack_server'
 
         Rack::Handler::WEBrick.run Ui::RackServer.new(configuration),
-                                   host: configuration['serve', 'host', default: '0.0.0.0'],
+                                   host: configuration['serve', 'host', default: 'localhost'],
                                    port: configuration['serve', 'port', default: 8080]
       end
 
       private
 
+      attr_accessor :ui
+
       # Helper to copy a file.
       #
       # @param [String] from

data/lib/usmu/plugin/core_hooks.rb

@@ -9,6 +9,14 @@ module Usmu
       # @param [Usmu::Ui::Console] ui The UI instance for this session.
       # @param [Commander::Runner] c The Commander instance to add commands to.
       def commands(ui, c); end
+
+      # Hook to allow altering the list of files that are in the site.
+      #
+      # @param [Array<Usmu::Template::StaticFile>] renderables An array of renderables.
+      # @param [Usmu::SiteGenerator] generator The site generator being used.
+      #
+      # @return [Array<Usmu::Template::StaticFile>] The altered list of renderables.
+      def renderables_alter(renderables, generator); end
     end
   end
 end

data/lib/usmu/plugin.rb

@@ -27,8 +27,9 @@ module Usmu
       @plugins ||= []
     end
 
-    # Call all plugins and collate any data returned. nil can be returned explicitly to say this plugin has nothing to
-    # return.
+    # Call all plugins and collate any data returned.
+    #
+    # nil can be returned explicitly to say this plugin has nothing to return.
     #
     # @param [Symbol] method The name of the method to call. This should be namespaced somehow. For example, a plugin
     #                        called `usmu-s3` could use the method namespace `s3` and have a hook called `:s3_upload`
@@ -46,6 +47,27 @@ module Usmu
       end.select {|i| i}
     end
 
+    # Call all plugins and allow for altering a value.
+    #
+    # The return value of each hook is passed into the next alter function, hence all implementations must always
+    # return a value. If the hook doesn't wish to modify data this call then it should return the original value.
+    #
+    # @param [Symbol] method The name of the method to call. This should be namespaced somehow. For example, a plugin
+    #                        called `usmu-s3` could use the method namespace `s3` and have a hook called `:s3_upload`
+    # @param [Object] value The value to modify.
+    # @param [Array]  context Optional extra parameters to provide.
+    # @return [Object] The modified value.
+    def alter(method, value, *context)
+      @log.debug("Invoking plugin alter API #{method}")
+      plugins.each do |p|
+        if p.respond_to? "#{method}_alter"
+          @log.debug("Sending message to #{p.class.name}")
+          value = p.public_send "#{method}_alter", value, *context
+        end
+      end
+      value
+    end
+
     private
 
     # Helper function to load and instantiate plugin classes
@@ -53,10 +75,7 @@ module Usmu
     # @param [String] klass The name of the class to load
     # @return [Object] A plugin object
     def plugin_get(klass)
-      object.const_get(klass).new
-    rescue NameError
-      # Ruby 1.9.3, dowp
-      klass.split('::').reduce(Object) {|memo, o| memo.const_get o }.new
+      Object.const_get(klass).new
     end
 
     # Helper function to load a plugin from a gem specification

data/lib/usmu/site_generator.rb

@@ -29,28 +29,18 @@ module Usmu
     # The only guarantee made for individual files is that they will conform to the interface defined by
     # Usmu::Template::StaticFile and thus be renderable, however most files will be one of the subclasses of that class.
     def renderables
-      @configuration.source_files.map do |filename|
-        metadata = @configuration.source_metadata.metadata(filename)
-        if Template::Layout.is_valid_file?('source', filename) && (!metadata['static'])
-          Template::Page.new(@configuration, filename, metadata)
-        else
-          Template::StaticFile.new(@configuration, filename, metadata)
+      @renderables ||= begin
+        rs = @configuration.source_files.map do |filename|
+          metadata = @configuration.source_metadata.metadata(filename)
+          if Template::Layout.is_valid_file?('source', filename) && (!metadata['static'])
+            Template::Page.new(@configuration, filename, metadata)
+          else
+            Template::StaticFile.new(@configuration, filename, metadata)
+          end
         end
-      end
-    end
-
-    # @!attribute [r] pages
-    # @return [Array<Usmu::Template::Page>]
-    #   a list of pages from the source folder. This is any file in the source folder which is not static.
-    def pages
-      renderables.select {|r| r.class <= Template::Layout }
-    end
 
-    # @!attribute [r] files
-    # @return [Array<Usmu::Template::StaticFile>]
-    #   a list of static files from the source folder.
-    def files
-      renderables - pages
+        Usmu.plugins.alter(:renderables, rs, self)
+      end
     end
 
     # Generate the website according to the configuration given.
@@ -95,7 +85,9 @@ module Usmu
       end
 
       File.write file, page.render
-      FileUtils.touch file, mtime: File.stat(page.input_path).mtime
+
+      mtime = page.input_path.nil? ? Time.now.to_i : File.stat(page.input_path).mtime
+      FileUtils.touch file, mtime: mtime
       nil
     end
   end

data/lib/usmu/template/generated_file.rb

@@ -0,0 +1,30 @@
+require 'usmu/template/static_file'
+
+module Usmu
+  module Template
+    class GeneratedFile < StaticFile
+      def initialize(configuration, name, metadata = {}, type = nil, content = nil)
+        super(configuration, name, metadata, type, content)
+      end
+
+      def render
+        unless @content
+          raise 'Render not implemented'
+        end
+        @content
+      end
+
+      def input_path
+        nil
+      end
+
+      def metadata
+        @metadata
+      end
+
+      def inspect
+        "\#<#{self.class}:#{'0x%08x' % __id__} #{@name} => #{output_filename}>"
+      end
+    end
+  end
+end

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/lib/usmu.rb

@@ -25,9 +25,6 @@ module Usmu
       ),
   )
 
-  # Globbing flags. Correct across 1.9.3 and 2.0+, enabling as many features as available
-  FILE_GLOB_FLAGS = defined?(File::FNM_EXTGLOB) ? File::FNM_EXTGLOB | File::FNM_PATHNAME : File::FNM_PATHNAME
-
   # Enable logging of all events to the console
   #
   # @return [void]

data/share/init-site/layouts/html.slim

@@ -2,7 +2,7 @@ doctype html
 html
   head
     meta http-equiv="Content-Type" content="text/html; charset=utf-8"
-    title #{site.title}
+    title #{site['title']}
 
   body
     | #{{content}}

data/spec/mock/usmu/mock_commander.rb

@@ -0,0 +1,31 @@
+
+module Usmu
+  class MockCommander
+    def initialize
+      @commands = {}
+    end
+
+    def get_command(name)
+      @commands[name]
+    end
+
+    def command(name, &block)
+      @current_command = name
+      @commands[name] = {}
+
+      block.yield(self)
+    end
+
+    def syntax=(value)
+      @commands[@current_command][:syntax] = value
+    end
+
+    def description=(value)
+      @commands[@current_command][:description] = value
+    end
+
+    def action(&block)
+      @commands[@current_command][:action] = block
+    end
+  end
+end

data/spec/plugin/core_spec.rb

@@ -0,0 +1,116 @@
+require 'usmu/plugin/core'
+require 'usmu/configuration'
+require 'usmu/mock_commander'
+require 'ostruct'
+require 'rack'
+require 'usmu/ui/rack_server'
+
+RSpec.describe Usmu::Plugin::Core do
+  let (:plugin) { described_class.new }
+  let (:configuration) { Usmu::Configuration.from_hash({}) }
+  let (:ui) { OpenStruct.new configuration: configuration }
+  let (:commander) { Usmu::MockCommander.new }
+  let (:options) { Commander::Command::Options.new }
+
+  context '#commands' do
+    it 'stores a the UI given to it' do
+      plugin.commands(ui, commander)
+
+      expect(plugin.send :ui).to eq(ui)
+      expect(@log_output.readline).to eq("  DEBUG  Usmu::Plugin::Core : Adding core console commands...\n")
+    end
+
+    it 'defines a "generate" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :generate
+      expect(command[:syntax]).to eq('usmu generate')
+      expect(command[:description]).to eq('Generates your website using the configuration specified.')
+      expect(command[:action]).to be_a(Proc)
+    end
+
+    it 'defines a "init" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :init
+      expect(command[:syntax]).to eq('usmu init [path]')
+      expect(command[:description]).to eq('Initialise a new website in the given path, or the current directory if none given.')
+      expect(command[:action]).to be_a(Proc)
+    end
+
+    it 'defines a "serve" command' do
+      plugin.commands(ui, commander)
+
+      command = commander.get_command :serve
+      expect(command[:syntax]).to eq('usmu serve')
+      expect(command[:description]).to eq('Serve files processed files directly. This won\'t update files on disk, but you will be able to view your website as rendered.')
+      expect(command[:action]).to be_a(Proc)
+    end
+  end
+
+  context '#command_generate' do
+    it 'raises an error when arguments are specified' do
+      expect { plugin.command_generate(['foo'], options) }.to raise_error('This command does not take arguments')
+    end
+
+    it 'raises an error when invalid options are specified' do
+      expect { plugin.command_generate([], []) }.to raise_error('Invalid options')
+    end
+
+    it 'should generate a site' do
+      expect(configuration.generator).to receive(:generate)
+
+      plugin.send :ui=, ui
+      plugin.command_generate [], options
+    end
+  end
+
+  context '#command_init' do
+    it 'should do something'
+  end
+
+  context '#command_serve' do
+    let (:empty_configuration) { Usmu::Configuration.from_hash({}) }
+    let (:configuration) {
+      Usmu::Configuration.from_hash(
+          {
+              'serve' => {
+                  'host' => '0.0.0.0',
+                  'port' => 8008,
+              }
+          }
+      )
+    }
+    let (:rs) { OpenStruct.new }
+
+    before do
+      allow(Usmu::Ui::RackServer).to receive(:new).with(empty_configuration).and_return(rs)
+      allow(Usmu::Ui::RackServer).to receive(:new).with(configuration).and_return(rs)
+    end
+
+    it 'raises an error when arguments are specified' do
+      expect { plugin.command_serve(['foo'], options) }.to raise_error('This command does not take arguments')
+    end
+
+    it 'raises an error when invalid options are specified' do
+      expect { plugin.command_serve([], []) }.to raise_error('Invalid options')
+    end
+
+    it 'should start a WEBrick Rack handler with a new RackServer UI' do
+      plugin.send :ui=, OpenStruct.new(configuration: empty_configuration)
+      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, host: 'localhost', port: 8080)
+      plugin.command_serve [], options
+      expect(@log_output.readline).to eq("   INFO  Usmu::Plugin::Core : Starting webserver...\n")
+    end
+
+    it 'should take hostname and ports from the configuration file' do
+      plugin.send :ui=, OpenStruct.new(configuration: configuration)
+      expect(Rack::Handler::WEBrick).to receive(:run).with(rs, host: '0.0.0.0', port: 8008)
+      plugin.command_serve [], options
+    end
+  end
+
+  context '#init_copy_file' do
+    it 'should do something'
+  end
+end

data/spec/usmu/configuration_spec.rb

@@ -264,15 +264,11 @@ RSpec.describe Usmu::Configuration do
       expect(configuration.send :excluded?, 'index.md').to eq(false)
     end
 
-    # FNM_EXTGLOB is supported from MRI 2.0 onwards. We also support the 1.9.3 ABI for JRuby and Rubinius sake. Only
-    # run this test if it's possible for it to pass.
-    if defined?(File::FNM_EXTGLOB)
-      it 'should honor {a,b}' do
-        configuration = Usmu::Configuration.from_hash({'exclude' => ['{a,b}.md']})
-        expect(configuration.send :excluded?, 'a.md').to eq(true)
-        expect(configuration.send :excluded?, 'b.md').to eq(true)
-        expect(configuration.send :excluded?, 'index.md').to eq(false)
-      end
+    it 'should honor {a,b}' do
+      configuration = Usmu::Configuration.from_hash({'exclude' => ['{a,b}.md']})
+      expect(configuration.send :excluded?, 'a.md').to eq(true)
+      expect(configuration.send :excluded?, 'b.md').to eq(true)
+      expect(configuration.send :excluded?, 'index.md').to eq(false)
     end
 
     it 'should honor \\ as an escape' do

data/spec/usmu/site_generator_spec.rb

@@ -59,33 +59,7 @@ RSpec.describe Usmu::SiteGenerator do
     end
 
     it 'should not list directories' do
-      expect(generator.files.select {|f| f.name == 'posts'}.length).to eq(0)
-    end
-  end
-
-  context '#pages' do
-    it 'should list pages' do
-      expect(generator).to receive(:renderables).and_return(
-                               [
-                                   instance_double('Usmu::Template::StaticFile', class: Usmu::Template::StaticFile, name: 'robots.txt'),
-                                   instance_double('Usmu::Template::Layout', class: Usmu::Template::Layout, name: 'layout.slim'),
-                                   instance_double('Usmu::Template::Page', class: Usmu::Template::Page, name: 'page.md'),
-                               ]
-                           )
-      expect(generator.pages.map {|p| p.name}.sort).to eq(%w{layout.slim page.md})
-    end
-  end
-
-  context '#files' do
-    it 'should list static files' do
-      expect(generator).to receive(:renderables).at_least(1).times.and_return(
-                               [
-                                   instance_double('Usmu::Template::StaticFile', class: Usmu::Template::StaticFile, name: 'robots.txt'),
-                                   instance_double('Usmu::Template::Layout', class: Usmu::Template::Layout, name: 'layout.slim'),
-                                   instance_double('Usmu::Template::Page', class: Usmu::Template::Page, name: 'page.md'),
-                               ]
-                           )
-      expect(generator.files.map {|f| f.name}.sort).to eq(%w{robots.txt})
+      expect(generator.renderables.select {|f| f.name == 'posts'}.length).to eq(0)
     end
   end
 

data/usmu.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test-site|spec)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.0')
 
   spec.add_dependency 'slim', '~> 3.0'
   spec.add_dependency 'tilt', '~> 2.0'
@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
 
   case ENV['BUILD_PLATFORM']
     when 'ruby'
-      spec.add_dependency 'redcarpet', '~> 3.2', '>= 3.2.1'
+      spec.add_dependency 'redcarpet', '~> 3.3'
       spec.add_development_dependency 'libnotify', '~> 0.9'
     when 'java'
       spec.platform = 'java'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -226,20 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: libnotify
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +282,7 @@ files:
 - lib/usmu/plugin/core.rb
 - lib/usmu/plugin/core_hooks.rb
 - lib/usmu/site_generator.rb
+- lib/usmu/template/generated_file.rb
 - lib/usmu/template/helpers.rb
 - lib/usmu/template/include.rb
 - lib/usmu/template/layout.rb
@@ -300,14 +295,16 @@ files:
 - share/init-site/.gitignore
 - share/init-site/Gemfile
 - share/init-site/layouts/html.slim
-- share/init-site/source/index.md
-- share/init-site/source/index.meta.yml
+- share/init-site/src/index.md
+- share/init-site/src/index.meta.yml
 - share/init-site/usmu.yml
 - spec/acceptance/full_site_build.feature
 - spec/acceptance/steps/full_site_build_steps.rb
+- spec/mock/usmu/mock_commander.rb
 - spec/mock/usmu/mock_metadata_configuration.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
+- spec/plugin/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
 - spec/usmu/configuration_spec.rb
@@ -368,7 +365,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -376,16 +373,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A static site generator with a web-based frontend for editing.
 test_files:
 - spec/acceptance/full_site_build.feature
 - spec/acceptance/steps/full_site_build_steps.rb
+- spec/mock/usmu/mock_commander.rb
 - spec/mock/usmu/mock_metadata_configuration.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
+- spec/plugin/core_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
 - spec/usmu/configuration_spec.rb