lib/rake/funnel/tasks/zip.rb in rake-funnel-0.1.0.pre vs lib/rake/funnel/tasks/zip.rb in rake-funnel-0.2.0.pre

@@ -1,76 +1,42 @@
-require 'pathname'
 require 'rake/tasklib'
-require 'zip'
 
 module Rake::Funnel::Tasks
   class Zip < Rake::TaskLib
     include Rake::Funnel::Support
 
     attr_accessor :name, :source, :target, :zip_root
 
-    def initialize(name = :package)
-      @name = name
+    def initialize(*args, &task_block)
+      setup_ivars(args)
 
+      define(args, &task_block)
+    end
+
+    private
+    def setup_ivars(args)
+      @name = args.shift || :package
+
       @source = []
       @target = nil
       @zip_root = nil
-
-      yield self if block_given?
-      define
     end
 
-    private
-    def define
-      target && CLEAN.include(target)
+    def define(args, &task_block)
+      desc 'Zip files' unless Rake.application.last_description
 
-      desc "Zip #{files.join(', ')} to #{target}"
-      task name do
-        raise 'Target not defined' unless target
+      task(name, *args) do |_, task_args|
+        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
 
-        target_dir = File.dirname(target)
-        RakeFileUtils.mkdir_p(target_dir) unless File.directory?(target_dir)
+        Zipper.zip(files, target, zip_root)
 
-        configure_zip
-        create_zip(files, target)
-
         Rake.rake_output_message("Created #{target}")
       end
 
       self
     end
 
     def files
       Finder.new(source, self, 'No files to zip.').all_or_default
-    end
-
-    def configure_zip
-      ::Zip.unicode_names = true
-      ::Zip.default_compression = Zlib::BEST_COMPRESSION
-    end
-
-    def create_zip(files, target)
-      ::Zip::File.open(target, ::Zip::File::CREATE) do |zip|
-        common_path = files.common_path
-
-        files.each do |file|
-          zipped_file = get_zipped_path(common_path, file)
-
-          entry = zip.add(zipped_file, file)
-          set_mtime(entry, file)
-        end
-      end
-    end
-
-    # To work around this bug: https://github.com/rubyzip/rubyzip/issues/176
-    def set_mtime(entry, file)
-      entry.time = ::Zip::DOSTime.at(File.mtime(file))
-      entry.extra.delete('UniversalTime')
-    end
-
-    def get_zipped_path(common_path, file)
-      file = Pathname.new(file).relative_path_from(Pathname.new(common_path)).to_s unless common_path.nil?
-      file = File.join(zip_root, file) unless zip_root.nil? || zip_root.empty?
-      file
     end
   end
 end