cloudformation-tool 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83b8efc5704070ab9a788b2a90abd76c5cddf51e001a809b8eb4232404d6a4a1
-  data.tar.gz: 09e63883d8159f6331d06f8b5b4af28888f755134f55972272b53df0bd7fe3e6
+  metadata.gz: f3c901ead020a647c6b7fca5e7c54a87ac460fa40ffea601e57fc679f4e16d48
+  data.tar.gz: e4a3b0af6b07b111926088777071e180bbf83fe4efc6782a97f1ed5b60683cd3
 SHA512:
-  metadata.gz: bbf45c2d3e1e03db1ae3e686e5432175547e00dc92db30ed12bf4bf03c66c2d8be8832cb1e1244a67025379a3918162962a071c67431468ea83795669c7eac58
-  data.tar.gz: 4e6480feac36232936ef892541aa0cd6e528547dab38721b0acb290db1360ee1ebd8f9cadd45f6c02cac43f3701d0298fc45c744175a1dde8ab2ae42bf1ab349
+  metadata.gz: 9b5f8f00b6a8d0c724dc1b7231b063d4b1b4c5807fd7915dcd70b272112266d7d8be75eb88f4576d9d0966b24629ea2d025c336a4f40958b9b3e7adc6fd1dbee
+  data.tar.gz: dc198485e2c6af34cef73e380fb69e478cf3b09b1512f76263bfb943061b90f16a2b3297bfd157baec7a50960cea8011a32381773081057b2085dbd55494f580

data/bin/cftool

@@ -4,6 +4,12 @@ require 'cloud_formation_tool'
 
 begin
   CloudFormationTool::CLI::Main.run
+rescue SocketError => e
+  warn "Networking error: #{e.message}"
+  exit 1
+rescue Seahorse::Client::NetworkingError => e
+  warn "Networking error: #{e.message}"
+  exit 1
 rescue CloudFormationTool::Errors::BaseError => e
   warn e.message
   exit 1

data/lib/cloud_formation_tool/cloud_formation/lambda_code.rb

@@ -38,19 +38,14 @@ module CloudFormationTool
       end
       
       def zip_path(path)
-        temp_file = Tempfile.new
-        temp_path = temp_file.path + '.zip'
-        begin
-          Zip::ZipFile.open(temp_path, true) do |zipfile|
-            Dir[File.join(path, '**','*')].each do |file|
-              zipfile.add(file.sub("#{path}/", ''), file)
-            end
+        Zip::OutputStream.write_buffer do |zf|
+          rdir path do |ent|
+            #log "Deflating #{ent}"
+            filepath = File.join(path,ent)
+            zf.put_next_entry ::Zip::Entry.new(nil, ent, nil, nil, nil, nil, nil, nil, ::Zip::DOSTime.at(File.mtime(filepath).to_i))
+            zf.write File.read(filepath) 
           end
-          File.read(temp_path)
-        ensure
-          temp_file.close!
-          File.unlink temp_path
-        end
+        end.string
       end
       
       def already_in_cache(uri_str)
@@ -129,6 +124,27 @@ module CloudFormationTool
           }
         end
       end
+      
+      def rdir path, prefix = '', &block
+        ents = []
+        (Dir.entries(path) - %w(. ..)).collect do |ent|
+          diskpath = File.join(path,ent)
+          localpath = prefix.length>0 ? File.join(prefix,ent) : ent
+          if block_given?
+            if File.directory? diskpath
+              rdir diskpath, localpath, &block
+            else
+              yield localpath
+            end
+          end
+          if File.directory? diskpath
+            rdir diskpath, localpath
+          else
+            ent
+          end
+        end.flatten
+      end
+      
     end
 
   end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Oded Arbel
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 description: 
 email: oded.arbel@greenfieldtech.net
 executables: