zip_dsl 1.2.0 → 1.3.1

data/.idea/zip_dsl.iml

@@ -13,19 +13,18 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.1, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.6, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.0.5, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="meta_methods (v1.0.5, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.1, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mocha (v0.10.3, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.9.0, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.9.0, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.9.1, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.9.0, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-1.9.3-p429 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.5, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.4, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.7, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.1, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mocha (v0.14.0, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.14.5, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.14.3, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.14.3, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zip (v2.0.2, RVM: ruby-1.9.3-p448 [zip_dsl]) [gem]" level="application" />
   </component>
 </module>
 

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3
+1.9.3

data/CHANGES

@@ -6,4 +6,12 @@
 
 == Version 1.2.0
 
-* Adding support for archive update.
+* Adding support for archive update.
+
+== Version 1.3.0
+
+* Move DirectoryBuilder into separate gem - DirDSL.
+
+== Version 1.3.1
+
+* Bug fixes.

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 group :default do
-  gem "meta_methods"
   gem "zip"
   gem "file_utils"
 end
@@ -12,6 +11,6 @@ group :development do
 end
 
 group :test do
-  gem "rspec", "2.9.0"
-  gem "mocha", "0.10.3"
+  gem "rspec"
+  gem "mocha"
 end

data/Rakefile

@@ -6,19 +6,16 @@ require "rspec/core/rake_task"
 require "zip_dsl/version"
 require "gemspec_deps_gen/gemspec_deps_gen"
 
-def version
-  ZipDSL::VERSION
-end
-
-def project_name
-  File.basename(Dir.pwd)
-end
+version = ZipDSL::VERSION
+project_name = File.basename(Dir.pwd)
 
-task :build do
+task :gen do
   generator = GemspecDepsGen.new
 
-  generator.generate_dependencies "#{project_name}.gemspec.erb", "#{project_name}.gemspec"
+  generator.generate_dependencies "spec", "#{project_name}.gemspec.erb", "#{project_name}.gemspec"
+end
 
+task :build => :gen do
   system "gem build #{project_name}.gemspec"
 end
 
@@ -26,6 +23,10 @@ task :install do
   system "gem install #{project_name}-#{version}.gem"
 end
 
+task :uninstall do
+  system "gem uninstall #{project_name}"
+end
+
 task :release => :build do
   system "gem push #{project_name}-#{version}.gem"
 end
@@ -34,3 +35,9 @@ RSpec::Core::RakeTask.new do |task|
   task.pattern = 'spec/**/*_spec.rb'
   task.verbose = false
 end
+
+task :fix_debug do
+  system "mkdir -p $GEM_HOME/gems/debugger-ruby_core_source-1.2.3/lib"
+  system "cp -R ~/debugger-ruby_core_source/lib $GEM_HOME/gems/debugger-ruby_core_source-1.2.3"
+end
+

data/lib/zip_dsl/version.rb

@@ -1,3 +1,3 @@
-module ZipDSL
-  VERSION = "1.2.0"
+class ZipDSL
+  VERSION = "1.3.1"
 end

data/lib/zip_dsl/zip_dsl.rb

@@ -1,56 +1,66 @@
-require 'meta_methods'
-
 class ZipDSL
-  include MetaMethods
+  attr_reader :from_root, :to_root, :name
 
-  attr_reader :name, :basedir
+  def initialize from_root, to_root, name
+    @from_root = File.expand_path(from_root)
+    @to_root = File.expand_path(to_root)
+    @name = name
 
-  def initialize name, basedir
-    @name = File.expand_path(name)
-    @basedir = File.expand_path(basedir)
+    FileUtils.mkdir_p(to_root) unless File.exists? to_root
   end
 
   def build(name=nil, &execute_block)
     name = name.nil? ? @name : name
 
-    create_block = lambda { ZipWriter.new(name, @basedir) }
+    create_block = lambda { ZipWriter.new(from_root, to_root, name) }
     destroy_block = lambda {|writer| writer.close }
 
-    evaluate_dsl(create_block, destroy_block, execute_block)
+    evaluate(create_block, destroy_block, execute_block)
   end
 
   def update(name=nil, &execute_block)
     name = name.nil? ? @name : name
 
-    create_block = lambda { ZipUpdater.new(name, @basedir) }
+    create_block = lambda { ZipUpdater.new(from_root, to_root, name) }
     destroy_block = lambda {|updater| updater.close }
 
-    evaluate_dsl(create_block, destroy_block, execute_block)
+    evaluate(create_block, destroy_block, execute_block)
   end
 
   def entry_exist? entry_name
-    create_block = lambda { ZipReader.new(@name) }
+    create_block = lambda { ZipReader.new(to_root, name) }
     destroy_block = lambda {|reader| reader.close }
     execute_block = lambda { |reader| reader.entry_exist?(entry_name) }
 
-    evaluate_dsl(create_block, destroy_block, execute_block)
+    evaluate(create_block, destroy_block, execute_block)
   end
 
   def entries_size
-    create_block = lambda { ZipReader.new(@name) }
+    create_block = lambda { ZipReader.new(to_root, name) }
     destroy_block = lambda {|reader| reader.close }
     execute_block = lambda { |reader| reader.entries_size }
 
-    evaluate_dsl(create_block, destroy_block, execute_block)
+    evaluate(create_block, destroy_block, execute_block)
   end
 
   def list dir="."
-    create_block = lambda { ZipReader.new(@name) }
+    create_block = lambda { ZipReader.new(to_root, name) }
     destroy_block = lambda {|reader| reader.close }
     execute_block = lambda { |reader| reader.list(dir) }
 
-    evaluate_dsl(create_block, destroy_block, execute_block)
+    evaluate(create_block, destroy_block, execute_block)
   end
 
+  private
+
+  def evaluate(create_block, destroy_block, execute_block)
+    begin
+      created_object = create_block.kind_of?(Proc) ? create_block.call : create_block
+
+      created_object.instance_eval(&execute_block)
+    ensure
+      destroy_block.call(created_object) if destroy_block && created_object
+    end
+  end
 end
 

data/lib/zip_dsl/zip_reader.rb

@@ -3,8 +3,8 @@ require 'zip/zip'
 class ZipReader
   include Enumerable
 
-  def initialize name
-    @zis = Zip::ZipInputStream.new(name)
+  def initialize to_root, name
+    @zis = Zip::ZipInputStream.new("#{to_root}/#{name}")
   end
 
   def each(&block)

data/lib/zip_dsl/zip_updater.rb

@@ -2,9 +2,9 @@ require 'zip/zip'
 
 class ZipUpdater
 
-  def initialize file_name, basedir
-    @zipfile = Zip::ZipFile.open(file_name)
-    @basedir = basedir
+  def initialize from_root, to_root, name
+    @from_root = from_root
+    @zipfile = Zip::ZipFile.open("#{to_root}/#{name}")
   end
 
   def close
@@ -99,7 +99,7 @@ class ZipUpdater
   end
 
   def full_name name
-    full_name?(name) ? name : "#@basedir/#{name}"
+    full_name?(name) ? name : "#{@from_root}/#{name}"
   end
 
 end

data/lib/zip_dsl/zip_writer.rb

@@ -2,9 +2,10 @@ require 'zip/zip'
 
 class ZipWriter
 
-  def initialize file_name, basedir
-    @zos = Zip::ZipOutputStream.new(file_name)
-    @basedir = basedir
+  def initialize from_root, to_root, name
+    @from_root = from_root
+
+    @zos = Zip::ZipOutputStream.new("#{to_root}/#{name}")
 
     @compression_level = Zlib::BEST_COMPRESSION
   end
@@ -102,7 +103,7 @@ class ZipWriter
   end
 
   def full_name name
-    full_name?(name) ? name : "#@basedir/#{name}"
+    full_name?(name) ? name : "#{@from_root}/#{name}"
   end
 
 end

data/spec/{zip_builder_spec.rb → zip_dsl_spec.rb}

@@ -1,11 +1,19 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'zip_dsl'
+require 'file_utils/file_utils'
 
 describe ZipDSL do
-  let(:basedir) { "#{File.dirname(__FILE__)}/.." }
+  include FileUtils
 
-  subject { ZipDSL.new "test.zip", basedir }
+  let(:from_basedir) { "." }
+  let(:to_basedir) { "build" }
+
+  subject { ZipDSL.new from_basedir, to_basedir, "test.zip" }
+
+  after do
+    delete_directory "build"
+  end
 
   it "should create new zip file with files at particular folder" do
     subject.build do
@@ -31,7 +39,7 @@ describe ZipDSL do
   end
 
   it "should create new zip file with file created from file" do
-    src = File.open("#{basedir}/Rakefile")
+    src = File.open("#{from_basedir}/Rakefile")
     subject.build do
       content :name => "Rakefile",  :source => src
     end
@@ -63,7 +71,7 @@ describe ZipDSL do
       file :name => "Gemfile"
     end
 
-    File.exist?(subject.name).should be_true
+    File.exist?("#{subject.to_root}/#{subject.name}").should be_true
     subject.entry_exist?("Gemfile").should be_true
 
     subject.update do

data/zip_dsl.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.version       = ZipDSL::VERSION
 
-  spec.add_runtime_dependency "meta_methods", [">= 0"]
+  
   spec.add_runtime_dependency "zip", [">= 0"]
   spec.add_runtime_dependency "file_utils", [">= 0"]
   spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
   spec.add_development_dependency "gemcutter", [">= 0"]
-  
+
 end
 

data/zip_dsl.gemspec.erb

@@ -15,6 +15,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.version       = ZipDSL::VERSION
 
-  <%= include_dependencies %>
+  <%= project_dependencies %>
 end
 

metadata

@@ -1,36 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: zip_dsl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: meta_methods
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: file_utils
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -115,44 +90,39 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/directory_builder.rb
 - lib/zip_dsl.rb
 - 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/directory_builder_spec.rb
 - spec/spec_helper.rb
-- spec/zip_builder_spec.rb
-- test.zip
+- spec/zip_dsl_spec.rb
 - zip_dsl.gemspec
 - zip_dsl.gemspec.erb
 homepage: http://github.com/shvets/zip_dsl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for working with zip file in DSL-way
 test_files:
-- spec/directory_builder_spec.rb
 - spec/spec_helper.rb
-- spec/zip_builder_spec.rb
+- spec/zip_dsl_spec.rb

data/lib/directory_builder.rb

@@ -1,105 +0,0 @@
-require 'file_utils/file_utils'
-require 'meta_methods'
-
-class DirectoryBuilder
-  include FileUtils
-  include MetaMethods
-
-  def initialize name, basedir
-    @name = name
-    @basedir = File.expand_path(basedir)
-  end
-
-  def build(name=nil, &execute_block)
-    name = name.nil? ? @name : name
-
-    evaluate_dsl(self, nil, execute_block)
-  end
-
-  def entry_exist? entry_name
-    File.exist? full_name("#@name/#{entry_name}")
-  end
-
-  def entries_size
-    list = Dir.glob("#{full_name(@name)}/**/*")
-
-    cnt = 0
-    list.each do |name|
-      cnt += 1 if File.file?(name)
-    end
-
-    cnt
-  end
-
-  def list dir="."
-    list = pattern_to_files full_name("#@name/#{dir}"), "**/*"
-
-    list.each_with_index do |name, index|
-      list[index] = name[full_name("#@name/#{dir}").length+1..-1]
-    end
-  end
-
-  def file params
-    to_dir = to_dir(params[:name], params[:to_dir])
-
-    create_directory full_name(to_dir)
-
-    write_to_file full_name(params[:name]), full_name("#{to_dir}/#{File.basename(params[:name])}")
-  end
-
-  def content params
-    source = params[:source]
-
-    stream = source.kind_of?(String) ? StringIO.new(source) : source
-    content = stream.read
-
-    to_dir = to_dir(params[:name], params[:to_dir])
-
-    create_directory full_name(to_dir)
-
-    write_content_to_file content, full_name("#{to_dir}/#{File.basename(params[:name])}")
-  end
-
-  def directory params
-    if params[:from_dir].nil?
-      create_empty_directory params[:to_dir]
-    else
-      if params[:to_dir] == "." || params[:to_dir].nil?
-        to_dir = "#@name"
-      else
-        to_dir = "#@name/#{params[:to_dir]}"
-      end
-
-      filter = params[:filter].nil? ? "**/*" : params[:filter]
-
-      copy_files full_name(params[:from_dir]), full_name(to_dir), filter
-    end
-  end
-
-  private
-
-  def to_dir name, dir
-    if dir.nil?
-      from_dir = File.dirname(name)
-      (from_dir == ".") ? @name : "#@name/#{from_dir}"
-    else
-      (dir == ".") ? @name : "#@name/#{dir}"
-    end
-  end
-
-  def create_empty_directory dir
-    to_dir = (dir == ".") ? @name : "#@name/#{dir}"
-
-    create_directory full_name(to_dir)
-  end
-
-  def full_name? name
-    File.expand_path(name) == name
-  end
-
-  def full_name name
-    full_name?(name) ? name : "#@basedir/#{name}"
-  end
-
-end
-

data/spec/directory_builder_spec.rb

@@ -1,81 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-require 'directory_builder'
-require 'file_utils/file_utils'
-
-describe DirectoryBuilder do
-  include FileUtils
-
-  let(:basedir) { "#{File.dirname(__FILE__)}/.." }
-  subject { DirectoryBuilder.new("build/test", basedir) }
-
-  after do
-    delete_directory "#{basedir}/build"
-  end
-
-  it "should create new zip file with files at particular folder" do
-    subject.build do
-      file :name => "Gemfile"
-      file :name => "Rakefile", :to_dir => "my_config"
-      file :name => "spec/spec_helper.rb", :to_dir => "my_config"
-    end
-
-    subject.entry_exist?("Gemfile").should be_true
-    subject.entry_exist?("my_config/Rakefile").should be_true
-    subject.entry_exist?("my_config/spec_helper.rb").should be_true
-
-    subject.entries_size.should == 3
-  end
-
-  it "should create new zip file with file created from string" do
-    subject.build do
-      content :name => "README", :source => "My README file content"
-    end
-
-    subject.entry_exist?("README").should be_true
-    subject.entries_size.should == 1
-  end
-
-  it "should create new zip file with file created from file" do
-    src = File.open("#{basedir}/Rakefile")
-    subject.build do
-      content :name => "Rakefile", :source => src
-    end
-
-    subject.entry_exist?("Rakefile").should be_true
-    subject.entries_size.should == 1
-  end
-
-  it "should create new zip file with new empty folder" do
-    subject.build do
-      directory :to_dir => "my_config"
-    end
-
-    subject.entry_exist?("my_config").should be_true
-  end
-
-  it "should create new zip file with new folder" do
-    subject.build do
-      directory :from_dir => "config", :to_dir => "my_config"
-    end
-
-    subject.entry_exist?("my_config").should be_true
-  end
-
-  it "should display files in current directory" do
-    subject.build do
-      directory :from_dir => "spec"
-    end
-
-    subject.list.should include "spec_helper.rb"
-  end
-
-  it "should display files in specified subdirectory" do
-    subject.build do
-      directory :from_dir => "lib"
-    end
-
-    subject.list("zip_dsl").first.should =~ %r{version.rb}
-  end
-
-end