guard-jekyll-plus 1.4.10 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGQ4MDQxOWQwY2ViZmNjNWQzMGYzMzJhMTM0M2M5MDM3NjQ4YWE5Nw==
-  data.tar.gz: !binary |-
-    YjQ3Mjg0MGUxNTUxZmMwYjI2NGJkNDYxNDE0MWJkZjc5Y2RhYTNkZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTI5NjE1ZWRiZTZkZTk3NWIxZDlkMDRhODU3MjRhYTRiOWNmNzljYWU1OWQy
-    ZDA5ZTI5NmNmMTJlMmE1Y2NhMjZjZTg0NjM0OWE4NmY5ZDQxZTA0MWNhN2Qz
-    OTQzNTdhNGY1YjI1ZmVmOTM0OTRmMDNhMTI0Y2U0OTQ5ZWRhODQ=
-  data.tar.gz: !binary |-
-    N2M0NzhmZDVhY2NiNTVkNmY0Zjk3MDA0MTUzODRiYTBlNDYyYzJmMDM5ZmFi
-    NzIwNmQ2MDNhMDMwZmQ3MDFkNmM2MGY4MzFlOGYzYmJjM2VlMTQ3ZTkxNTgx
-    ZDhmYzljMzJlNmJkZTIyNDg2YWRhOTlhYzg4MzA3NWE3MTI1MDU=
+SHA1:
+  metadata.gz: be72288508230bb15f897c6a90e3e3acadbfd133
+  data.tar.gz: 5d2617be237688069afa09a0ca1e520f67ae1c63
+SHA512:
+  metadata.gz: 026b9320d2df6366b31badc431cf5a4f30595f7cb8ab184320354e141a7707e7390e76a2b6a7f44f80a3fecd02a7206c79d5907c3f6f7e94126855a003408ca3
+  data.tar.gz: 1556ec62c7a9d61cecbcfb62582e3d1f605b3c4cef1101b3a67d629a7b8f4c6ffd02565d363da2aebddfd719c437a1e6a19c2778e6ae9e0f49c57703345ef6fa

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 2.0.0
+
+- Updated to work with Guard 2.x
+
 ### 1.4.10
 
 - Now pointing to the latest compatible Guard release.

data/README.md

@@ -33,7 +33,6 @@ Or install it manually with:
 
     $ gem install guard-jekyll-plus
 
-
 ## Usage
 
 Navigate to your Jekyll project directory and create a Guardfile using:
@@ -49,7 +48,10 @@ guard "jekyll-plus" do
 end
 ```
 
-Run the guard and Jekyll will begin watching your project.
+
+Add `Guardfile` to the list of files in your Jekyll's `exclude` configuration to prevent it from being copied into your site directory.
+
+Then run the guard and Jekyll will begin watching your project.
 
     $ bundle exec guard
 

data/guard-jekyll-plus.gemspec

@@ -13,9 +13,16 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/imathis/guard-jekyll-plus"
   gem.license       = 'MIT'
 
-  gem.add_dependency 'guard', '~> 1.8.3'
-  gem.add_dependency 'jekyll', '>= 1.0.0'
-  
   gem.files         = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
+
+  gem.add_dependency 'guard', '~> 2.8'
+  gem.add_dependency 'jekyll', '>= 1.0.0'
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "pry-byebug"
+
+  if RUBY_VERSION >= "2"
+    gem.add_development_dependency "bundler"
+  end
 end

data/lib/guard/jekyll-plus.rb

@@ -1,25 +1,23 @@
 # encoding: UTF-8
 
-require 'guard'
-require 'guard/guard'
+require 'benchmark'
+require 'guard/plugin'
 require 'jekyll'
 
 begin
   require 'rack'
-  @use_rack = true
 rescue LoadError
 end
 
 module Guard
-  class Jekyllplus < Guard
-
-    def initialize (watchers=[], options={})
+  class Jekyllplus < Plugin
+    def initialize(options = {})
       super
 
-      default_extensions = ['md','mkd','mkdn','markdown','textile','html','haml','slim','xml','yml']
+      default_extensions = ['md','mkd','mkdn','markdown','textile','html','haml','slim','xml','yml','sass','scss']
 
       @options = {
-        :extensions     => [], 
+        :extensions     => [],
         :config         => ['_config.yml'],
         :serve          => false,
         :rack_config    => nil,
@@ -30,41 +28,39 @@ module Guard
         :msg_prefix     => 'Jekyll'
       }.merge(options)
 
-      # The config_hash option should be a hash ready to be consumed by Jekyll's Site class.
-      #
-      @config = jekyll_config(@options)
-
-      # Override configuration with guard option values
-      #
-      @config['show_drafts'] ||= @options[:drafts]
-      @config['future']      ||= @options[:future]
-
-      # Store vars for easy internal access
-      #
+      @config = load_config(@options)
       @source = local_path @config['source']
       @destination = local_path @config['destination']
       @msg_prefix = @options[:msg_prefix]
- 
+
       # Convert array of extensions into a regex for matching file extensions eg, /\.md$|\.markdown$|\.html$/i
-      #
+      # 
       extensions  = @options[:extensions].concat(default_extensions).flatten.uniq
       @extensions = Regexp.new extensions.map { |e| (e << '$').gsub('\.', '\\.') }.join('|'), true
 
-      # set Jekyll server process id to nil
-      #
-      @pid = nil
+      # set Jekyll server thread to nil
+      @server_thread = nil
 
-      # Create a Jekyll site
-      #
-      @site = ::Jekyll::Site.new @config
-      @rack = ::Rack::Server.new(rack_config(@destination)) if @use_rack
+    end
+
+    def load_config(options)
+      config = jekyll_config(options)
+
+      # Override configuration with guard option values
+      config['show_drafts'] ||= options[:drafts]
+      config['future']      ||= options[:future]
+      config
+    end
 
+    def reload_config!
+      UI.info "Reloading Jekyll configuration!"
+      @config = load_config(@options)
     end
 
     def start
       if @options[:serve]
-        start_server
         build
+        start_server
         UI.info "#{@msg_prefix} " + "watching and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}" unless @config[:silent]
       else
         build
@@ -72,20 +68,27 @@ module Guard
       end
     end
 
-    def restart
-      stop if alive?
+    def reload
+      stop if !@server_thread.nil? and @server_thread.alive?
+      reload_config!
       start
     end
 
+    def reload_server
+      stop_server
+      start_server
+    end
 
     def stop
       stop_server
     end
 
     def run_on_modifications(paths)
+      # At this point we know @options[:config] is going to be an Array
+      # thanks to the call the jekyll_config earlier.
+      reload_config! if @options[:config].map { |f| paths.include?(f) }.any?
       matched = jekyll_matches paths
       unmatched = non_jekyll_matches paths
-
       if matched.size > 0
         build(matched, "Files changed: ", "  ~ ".yellow)
       elsif unmatched.size > 0
@@ -126,10 +129,9 @@ module Guard
           files.each { |file| puts '|' + mark + file }
           puts '| ' # spacing
         end
-        @site.process
-        UI.info "#{@msg_prefix} " + "build complete ".green + "#{@source} → #{@destination}" unless @config[:silent]
-
-      rescue Exception => e
+        elapsed = Benchmark.realtime { build_site(@config) }
+        UI.info "#{@msg_prefix} " + "build completed in #{elapsed.round(2)}s ".green + "#{@source} → #{@destination}" unless @config[:silent]
+      rescue Exception
         UI.error "#{@msg_prefix} build has failed" unless @config[:silent]
         stop_server
         throw :task_has_failed
@@ -147,14 +149,18 @@ module Guard
           UI.info "#{@msg_prefix} #{message.green}" unless @config[:silent]
           puts '| ' #spacing
           files.each do |file|
-            path = destination_path file
-            FileUtils.mkdir_p File.dirname(path)
-            FileUtils.cp file, path
-            puts '|' + "  → ".green + path
+            if(!check_jekyll_exclude(file))
+              path = destination_path file
+              FileUtils.mkdir_p File.dirname(path)
+              FileUtils.cp file, path
+              puts '|' + "  → ".green + path
+            else
+              puts '|' + "  ~ ".yellow + "Jekyll exclude: Ignoring changes to #{file}".yellow
+            end
           end
           puts '| ' #spacing
 
-        rescue Exception => e
+        rescue Exception
           UI.error "#{@msg_prefix} copy has failed" unless @config[:silent]
           UI.error e
           stop_server
@@ -171,7 +177,7 @@ module Guard
       else
         files
       end
-      
+
     end
 
     # Remove deleted source file/directories from destination
@@ -195,13 +201,13 @@ module Guard
 
             dir = File.dirname path
             if Dir[dir+'/*'].empty?
-              FileUtils.rm_r(dir) 
+              FileUtils.rm_r(dir)
               puts '|' + "  x ".red + dir
             end
           end
           puts '| ' #spacing
 
-        rescue Exception => e
+        rescue Exception
           UI.error "#{@msg_prefix} remove has failed" unless @config[:silent]
           UI.error e
           stop_server
@@ -226,7 +232,11 @@ module Guard
         options[:config] = [options[:config]] unless options[:config].is_a? Array
         config = options
       end
-      ::Jekyll.configuration(config)
+      Jekyll.configuration(config)
+    end
+
+    def check_jekyll_exclude(path)
+      return @config['exclude'].any? {|f| File.fnmatch?(path, f)}
     end
 
     def rack_config(root)
@@ -235,7 +245,7 @@ module Guard
       local_config = File.exist?('config.ru') ? 'config.ru' : nil
 
       config = (@config['rack_config'] || local_config || default_config)
-      { :config => config, :Port => @config['port'], :Host => @config['host'] }
+      { :config => config, :Port => @config['port'], :Host => @config['host'], :environment => 'development' }
     end
 
     def local_path(path)
@@ -244,60 +254,47 @@ module Guard
       path = path.sub current, ''
       if path == ''
         './'
-      else 
-        path.sub /^\//, ''
+      else
+        path.sub(/^\//, '')
       end
     end
+
+    def build_site(options)
+      Jekyll.logger.log_level = :error
+      site = Jekyll::Site.new(options)
+      Jekyll.logger.log_level = :info
+      site.process
+    end
     
+
     def destination_path(file)
       if @source =~ /^\./
         File.join @destination, file
       else
-        file.sub /^#{@source}/, "#{@destination}"
+        file.sub(/^#{@source}/, "#{@destination}")
       end
     end
 
-    # Remove 
-    def ignore_underscores(paths)
-      paths.select { |file| file =~ /^[^_]/  }
-    end
-
     def server(config)
-      if @rack
-        proc{ Process.fork { @rack.start } }
+      if defined? ::Rack
+        Thread.new { ::Rack::Server.start(rack_config(@destination)) }
+        UI.info "#{@msg_prefix} running Rack" unless @config[:silent]
       else
-        proc{ Process.fork { ::Jekyll::Commands::Serve.process(config) } }
+        Thread.new { Jekyll::Commands::Serve.process(config) }
       end
     end
 
-    def kill
-      proc{|pid| Process.kill("INT", pid)}
-    end
-
     def start_server
-      return @pid if alive?
-      @pid = instance_eval &server(@config)
-    end
-
-    def stop_server
-      if alive?
-        instance_eval do
-          kill.call(@pid)
-          @pid = nil
-        end
+      if @server_thread.nil?
+        @server_thread = server(@config)
+      else
+        UI.warning "#{@msg_prefix} using an old server thread!"
       end
     end
-    
-    def alive?
-      return false unless @pid
 
-      begin
-        Process.getpgid(@pid)
-        true
-      rescue Errno::ESRCH => e
-        false
-      end
+    def stop_server
+      @server_thread.kill unless @server_thread.nil?
+      @server_thread = nil
     end
   end
 end
-

data/lib/guard/jekyll-plus/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class JekyllPlusVersion
-    VERSION = "1.4.10"
+    VERSION = "2.0.0"
   end
 end

data/test/Testfile

@@ -0,0 +1 @@
+Don't copy me.

data/test/_config.yml

@@ -1,2 +1,3 @@
 source: ./
 port: 4000
+exclude: ['Testfile', 'Guardfile', 'Gemfile', 'Gemfile.lock']

metadata

@@ -1,43 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 2.0.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Guard plugin for smarter Jekyll watching
 email:
 - brandon@imathis.com
@@ -45,10 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -60,8 +101,8 @@ files:
 - test/.gitignore
 - test/404.html
 - test/Gemfile
-- test/Gemfile.lock
 - test/Guardfile
+- test/Testfile
 - test/_config.yml
 - test/_layouts/default.html
 - test/_layouts/post.html
@@ -84,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Guard plugin for Jekyll which intelligently handles changes to static and

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    guard-jekyll-plus (1.4.9)
-      guard (>= 1.1.0)
-      jekyll (>= 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    coderay (1.0.9)
-    colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
-    fast-stemmer (1.0.2)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    guard (2.0.5)
-      formatador (>= 0.2.4)
-      listen (~> 2.0)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    highline (1.6.19)
-    jekyll (1.2.1)
-      classifier (~> 1.3)
-      colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      liquid (~> 2.5.2)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.7.0)
-    liquid (2.5.3)
-    listen (2.0.4)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
-    maruku (0.7.0)
-    method_source (0.8.2)
-    posix-spawn (0.3.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pygments.rb (0.5.2)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    redcarpet (2.3.0)
-    safe_yaml (0.7.1)
-    slop (3.4.6)
-    thor (0.18.1)
-    timers (1.1.0)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  guard-jekyll-plus!

data/test/Gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    guard-jekyll-plus (1.4.9)
-      guard (>= 1.1.0)
-      jekyll (>= 1.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    coderay (1.0.9)
-    colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
-    fast-stemmer (1.0.2)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    guard (1.8.2)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    highline (1.6.19)
-    jekyll (1.1.2)
-      classifier (~> 1.3)
-      colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      kramdown (~> 1.0.2)
-      liquid (~> 2.5.1)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.2.2)
-      safe_yaml (~> 0.7.0)
-    kramdown (1.0.2)
-    liquid (2.5.1)
-    listen (1.3.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    method_source (0.8.2)
-    posix-spawn (0.3.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pygments.rb (0.5.2)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    redcarpet (2.2.2)
-    safe_yaml (0.7.1)
-    slop (3.4.6)
-    syntax (1.0.0)
-    thor (0.18.1)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  guard-jekyll-plus!