usmu 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c88ec6ba5b8a271859391560db4a5e8cc2291a
-  data.tar.gz: ed8cb596f45df692af2af0918a9922d40207cdfd
+  metadata.gz: 7b8b70c84c30cdcdd1b5e3bd4aaccf9393c1a815
+  data.tar.gz: 81de219aa3ac8c671606ebfe9b11d7e16707929f
 SHA512:
-  metadata.gz: ee74fbc44b431509c347ad9701c4d70e44ea7324409cc738ef29b69159f46ca3f2c762275c596c201c59cc1d48c5b6193d3f73ac9520e1ec3eaeff079993bc97
-  data.tar.gz: 70b0723a7c21c742be92f1994255282f7ac873e0902a7b0caaca7143d86edc6dc0fc6e2f0809e4e05a52191d7b98e37bfecf71577b928618a1f18144a8dd79de
+  metadata.gz: a6d9e4559b7ce3691e3b9e3d8e58b600e89e48c2ca746b43a71ced2096f94206e0938a9722b9f65121afdb88021b72be73c2258fa1814f1df68ae716b19cf2bd
+  data.tar.gz: 930086e119f6887041a56d4d05b3438be05f7ea341be22dd38bd512d97e2c357124f37d3ae506113ad51274dc1dbf1056323a136b82d54406f0889d6d8ed5ae6

data/.rspec

@@ -4,3 +4,4 @@
 --require spec_helper
 --format documentation
 --no-profile
+-r rspec_junit_formatter

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0@usmu

data/README.md

@@ -1,6 +1,6 @@
 # usmu
 
-[![Build Status](https://travis-ci.org/usmu/usmu.svg?branch=master)](https://travis-ci.org/usmu/usmu)
+[![Circle CI](https://circleci.com/gh/usmu/usmu/tree/master.svg?style=svg)](https://circleci.com/gh/usmu/usmu/tree/master)
 [![Dependency Status](https://gemnasium.com/usmu/usmu.svg)](https://gemnasium.com/usmu/usmu)
 [![Code Climate](https://codeclimate.com/github/usmu/usmu/badges/gpa.svg)](https://codeclimate.com/github/usmu/usmu)
 
@@ -44,7 +44,7 @@ As a baseline `usmu` will pull in Slim for layouts and Redcarpet for content wri
 Tilt API to render all layouts and content, therefore you should be able to use anything supported by Tilt including
 Sass, Less, Textile and [many others][tilt-support], you just need to ensure you have the correct gems installed.
 
-If you want to further [configure the way your template's are processed][template-options] then you can specify 
+If you want to further [configure the way your template's are processed][template-options] then you can specify
 configurations for each template engine. Just add it to your `usmu.yml`:
 
 ```yaml

data/circle.yml

@@ -0,0 +1,7 @@
+machine:
+  ruby:
+    version: 2.3.0
+
+test:
+  override:
+    - bundle exec rspec --format RspecJunitFormatter -o $CIRCLE_TEST_REPORTS/rspec/junit.xml

data/lib/usmu/template/layout.rb

@@ -187,7 +187,19 @@ module Usmu
       #
       # This is used to determine which settings to use from the configuration file.
       def provider_name
-        Tilt.default_mapping.lazy_map[@type].select {|x| x[0] == template_class.name }.first[1].split('/').last
+        provider = Tilt.default_mapping.lazy_map[@type].select {|x| x[0] == template_class.name }.first
+        if provider
+          # Use the require path to choose out a name.
+          provider[1].split('/').last
+        else
+          # Approximate using class name if we can't track down a require path.
+          provider = template_class.name.split('::').last
+          if provider.end_with? 'Template'
+            provider[0..-9].downcase
+          else
+            provider.downcase
+          end
+        end
       end
 
       # @!attribute [r] content_path

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 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('>= 2.0.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
 
   spec.add_dependency 'slim', '~> 3.0'
   spec.add_dependency 'tilt', '~> 2.0'
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   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 'rspec_junit_formatter', '~> 0.2'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'guard', '~> 2.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +274,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -270,6 +284,7 @@ files:
 - README.md
 - Rakefile
 - bin/usmu
+- circle.yml
 - lib/usmu.rb
 - lib/usmu/collections.rb
 - lib/usmu/configuration.rb
@@ -364,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -372,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A static site generator with a web-based frontend for editing.

data/.travis.yml

@@ -1,36 +0,0 @@
-sudo: required
-dist: trusty
-
-language: ruby
-before_install:
-# This was an attempt to get rbx working under trusty. Seems there's some sort of conflict with libssl going on.
-#- sudo apt-get update && sudo apt-get install openssl libssl1.0.0 --yes
-#- sudo apt-get --purge remove libssl1.0.0 --yes
-#- sudo apt-get install libssl1.0.0 --yes
-- gem install bundler
-install: bundle install --jobs 3 --retry 3 --without mutant --path vendor/bundle
-script: bundle exec rake ci
-rvm:
-  - 2.3.0
-  - 2.2.4
-  - 2.1.8
-  - 2.0.0
-  - ruby-head
-  - rbx
-matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS='--2.0'
-    - rvm: jruby-head
-      env: JRUBY_OPTS='--2.0'
-  allow_failures:
-    - rvm: jruby
-    - rvm: jruby-head
-    - rvm: rbx
-addons:
-  code_climate:
-    repo_token: 5ac0735331c1749a461eae94f89cd2011cc001979f9941d7241f97caeff7bde1
-
-cache:
-  directories:
-  - vendor