roger 0.12.2 → 0.12.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTVhNDk2M2U3ZWFjY2QxMzhhMzU3YTA2OTYwYmNjNTRkYmI1ZTYzYg==
+    ZDNkNDAwZjFmOTYxZWVmYjE5MDYwYmFmZWQ5OTU2YmU4Zjc1NzczZg==
   data.tar.gz: !binary |-
-    ZmFiYzk4MjkwMDcxOWY0M2FiNThhNGJlNzczZTVjZDBkMTk4MjdiYg==
+    MjExZDc0NjVhMGYwNzYzNTM2ZTFhMjFlZGZmMTY5MjE3MWUxZDQ3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NzQ3OTk0ZTIzNmU0ZjgxZTEyMzJhMDUxNGVhNmIxN2IyOTcwMmUxZTk4YmE4
-    Y2M2YzEyZmE3ZGQxNWUyYWUyMWYwZWIxNzE0MmE3Zjc1MGIyNzQzNmUwN2Fl
-    YzE4ZDRkNzRkNTIzNDdhMjBlYWYzM2RhNzA4YjI0NzllYWE3MTQ=
+    N2UxNjZmMDJjOGVlMmQxOGQ3ODhiYzVhNjMzOGI2ZjYyOGM0YThhMDE1YjUz
+    OWEwYWMwYjBhNDk4MGU0MTEzMGRlMDYxNDVlNjJjY2UwYjkxNmRkMmQ2ZjA5
+    NDZjNmRhNmNhNWZhNDhkMjBhYjg1NzkwNjBhZjg5YTI1ZTkyYjQ=
   data.tar.gz: !binary |-
-    NTU4YWEzYWFmMTZiZTdlYTYwNTgzMmQ5MTI2NDkxN2FlZmI4MGVjNGZkOTVj
-    MzJlNzVjM2ZiOGQ3MmIyZmIyOGU1ZjEzOWNiMDUxNWIwNGQ5NzFmODg2OTBi
-    NjBkZjIwOTVmMDBlMjU5ZjNjNjkyNTlhMzgyOWNhYzA5YmI1NmM=
+    YjMzZDJjZDM0YWRhZDcwNGIyNmM5ZDUzOTc0OWE3ZmM1ZWUzMWRjMTYxNDA5
+    OTYxYTgwMzJlNmQ2MjY4MDcxOWZmNDgxZDYyMTk2NzM0ZmE4MTc0NDJlODhl
+    MTAxZGQ5NGZmOWU1NDNjMmVmNTEzN2M5NjBjZjUzMWYzZTUwZjY=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.12.3
+* Allow release cleaner to work with arrays of globs/paths
+
 ## Version 0.12.2
 * Add redcarpet as a dependency so markdown processing always works
 

data/lib/roger/release/cleaner.rb

@@ -1,25 +1,33 @@
 module Roger
   class Release::Cleaner
     def initialize(pattern)
-      @pattern = pattern
+      @pattern = [pattern].flatten
     end
     
     def call(release, options = {})
       # We switch to the build path and append the globbed files for safety, so even if you manage to sneak in a
       # pattern like "/**/*" it won't do you any good as it will be reappended to the path
       Dir.chdir(release.build_path.to_s) do
-        Dir.glob(@pattern).each do |file|
-          path = File.join(release.build_path.to_s, file)
-          if is_inside_build_path(release.build_path, path)
-            release.log(self, "Cleaning up \"#{path}\" in build")
-            rm_rf(path)
-          else
-            release.log(self, "FAILED cleaning up \"#{path}\" in build")
+        @pattern.each do |pattern|
+          Dir.glob(pattern).each do |file|
+            self.clean_path(release, file)
           end
         end
       end
     end
 
+    def clean_path(release, file)
+      path = File.join(release.build_path.to_s, file)
+      if is_inside_build_path(release.build_path, path)
+        release.log(self, "Cleaning up \"#{path}\" in build")
+        rm_rf(path)
+        true
+      else
+        release.log(self, "FAILED cleaning up \"#{path}\" in build")
+        false
+      end
+    end
+
     protected
 
     def is_inside_build_path(build_path, path)     

data/roger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "roger"
-  s.version = "0.12.2"
+  s.version = "0.12.3"
   
   s.authors = ["Flurin Egger", "Edwin van der Graaf", "Joran Kapteijns"]
   s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  

data/test/unit/release/cleaner_test.rb

@@ -8,6 +8,27 @@ class CleanerTest < Test::Unit::TestCase
     @base = File.dirname(__FILE__) + "/../../project"
   end
 
+  def test_use_array_as_pattern
+    dirs = ["dir1", "dir2"]
+
+    dirs.each do |dir|
+      path = @base + "/" +dir
+      mkdir path unless File.directory?(path)
+      assert(File.directory?(path))
+    end
+
+    project = Roger::Project.new(@base)
+    release = Roger::Release.new(project, :build_path => Pathname.new(@base))
+
+    cleaner = Roger::Release::Cleaner.new(dirs)
+    cleaner.call(release)
+
+    dirs.each do |dir|
+      path = @base + "/" + dir
+      assert(!File.directory?(path))
+    end
+  end
+
   def test_only_clean_inside_build_path_relative
   
     cleaner = Roger::Release::Cleaner.new(@base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.