fix zip bug

kayac · Jan 20, 2018 · 01608f2 · 01608f2
1 parent 7f43dfa
commit 01608f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rebi (0.3.1)
+    rebi (0.3.2)
       activesupport (~> 5.0)
       aws-sdk-ec2 (~> 1.0)
       aws-sdk-elasticbeanstalk (~> 1.0)
@@ -22,7 +22,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-partitions (1.55.0)
+    aws-partitions (1.56.0)
     aws-sdk-core (3.14.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)

diff --git a/lib/rebi/version.rb b/lib/rebi/version.rb
@@ -1,3 +1,3 @@
 module Rebi
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end
diff --git a/lib/rebi/zip_helper.rb b/lib/rebi/zip_helper.rb
@@ -56,8 +56,9 @@ def gen env_conf,opts={}
       tmp_folder = Dir.mktmpdir
       Zip::File.open(tmp_file.path) do |z|
         ebextensions.each do |ex_folder|
+
+          z.remove_folder ex_folder unless ex_folder == ".ebextension"
           Dir.glob("#{ex_folder}/*.config") do |fname|
-            z.remove_folder ex_folder unless ex_folder == ".ebextension"
             next unless File.file?(fname)
             next unless y = YAML::load(ErbHelper.new(File.read(fname), env_conf).result)
             basename = File.basename(fname)
@@ -70,7 +71,6 @@ def gen env_conf,opts={}
             z.add target, tmp_yaml
           end
         end
-
         dockerrun_file = env_conf.dockerrun || "Dockerrun.aws.json"
 
         if File.exists?(dockerrun_file)
@@ -88,6 +88,7 @@ def gen env_conf,opts={}
 
       FileUtils.rm_rf tmp_folder
 
+
       log("Zip was created in: #{Time.now - start}s", env_conf.name)
       return {
         label: Time.now.strftime("app_#{env_conf.name}_#{version_label}_%Y%m%d_%H%M%S"),