usmu 0.3.1 → 0.3.2

data/{test/spec → spec}/template/layout_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Usmu::Template::Layout do
   it 'should not allow circular references with #find_layout' do
     # This will also get tested during the acceptance tests, though we test here explicitly to help aid narrow where
     # the bug actually is.
-    configuration = Usmu::Configuration.from_file('test/site/usmu.yml')
+    configuration = Usmu::Configuration.from_file('test-site/usmu.yml')
     layout = Usmu::Template::Layout.new(configuration, 'html.slim')
   end
 

data/{test/spec → spec}/template/static_file_spec.rb

@@ -4,12 +4,12 @@ require 'usmu/template/static_file'
 RSpec.describe Usmu::Template::StaticFile do
   it_behaves_like 'a renderable file'
 
-  let(:configuration) { Usmu::Configuration.from_file('test/site/usmu.yml') }
+  let(:configuration) { Usmu::Configuration.from_file('test-site/usmu.yml') }
 
   it 'uses the \'source\' folder' do
     file = Usmu::Template::StaticFile.new(configuration, 'robots.txt')
     rendered = file.render
-    expect(rendered).to eq(File.read('test/expected-site/robots.txt'))
+    expect(rendered).to eq(File.read('test-site/expected-site/robots.txt'))
   end
 
   it 'has an input path' do

data/{test/spec → spec}/ui/console_spec.rb

@@ -5,21 +5,21 @@ 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})
+    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})
+    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})
+    Usmu::Ui::Console.new(%w{--verbose --config test-site/usmu.yml})
   end
 
   it '#load_configuration returns a configuration' do
-    config = Usmu::Ui::Console.new(%w{--config test/site/usmu.yml}).load_configuration('test/site/usmu.yml')
+    config = Usmu::Ui::Console.new(%w{--config test-site/usmu.yml}).load_configuration('test-site/usmu.yml')
     expect(config.class.name).to eq('Usmu::Configuration')
   end
 end

data/usmu-jruby.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
   spec.add_development_dependency 'turnip', '~> 1.2'
   spec.add_development_dependency 'sass', '~> 3.4'
+  spec.add_development_dependency 'timeout', '~> 0.0'
 end

data/usmu.gemspec

@@ -33,11 +33,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.1'
   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 'libnotify', '~> 0.9'
   spec.add_development_dependency 'turnip', '~> 1.2'
   spec.add_development_dependency 'sass', '~> 3.4'
+  spec.add_development_dependency 'timeout', '~> 0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -156,34 +156,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +226,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: |2
       Usmu is a static site generator built in Ruby that leverages the Tilt API to support many different template
       engines. It supports local generation but is designed to be used with the web-based editor.
@@ -264,10 +250,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -281,6 +265,9 @@ files:
 - bin/usmu
 - lib/usmu.rb
 - lib/usmu/configuration.rb
+- lib/usmu/deployment.rb
+- lib/usmu/deployment/directory_diff.rb
+- lib/usmu/deployment/remote_file_interface.rb
 - lib/usmu/plugin.rb
 - lib/usmu/plugin/core.rb
 - lib/usmu/plugin/core_hooks.rb
@@ -298,42 +285,44 @@ files:
 - share/init-site/layouts/html.slim
 - share/init-site/source/index.md
 - share/init-site/usmu.yml
-- test/expected-site/.dotfiletest.txt
-- test/expected-site/css/app.css
-- test/expected-site/default.html
-- test/expected-site/embedded.html
-- test/expected-site/index.html
-- test/expected-site/posts/test-post.html
-- test/expected-site/robots.txt
-- test/site/content/.dotfiletest.txt
-- test/site/content/css/_partial.scss
-- test/site/content/css/app.scss
-- test/site/content/default.md
-- test/site/content/embedded.md
-- test/site/content/embedded.meta.yml
-- test/site/content/index.md
-- test/site/content/index.meta.yml
-- test/site/content/posts/test-post.md
-- test/site/content/robots.txt
-- test/site/includes/footer.meta.yml
-- test/site/includes/footer.slim
-- test/site/layouts/embedded.meta.yml
-- test/site/layouts/embedded.slim
-- 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/mock/usmu/mock_plugin.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/support/shared_layout.rb
-- test/spec/template/layout_spec.rb
-- test/spec/template/page_spec.rb
-- test/spec/template/static_file_spec.rb
-- test/spec/ui/console_spec.rb
+- spec/acceptance/full_site_build.feature
+- spec/acceptance/steps/full_site_build_steps.rb
+- spec/configuration_spec.rb
+- spec/deployment/directory_diff_spec.rb
+- spec/mock/usmu/mock_plugin.rb
+- spec/mock/usmu/mock_remote_files.rb
+- spec/plugin/core_spec.rb
+- spec/plugin_spec.rb
+- spec/site_generator_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_layout.rb
+- spec/template/layout_spec.rb
+- spec/template/page_spec.rb
+- spec/template/static_file_spec.rb
+- spec/ui/console_spec.rb
+- test-site/content/.dotfiletest.txt
+- test-site/content/css/_partial.scss
+- test-site/content/css/app.scss
+- test-site/content/default.md
+- test-site/content/embedded.md
+- test-site/content/embedded.meta.yml
+- test-site/content/index.md
+- test-site/content/index.meta.yml
+- test-site/content/posts/test-post.md
+- test-site/content/robots.txt
+- test-site/expected-site/.dotfiletest.txt
+- test-site/expected-site/css/app.css
+- test-site/expected-site/default.html
+- test-site/expected-site/embedded.html
+- test-site/expected-site/index.html
+- test-site/expected-site/posts/test-post.html
+- test-site/expected-site/robots.txt
+- test-site/includes/footer.meta.yml
+- test-site/includes/footer.slim
+- test-site/layouts/embedded.meta.yml
+- test-site/layouts/embedded.slim
+- test-site/layouts/html.slim
+- test-site/usmu.yml
 - usmu-jruby.gemspec
 - usmu.gemspec
 homepage: https://github.com/usmu/usmu
@@ -356,45 +345,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A static site generator with a web-based frontend for editing.
 test_files:
-- test/expected-site/.dotfiletest.txt
-- test/expected-site/css/app.css
-- test/expected-site/default.html
-- test/expected-site/embedded.html
-- test/expected-site/index.html
-- test/expected-site/posts/test-post.html
-- test/expected-site/robots.txt
-- test/site/content/.dotfiletest.txt
-- test/site/content/css/_partial.scss
-- test/site/content/css/app.scss
-- test/site/content/default.md
-- test/site/content/embedded.md
-- test/site/content/embedded.meta.yml
-- test/site/content/index.md
-- test/site/content/index.meta.yml
-- test/site/content/posts/test-post.md
-- test/site/content/robots.txt
-- test/site/includes/footer.meta.yml
-- test/site/includes/footer.slim
-- test/site/layouts/embedded.meta.yml
-- test/site/layouts/embedded.slim
-- 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/mock/usmu/mock_plugin.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/support/shared_layout.rb
-- test/spec/template/layout_spec.rb
-- test/spec/template/page_spec.rb
-- test/spec/template/static_file_spec.rb
-- test/spec/ui/console_spec.rb
+- spec/acceptance/full_site_build.feature
+- spec/acceptance/steps/full_site_build_steps.rb
+- spec/configuration_spec.rb
+- spec/deployment/directory_diff_spec.rb
+- spec/mock/usmu/mock_plugin.rb
+- spec/mock/usmu/mock_remote_files.rb
+- spec/plugin/core_spec.rb
+- spec/plugin_spec.rb
+- spec/site_generator_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_layout.rb
+- spec/template/layout_spec.rb
+- spec/template/page_spec.rb
+- spec/template/static_file_spec.rb
+- spec/ui/console_spec.rb
 has_rdoc: 

data/.cane

@@ -1,4 +0,0 @@
---color
---max-violations 0
---style-measure 120
---abc-exclude Usmu::Layout#initialize

data/.simplecov

@@ -1,4 +0,0 @@
-SimpleCov.start do
-  coverage_dir 'test/coverage'
-  add_filter 'test/'
-end

data/test/spec/configuration_spec.rb

@@ -1,176 +0,0 @@
-require 'usmu/configuration'
-
-RSpec.describe Usmu::Configuration do
-  context 'should prepend configuration folder' do
-    before do
-      hash = {
-          'source' => 'source',
-          'destination' => 'destination',
-          'layouts' => 'templates',
-          'includes' => 'includes',
-      }
-      @configuration = Usmu::Configuration.from_hash(hash, 'test/usmu.yaml')
-    end
-
-    it 'to source' do
-      expect(@configuration.source_path).to eq('test/source')
-    end
-
-    it 'to destination' do
-      expect(@configuration.destination_path).to eq('test/destination')
-    end
-
-    it 'to layouts' do
-      expect(@configuration.layouts_path).to eq('test/templates')
-    end
-
-    it 'to includes' do
-      expect(@configuration.includes_path).to eq('test/includes')
-    end
-  end
-
-  context 'should have a default path' do
-    before do
-      hash = {}
-      @configuration = Usmu::Configuration.from_hash(hash)
-    end
-
-    it 'for source' do
-      expect(@configuration.source_path).to eq('src')
-    end
-
-    it 'for destination' do
-      expect(@configuration.destination_path).to eq('site')
-    end
-
-    it 'for layouts' do
-      expect(@configuration.layouts_path).to eq('layouts')
-    end
-
-    it 'for includes' do
-      expect(@configuration.includes_path).to eq('includes')
-    end
-  end
-
-  it 'should have a list of source files' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test.md))
-    expect(@configuration.source_files).to eq(%w(index.md test.md))
-  end
-
-  it 'should ignore metadata files in the source folder' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/index.meta.yml src/test.md))
-    expect(@configuration.source_files).to eq(%w(index.md test.md))
-  end
-
-  it 'should have a list of layouts files' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('layouts/**/{*,.??*}').and_return(%w(layouts/html.slim layouts/page.slim))
-    expect(@configuration.layouts_files).to eq(%w(html.slim page.slim))
-  end
-
-  it 'should ignore metadata files in the layouts folder' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('layouts/**/{*,.??*}').and_return(%w(layouts/html.slim layouts/html.meta.yml layouts/page.slim))
-    expect(@configuration.layouts_files).to eq(%w(html.slim page.slim))
-  end
-
-  it 'should have a list of includes files' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('includes/**/{*,.??*}').and_return(%w(includes/footer.slim))
-    expect(@configuration.includes_files).to eq(%w(footer.slim))
-  end
-
-  it 'should ignore metadata files in the includes folder' do
-    @configuration = Usmu::Configuration.from_hash({})
-    allow(Dir).to receive(:'[]').with('includes/**/{*,.??*}').and_return(%w(includes/footer.slim includes/footer.meta.yml))
-    expect(@configuration.includes_files).to eq(%w(footer.slim))
-  end
-
-  it 'should remember arbitrary configuration' do
-    configuration = Usmu::Configuration.from_hash({:test => 'foo'})
-    expect(configuration[:test]).to eq('foo')
-  end
-
-  context 'should exclude files from source' do
-    it 'as specified' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['foo.md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/foo.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    end
-
-    it 'in ignored folders if trailing "/" is used' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['test/']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test/foo/test.md src/test/foo.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    end
-
-    it 'and honor *' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['*/foo.md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test/foo/foo.md src/test/foo.md))
-      expect(@configuration.source_files).to eq(%w(index.md test/foo/foo.md))
-    end
-
-    it 'and * ignores folders without a trailing /' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['*']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test/foo.md src/test.md))
-      expect(@configuration.source_files).to eq(%w(test/foo.md))
-    end
-
-    it 'and honor **' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['**/foo.md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test/foo/foo.md src/test/foo.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    end
-
-    it 'and honor []' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['[ab].md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/a.md src/b.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    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 'and honor {a,b}' do
-        @configuration = Usmu::Configuration.from_hash({'exclude' => ['{a,b}.md']})
-        allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/a.md src/b.md))
-        expect(@configuration.source_files).to eq(%w(index.md))
-      end
-    end
-
-    it 'and honor \\ as an escape' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['\*.md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/*.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    end
-
-    it 'and honor ?' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['?.md']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/a.md src/b.md))
-      expect(@configuration.source_files).to eq(%w(index.md))
-    end
-
-    it 'and ignore files inside folders specified via globs with trailing "/"' do
-      @configuration = Usmu::Configuration.from_hash({'exclude' => ['test/*/']})
-      allow(Dir).to receive(:'[]').with('src/**/{*,.??*}').and_return(%w(src/index.md src/test/foo/foo.md src/test/foo.md))
-      expect(@configuration.source_files).to eq(%w(index.md test/foo.md))
-    end
-  end
-
-  it 'should allow indexing the configuration file' do
-    configuration = Usmu::Configuration.from_hash({test: 'foo'})
-    expect(configuration[:test]).to eq('foo')
-  end
-
-  it 'should allow indexing the configuration file with a default value' do
-    configuration = Usmu::Configuration.from_hash({test: 'foo'})
-    expect(configuration[:bar, default: 'baz']).to eq('baz')
-  end
-
-  it 'should allow indexing the configuration file using a path of indices' do
-    configuration = Usmu::Configuration.from_hash({test: {bar: 'foo'}})
-    expect(configuration[:test, :bar]).to eq('foo')
-  end
-end