zipit 0.3.5 → 0.3.6

data/.idea/zipit.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.3, RVM: ruby-1.9.2-p318 [zipit]) [gem]" level="application" />
+  </component>
+</module>
+

data/.rvmrc

@@ -0,0 +1,6 @@
+rvm_project_rvmrc=1
+rvm_trust_rvmrcs_flag=1
+rvm_gemset_create_on_use_flag=1
+rvm_pretty_print_flag=1
+
+rvm use 1.9.3@zipit

data/CHANGES

@@ -7,4 +7,8 @@
 
 == Version 0.2.0
 
-* Adding binary zipit.
+* Adding binary zipit.
+
+== Version 0.3.6
+
+* Integration with zip_dsl

data/Gemfile

@@ -0,0 +1,14 @@
+source :rubygems
+
+group :default do
+  gem "zip_dsl"
+end
+
+group :development do
+  gem "gemspec_deps_gen"
+  gem "gemcutter"
+end
+
+group :test do
+  gem "rspec"
+end

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    gemcutter (0.7.1)
+    gemspec_deps_gen (1.0.0)
+    meta_methods (1.0.1)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    zip_dsl (1.0.0)
+      meta_methods
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gemcutter
+  gemspec_deps_gen
+  rspec
+  zip_dsl

data/Rakefile

@@ -1,36 +1,47 @@
 # Rakefile for zipit
 
-require "lib/zipit"
- 
+
+$LOAD_PATH.unshift File.expand_path("lib", File.dirname(__FILE__))
+
+require "rspec/core/rake_task"
+require "zipit/version"
+require "gemspec_deps_gen/gemspec_deps_gen"
+
+def version
+  Zipit::VERSION
+end
+
+def project_name
+  File.basename(Dir.pwd)
+end
+
+task :build do
+  generator = GemspecDepsGen.new
+
+  generator.generate_dependencies "#{project_name}.gemspec.erb", "#{project_name}.gemspec"
+
+  system "gem build #{project_name}.gemspec"
+end
+
+task :release => :build do
+  system "gem push #{project_name}-#{version}.gem"
+end
+
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.verbose = false
+end
+
+require "zipit"
+
 task :default => :zip
 
 task :zip do
   zip :archive => "zipit.zip", :dir => "."
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "zipit"
-    gemspec.summary = "Rake helper for zipping/unzipping project files. (Summary)."
-    gemspec.description = "Rake helper for zipping/unzipping project files."
-    gemspec.email = "alexander.shvets@gmail.com"
-    gemspec.homepage = "http://github.com/shvets/zipit"
-    gemspec.authors = ["Alexander Shvets"]
-    gemspec.files = FileList["CHANGES", "zipit.gemspec", "Rakefile", "init.rb", "README", "VERSION", "lib/**/*", "bin/**/*"]
-    gemspec.add_dependency "rubyzip", ">= 0.9.4"
-    gemspec.executables = ['zipit']
-    gemspec.requirements = ["none"]
-    gemspec.bindir = "bin"    
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalsteaks-jeweler -s http://gems.github.com"
-end
-
 desc "Run gem code locally"
 task :"run:gem" do
   command = "bin/zipit a.zip ."
   puts ruby("#{command}")
 end
-

data/bin/zipit

@@ -6,5 +6,13 @@ $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
 require 'zipit'
 
-zip_cmd_line ARGV
+zipit = Zipit.new
+
+hash = {}
+
+hash[:dir] = (ARGV.size > 0) ? ARGV[0] : "."
+hash[:archive] = (ARGV.size > 1) ? ARGV[1] :  "#{File.basename(Dir.pwd)}.zip"
+
+zipit.zip hash
+
 

data/lib/zipit.rb

@@ -1,89 +1 @@
-require 'zip/zip'
-
-class Zipit
-  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_stream(zos, dir, dir)
-    end
-  end
-
-  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
-          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 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)
-            # Add the contents of the file, don't read the stuff linewise if its binary, instead use direct IO
-            zos.print IO.read(name + '/' + filename)
-          end
-        end
-      end
-    end
-  end
-
-  def match? name, list
-    list.each do |pattern|
-      return true if File.fnmatch(pattern, name) or name =~ /#{pattern}/
-    end
-
-    false
-  end
-
-end
-
-def zip params
-  zipit = Zipit.new
-
-  zipit.zip params
-end
-
-def zip_cmd_line params
-  zipit = Zipit.new
-
-  zipit.zip_cmd_line params
-end
+require "zipit"

data/lib/zipit/version.rb

@@ -0,0 +1,3 @@
+module Zipit
+  VERSION = "0.3.6"
+end

data/lib/zipit/zipit.rb

@@ -0,0 +1,41 @@
+#require 'zip/zip'
+
+require 'zip_dsl/zip_dsl'
+require 'directory_scanner'
+
+class Zipit
+  attr_reader :global_excludes, :includes, :excludes
+
+  def zip params
+    includes = params[:includes].nil? ? [] : params[:includes]
+    excludes = params[:excludes].nil? ? [] : params[:excludes]
+    #@global_excludes = params[:global_excludes].nil? ? [] : params[:global_excludes]
+    #
+    excludes << params[:archive]
+    #@global_excludes << '.svn'
+    #@global_excludes << '.git'
+
+    create_zip_file(params[:dir], params[:archive], includes, excludes)
+  end
+
+  private
+
+  def create_zip_file dir, file_name, includes, excludes
+    scanner = DirectoryScanner.new
+    files = scanner.scan dir, includes, excludes
+
+    builder = Zip::DSL.new file_name
+
+    builder.build do
+      files.each do |name|
+        full_name = "#{dir}/#{name}"
+        if File.directory? full_name
+          directory :from_dir => full_name
+        else
+          to_dir =  "#{dir}/#{File.dirname(name)}"
+          file :name => full_name, :to_dir => to_dir
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')

data/spec/zipit_spec.rb

@@ -1,40 +1,22 @@
-# zipit_spec.rb
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 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"
+      subject.zip :dir => "config", :archive => "config.zip"
 
-      Zip::ZipFile.open("../test1.zip") do |zipfile|
-        zipfile.find_entry('test1/test2/test3/zipit_spec.rb').should_not be_nil
-      end
+      reader = Zip::Reader.new "config.zip"
+      reader.list.should include("config/application.rb")
     end
 
     it "should not include test2" do
-      subject.zip :archive => "../test2.zip", :dir => "test", :excludes => ["test2"]
+      subject.zip :dir => "config", :archive => "config.zip", :excludes => ["config/environments"]
 
-      Zip::ZipFile.open("../test2.zip") do |zipfile|
-        zipfile.find_entry('test1/test2/test3/zipit_spec.rb').should be_nil
-      end
+      reader = Zip::Reader.new "config.zip"
+      reader.list.should_not include("config/environments/test.rb")
     end
   end
 end

data/zipit.gemspec

@@ -1,54 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# 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.5"
+require File.expand_path(File.dirname(__FILE__) + '/lib/zipit/version')
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexander Shvets"]
-  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}
-  s.executables = ["zipit"]
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "CHANGES",
-    "README",
-    "Rakefile",
-    "VERSION",
-    "bin/zipit",
-    "bin/zipit.bat",
-    "lib/zipit.rb",
-    "zipit.gemspec"
-  ]
-  s.homepage = %q{http://github.com/shvets/zipit}
-  s.require_paths = ["lib"]
-  s.requirements = ["none"]
-  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"
-  ]
+Gem::Specification.new do |spec|
+  spec.name          = "zipit"
+  spec.summary       = %q{Rake helper for zipping/unzipping project files. (Summary).}
+  spec.description   = %q{Rake helper for zipping/unzipping project files.}
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/zipit"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files`.split($\)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.bindir = "bin"
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = Zipit::VERSION
 
-    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
+  spec.add_runtime_dependency "zip_dsl", [">= 0"]
+  spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
+  spec.add_development_dependency "gemcutter", [">= 0"]
+  
 end
-

data/zipit.gemspec.erb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/zipit/version')
+
+Gem::Specification.new do |spec|
+  spec.name          = "zipit"
+  spec.summary       = %q{Rake helper for zipping/unzipping project files. (Summary).}
+  spec.description   = %q{Rake helper for zipping/unzipping project files.}
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/zipit"
+
+  spec.files         = `git ls-files`.split($\)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.bindir = "bin"
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = Zipit::VERSION
+
+  <%= include_dependencies %>
+end

metadata

@@ -1,104 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zipit
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.3.6
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
 platform: ruby
-authors: 
+authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-26 00:00:00 -04:00
-default_executable: zipit
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2012-06-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: zip_dsl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !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 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gemspec_deps_gen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gemcutter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  name: rubyzip
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake helper for zipping/unzipping project files.
 email: alexander.shvets@gmail.com
-executables: 
+executables:
 - zipit
+- zipit.bat
 extensions: []
-
-extra_rdoc_files: 
-- README
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .idea/.name
+- .idea/.rakeTasks
+- .idea/cssxfire.xml
+- .idea/encodings.xml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
+- .idea/workspace.xml
+- .idea/zipit.iml
+- .rvmrc
 - CHANGES
+- Gemfile
+- Gemfile.lock
 - README
 - Rakefile
-- VERSION
 - bin/zipit
 - bin/zipit.bat
 - lib/zipit.rb
-- zipit.gemspec
+- lib/zipit/version.rb
+- lib/zipit/zipit.rb
+- spec/spec_helper.rb
 - spec/zipit_spec.rb
-has_rdoc: true
+- zipit.gemspec
+- zipit.gemspec.erb
 homepage: http://github.com/shvets/zipit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- none
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rake helper for zipping/unzipping project files. (Summary).
-test_files: 
+test_files:
+- spec/spec_helper.rb
 - spec/zipit_spec.rb