usmu 1.2.1 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a17b2f0a54894311de49ba082286ef8b42abdddb
4
- data.tar.gz: b8b72e07ca7986addb70bf255ec6a18c15e6471c
3
+ metadata.gz: 1fd3da296c75ec27090a515a0d2c1cba18a33a40
4
+ data.tar.gz: ef74e9b5e859c7ccd183c59f1a241e406fd8e590
5
5
  SHA512:
6
- metadata.gz: 5783809764b9fee5b97a5879592f18b3766e50c82c9d4cfb1aadeb84e437c2b2bc079d1caf285e3af161209598c76685cd8ac29ee8adc3e2804351810ad6095c
7
- data.tar.gz: f1d90b1aec2431e0d7c788ce09385179624c7a09121bdcbef5ed66fad5ce78276e2a0cde4b764cb610c2d7c366d6ec66ca169d69a570e60a7d41392babe9e256
6
+ metadata.gz: 4797dce796a431c89bf24361b0aad782d28e1d011340a0f7719745cbfabc66c28b37799f79907b080cb6efbfb6f55eab6d575902debeb43674316ff680c23685
7
+ data.tar.gz: 433db4d6a99491e0c66a96f4833757da16c560fd6a0e1a41ad6e6f1c93af624e2c9dbe043c2b0b623e84bb3eb3f0acdb1bc6595c5db22c9260caba6a211b4141
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Usmu Change Log
2
2
 
3
+ ## 1.2.2
4
+
5
+ Matthew Scharley <matt.scharley@gmail.com>
6
+
7
+ * Implement Pygments support for redcarpet (5dd9140a4d9df9e9014774d74e71610a98e16c54)
8
+
3
9
  ## 1.2.1
4
10
 
5
11
  Matthew Scharley <matt.scharley@gmail.com>
data/Rakefile CHANGED
@@ -57,19 +57,17 @@ end
57
57
  namespace :gem do
58
58
  desc 'Build gems'
59
59
  task :build => [:clean] do
60
- if ENV['BUNDLE_GEMFILE']
61
- STDERR.puts 'This command will fail if run via bundler. If you are using RVM, please try running the following command:'
62
- STDERR.puts " NOEXEC_DISABLE=1 #{File.basename($0)} #{ARGV.join(' ')}"
63
- exit 1
64
- end
65
-
66
- mkdir 'pkg' unless File.exist? 'pkg'
67
- platforms.each do |p|
68
- ENV['BUILD_PLATFORM'] = p
69
- sh *%w{gem build usmu.gemspec}
70
- end
71
- Dir['*.gem'].each do |gem|
72
- mv gem, "pkg/#{gem}"
60
+ require 'bundler'
61
+
62
+ Bundler.with_clean_env do
63
+ mkdir 'pkg' unless File.exist? 'pkg'
64
+ platforms.each do |p|
65
+ ENV['BUILD_PLATFORM'] = p
66
+ sh *%w{gem build usmu.gemspec}
67
+ end
68
+ Dir['*.gem'].each do |gem|
69
+ mv gem, "pkg/#{gem}"
70
+ end
73
71
  end
74
72
  end
75
73
 
@@ -66,7 +66,7 @@ module Usmu
66
66
  # @param variables [Hash] Variables to be used in the template.
67
67
  # @return [String] The rendered file.
68
68
  def render(variables = {})
69
- template_config = add_template_defaults(@configuration[provider_name] || {}, provider_name)
69
+ template_config = add_template_defaults((@configuration[provider_name] || {}).clone, provider_name)
70
70
  content = template_class.new("#{@name}", 1, template_config) { @content }.
71
71
  render(helpers, get_variables(variables))
72
72
 
@@ -208,6 +208,20 @@ module Usmu
208
208
  # @return [Hash] Template options to pass into the engine
209
209
  def add_template_defaults(overrides, engine)
210
210
  case engine
211
+ when 'redcarpet'
212
+ if overrides.delete :pygments
213
+ begin
214
+ require 'pygments'
215
+ overrides[:renderer] = Class.new(::Redcarpet::Render::HTML) do
216
+ def block_code(code, language)
217
+ Pygments.highlight(code, lexer: language)
218
+ end
219
+ end
220
+ rescue LoadError
221
+ @log.warn('Unable to load pygments.rb gem.')
222
+ end
223
+ overrides
224
+ end
211
225
  when 'sass'
212
226
  {
213
227
  :load_paths => [@configuration.source_path + '/' + File.dirname(@name)]
data/lib/usmu/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
2
  module Usmu
3
3
  # The current version string for the gem
4
- VERSION = '1.2.1'
4
+ VERSION = '1.2.2'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usmu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthew Scharley