usmu 0.1.0 → 0.2.0

data/test/spec/plugin_spec.rb

@@ -0,0 +1,49 @@
+require 'usmu/plugin'
+require 'ostruct'
+
+RSpec.describe Usmu::Plugin do
+  before(:each) do
+    # noinspection RubyStringKeysInHashInspection
+    allow(Gem::Specification).to receive(:find_all).and_return([OpenStruct.new({'name' => 'usmu-mock_plugin'})])
+  end
+
+  let(:plugins) { Usmu::Plugin.new }
+
+  it 'should load the core plugin' do
+    plugins.load_plugins
+    expect(plugins.plugins.select {|p| p.class.name == 'Usmu::Plugin::Core'}.length).to eq(1)
+  end
+
+  it 'should load plugins from gems' do
+    plugins.load_plugins
+    expect(plugins.plugins.select {|p| p.class.name == 'Usmu::MockPlugin'}.length).to eq(1)
+  end
+
+  it 'should avoid loading plugins more than once' do
+    # noinspection RubyStringKeysInHashInspection
+    allow(Gem::Specification).to receive(:find_all).and_return([
+                                                                   OpenStruct.new({'name' => 'usmu-mock_plugin'}),
+                                                                   OpenStruct.new({'name' => 'usmu-mock_plugin'}),
+                                                               ])
+    plugins.load_plugins
+    expect(plugins.plugins.select {|p| p.class.name == 'Usmu::MockPlugin'}.length).to eq(1)
+  end
+
+  it 'should call methods by name when using #invoke' do
+    plugins.load_plugins
+    plugins.plugins.select {|p| p.class.name == 'Usmu::MockPlugin' }.each do |p|
+      allow(p).to receive(:test).with('Hello world!')
+    end
+
+    plugins.invoke :test, 'Hello world!'
+  end
+
+  it 'should aggregate information from plugins when using #invoke' do
+    plugins.load_plugins
+    plugins.plugins.select {|p| p.class.name == 'Usmu::MockPlugin' }.each do |p|
+      allow(p).to receive(:test).and_return(['Goodbye world!'])
+    end
+
+    expect(plugins.invoke :test).to eq([['Goodbye world!']])
+  end
+end

data/test/spec/site_generator_spec.rb

@@ -1,4 +1,3 @@
-require 'rspec'
 require 'usmu/site_generator'
 
 RSpec.describe Usmu::SiteGenerator do
@@ -27,6 +26,5 @@ RSpec.describe Usmu::SiteGenerator do
 
   it 'should be able to generate a site' do
     expect(generator.respond_to? :generate).to eq(true)
-    # Further testing is exercised at the system integration level in the cukes.
   end
 end

data/test/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.command_name 'RSpec'
+
+require 'logging'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this
@@ -54,7 +59,7 @@ RSpec.configure do |config|
 
   # This setting enables warnings. It's recommended, but in some cases may
   # be too noisy due to issues in dependencies.
-  config.warnings = true
+  config.warnings = false
 
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
@@ -83,3 +88,9 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 end
+
+# Load turnip step definitions
+Dir['test/spec/**/*_steps.rb'].each {|f| require f[10..f.length] }
+
+# Allow loading of mocks
+$LOAD_PATH.unshift(File.realpath('./test/spec/mock'))

data/test/spec/static_file_spec.rb

@@ -1,4 +1,3 @@
-require 'rspec'
 require 'support/shared_layout'
 require 'usmu/static_file'
 
@@ -13,6 +12,13 @@ RSpec.describe Usmu::StaticFile do
     expect(rendered).to eq(File.read('test/expected-site/robots.txt'))
   end
 
+  it 'has an input path' do
+    configuration = Usmu::Configuration.from_hash({})
+    page = Usmu::StaticFile.new(configuration, 'robots.txt', 'txt', '', {})
+    expect(page.respond_to? :input_path).to eq(true)
+    expect(page.input_path).to eq('src/robots.txt')
+  end
+
   it 'has an output filename that matches input' do
     file = Usmu::StaticFile.new(configuration, 'robots.txt')
     expect(file.output_filename).to eq('robots.txt')

data/test/spec/support/shared_layout.rb

@@ -20,7 +20,7 @@ RSpec.shared_examples 'a layout' do
   include_examples 'a renderable file'
 
   let(:title_configuration) { Usmu::Configuration.from_hash({'default meta' => {'title' => 'title'}}) }
-  let(:meta_with_title) { {'title' => 'title'} }
+  let(:meta_with_title) { {'title' => 'meta title'} }
   let(:content) { "title \#{title}\nbody\n  #container\n    | \#{{content}}" }
 
   it 'and has a type' do
@@ -35,6 +35,72 @@ RSpec.shared_examples 'a layout' do
 <title>title</title><body><div id="container">test</div></body>
     EOF
   end
+
+  context 'and when it\'s type' do
+    it 'is invalid' do
+      expect {described_class.new(empty_configuration, 'body.foo', nil, '', {})}.to raise_error()
+    end
+
+    it 'is erb then it\'s output type should be taken from it\'s filename' do
+      layout = described_class.new(empty_configuration, 'body.txt.erb', 'erb', '', {})
+      expect(layout.output_filename).to eq('body.txt')
+    end
+
+    it 'is rhtml then it\'s output type should be taken from it\'s filename' do
+      layout = described_class.new(empty_configuration, 'body.txt.rhtml', 'rhtml', '', {})
+      expect(layout.output_filename).to eq('body.txt')
+    end
+
+    it 'is erubis then it\'s output type should be taken from it\'s filename' do
+      layout = described_class.new(empty_configuration, 'body.txt.erubis', 'erubis', '', {})
+      expect(layout.output_filename).to eq('body.txt')
+    end
+
+    it 'is markdown then it\'s output type should be html' do
+      layout = described_class.new(empty_configuration, 'body.markdown', 'markdown', '', {})
+      expect(layout.output_filename).to eq('body.html')
+    end
+
+    it 'is mkd then it\'s output type should be html' do
+      layout = described_class.new(empty_configuration, 'body.mkd', 'mkd', '', {})
+      expect(layout.output_filename).to eq('body.html')
+    end
+
+    it 'is md then it\'s output type should be html' do
+      layout = described_class.new(empty_configuration, 'body.md', 'md', '', {})
+      expect(layout.output_filename).to eq('body.html')
+    end
+
+    it 'is coffee then it\'s output type should be js' do
+      layout = described_class.new(empty_configuration, 'body.coffee', 'coffee', '', {})
+      expect(layout.output_filename).to eq('body.js')
+    end
+
+    it 'is less then it\'s output type should be css' do
+      layout = described_class.new(empty_configuration, 'body.less', 'less', '', {})
+      expect(layout.output_filename).to eq('body.css')
+    end
+
+    it 'is liquid then it\'s output type should be taken from it\'s filename' do
+      layout = described_class.new(empty_configuration, 'body.txt.liquid', 'liquid', '', {})
+      expect(layout.output_filename).to eq('body.txt')
+    end
+
+    it 'is sass then it\'s output type should be scss' do
+      layout = described_class.new(empty_configuration, 'body.sass', 'sass', '', {})
+      expect(layout.output_filename).to eq('body.css')
+    end
+
+    it 'is scss then it\'s output type should be css' do
+      layout = described_class.new(empty_configuration, 'body.scss', 'scss', '', {})
+      expect(layout.output_filename).to eq('body.css')
+    end
+
+    it 'is slim then it\'s output type should be html' do
+      layout = described_class.new(empty_configuration, 'body.slim', 'slim', '', {})
+      expect(layout.output_filename).to eq('body.html')
+    end
+  end
 end
 
 RSpec.shared_examples 'a layout with metadata' do
@@ -61,10 +127,10 @@ RSpec.shared_examples 'a layout with metadata' do
       EOF
     end
 
-    it 'variables over default metadata' do
-      layout = described_class.new(empty_configuration, 'body.slim', 'slim', content, {})
-      expect(layout.render({'content' => 'test', 'title' => 'overridden title'})).to eq(<<-EOF)
-<title>overridden title</title><body><div id="container">test</div></body>
+    it 'metadata over default metadata' do
+      layout = described_class.new(title_configuration, 'body.slim', 'slim', content, meta_with_title)
+      expect(layout.render({'content' => 'test'})).to eq(<<-EOF)
+<title>meta title</title><body><div id="container">test</div></body>
       EOF
     end
   end
@@ -89,6 +155,24 @@ RSpec.shared_examples 'an embeddable layout' do
     EOF
   end
 
+  it 'and respects templates from default metadata' do
+    parent = described_class.new(empty_configuration, 'html.slim', 'slim', wrapper, {})
+    default_layout_configuration = Usmu::Configuration.from_hash({'default meta' => {'layout' => parent}})
+    layout = described_class.new(default_layout_configuration, 'body.slim', 'slim', content, {'title' => 'test title'})
+    expect(layout.render({'content' => 'test'})).to eq(<<-EOF)
+<html><title>test title</title><body><div id="container">test</div></body>
+</html>
+    EOF
+  end
+
+  it 'and uses a template of "none" to explicitly disable the parent template' do
+    default_layout_configuration = Usmu::Configuration.from_hash({'default meta' => {'layout' => 'html'}})
+    layout = described_class.new(default_layout_configuration, 'body.slim', 'slim', content, {'layout' => 'none', 'title' => 'test title'})
+    expect(layout.render({'content' => 'test'})).to eq(<<-EOF)
+<title>test title</title><body><div id="container">test</div></body>
+    EOF
+  end
+
   context 'and prioritises' do
     it 'metadata over parent metadata' do
       parent = described_class.new(empty_configuration, 'html.slim', 'slim', wrapper, {'title' => 'title'})

data/test/spec/ui/console_spec.rb

@@ -0,0 +1,20 @@
+require 'usmu/ui/console'
+
+Usmu.disable_stdout_logging
+
+RSpec.describe Usmu::Ui::Console do
+  it 'supports --quiet' do
+    expect(Usmu).to receive(:quiet_logging)
+    Usmu::Ui::Console.new(%w{--quiet --config test/site/usmu.yml})
+  end
+
+  it 'supports --log' do
+    expect(Usmu).to receive(:add_file_logger).with('test.log')
+    Usmu::Ui::Console.new(%w{--log test.log --config test/site/usmu.yml})
+  end
+
+  it 'supports --verbose' do
+    expect(Usmu).to receive(:verbose_logging)
+    Usmu::Ui::Console.new(%w{--verbose --config test/site/usmu.yml})
+  end
+end

data/usmu-jruby.gemspec

@@ -22,13 +22,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tilt', '~> 2.0'
   spec.add_dependency 'kramdown', '~> 1.5'
   spec.add_dependency 'deep_merge', '~> 1.0'
-  spec.add_dependency 'trollop', '~> 2.0'
-  spec.add_dependency 'highline', '~> 1.6'
+  spec.add_dependency 'commander', '~> 4.2'
+  spec.add_dependency 'logging', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'cucumber', '~> 1.3'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'cane', '~> 2.6'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'guard', '~> 2.8'
+  spec.add_development_dependency 'guard-rspec', '~> 4.3'
+  spec.add_development_dependency 'turnip', '~> 1.2'
 end

data/usmu.gemspec

@@ -19,17 +19,18 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'slim', '~> 2.1'
   spec.add_dependency 'tilt', '~> 2.0'
-  # For now yard requires redcarpet < 3.2
-  # See: https://github.com/lsegal/yard/issues/812
-  spec.add_dependency 'redcarpet', '~> 3.1', '< 3.2'
+  spec.add_dependency 'redcarpet', '~> 3.2', '>= 3.2.1'
   spec.add_dependency 'deep_merge', '~> 1.0'
-  spec.add_dependency 'trollop', '~> 2.0'
-  spec.add_dependency 'highline', '~> 1.6'
+  spec.add_dependency 'commander', '~> 4.2'
+  spec.add_dependency 'logging', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'cucumber', '~> 1.3'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'cane', '~> 2.6'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'guard', '~> 2.8'
+  spec.add_development_dependency 'guard-rspec', '~> 4.3'
+  spec.add_development_dependency 'turnip', '~> 1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -43,21 +43,21 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -73,33 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,47 +143,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: turnip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: 
 email:
 - matt.scharley@gmail.com
@@ -195,10 +237,13 @@ files:
 - ".cane"
 - ".gitignore"
 - ".rspec"
+- ".simplecov"
 - ".travis.yml"
 - ".yardopts"
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile-jruby
+- Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
@@ -208,6 +253,8 @@ files:
 - lib/usmu/configuration.rb
 - lib/usmu/layout.rb
 - lib/usmu/page.rb
+- lib/usmu/plugin.rb
+- lib/usmu/plugin/core.rb
 - lib/usmu/site_generator.rb
 - lib/usmu/static_file.rb
 - lib/usmu/ui.rb
@@ -217,8 +264,6 @@ files:
 - test/expected-site/embedded.html
 - test/expected-site/index.html
 - test/expected-site/robots.txt
-- test/features/generator.feature
-- test/features/step_definitions/step_general.rb
 - test/site/content/default.md
 - test/site/content/embedded.md
 - test/site/content/embedded.meta.yml
@@ -230,13 +275,19 @@ files:
 - test/site/layouts/html.meta.yml
 - test/site/layouts/html.slim
 - test/site/usmu.yml
+- test/spec/acceptance/full_site_build.feature
+- test/spec/acceptance/steps/full_site_build_steps.rb
 - test/spec/configuration_spec.rb
 - test/spec/layout_spec.rb
+- test/spec/mock/usmu/mock_plugin.rb
 - test/spec/page_spec.rb
+- test/spec/plugin/core_spec.rb
+- test/spec/plugin_spec.rb
 - test/spec/site_generator_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/static_file_spec.rb
 - test/spec/support/shared_layout.rb
+- test/spec/ui/console_spec.rb
 - usmu-jruby.gemspec
 - usmu.gemspec
 homepage: https://github.com/usmu/usmu
@@ -268,8 +319,6 @@ test_files:
 - test/expected-site/embedded.html
 - test/expected-site/index.html
 - test/expected-site/robots.txt
-- test/features/generator.feature
-- test/features/step_definitions/step_general.rb
 - test/site/content/default.md
 - test/site/content/embedded.md
 - test/site/content/embedded.meta.yml
@@ -281,11 +330,17 @@ test_files:
 - test/site/layouts/html.meta.yml
 - test/site/layouts/html.slim
 - test/site/usmu.yml
+- test/spec/acceptance/full_site_build.feature
+- test/spec/acceptance/steps/full_site_build_steps.rb
 - test/spec/configuration_spec.rb
 - test/spec/layout_spec.rb
+- test/spec/mock/usmu/mock_plugin.rb
 - test/spec/page_spec.rb
+- test/spec/plugin/core_spec.rb
+- test/spec/plugin_spec.rb
 - test/spec/site_generator_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/static_file_spec.rb
 - test/spec/support/shared_layout.rb
+- test/spec/ui/console_spec.rb
 has_rdoc: