guard-jekyll-plus 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076743d79bba521d0febc7610d79d83fff4e3e06
-  data.tar.gz: 32a121773ebec897e7799df0de0db78aca64710e
+  metadata.gz: b4b2b693629d26271552853a0d20a61e86c57c9e
+  data.tar.gz: 78e039344f2b45b5eb5d3c311a4805f757d50c4b
 SHA512:
-  metadata.gz: df7d740d999f05818c70cb31b089538f96cdec8544706905be63582917aea9964e36c49ce707a7f62eb82d5a4ad5ff9a4c65a74c168d798bd8ef26833a1be6e0
-  data.tar.gz: 54a1aca7708d5aeb3a0cb64c83afebd742569b688d373a5c9846d19d4e488c7e6a06353902d2b18686234e37e854d3207201c9ddce87eafd443bb659dc12cab3
+  metadata.gz: 5fdae4a7d830545255df9197f29ae4e82aa1facfbabcf86ba63a59a7edbafaa96da23b6194e03d0c1bc987232ac41ee27319ba1c60d7574147ac1ad79b7b0432
+  data.tar.gz: 940e42475d2420f3ccba64c619aabc436bc7a0c352458e5269f4f7ad21468aed3425ccb8314a513bf74c1d8f093c1e4bd9c14aa9e01142e86efd69e02fc91e3d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 2.0.1 - 05-06-2015
+- Fix: Guard init failure.
+- Fix: Mishandling of paths triggered a SameFile argument error.
+
 ### 2.0.1 - 12-15-2014
 
 - Changed guard template name for better compatibility with Guard's naming scheme.

data/README.md

@@ -42,9 +42,10 @@ Navigate to your Jekyll project directory and create a Guardfile using:
 Or if you already have a Guardfile, add a Jekyll guard.
 
 ```ruby
-guard "jekyll_plus" do
+ignore /^_site/ # NOTE: this can interfere with Guard::LiveReload
+
+guard "jekyll-plus" do
   watch /.*/
-  ignore /^_site/
 end
 ```
 
@@ -66,7 +67,7 @@ If your Jekyll project has a non-standard directory stucture like this:
 You would do this instead:
 
 ```ruby
-guard "jekyll_plus" do
+guard "jekyll-plus" do
   watch /^source/
   watch /_config.yml/
 end
@@ -97,9 +98,10 @@ This guard has these configurations.
 To use Jekyll's built-in server, simply set `:serve => true` in your rack options
 
 ```ruby
-guard "jekyll_plus", :serve => true do
+ignore /^_site/ # NOTE: this can interfere with Guard::LiveReload
+
+guard "jekyll-plus", :serve => true do
   watch /.*/
-  ignore /^_site/
 end
 ```
 
@@ -115,9 +117,10 @@ If you wish to use your own rack server configuration, simply drop a `config.ru`
 Here's how you would add `txt` to the list of file extensions which triggers a Jekyll build.
 
 ```ruby
-guard "jekyll_plus", :extensions => ['txt'] do
+ignore /^_site/ # NOTE: this can interfere with Guard::LiveReload
+
+guard "jekyll-plus", :extensions => ['txt'] do
   watch /.*/
-  ignore /^_site/
 end
 ```
 
@@ -129,9 +132,10 @@ which don't match these extensions will be simply copied over to the destination
 Here's how you might tell Jekyll to read from multiple configuration files.
 
 ```ruby
-guard "jekyll_plus", :config => ['settings.yml', 'override.yml'] do
+ignore /^_site/ # NOTE: this can interfere with Guard::LiveReload
+
+guard "jekyll-plus", :config => ['settings.yml', 'override.yml'] do
   watch /.*/
-  ignore /^_site/
 end
 ```
 

data/lib/guard/jekyll-plus.rb

@@ -0,0 +1,4 @@
+# NOTE: guard needs this file, because it needs to require the file matching the
+# gem name (`guard-jekyll-plus` gem => `require "guard/jekyll-plus"`)
+
+require 'guard/jekyll_plus'

data/lib/guard/jekyll_plus.rb

@@ -50,5 +50,10 @@ module Guard
     def run_on_removals(paths)
       @builder.removed(paths)
     end
+
+    def self.template(plugin_location)
+      path = 'lib/guard/jekyll_plus/templates/Guardfile'
+      (Pathname(plugin_location) + path).read
+    end
   end
 end

data/lib/guard/jekyll_plus/builder/action.rb

@@ -58,11 +58,16 @@ module Guard
         end
 
         def destination_path(file)
-          if @config.source =~ /^\./
-            File.join @config.destination, file
-          else
-            file.sub(/^#{@config.source}/, "#{@config.destination}")
-          end
+          src_abs_path = Pathname(@config.source).expand_path
+
+          abs_path = Pathname(file).expand_path
+          rel_path = begin
+                       abs_path.relative_path_from(src_abs_path)
+                     rescue ArgumentError # probably happens only on Windows
+                       raise "File not in Jekyll source dir: #{file}"
+                     end
+
+          (Pathname(@config.destination) + rel_path).to_s
         end
 
         def build_was_needed(paths)

data/lib/guard/jekyll_plus/config.rb

@@ -91,6 +91,10 @@ module Guard
         @jekyll_config['exclude'].any? { |glob| File.fnmatch?(glob, path) }
       end
 
+      def watch_regexp
+        %r{^(?!#{destination}\/).*}
+      end
+
       private
 
       def silent?
@@ -123,7 +127,7 @@ module Guard
         if path == ''
           './'
         else
-          path.sub(/^\//, '')
+          path.sub(%r{^/}, '')
         end
       end
     end

data/lib/guard/jekyll_plus/templates/Guardfile

@@ -1,4 +1,5 @@
-guard 'jekyll_plus' do
-  watch(/.*/)
-  ignore(/^_site/)
+require 'guard/jekyll_plus/config'
+jekyll_plus_options = {}
+guard 'jekyll-plus', jekyll_plus_options do
+  watch(Guard::JekyllPlus::Config.new(jekyll_plus_options).watch_regexp)
 end

data/lib/guard/jekyll_plus/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class JekyllPlusVersion
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

data/spec/lib/guard/jekyll_plus/builder/action_spec.rb

@@ -0,0 +1,68 @@
+require 'guard/jekyll_plus/builder/action'
+module Guard
+  RSpec.describe JekyllPlus::Builder::Action do
+    let(:site) { instance_double(Jekyll::Site) }
+    let(:config) { instance_double(JekyllPlus::Config) }
+
+    subject { described_class.new(config, site) }
+
+    describe '#destination_path' do
+      let(:source) { '/foo/project' }
+
+      before do
+        allow(config).to receive(:destination).and_return(destination)
+        allow(config).to receive(:source).and_return(source)
+        allow_any_instance_of(Pathname).to receive(:expand_path) do |path|
+          case path
+          when Pathname('/foo/project')
+            Pathname('/foo/project')
+          when Pathname('bar/file.html')
+            Pathname('/foo/project/bar/file.html')
+          when Pathname('/foo/project/bar/file.html')
+            Pathname('/foo/project/bar/file.html')
+          else
+            fail "Unexpected path: #{path.inspect}"
+          end
+        end
+      end
+
+      context 'when destination is absolute ' do
+        let(:destination) { '/foo/project/public' }
+        let(:expected) { '/foo/project/public/bar/file.html' }
+
+        context 'when file is absolute' do
+          let(:file) { '/foo/project/bar/file.html' }
+          it 'is absolute' do
+            expect(subject.destination_path(file)).to eq expected
+          end
+        end
+
+        context 'when file is relative' do
+          let(:file) { 'bar/file.html' }
+          it 'is absolute' do
+            expect(subject.destination_path(file)).to eq expected
+          end
+        end
+      end
+
+      context 'when destination is relative' do
+        let(:destination) { 'public' }
+        let(:expected) { 'public/bar/file.html' }
+
+        context 'when file is absolute' do
+          let(:file) { '/foo/project/bar/file.html' }
+          it 'is relative ' do
+            expect(subject.destination_path(file)).to eq expected
+          end
+        end
+
+        context 'when file is relative' do
+          let(:file) { 'bar/file.html' }
+          it 'is relative ' do
+            expect(subject.destination_path(file)).to eq expected
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/guard/{jekyll-plus → jekyll_plus}/builder/adder_spec.rb

@@ -31,6 +31,7 @@ module Guard
       context 'when assets change' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
           allow(config).to receive(:excluded?).with('foo.jpg').and_return(false)
         end
 
@@ -70,6 +71,7 @@ module Guard
       context 'when an error happens' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
           allow(FileUtils).to receive(:cp).and_raise(Errno::ENOENT, 'foo')
           allow(config).to receive(:error)
           allow(config).to receive(:excluded?).with('foo').and_return(false)

data/spec/lib/guard/{jekyll-plus → jekyll_plus}/builder/modifier_spec.rb

@@ -31,6 +31,7 @@ module Guard
       context 'when assets change' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
           allow(config).to receive(:excluded?).with('foo.jpg').and_return(false)
         end
 
@@ -43,6 +44,7 @@ module Guard
       context 'when excluded file changes' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
           allow(config).to receive(:excluded?).with('foo.jpg').and_return(true)
         end
 
@@ -89,6 +91,7 @@ module Guard
       context 'when an error happens' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
           allow(FileUtils).to receive(:cp).and_raise(Errno::ENOENT, 'foo')
           allow(config).to receive(:error)
           allow(config).to receive(:excluded?).with('foo').and_return(false)

data/spec/lib/guard/{jekyll-plus → jekyll_plus}/builder/remover_spec.rb

@@ -23,6 +23,7 @@ module Guard
       context 'when asset files are deleted' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
 
           # non existing src file
           allow(File).to receive(:exist?).with('foo.jpg').and_return(false)
@@ -59,6 +60,8 @@ module Guard
       context 'when an error happens' do
         before do
           allow(config).to receive(:destination).and_return('bar/')
+          allow(config).to receive(:source).and_return('.')
+
           allow(config).to receive(:error)
           allow(File).to receive(:exist?).with('foo').and_return(false)
 

data/spec/lib/guard/{jekyll-plus → jekyll_plus}/config_spec.rb

@@ -135,4 +135,26 @@ RSpec.describe Guard::JekyllPlus::Config do
       end
     end
   end
+
+  describe '#watch_regexp' do
+    context 'with a destination' do
+      let(:jekyll_config) do
+        valid_jekyll_options.merge('destination' => 'public')
+      end
+
+      it 'matches files outside destination' do
+        expect(subject.watch_regexp).to match('foo')
+        expect(subject.watch_regexp).to match('foo/bar')
+        expect(subject.watch_regexp).to match('foo/public/bar')
+        expect(subject.watch_regexp).to match('foo/public')
+        expect(subject.watch_regexp).to match('publics/bar')
+      end
+
+      it 'does not match files in destination' do
+        expect(subject.watch_regexp).to_not match('public/foo')
+        expect(subject.watch_regexp).to_not match('public/foo/bar')
+        expect(subject.watch_regexp).to_not match('public/foo/public')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -134,6 +134,7 @@ files:
 - README.md
 - Rakefile
 - guard-jekyll-plus.gemspec
+- lib/guard/jekyll-plus.rb
 - lib/guard/jekyll_plus.rb
 - lib/guard/jekyll_plus/builder.rb
 - lib/guard/jekyll_plus/builder/action.rb
@@ -146,14 +147,15 @@ files:
 - lib/guard/jekyll_plus/templates/Guardfile
 - lib/guard/jekyll_plus/version.rb
 - lib/rack/config.ru
-- spec/lib/guard/jekyll-plus/builder/adder_spec.rb
-- spec/lib/guard/jekyll-plus/builder/modifier_spec.rb
-- spec/lib/guard/jekyll-plus/builder/rebuilder_spec.rb
-- spec/lib/guard/jekyll-plus/builder/remover_spec.rb
-- spec/lib/guard/jekyll-plus/builder_spec.rb
-- spec/lib/guard/jekyll-plus/config_spec.rb
-- spec/lib/guard/jekyll-plus/server_spec.rb
-- spec/lib/guard/jekyll-plus_spec.rb
+- spec/lib/guard/jekyll_plus/builder/action_spec.rb
+- spec/lib/guard/jekyll_plus/builder/adder_spec.rb
+- spec/lib/guard/jekyll_plus/builder/modifier_spec.rb
+- spec/lib/guard/jekyll_plus/builder/rebuilder_spec.rb
+- spec/lib/guard/jekyll_plus/builder/remover_spec.rb
+- spec/lib/guard/jekyll_plus/builder_spec.rb
+- spec/lib/guard/jekyll_plus/config_spec.rb
+- spec/lib/guard/jekyll_plus/server_spec.rb
+- spec/lib/guard/jekyll_plus_spec.rb
 - spec/spec_helper.rb
 - test/.gitignore
 - test/404.html
@@ -191,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Guard plugin for Jekyll which intelligently handles changes to static and