zipit 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/bin/zipit

@@ -2,8 +2,6 @@
 
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 
-#!/usr/bin/env ruby
-
 $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
 require 'zipit'

data/lib/zipit.rb

@@ -1,32 +1,60 @@
 require 'zip/zip'
 
 class Zipit
-  def create_zip_file params
-    file_name = params[:file_name]
-    dir = params[:dir]
+  attr_reader :global_excludes, :includes, :excludes
+
+  def zip_cmd_line params
+    archive = params[0].nil? ? "#{File.basename(Dir.pwd)}.zip" : params[0]
+    dir = params[1].nil? ? "." : params[1]
+
+    @includes = params[:includes].nil? ? [] : params[:includes]
+    @excludes = params[:excludes].nil? ? [] : params[:excludes]
     @global_excludes = params[:global_excludes].nil? ? [] : params[:global_excludes]
+
+    @excludes += [archive]
+    @global_excludes += ['.svn', '.git']
+
+    create_zip_file(:file_name => archive, :dir => dir)
+  end
+
+  def zip params
+    archive = params[:archive].nil? ? "#{File.basename(Dir.pwd)}.zip" : params[:archive]
+    dir = params[:dir].nil? ? "." : params[:dir]
+
     @includes = params[:includes].nil? ? [] : params[:includes]
     @excludes = params[:excludes].nil? ? [] : params[:excludes]
+    @global_excludes = params[:global_excludes].nil? ? [] : params[:global_excludes]
+
+    @excludes += [archive]
+    @global_excludes += ['.svn', '.git']
+
+    create_zip_file(:file_name => archive, :dir => dir)
+  end
+
+  private
+
+  def create_zip_file params
+    file_name = params[:file_name]
+    dir = params[:dir]
 
     Zip::ZipOutputStream.open(file_name) do |zos|
-      zip(zos, dir, dir)
+      zip_stream(zos, dir, dir)
     end
   end
 
-  def zip zos, name, basedir
+  def zip_stream zos, name, basedir
     Dir.new(name).each do |filename|
       if(filename != '.' and filename != '..')
         full_name = name + '/' + filename
 
         if File.directory? full_name
-          zip(zos, full_name, basedir)
+          if not match?(full_name, global_excludes) and not match?(full_name, excludes) and not match?(full_name, includes)
+            zip_stream(zos, full_name, basedir)
+          end
         else
           new_name = full_name[basedir.length+1..full_name.length]
-          
-          if (match?(new_name, @global_excludes) or match?(new_name, @excludes)) and
-            not match?(new_name, @includes)
-            ;
-          else
+
+          if not (match?(new_name, global_excludes) and not match?(new_name, excludes)) and not match?(new_name, includes)
             puts "Adding #{new_name} ..."
             # Create a new entry with some arbitrary name
             zos.put_next_entry(new_name)
@@ -37,34 +65,25 @@ class Zipit
       end
     end
   end
-  
+
   def match? name, list
     list.each do |pattern|
-      return true if File.fnmatch(pattern, name) or name =~ /^#{pattern}/
+      return true if File.fnmatch(pattern, name) or name =~ /#{pattern}/
     end
 
     false
-  end   
+  end
+
 end
 
-def zip_cmd_line params
+def zip params
   zipit = Zipit.new
 
-  archive = params[0].nil? ? "#{File.basename(Dir.pwd)}.zip" : params[0]
-  dir = params[1].nil? ? "." : params[1]
-
-  zipit.create_zip_file( 
-    :file_name => archive, :dir => dir,
-    :global_excludes => ['.svn', '.git'], :excludes => [archive])
-end  
+  zipit.zip params
+end
 
-def zip params
+def zip_cmd_line params
   zipit = Zipit.new
-  
-  archive = params[:archive].nil? ? "#{File.basename(Dir.pwd)}.zip" : params[:archive]
-  dir = params[:dir].nil? ? "." : params[:dir]
 
-  zipit.create_zip_file( 
-    :file_name => archive, :dir => dir,
-    :global_excludes => ['.svn', '.git'], :excludes => [archive])
+  zipit.zip_cmd_line params
 end

data/spec/zipit_spec.rb

@@ -0,0 +1,41 @@
+# zipit_spec.rb
+
+require 'zipit'
+
+describe Zipit do
+  context "create zip archive from the dir" do
+    subject { Zipit.new }
+
+    before do
+      `mkdir -pv test/.svn`
+      `mkdir -pv test/test1/.svn`
+      `cp zipit_spec.rb test/test1/.svn`
+
+      `mkdir -pv test/test1/test2/test3`
+      `mkdir -pv test/test4/test5/test6/test7`
+      `cp zipit_spec.rb test/test1/test2/test3`
+      `cp zipit_spec.rb test/test4/test5/test6/test7`
+    end
+
+    after do
+      `rm -r test`
+    end
+
+    it "should create new archive" do
+      subject.zip :archive => "../test1.zip", :dir => "test"
+
+      Zip::ZipFile.open("../test1.zip") do |zipfile|
+        zipfile.find_entry('test1/test2/test3/zipit_spec.rb').should_not be_nil
+      end
+    end
+
+    it "should not include test2" do
+      subject.zip :archive => "../test2.zip", :dir => "test", :excludes => ["test2"]
+
+      Zip::ZipFile.open("../test2.zip") do |zipfile|
+        zipfile.find_entry('test1/test2/test3/zipit_spec.rb').should be_nil
+      end
+    end
+  end
+end
+

data/zipit.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{zipit}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2011-08-26}
   s.default_executable = %q{zipit}
   s.description = %q{Rake helper for zipping/unzipping project files.}
   s.email = %q{alexander.shvets@gmail.com}
@@ -19,31 +19,35 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGES",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "bin/zipit",
-     "bin/zipit.bat",
-     "lib/zipit.rb",
-     "zipit.gemspec"
+    "README",
+    "Rakefile",
+    "VERSION",
+    "bin/zipit",
+    "bin/zipit.bat",
+    "lib/zipit.rb",
+    "zipit.gemspec"
   ]
   s.homepage = %q{http://github.com/shvets/zipit}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.requirements = ["none"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Rake helper for zipping/unzipping project files. (Summary).}
+  s.test_files = [
+    "spec/zipit_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<zip>, [">= 0"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.4"])
     else
+      s.add_dependency(%q<zip>, [">= 0"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
     end
   else
+    s.add_dependency(%q<zip>, [">= 0"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zipit
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -15,13 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -04:00
+date: 2011-08-26 00:00:00 -04:00
 default_executable: zipit
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: zip
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,8 +46,8 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
-  version_requirements: *id001
+  name: rubyzip
+  version_requirements: *id002
 description: Rake helper for zipping/unzipping project files.
 email: alexander.shvets@gmail.com
 executables: 
@@ -51,13 +65,14 @@ files:
 - bin/zipit.bat
 - lib/zipit.rb
 - zipit.gemspec
+- spec/zipit_spec.rb
 has_rdoc: true
 homepage: http://github.com/shvets/zipit
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,9 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rake helper for zipping/unzipping project files. (Summary).
-test_files: []
-
+test_files: 
+- spec/zipit_spec.rb