zip_dir 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe1cd41c0b83dd595962ce0b0242b5aff1a4f4a
-  data.tar.gz: 22106c6db7edcdd3af3172cba7f72a7bb2946bb0
+  metadata.gz: 22142ae2361dcab30f0d4ad978ff3260e696a4e2
+  data.tar.gz: 01e541d83f1ced7255b4fbfe17c9901fd3aba747
 SHA512:
-  metadata.gz: 10207faa6757782af155611013bc82d18137d8d9b4d6e434d755e363a6a34da6a67a7d9cae0a85daf3eed48426403c847c0602ec5c59b3678f6fa62811b68866
-  data.tar.gz: 32444d4ebd2e080675a721ee5022215777e9d04071d38274f834fd0dec10eb261aee573546346633c77935e303475785c914a1dbe8fcaa8a49f6dfb28bb34fe1
+  metadata.gz: d6851216876a02cb2bde2053e8ba72707a8d98abf9a18c2ae6732171bde48be53807a70ad372100a0ea37e130d8ae0d81f2dcc34ccb555c35adb5aee00f3a02b
+  data.tar.gz: fba12bc80581b2fae9166510c9f9b62aa1b9a7576aceea1d9dd74a86f7348053f9240e375c0a5adf87d3a31c105190b81f72e334ed44eba191ea35de776f8bfc

data/README.md

@@ -21,15 +21,33 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
+#
 # Zip
-zipper = ZipDir::Zipper.new
+#
+zipper = ZipDir::Zipper.new(__optional_filename__)
+
+zip_file = zipper.generate(__some_path_to_directory__)
+zip_file # => #<Tempfile:/var/folders/6c/s4snqy051jqdpbjw7f7tsn940000gn/T/zipper-20151127-19694-1baaqoi.zip>
+zip_file == zipper.file # => true
+
+# to zip multiple directories
 zip_file = zipper.generate do |z|
   z.add_path __some_path_to_directory__
   z.add_path __another_path_to_directory__ # does a shell "cp -r" operation
 end
-zip_file == zipper.file # => true
 
+# to zip __just the paths inside the directory___
+zip_file = zipper.generate(__some_path_to_directory__, root_directory: true)
 
+zip_file = zipper.generate do |z|
+  z.add_path __some_path_to_directory__, root_directory: true
+end
+
+#
 # Unzip
+#
 unzip_path = ZipDir::Unzipper.new(zip_file.path).unzip_path
 ```
+
+## dir_model
+Use [`dir_model`](https://github.com/FinalCAD/dir_model) to create complex directories to zip.

data/lib/zip_dir/unzipper.rb

@@ -20,7 +20,7 @@ module ZipDir
     end
 
     def unzip
-      Zip::File.open(zip_path) do |zip_file|
+      ::Zip::File.open(zip_path) do |zip_file|
         zip_file.each do |entry|
           file_path = "#{@unzip_path}/#{entry.name}"
           entry.extract(file_path) unless File.exists?(file_path)

data/lib/zip_dir/version.rb

@@ -1,3 +1,3 @@
 module ZipDir
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/zip_dir/zip.rb

@@ -0,0 +1,42 @@
+module ZipDir
+  class Zip
+    attr_reader :source_path
+    def initialize(source_path, filename="zip.zip")
+      filename = filename.chomp(".zip")
+      @source_path, @file = source_path, Tempfile.new(["#{filename}-", ".zip"])
+    end
+
+    def file
+      generate unless generated?
+      @file
+    end
+
+    def generate
+      ::Zip::File.open(@file.path, ::Zip::File::CREATE) do |zip_io|
+        zip_path(zip_io)
+      end
+      @generated = true
+    end
+
+    def generated?
+      !!@generated
+    end
+
+    protected
+    def zip_path(zip_io, relative_path="")
+      entries = Dir.entries(relative_path.empty? ? source_path : File.join(source_path, relative_path))
+      entries.shift(2)
+      entries.each do |entry|
+        relative_entry_path = relative_path.empty? ? entry : File.join(relative_path, entry)
+        source_entry_path = File.join(source_path, relative_entry_path)
+
+        if File.directory?(source_entry_path)
+          zip_io.mkdir relative_entry_path
+          zip_path zip_io, relative_entry_path
+        else
+          zip_io.add relative_entry_path, source_entry_path
+        end
+      end
+    end
+  end
+end

data/lib/zip_dir/zipper.rb

@@ -1,65 +1,60 @@
+require "zip_dir/zip"
+
 module ZipDir
   class Zipper
-    attr_reader :copy_path, :file
+    attr_reader :copy_path, :filename
 
-    def initialize
-      @copy_path = Dir.mktmpdir
-    end
+    DEFAULT_FILENAME = "zipper.zip".freeze
 
-    def add_path(source_path)
-      FileUtils.cp_r source_path, copy_path
+    def initialize(filename=DEFAULT_FILENAME)
+      @filename = filename
     end
-    alias_method :<<, :add_path
 
     def generated?
-      !!file
+      !!@generated
     end
 
-    def generate(filename="zipper")
-      yield self
-      @file = Zip.new(copy_path, filename).file
-    end
+    def generate(source_path=nil, root_directory: false)
+      cleanup if generated?
 
-    def cleanup
-      FileUtils.remove_entry_secure copy_path
-    end
-
-    class Zip
-      attr_reader :source_path
-      def initialize(source_path, filename)
-        @source_path, @file = source_path, Tempfile.new([filename, ".zip"])
+      @copy_path = Dir.mktmpdir
+      proxy = Proxy.new(copy_path)
+      if source_path
+        raise "should not give block and source_path" if block_given?
+        proxy.add_path source_path, root_directory: root_directory
+      else
+        yield proxy
       end
 
-      def file
-        generate unless generated?
-        @file
-      end
+      @file = ZipDir::Zip.new(copy_path, filename).file
+    ensure
+      @generated = true
+    end
 
-      def generate
-        ::Zip::File.open(@file.path, ::Zip::File::CREATE) do |zip_io|
-          zip_path(zip_io)
-        end
-        @generated = true
-      end
+    def file
+      return unless generated?
+      @file
+    end
 
-      def generated?
-        !!@generated
-      end
+    def cleanup
+      FileUtils.remove_entry_secure copy_path if copy_path
+      @file = @copy_path = nil
+      @generated = false
+    end
 
-      def zip_path(zip_io, relative_path="")
-        entries = Dir.clean_entries(relative_path.empty? ? source_path : File.join(source_path, relative_path))
-        entries.each do |entry|
-          relative_entry_path = relative_path.empty? ? entry : File.join(relative_path, entry)
-          source_entry_path = File.join(source_path, relative_entry_path)
+    class Proxy
+      def initialize(copy_path)
+        @copy_path = copy_path
+      end
 
-          if File.directory?(source_entry_path)
-            zip_io.mkdir relative_entry_path
-            zip_path zip_io, relative_entry_path
-          else
-            zip_io.add relative_entry_path, source_entry_path
-          end
+      def add_path(source_path, root_directory: false)
+        if root_directory
+          Dir.glob("#{source_path}/*").each { |path| add_path(path) }
+        else
+          FileUtils.cp_r source_path, @copy_path
         end
       end
+      alias_method :<<, :add_path
     end
   end
 end

data/lib/zip_dir.rb

@@ -2,8 +2,6 @@ require "zip_dir/version"
 
 require 'zip'
 
-require 'zip_dir/core_ext/dir'
-
 require 'zip_dir/zipper'
 require 'zip_dir/unzipper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip_dir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -41,9 +41,9 @@ files:
 - bin/console
 - bin/setup
 - lib/zip_dir.rb
-- lib/zip_dir/core_ext/dir.rb
 - lib/zip_dir/unzipper.rb
 - lib/zip_dir/version.rb
+- lib/zip_dir/zip.rb
 - lib/zip_dir/zipper.rb
 - zip_dir.gemspec
 homepage: https://github.com/FinalCAD/zip_dir

data/lib/zip_dir/core_ext/dir.rb

@@ -1,10 +0,0 @@
-class Dir
-  class << self
-    def clean_entries(dir)
-      entries = entries(dir)
-      entries.delete "."
-      entries.delete ".."
-      entries
-    end
-  end
-end