guard-jekyll-plus 1.4.6 → 1.4.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTc2OTc3NGYyNzI1ZDkwYjZlMGMwNGJlMDE1YjE1OTVjYjg5MTcyMw==
+  data.tar.gz: !binary |-
+    NmE2YjExYjgyNTFjM2YzMGU4ZGMzZjJmYTljNmQ5ZGUzYmY2YzFlOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2MxNjNmZTg2MzJmYzA3NWVlMWNmODU1ZjNhNTM2ZjU4ZWU5NWZkNjBmY2Iw
+    ZmUxY2ZiZmUyN2Q2NDNiNzIzNjA5YWVmNzEzM2IxNTkzNmE4YzhiNDc4Y2Nh
+    ZWZhNTJmYWI3Y2I2NzE2ODZmMjJlZTYzOTE2MjU5YjU0NDExZGY=
+  data.tar.gz: !binary |-
+    NmUxZGZmNzI4ZWIwN2IyNTliYmM3ZWU0M2E2YjZkNDQ4Y2NmNGE1MDY3OTU0
+    ZTNhMzBjOWUxZWVlZDRjNWNlOGFiYTViNzZiMDUxOGRlOGZlMzIwMzVmNzgz
+    Y2U5NWY4NTA3ZTc5MzJmNjFkOTNkZDdiZjI3OTE3ZWM2OWQxOWY=

data/CHANGELOG.md

@@ -68,7 +68,10 @@ New config options
 
 - Rack process is now succesfully killed on Guard stop
 
-### 1.4.5
+### 1.4.6
 
 - Rack is now actually optional (oops).
 
+### 1.4.7
+
+- Double checks that there are files to remove before proceeding and printing remove message.

data/lib/guard/jekyll-plus.rb

@@ -164,34 +164,37 @@ module Guard
     # Remove deleted source file/directories from destination
     #
     def remove(files=[])
-      begin
-        message = 'removed file'
-        message += 's' if files.size > 1
-        UI.info "#{@msg_prefix} #{message.red}" unless @config[:silent]
-        puts '| ' #spacing
-
-        files.each do |file|
-          path = destination_path file
-          if File.exist? path
-            FileUtils.rm path
-            puts '|' + "  x ".red + path
+      # Ensure at least one file still exists (other scripts may clean up too)
+      if files.select {|f| File.exist? f }.size > 0
+        begin
+          message = 'removed file'
+          message += 's' if files.size > 1
+          UI.info "#{@msg_prefix} #{message.red}" unless @config[:silent]
+          puts '| ' #spacing
+
+          files.each do |file|
+            path = destination_path file
+            if File.exist? path
+              FileUtils.rm path
+              puts '|' + "  x ".red + path
+            end
+
+            dir = File.dirname path
+            if Dir[dir+'/*'].empty?
+              FileUtils.rm_r(dir) 
+              puts '|' + "  x ".red + dir
+            end
           end
+          puts '| ' #spacing
 
-          dir = File.dirname path
-          if Dir[dir+'/*'].empty?
-            FileUtils.rm_r(dir) 
-            puts '|' + "  x ".red + dir
-          end
+        rescue Exception => e
+          UI.error "#{@msg_prefix} remove has failed" unless @config[:silent]
+          UI.error e
+          stop_server
+          throw :task_has_failed
         end
-        puts '| ' #spacing
-
-      rescue Exception => e
-        UI.error "#{@msg_prefix} remove has failed" unless @config[:silent]
-        UI.error e
-        stop_server
-        throw :task_has_failed
+        true
       end
-      true
     end
 
     def jekyll_matches(paths)

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

@@ -1,5 +1,5 @@
 module Guard
   class JekyllPlusVersion
-    VERSION = "1.4.6"
+    VERSION = "1.4.7"
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.4.6
-  prerelease: 
+  version: 1.4.7
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,27 +78,26 @@ files:
 homepage: http://github.com/imathis/guard-jekyll-plus
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Guard plugin for Jekyll which intelligently handles changes to static and
   template files, only running a Jekyll build when necessary.
 test_files: []