sitefs 1.0.0.beta3 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da2c5fa4d72e3ce2a8a03aab7b8c7f76e066ffb9
-  data.tar.gz: 2f8c4fb2c48f20a7e359a7268663a7e60220509a
+SHA256:
+  metadata.gz: a028c7b92fbaf174d300f1d57606e019a297fbf8ce8f68f1bc8c85b62185e089
+  data.tar.gz: 9e42f5715c7f3978768f124508be9fb5ec37c4acc71118e1d6bf27a297027907
 SHA512:
-  metadata.gz: 6b2b7da914a23d0ebfc777fc5ec5a1d73037deae44b8c6bd30d34c7876ee256e6cd0c3b1ead5ce4afd0d3eb44e796d9fa318cfd901ae6c50a3086701746dd02a
-  data.tar.gz: 680e15a00e14f4a4d87e034b29085798a1a53c117cbb435260c45a02158b2aade35928239bc2ad453256a339b96dcfb070be29c73906dbd99ae1f439a0da779d
+  metadata.gz: 2108a026a55070b74437033f4ecf51ce9b57935221c8f3f2de2b8f6a5829d6a3fb8466433885bf7b4f48d7810b3a63eac34a378428ddc767f7aa42e3993c7950
+  data.tar.gz: c6ea8d02ce13695d604f5e2041fb502212b652cfe389ea5a95c212737955fd4593938b3262ee878363c86e0ac29818f47af2a14f10916d210849233f10cebab3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sitefs (1.0.0.beta3)
+    sitefs (1.0.0.beta5)
       autoloaded (~> 2)
       aws-sdk (~> 2)
       diffy (~> 3)
@@ -10,7 +10,6 @@ PATH
       html-pipeline-rouge_filter (~> 1.0)
       listen (~> 3.1)
       mime-types (~> 3)
-      ratom (~> 0.9)
       rinku (~> 2.0)
       sass (~> 3.4)
       slop (~> 4)
@@ -19,54 +18,54 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    autoloaded (2.1.1)
-    aws-sdk (2.7.6)
-      aws-sdk-resources (= 2.7.6)
-    aws-sdk-core (2.7.6)
+      zeitwerk (~> 2.2)
+    autoloaded (2.2.1)
+    aws-eventstream (1.0.3)
+    aws-sdk (2.11.454)
+      aws-sdk-resources (= 2.11.454)
+    aws-sdk-core (2.11.454)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.6)
-      aws-sdk-core (= 2.7.6)
-    aws-sigv4 (1.0.0)
-    concurrent-ruby (1.0.4)
+    aws-sdk-resources (2.11.454)
+      aws-sdk-core (= 2.11.454)
+    aws-sigv4 (1.1.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    diffy (3.1.0)
-    ffi (1.9.18)
+    diffy (3.3.0)
+    ffi (1.12.2)
     github-markdown (0.6.9)
-    html-pipeline (2.6.0)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html-pipeline-rouge_filter (1.0.5)
+    html-pipeline-rouge_filter (1.0.7)
       activesupport
       html-pipeline (>= 1.11)
-      rouge (~> 2.0.7)
-    i18n (0.8.0)
-    jmespath (1.3.1)
-    libxml-ruby (2.9.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mime-types (3.1)
+      rouge (>= 2.0.0, < 4)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.2.0)
-    minitest (5.10.1)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    mime-types-data (3.2019.1009)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
     rake (12.0.0)
-    ratom (0.9.0)
-      libxml-ruby (~> 2.6)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rinku (2.0.2)
-    rouge (2.0.7)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rinku (2.0.6)
+    rouge (3.16.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -80,13 +79,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    ruby_dep (1.5.0)
-    sass (3.4.24)
-    slop (4.4.1)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    slop (4.8.0)
     stamp (0.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -98,4 +101,4 @@ DEPENDENCIES
   sitefs!
 
 BUNDLED WITH
-   1.14.6
+   1.17.3

data/bin/sitefs

@@ -2,8 +2,8 @@
 
 require 'bundler/setup'
 require 'yaml'
-require 'sitefs'
 require 'slop'
+require File.expand_path(File.join(__dir__, '../lib/sitefs'))
 
 include Sitefs
 

data/lib/sitefs/file_action.rb

@@ -37,6 +37,15 @@ class Sitefs::FileAction
     type
   end
 
+  def content_causes_error?
+    begin
+      content
+      nil
+    rescue => error
+      error
+    end
+  end
+
   def content
     if @content.respond_to?(:call)
       @content = @content.call
@@ -123,7 +132,11 @@ class Sitefs::FileAction
 
     case action
     when :write
-      if should_write? config, action, path
+      if error = content_causes_error?
+        log :exception, path
+        puts error.message
+        puts error.backtrace
+      elsif should_write? config, action, path
         log :generate, path
         FileUtils.mkdir_p dirname
         File.open(path, 'w') { |file| file.write content }

data/lib/sitefs/file_action_set.rb

@@ -25,8 +25,6 @@ class Sitefs::FileActionSet
   end
 
   def includes_path? path
-    path = File.expand_path(path)
-
     output_paths.include? path
   end
 

data/lib/sitefs/handlers/single_erb.rb

@@ -26,6 +26,7 @@ class Sitefs::Handlers::SingleErb < Sitefs::Handler
   def pages
     @pages ||= begin
       page = Page.new path_helper, attributes
+      page.href = path_helper.min_href_for output_path
       page.published_at = File.birthtime(source_file)
       [page]
     end

data/lib/sitefs/path_helper.rb

@@ -15,7 +15,7 @@ class Sitefs::PathHelper
 
     dir = File.dirname source_file
 
-    File.expand_path(href, dir).sub(root_path, '')
+    File.expand_path(href, dir).sub(root_path, '').sub(/index\.html?$/, '')
   end
 
   def min_href_for path

data/lib/sitefs/render_context.rb

@@ -24,6 +24,8 @@ class Sitefs::RenderContext
   end
 
   class << self
+    # Exists so that if there's no render context all the method calls can still
+    # work see Renderer#method_missing
     def nil
       @nil ||= new(nil)
     end

data/lib/sitefs/version.rb

@@ -1,3 +1,3 @@
 module Sitefs
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta5"
 end

data/lib/sitefs/walker.rb

@@ -40,8 +40,10 @@ class Sitefs::Walker
   IGNORE_MATCHERS = [
     '**/node_modules',
     '**/.sass-cache',
+    '**/.sass-cache/**/*.scssc',
     '**/.git',
     '**/.DS_Store',
+    "**/#{Sitefs::MANIFEST_FILENAME}"
   ]
 
   def initialize config
@@ -52,19 +54,29 @@ class Sitefs::Walker
     @config.root_path
   end
 
+  def ignore_matchers
+    IGNORE_MATCHERS | config.ignore_patterns
+  end
+
+  def match_args
+    match_args = File::FNM_CASEFOLD | File::FNM_EXTGLOB | File::FNM_PATHNAME | File::FNM_DOTMATCH
+  end
+
+  def path_should_be_ignored path
+    ignore_matchers.find {|pattern| File.fnmatch(pattern, path, match_args)}
+  end
+
   def walk
     reg = FileRegistry.new
 
     Dir.chdir root_path
 
-    ignore_matchers = IGNORE_MATCHERS | config.ignore_patterns
     handlers = HANDLERS.map_keys {|ext| File.join('**', "*.#{ext}") }
-    match_args = File::FNM_CASEFOLD | File::FNM_EXTGLOB | File::FNM_PATHNAME
 
     Find.find root_path do |full_path|
       path = full_path.sub(root_path, '')
 
-      if ignore_matchers.find {|pattern| File.fnmatch(pattern, path, match_args)}
+      if path_should_be_ignored(path)
         Find.prune if File.directory?(path)
         next
       end
@@ -72,7 +84,6 @@ class Sitefs::Walker
       if handler_class = handlers.find_value { |pattern, handler_class| File.fnmatch(pattern, path, match_args)}
         handler = handler_class.new(root_path, full_path)
 
-
         reg << handler if handler.should_generate?(config)
       end
     end

data/lib/sitefs/watcher.rb

@@ -63,21 +63,29 @@ class Sitefs::Watcher
   end
 
   def change modified, added, removed
-    puts "Change detected:"
 
-    modified.each {|f| puts "  modified: #{f}"}
-    added.each {|f| puts "  added: #{f}"}
-    removed.each {|f| puts "  removed: #{f}"}
+    modified = modified.map{|f| f.sub(root_path, '')}.select{|f| !walker.path_should_be_ignored(f)}
+    added = added.map{|f| f.sub(root_path, '')}.select{|f| !walker.path_should_be_ignored(f)}
+    removed = removed.map{|f| f.sub(root_path, '')}.select{|f| !walker.path_should_be_ignored(f)}
 
     all = (modified | added | removed)
 
+    return if all.empty?
+
     as = action_set
 
     has_ungenerated_file = all.find do |path|
       !as.includes_path?(path)
     end
 
-    as.call(walker.config, :write) if has_ungenerated_file
+    if has_ungenerated_file
+      puts "Change detected:"
+      modified.each {|f| puts "  modified: #{f}"}
+      added.each {|f| puts "  added: #{f}"}
+      removed.each {|f| puts "  removed: #{f}"}
+      puts "Perform actions: "
+      as.call(walker.config, :write)
+    end
 
     puts ''
   end

data/sitefs.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'listen', '~> 3.1'
   spec.add_dependency 'sass', '~> 3.4'
   spec.add_dependency 'stamp', '~> 0.6'
-  spec.add_dependency 'ratom', '~> 0.9'
   spec.add_dependency 'autoloaded', '~> 2'
   spec.add_dependency 'slop', '~> 4'
   spec.add_dependency 'diffy', '~> 3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitefs
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Tal Atlas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: ratom
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: autoloaded
   requirement: !ruby/object:Gem::Requirement
@@ -327,8 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A simple static site generator