rake-funnel 0.0.4.pre → 0.0.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5421eb82b05425c0ec2fb547335b696baa93b1
-  data.tar.gz: efc075719e3703ec0acb7142f9bba7c38ab36dc8
+  metadata.gz: 276f461ed75b3b78a82c23de466ed0f8057b6019
+  data.tar.gz: ff755cdb17ebc083b62c378823bc0f85211bef92
 SHA512:
-  metadata.gz: 01310922f9a669085abc9ea77581045c78bcde0affb9de7546c81dde79b162ee63c328d4be91885f4b178297a80202563ec79bd8508d49528a5243832c619ac7
-  data.tar.gz: 24cf888b65ba0cd36fa6b801fad51ae702c8cd302a08e19b5d61a118afb188c76f1646cac5c718bfde65e90d2cfd42ac05b149d9f11aa7173a8daf02286fc0fe
+  metadata.gz: 08f26a42351dd4c114dd6c0ab367c7af0707d98cfdd5da12f88317f7ef52776dc3725b6624d055a2b6d34aa81ed28185fd9f9d20f8ca2e13e1e78fe03dd4f1f6
+  data.tar.gz: fece830b5b3479da6c8b161897529709e125776361074f47ca1f6bed80fa0d45794d22a4609f814f9edc58385c7ebf234d012a270c89bd6e81e335535fd511f6

data/lib/rake/funnel/integration/teamcity/nunit_plugin.rb

@@ -52,7 +52,7 @@ module Rake::Funnel::Integration::TeamCity
         destination = File.join(File.dirname(nunit), 'addins')
 
         RakeFileUtils.mkdir_p(destination)
-        RakeFileUtils.cp(addin_files, destination)
+        RakeFileUtils.cp(addin_files, destination, { preserve: true })
       end
     end
   end

data/lib/rake/funnel/tasks/copy.rb

@@ -31,7 +31,7 @@ module Rake::Funnel::Tasks
           dir = File.dirname(target)
           RakeFileUtils.mkdir_p(dir) unless File.directory?(dir)
 
-          RakeFileUtils.cp(source, target)
+          RakeFileUtils.cp(source, target, { preserve: true})
         end
       end
 

data/lib/rake/funnel/tasks/zip.rb

@@ -53,11 +53,18 @@ module Rake::Funnel::Tasks
         files.each do |file|
           zipped_file = get_zipped_path(common_path, file)
 
-          zip.add(zipped_file, 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?

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.0.4.pre'
+    VERSION = '0.0.5.pre'
   end
 end

data/spec/rake/funnel/integration/teamcity/nunit_plugin_spec.rb

@@ -43,7 +43,7 @@ describe Rake::Funnel::Integration::TeamCity::NUnitPlugin do
     end
 
     it 'should copy the addin from TeamCity to NUnit' do
-      expect(RakeFileUtils).to have_received(:cp).with(addin_dlls, File.join(File.dirname(which), 'addins'))
+      expect(RakeFileUtils).to have_received(:cp).with(addin_dlls, File.join(File.dirname(which), 'addins'), { preserve: true })
     end
 
     it 'should report that the addin is installed' do

data/spec/rake/funnel/tasks/copy_spec.rb

@@ -91,7 +91,7 @@ describe Rake::Funnel::Tasks::Copy do
         source
           .select { |src| !File.directory?(src) }
           .each do |src|
-          expect(RakeFileUtils).to have_received(:cp).with(src, File.join(subject.target, no_prefix(src)))
+          expect(RakeFileUtils).to have_received(:cp).with(src, File.join(subject.target, no_prefix(src)), { preserve: true })
         end
       end
     end

data/spec/rake/funnel/tasks/zip_spec.rb

@@ -58,6 +58,8 @@ describe Rake::Funnel::Tasks::Zip do
     context 'success' do
       let(:finder) { double(Finder).as_null_object }
       let(:zip) { double(::Zip::File).as_null_object }
+      let(:mtime) { Time.new(2015, 3, 9) }
+      let(:zip_entry) { double(::Zip::Entry).as_null_object }
 
       before {
         allow(finder).to receive(:all_or_default).and_return(source)
@@ -67,6 +69,11 @@ describe Rake::Funnel::Tasks::Zip do
         allow(::Zip::File).to receive(:open).with(target, ::Zip::File::CREATE).and_yield(zip)
       }
 
+      before {
+        allow(zip).to receive(:add).and_return(zip_entry)
+        allow(File).to receive(:mtime).and_return(mtime)
+      }
+
       before {
         Task[subject.name].invoke
       }
@@ -112,6 +119,10 @@ describe Rake::Funnel::Tasks::Zip do
               expect(zip).to have_received(:add).with(*file_args)
             end
           end
+
+          it 'should explicitly set the file mtime to work around https://github.com/rubyzip/rubyzip/issues/176' do
+            expect(zip_entry).to have_received(:time=).with(mtime).exactly(build_args.length).times
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
+  version: 0.0.5.pre
 platform: ruby
 authors:
 - Alexander Groß