summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Nikolai Viessmann2015-04-27 14:38:46 +0200
committerHans-Nikolai Viessmann2015-04-27 14:38:46 +0200
commit21a323dfe9edaaf05a94547f18ba57077b510985 (patch)
tree8aad25ef4483ed5fbc6e3bdb1d45f04719a4f27e
parentb49539a5ffbc3d8520457491de9ed8bf25edf26b (diff)
downloadblog-21a323dfe9edaaf05a94547f18ba57077b510985.tar.gz
blog-21a323dfe9edaaf05a94547f18ba57077b510985.zip
Fixed looping regenerating problem
My plugin to generate the CHANGELOG file was being written after a regeneration loop, and because of how the watch is designed, it detected this change regenerated again...so on and so on.
-rw-r--r--Gemfile.lock26
-rw-r--r--_config.yml21
-rwxr-xr-x_plugins/changelog.rb4
3 files changed, 18 insertions, 33 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b0c1240..2aab1c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.3.7)
+ addressable (2.3.8)
asciidoctor (1.5.2)
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
classifier-reborn (2.0.3)
fast-stemmer (~> 1.0)
- coffee-script (2.3.0)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.9.1)
+ coffee-script-source (1.9.1.1)
colorator (0.1)
- execjs (2.4.0)
+ execjs (2.5.2)
fast-stemmer (1.0.2)
fastimage (1.6.8)
addressable (~> 2.3, >= 2.3.5)
- ffi (1.9.6)
+ ffi (1.9.8)
hike (1.2.3)
hitimes (1.2.2)
jekyll (2.5.3)
@@ -47,11 +47,11 @@ GEM
sprockets-sass
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
- jekyll-gist (1.1.0)
+ jekyll-gist (1.2.1)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
- jekyll-sitemap (0.8.0)
+ jekyll-sitemap (0.8.1)
jekyll-watch (1.2.1)
listen (~> 2.7)
jekyll_inline_highlight (2.0)
@@ -59,17 +59,17 @@ GEM
json (1.8.2)
kramdown (1.6.0)
liquid (2.6.2)
- listen (2.8.6)
- celluloid (>= 0.15.2)
+ listen (2.10.0)
+ celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
mercenary (0.3.5)
- mini_magick (4.1.0)
+ mini_magick (4.2.3)
multi_json (1.11.0)
parslet (1.5.0)
blankslate (~> 2.0)
- posix-spawn (0.3.10)
- pygments.rb (0.6.2)
+ posix-spawn (0.3.11)
+ pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rack (1.6.0)
@@ -77,7 +77,7 @@ GEM
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.8)
- redcarpet (3.2.2)
+ redcarpet (3.2.3)
safe_yaml (1.0.4)
sass (3.4.13)
sprockets (2.12.3)
diff --git a/_config.yml b/_config.yml
index 577a97f..cd5526a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,38 +1,23 @@
# Configuration file for hans.viessmann.co
safe: false
port: 4000
-baseurl: /
-source: .
-destination: ./_site
+source: ./
plugins: ./_plugins
relative_permalinks: false
+exclude: [ 'Gemfile*', '_site/', '.sass-cache/', '.git/' ]
future: true
lsi: false
highlighter: false
-markdown: rdiscount
+markdown: kramdown
permalink: pretty
production: false
-exclude: [Gemfile, Gemfile.lock]
asciidoctor:
attributes:
- hardbreaks!
-maruku:
- use_tex: false
- use_divs: false
- png_engine: blahtex
- png_dir: images/latex
- png_url: /images/latex
-
-rdiscount:
- extensions: []
-
-redcarpet:
- extensions: []
-
assets:
compress:
css: sass
diff --git a/_plugins/changelog.rb b/_plugins/changelog.rb
index 2bfe928..3ad2e1b 100755
--- a/_plugins/changelog.rb
+++ b/_plugins/changelog.rb
@@ -31,9 +31,9 @@ module Jekyll
def generate(site)
if self.check_git
- self.git_log(File.join(site.source, CHANGELOG_FILE))
+ self.git_log(File.join(site.source, '_site', CHANGELOG_FILE))
- site.static_files << ChangelogFile.new(site, site.source, "/", CHANGELOG_FILE)
+ site.static_files << ChangelogFile.new(site, site.source, '/', CHANGELOG_FILE)
end
end
end