usmu 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17b2f0a54894311de49ba082286ef8b42abdddb
-  data.tar.gz: b8b72e07ca7986addb70bf255ec6a18c15e6471c
+  metadata.gz: 1fd3da296c75ec27090a515a0d2c1cba18a33a40
+  data.tar.gz: ef74e9b5e859c7ccd183c59f1a241e406fd8e590
 SHA512:
-  metadata.gz: 5783809764b9fee5b97a5879592f18b3766e50c82c9d4cfb1aadeb84e437c2b2bc079d1caf285e3af161209598c76685cd8ac29ee8adc3e2804351810ad6095c
-  data.tar.gz: f1d90b1aec2431e0d7c788ce09385179624c7a09121bdcbef5ed66fad5ce78276e2a0cde4b764cb610c2d7c366d6ec66ca169d69a570e60a7d41392babe9e256
+  metadata.gz: 4797dce796a431c89bf24361b0aad782d28e1d011340a0f7719745cbfabc66c28b37799f79907b080cb6efbfb6f55eab6d575902debeb43674316ff680c23685
+  data.tar.gz: 433db4d6a99491e0c66a96f4833757da16c560fd6a0e1a41ad6e6f1c93af624e2c9dbe043c2b0b623e84bb3eb3f0acdb1bc6595c5db22c9260caba6a211b4141

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Usmu Change Log
 
+## 1.2.2
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Implement Pygments support for redcarpet (5dd9140a4d9df9e9014774d74e71610a98e16c54)
+
 ## 1.2.1
 
 Matthew Scharley <matt.scharley@gmail.com>

data/Rakefile

@@ -57,19 +57,17 @@ end
 namespace :gem do
   desc 'Build gems'
   task :build => [:clean] do
-    if ENV['BUNDLE_GEMFILE']
-      STDERR.puts 'This command will fail if run via bundler. If you are using RVM, please try running the following command:'
-      STDERR.puts "  NOEXEC_DISABLE=1 #{File.basename($0)} #{ARGV.join(' ')}"
-      exit 1
-    end
-
-    mkdir 'pkg' unless File.exist? 'pkg'
-    platforms.each do |p|
-      ENV['BUILD_PLATFORM'] = p
-      sh *%w{gem build usmu.gemspec}
-    end
-    Dir['*.gem'].each do |gem|
-      mv gem, "pkg/#{gem}"
+    require 'bundler'
+
+    Bundler.with_clean_env do
+      mkdir 'pkg' unless File.exist? 'pkg'
+      platforms.each do |p|
+        ENV['BUILD_PLATFORM'] = p
+        sh *%w{gem build usmu.gemspec}
+      end
+      Dir['*.gem'].each do |gem|
+        mv gem, "pkg/#{gem}"
+      end
     end
   end
 

data/lib/usmu/template/layout.rb

@@ -66,7 +66,7 @@ module Usmu
       # @param variables [Hash] Variables to be used in the template.
       # @return [String] The rendered file.
       def render(variables = {})
-        template_config = add_template_defaults(@configuration[provider_name] || {}, provider_name)
+        template_config = add_template_defaults((@configuration[provider_name] || {}).clone, provider_name)
         content = template_class.new("#{@name}", 1, template_config) { @content }.
             render(helpers, get_variables(variables))
 
@@ -208,6 +208,20 @@ module Usmu
       # @return [Hash] Template options to pass into the engine
       def add_template_defaults(overrides, engine)
         case engine
+          when 'redcarpet'
+            if overrides.delete :pygments
+              begin
+                require 'pygments'
+                overrides[:renderer] = Class.new(::Redcarpet::Render::HTML) do
+                  def block_code(code, language)
+                    Pygments.highlight(code, lexer: language)
+                  end
+                end
+              rescue LoadError
+                @log.warn('Unable to load pygments.rb gem.')
+              end
+              overrides
+            end
           when 'sass'
             {
                 :load_paths => [@configuration.source_path + '/' + File.dirname(@name)]

data/lib/usmu/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Matthew Scharley