zip_dsl 1.4.4 → 1.5.0

data/.idea/zip_dsl.iml

@@ -36,7 +36,7 @@
       <ConfigurationWrapper RunnerId="RubyDebugRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="ZipDSL" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="ZipDSL#build excludes specified directory: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="zip_dsl" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -59,7 +59,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/zip_dsl_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#build excludes specified directory" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -68,11 +68,13 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
       <RunnerSettings RunnerId="RubyRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
       <ConfigurationWrapper RunnerId="RubyRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="zip_dsl_spec" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="ZipDSL#build should create new zip file with new empty folder: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="zip_dsl" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -95,7 +97,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/zip_dsl_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#build should create new zip file with new empty folder" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -108,7 +110,7 @@
       <ConfigurationWrapper RunnerId="RubyRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="ZipDSL should display files in specified subdirectory: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="ZipDSL#build updates existing zip file: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="zip_dsl" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -119,7 +121,7 @@
       <envs>
         <env name="JRUBY_OPTS" value="-X+O" />
       </envs>
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
       <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
       <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
         <COVERAGE_PATTERN ENABLED="true">
@@ -131,7 +133,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/zip_dsl_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL should display files in specified subdirectory" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#build updates existing zip file" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -144,7 +146,7 @@
       <ConfigurationWrapper RunnerId="RubyRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="ZipDSL#read: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="Run spec 'zip_dsl_spec': zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="zip_dsl" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -155,7 +157,7 @@
       <envs>
         <env name="JRUBY_OPTS" value="-X+O" />
       </envs>
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
       <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
       <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
         <COVERAGE_PATTERN ENABLED="true">
@@ -167,7 +169,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/zip_dsl_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#read" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -176,11 +178,13 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
+      <RunnerSettings RunnerId="RubyDebugRunner" />
       <RunnerSettings RunnerId="RubyRunner" />
+      <ConfigurationWrapper RunnerId="RubyDebugRunner" />
       <ConfigurationWrapper RunnerId="RubyRunner" />
       <method />
     </configuration>
-    <configuration default="false" name="ZipDSL#build should create new zip file with files at particular folder: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
+    <configuration default="false" name="ZipDSL#build excludes specified directories: zip_dsl" type="RSpecRunConfigurationType" factoryName="RSpec" temporary="true">
       <predefined_log_file id="RUBY_RSPEC" enabled="true" />
       <module name="zip_dsl" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
@@ -191,7 +195,7 @@
       <envs>
         <env name="JRUBY_OPTS" value="-X+O" />
       </envs>
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
+      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
       <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
       <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
         <COVERAGE_PATTERN ENABLED="true">
@@ -203,7 +207,7 @@
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="$MODULE_DIR$/spec/zip_dsl_spec.rb" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
-      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#build should create new zip file with files at particular folder" />
+      <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="ZipDSL#build excludes specified directories" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
       <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
@@ -221,21 +225,20 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p550 [zip_dsl]" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.2.0 [zip_dsl]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.4, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.7, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="meta_methods (v1.2.0, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.4, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mocha (v1.1.0, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.1.0, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.1.7, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.1.2, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.1.3, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.1.2, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-1.9.3-p550 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.9, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="meta_methods (v1.3.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.4, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mocha (v1.1.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.2.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.2.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.2.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.2.0, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.2.1, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-2.2.0 [zip_dsl]) [gem]" level="application" />
   </component>
 </module>

data/.ruby-version

@@ -1 +1 @@
-2.1.4
+2.2.0

data/CHANGES

@@ -48,4 +48,10 @@
 
 * Bug fix.
 
+== Version 1.5.0
+
+* Merging zip_updated into zip_writer.
+* Use directory_scanner
+* Introduce includes/excludes
+
 

data/lib/zip_dsl/version.rb

@@ -1,3 +1,3 @@
 class ZipDSL
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

data/lib/zip_dsl/zip_dsl.rb

@@ -3,9 +3,11 @@ require 'meta_methods/dsl_builder'
 class ZipDSL
   attr_reader :name, :from_dir
 
-  def initialize name, from_dir = nil
+  def initialize name, from_dir=".", params={}
     @name = name
-    @from_dir = from_dir.nil? ? from_dir : File.expand_path(from_dir)
+    @from_dir = File.expand_path(from_dir)
+    @includes = params[:includes]
+    @excludes = params[:excludes]
 
     to_root = File.expand_path(File.dirname(name))
     FileUtils.mkdir_p(to_root) unless File.exists? to_root
@@ -14,21 +16,12 @@ class ZipDSL
   def build(name=nil, &execute_block)
     name = name.nil? ? @name : name
 
-    create_block = lambda { ZipWriter.new(name, from_dir) }
+    create_block = lambda { ZipWriter.new(name, from_dir, @includes, @excludes) }
     destroy_block = lambda {|writer| writer.close }
 
     MetaMethods::DslBuilder.instance.evaluate_dsl(create_block, destroy_block, execute_block)
   end
 
-  def update(name=nil, &execute_block)
-    name = name.nil? ? @name : name
-
-    create_block = lambda { ZipUpdater.new(name, from_dir) }
-    destroy_block = lambda {|updater| updater.close }
-
-    MetaMethods::DslBuilder.instance.evaluate_dsl(create_block, destroy_block, execute_block)
-  end
-
   def entry_exist? entry_name
     create_block = lambda { ZipReader.new(name) }
     destroy_block = lambda {|reader| reader.close }

data/lib/zip_dsl/zip_writer.rb

@@ -1,24 +1,36 @@
+require 'file_utils/directory_scanner'
 require 'zip/zip'
 
 class ZipWriter
   attr_reader :from_dir
 
-  def initialize name, from_dir
+  def initialize name, from_dir, includes=[], excludes=[]
     @from_dir = from_dir
+    @global_includes = includes
+    @global_excludes = excludes
 
-    @zos = Zip::ZipOutputStream.new(name)
-
-    @compression_level = Zlib::BEST_COMPRESSION
+    if File.exist?(name)
+      @zipfile = Zip::ZipFile.open(name)
+      @new_file = false
+    else
+      @compression_level = Zlib::BEST_COMPRESSION
+      @zos = Zip::ZipOutputStream.new(name)
+      @new_file = true
+    end
   end
 
   def close
-    @zos.close
+    @new_file ? @zos.close : @zipfile.close
   end
 
   def file params
     to_dir = params[:to_dir].nil? ? File.dirname(params[:name]) : strip_dot(params[:to_dir])
 
-    add_file full_name(params[:name]), to_dir
+    if @new_file
+      add_file full_name(params[:name]), to_dir
+    else
+      add_or_replace_file full_name(params[:name]), "#{to_dir}/#{params[:name]}"
+    end
   end
 
   def content params
@@ -37,43 +49,66 @@ class ZipWriter
         to_dir = params[:to_dir]
       end
 
-      filter = params[:filter].nil? ? "**/*" : params[:filter]
+      includes = build_filter(params[:includes], @global_includes)
+      excludes = build_filter(params[:excludes], @global_excludes)
 
-      add_directory params[:from_dir], to_dir, filter
+      add_directory File.expand_path(params[:from_dir]), to_dir, includes, excludes
     end
   end
 
   private
 
+  def build_filter from1, from2
+    from1 = from1.nil? ? [] : from1
+    from2 = from2.nil? ? [] : from2
+
+    from1 + from2
+  end
+
+  def add_or_replace_file from_name, to_name
+    begin
+      @zipfile.add to_name, from_name
+    rescue Zip::ZipEntryExistsError
+      @zipfile.replace to_name, from_name
+    end
+  end
+
   def add_file name, to_dir = nil
     add name, to_dir, File.open(name)
   end
 
-  def add_directory from_dir, to_dir, filter="**/*"
-    patterns = filter.kind_of?(String) ? [filter] : filter
-
-    patterns.each do |pattern|
-      files = pattern_to_files full_name(from_dir), pattern
+  def add_directory from, to_dir, includes, excludes
+    scanner = DirectoryScanner.new
+    files = scanner.scan full_name(from), false, :includes => includes, :excludes => excludes
 
-      files.each do |file_name|
-        suffix = File.dirname(file_name)[full_name(from_dir).size+1..-1]
-        dir = suffix.nil? ? to_dir : "#{to_dir}/#{suffix}"
+    files.each do |file_name|
+      suffix = File.dirname(file_name)[full_name(from).size+1..-1]
+      dir = suffix.nil? ? to_dir : "#{to_dir}/#{suffix}"
 
-        if File.file?(file_name)
+      if File.file?(file_name)
+        if @new_file
           add_file file_name, dir
+        else
+          to_name = "#{dir}/#{file_name[full_name(dir).size+1..-1]}"
+
+          add_or_replace_file file_name, to_name
         end
       end
     end
   end
 
-  def pattern_to_files dir, pattern
-    Dir.glob("#{dir}/#{pattern}")
-  end
-
   def add_empty_directory(name)
-    entry = Zip::ZipStreamableDirectory.new "", "#{name}/"
+    if @new_file
+      entry = Zip::ZipStreamableDirectory.new "", "#{name}/"
+
+      @zos.put_next_entry entry
+    else
+      puts "adding empty dir: #{name}"
 
-    @zos.put_next_entry entry
+      #entry = Zip::ZipStreamableDirectory.new "", "#{name}/"
+      #
+      #@zos.put_next_entry entry
+    end
   end
 
   def add name, to_dir, source

data/lib/zip_dsl.rb

@@ -1,4 +1,3 @@
 require 'zip_dsl/zip_reader'
 require 'zip_dsl/zip_writer'
-require 'zip_dsl/zip_updater'
 require 'zip_dsl/zip_dsl'

data/spec/zip_dsl_spec.rb

@@ -15,7 +15,7 @@ describe ZipDSL do
   end
 
   describe "#build" do
-    it "should create new zip file with files at particular folder" do
+    it "creates new zip file with files at particular folder" do
       subject.build do
         file :name => "Gemfile"
         file :name => "Rakefile", :to_dir => "my_config"
@@ -29,7 +29,7 @@ describe ZipDSL do
       expect(subject.entries_size).to eq 3
     end
 
-    it "should create new zip file with file created from string" do
+    it "creates new zip file with file created from string" do
       subject.build do
         content :name => "README", :source => "My README file content"
       end
@@ -38,7 +38,7 @@ describe ZipDSL do
       expect(subject.entries_size).to eq 1
     end
 
-    it "should create new zip file with file created from file" do
+    it "creates new zip file with file created from file" do
       src = File.open("#{from_dir}/Rakefile")
       subject.build do
         content :name => "Rakefile",  :source => src
@@ -57,7 +57,7 @@ describe ZipDSL do
       expect(subject.entries_size).to eq 1
     end
 
-    it "should create new zip file with new folder" do
+    it "creates new zip file with new folder" do
       subject.build do
         directory :from_dir => "spec", :to_dir => "my_config"
       end
@@ -65,10 +65,8 @@ describe ZipDSL do
       expect(subject.entry_exist?("my_config")).to be_truthy
       expect(subject.entries_size).to be > 1
     end
-  end
 
-  describe "#update" do
-    it "should update existing zip file" do
+    it "updates existing zip file" do
       subject.build do
         file :name => "Gemfile"
       end
@@ -76,7 +74,7 @@ describe ZipDSL do
       expect(File.exist?(subject.name)).to be_truthy
       expect(subject.entry_exist?("Gemfile")).to be_truthy
 
-      subject.update do
+      subject.build do
         file :name => "README.md"
         directory :from_dir => "lib"
       end
@@ -85,10 +83,21 @@ describe ZipDSL do
       expect(subject.entry_exist?("README.md")).to be_truthy
       expect(subject.entry_exist?("lib/zip_dsl/version.rb")).to be_truthy
     end
+
+    it "excludes specified directories" do
+      subject = ZipDSL.new "build/test.zip", from_dir, :excludes => [".git", ".idea", ".DS_Store"]
+
+      subject.build do
+        directory :from_dir => ".", :excludes => ["build"]
+      end
+
+      expect(subject.entry_exist?("build")).to be_falsey
+      expect(subject.entry_exist?(".git")).to be_falsey
+    end
   end
 
   describe "#list" do
-    it "should display files in current directory" do
+    it "displays files in current directory" do
       subject.build do
         directory :from_dir => "spec"
       end
@@ -96,7 +105,7 @@ describe ZipDSL do
       expect(subject.list).to include "spec/spec_helper.rb"
     end
 
-    it "should display files in specified subdirectory" do
+    it "displays files in specified subdirectory" do
       subject.build do
         directory :from_dir => "lib"
       end
@@ -106,7 +115,7 @@ describe ZipDSL do
   end
 
   describe "#each_entry" do
-    it "should display files in specified subdirectory" do
+    it "displays files in specified subdirectory" do
       subject.build do
         directory :from_dir => "lib"
       end

metadata

@@ -1,105 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: zip_dsl
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: file_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: meta_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   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: gemcutter
   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: ! 'Library for working with zip file in DSL-way '
+description: 'Library for working with zip file in DSL-way '
 email: alexander.shvets@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .idea/.name
-- .idea/.rakeTasks
-- .idea/cssxfire.xml
-- .idea/encodings.xml
-- .idea/misc.xml
-- .idea/modules.xml
-- .idea/runConfigurations/rake.xml
-- .idea/scopes/scope_settings.xml
-- .idea/vcs.xml
-- .idea/workspace.xml
-- .idea/zip_dsl.iml
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".idea/.name"
+- ".idea/.rakeTasks"
+- ".idea/cssxfire.xml"
+- ".idea/encodings.xml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/runConfigurations/rake.xml"
+- ".idea/scopes/scope_settings.xml"
+- ".idea/vcs.xml"
+- ".idea/workspace.xml"
+- ".idea/zip_dsl.iml"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGES
 - Gemfile
 - LICENSE
@@ -109,7 +109,6 @@ files:
 - lib/zip_dsl/version.rb
 - lib/zip_dsl/zip_dsl.rb
 - lib/zip_dsl/zip_reader.rb
-- lib/zip_dsl/zip_updater.rb
 - lib/zip_dsl/zip_writer.rb
 - spec/spec_helper.rb
 - spec/zip_dsl_spec.rb
@@ -125,17 +124,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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Library for working with zip file in DSL-way