dir_dsl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE5NmM3YjgxNjFiNzA2NWVmZThhNjk2NmM1NWFjMjE1NmZiZWFiMw==
+    MzZlZDc2YTZmYmE3NzRiYzE3OTQ2MDI4MTVkNDI2ZjRjNDQ0MTQ2NQ==
   data.tar.gz: !binary |-
-    NGUzNjZjMGJlZjgyNDY3ODNjM2IwMTJkMjMxOGQyN2ViZjgwMTYyNQ==
+    OGRiOTZhODNhMDI1ZDNiYmYwNzBjNDliODhjMzMxOTFhMDRiOWU5OA==
 SHA512:
   metadata.gz: !binary |-
-    N2ZjNWQ2NWYwOTBhMDIwMmM3YTM5YWFiYjgwYjhiZjUwMWI4MTYwODdkZmQw
-    N2U2MzgzZmY0ZGRjMDkxYWYyZTRmMjUwNmE5OTZlMTBkMjBjYzk5NjMyNTIx
-    NTAyZDA2ZTMyYTI4NWEyMDljNTFmMTcwYzQyNWNjNDVkMGVhNGU=
+    MmFlN2MxOTU5MTMzYTE1ODZlZmMyNGE3NWU2NzFiM2IxZjJmMzM2OGQxZWMw
+    NTNiOTAxMTFhNWZkMjE1YmUxMjE4NWMyYzAxYTdhYWY3MmNhNTVjYzUyY2Nh
+    NGQ0OTBmYjYyMGMyNjIzMjNmZWZkMDdkNTM3MmQyZmY4YzE1MDE=
   data.tar.gz: !binary |-
-    YThlYWYzZTE2YmIxMjgwZTJiZWVhYzI1OTNlZWZkNjBiMGM0ODE0N2RmZWFh
-    Yzk1NmY0NDA4OWE4MmIxMTM3ODk2MWE5Njg0ZWUwNzc1MTZhZjkxYWYxZTI2
-    MzBmODE1ZjhhMmY5NDY2ODQ2MzAyZjlhZjk4YWFjMWYzMzI4OGY=
+    ZDViMTJiMTFiNjZkMzgxOTFhYzQzN2RhYzQ0YzE5N2JkNzMxYTQ2ZjVhYTRl
+    MTM3NTc0Zjc1YmNkZjdjNDZmNzkwMzg1YzQxZDQwZjM4NDY4MTUxMTQ4ZGI0
+    OTY5YzU3OGM0NmVjZDcyNDZhOGNmYTJlNTBiMjM3ZDNkNjExOTk=

data/CHANGES

@@ -6,4 +6,8 @@
 
 == Version 1.0.1
 
+* Bug fixes.
+
+== Version 1.0.2
+
 * Bug fixes.

data/lib/dir_dsl/dir_dsl.rb

@@ -8,12 +8,17 @@ class DirDSL
   def initialize from_root, to_root
     @from_root = File.expand_path(from_root)
     @to_root = File.expand_path(to_root)
+    @global_ignores = []
   end
 
   def build(&block)
     self.instance_eval(&block)
   end
 
+  def global_ignore ignore
+    @global_ignores << ignore
+  end
+
   def entry_exist? entry_name
     File.exist? "#{to_root}/#{entry_name}"
   end
@@ -30,7 +35,7 @@ class DirDSL
   end
 
   def list dir="."
-    list = pattern_to_files"#{from_root}/#{dir}", "**/*"
+    list = pattern_to_files "#{from_root}/#{dir}", "**/*"
 
     list.each_with_index do |name, index|
       list[index] = name["#{from_root}/#{dir}".length+1..-1]
@@ -59,11 +64,7 @@ class DirDSL
   end
 
   def directory params
-    if params[:from_dir].nil?
-      to_dir = "#{to_root}/#{params[:to_dir]}"
-
-      create_directory to_dir unless File.exist? to_dir
-    else
+    if params[:from_dir]
       if params[:to_dir] == "." || params[:to_dir].nil?
         to_dir = params[:from_dir]
       else
@@ -71,22 +72,74 @@ class DirDSL
       end
 
       filter = params[:filter].nil? ? "**/*" : params[:filter]
+      excludes = parse_excludes(params[:excludes])
+
+      copy_files_with_excludes "#{from_root}/#{params[:from_dir]}", "#{to_root}/#{to_dir}", filter, excludes
+    else
+      to_dir = "#{to_root}/#{params[:to_dir]}"
 
-      copy_files "#{from_root}/#{params[:from_dir]}", "#{to_root}/#{to_dir}", filter
+      create_directory to_dir unless File.exist? to_dir
     end
   end
 
   private
 
   def to_dir dir, name
-    if dir.nil?
-      from_dir = File.dirname(name)
-      to_dir = (from_dir == ".") ? to_root : "#{to_root}/#{from_dir}"
+    dir = File.dirname(name) unless dir
+
+    if dir == "."
+      to_root
+    else
+      "#{to_root}/#{dir}"
+    end
+  end
+
+  def parse_excludes excludes
+    if excludes
+      excludes.split(",").map(&:strip)
     else
-      to_dir = (dir == ".") ? to_root : "#{to_root}/#{dir}"
+      []
+    end
+  end
+
+  def copy_files_with_excludes from_dir, to_dir, pattern, excludes
+    create_directory to_dir
+
+    files = pattern_to_files from_dir, pattern
+
+    files.each do |file|
+      if File.file? file and not file_excluded(file, excludes)
+        FileUtils.cp(file, to_dir)
+      elsif File.directory?(file) and not dir_in_global_ignores(file, @global_ignores)
+        FileUtils.mkdir_p file
+      end
+    end
+  end
+
+  def dir_in_global_ignores dir, global_ignores
+    ignored = false
+
+    global_ignores.each do |exclude|
+      if dir =~ /#{exclude}/
+        ignored = true
+        break
+      end
+    end
+
+    ignored
+  end
+
+  def file_excluded(file, excludes)
+    excluded = false
+
+    excludes.each do |exclude|
+      if file =~ /#{exclude}/
+        excluded = true
+        break
+      end
     end
 
-    to_dir
+    excluded
   end
 
 end

data/lib/dir_dsl/version.rb

@@ -1,3 +1,3 @@
 class DirDSL
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/dir_dsl_spec.rb

@@ -69,7 +69,7 @@ describe DirDSL do
       directory :from_dir => "spec"
     end
 
-    subject.list("spec").should include "spec_helper.rb"
+    subject.entry_exist?("spec/spec_helper.rb").should be_true
   end
 
   it "should display files in specified subdirectory" do
@@ -77,7 +77,15 @@ describe DirDSL do
       directory :from_dir => "lib"
     end
 
-    subject.list("lib/dir_dsl").first.should =~ %r{dir_dsl.rb}
+    subject.entry_exist?("lib/dir_dsl.rb").should be_true
+  end
+
+  it "should exclude files from result" do
+    subject.build do
+      directory :from_dir => "lib", :excludes => "version.rb"
+    end
+
+    subject.entry_exist?("lib/version.rb").should be_false
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir_dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Shvets