revealing 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47824e706f740bb4bd389506532615d0f27c64d3c222ac24ba9a5edfc9b7ec2
-  data.tar.gz: 37502d62f798b59acbd06b9e9a37bf62eb82bac0753bf1fa2e84594a29b7e40f
+  metadata.gz: f88e8404c6aaf20a49dbd3ee4c7a3d3d9eda17e567a4f6f6d63c51ea465256f6
+  data.tar.gz: fae690feb332b5a8d7d9c1840ad6a7981725f70bdc9646eabe2cbcfcd6d9fd07
 SHA512:
-  metadata.gz: 91b2f7a00c4b60d06f0d81a59ffc43383272857cbaeb7f768091e101f17ff859c47cbcc6091843b111dff1ab899df7be1756c2a4fd49cf51f9d6d7c514dcfc1b
-  data.tar.gz: b10369ffc6c16f1e64635ac80998358a280eab4675c6e4a1279b89c2a21d44745d780394a8e0fe237af7327659d3849b20f205929936542f2a1a7b8409c81e73
+  metadata.gz: b2d5cf5426276b23307d29fb11e84b25b2221e694a69ac7667cf90e4a1a5f5798492aa5309e0d837a6c0b357e2bb3d2afe3367e328c87d3d5f2989330a5039b5
+  data.tar.gz: e5c7a73f5b15a7da7d7553d857843d2bd5a84667d904042e84590b7abbd8bd7f8c56db65c5826e55b8a08f66362d7dfc9c6621422ff04d1ec12c0ec503be1782

data/.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+.envrc
 Gemfile.lock
 pkg
 tmp

data/README.markdown

@@ -33,10 +33,11 @@ This gem provides a set of [`Rake`](https://github.com/ruby/rake) tasks to creat
 # TODO
 
 1. `revealing doctor` to analyze tools
-1. Target folders mirror source, so that we don't risk duplicates
-1. Read desired versions of dependencies from a YAML file (with sensible defaults coming from this project)
+1. Rubocop
+1. Read desired dependencies (URLs or version numbers) from ENV vars or a YAML file (with sensible defaults coming from this project)
 1. Re-add ditaa processing
 1. Add mathjax (copy to target if present, otherwise use CDN)
+1. Add guard-livereload to the generated project
 1. Expose customization of
    * highlight-style
    * slide-level

data/lib/revealing/tasks/assets.rake

@@ -1,5 +1,24 @@
 prereq 'gm'
 
+def refute_duplicate_basename(assets)
+  assets = assets.map{ |f| Pathname(f) }
+  basenames = assets.map{ |f| f.basename }
+
+  if basenames.length != basenames.uniq.length
+    # https://stackoverflow.com/a/8922931/3212907
+    duplicate_basenames = basenames.select{ |e| basenames.count(e) > 1 }.uniq
+    list = assets.select{ |a| duplicate_basenames.include?(a.basename) }
+    warn "Error: The following assets have the same base name and would override another in the output:"
+    warn ''
+    warn list.join("\n")
+    warn ''
+    warn "Consider renaming them to be unique."
+    fail
+  end
+end
+
+refute_duplicate_basename(RESIZABLE_ASSETS)
+
 RESIZED_ASSETS.zip(RESIZABLE_ASSETS).each do |target, source|
   desc "Resize #{source} to #{target}"
   file target => ['gm', source] do
@@ -7,9 +26,11 @@ RESIZED_ASSETS.zip(RESIZABLE_ASSETS).each do |target, source|
   end
 end
 
+refute_duplicate_basename(ASSET_SOURCES)
+
 ASSETS.zip(ASSET_SOURCES).each do |target, source|
   desc "Copy #{source} to #{target}"
-  file target => ['gm', source] do
+  file target => source do
     cp source, target
   end
 end

data/lib/revealing/tasks.rb

@@ -22,8 +22,9 @@ REVEAL_JS_TARGET_DIR = TARGET_DIR / REVEAL_JS
 
 RESIZABLE_ASSETS = (FileList[SOURCE_DIR / '**/*.png'] + FileList[SOURCE_DIR / '**/*.jpg'])
 RESIZED_ASSETS = RESIZABLE_ASSETS.pathmap("#{TARGET_DIR}/%f")
-ASSET_SOURCES = FileList[SOURCE_DIR / '*'] - RESIZABLE_ASSETS - SOURCE_FILES
+ASSET_SOURCES = FileList[SOURCE_DIR / '**/*'].select{ |f| Pathname(f).file? } - RESIZABLE_ASSETS - SOURCE_FILES
 ASSETS = ASSET_SOURCES.pathmap("#{TARGET_DIR}/%f") - RESIZED_ASSETS
+
 HEADERS = FileList['headers/*'] # These are included literal; no need to copy them
 
 load "#{__dir__}/tasks/prereq.rake"

data/lib/revealing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Revealing
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: revealing
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Steffen Uhlig