ey-core 3.6.4 → 3.6.5

data/lib/ey-core/cli/helpers/archive.rb

@@ -1,70 +1,70 @@
-require 'stringio'
-require 'rubygems/package'
-require 'zlib'
-
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module Archive
-          def gzip(tarfile)
-            gz = StringIO.new("")
-            zipper = Zlib::GzipWriter.new(gz)
-            zipper.write tarfile.string
-            zipper.close # this is necessary!
-
-            # z was closed to write the gzip footer, so
-            # now we need a new StringIO
-            StringIO.new gz.string
-          end
-
-          def archive_directory(path)
-            tarfile = StringIO.new("")
-            Gem::Package::TarWriter.new(tarfile) do |tar|
-              Dir[File.join(path, "**/*")].each do |file|
-                mode          = File.stat(file).mode
-                relative_file = "cookbooks/#{file.sub(/^#{Regexp::escape path}\/?/, '')}"
-
-                if File.directory?(file)
-                  tar.mkdir relative_file, mode
-                else
-                  tar.add_file relative_file, mode do |tf|
-                    File.open(file, "rb") { |f| tf.write f.read }
-                  end
-                end
-              end
-            end
-
-            tarfile.rewind
-            gzip(tarfile)
-          end
-
-          def ungzip(tarfile)
-            zipped = Zlib::GzipReader.new(tarfile)
-            unzipped = StringIO.new(zipped.read)
-            zipped.close
-            unzipped
-          end
-
-          def untar(io, destination)
-            Gem::Package::TarReader.new io do |tar|
-              tar.each do |tarfile|
-                destination_file = File.join destination, tarfile.full_name
-
-                if tarfile.directory?
-                  FileUtils.mkdir_p destination_file
-                else
-                  destination_directory = File.dirname(destination_file)
-                  FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
-                  File.open destination_file, "wb" do |file|
-                    file.print tarfile.read
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'stringio'
+require 'rubygems/package'
+require 'zlib'
+
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module Archive
+          def gzip(tarfile)
+            gz = StringIO.new("")
+            zipper = Zlib::GzipWriter.new(gz)
+            zipper.write tarfile.string
+            zipper.close # this is necessary!
+
+            # z was closed to write the gzip footer, so
+            # now we need a new StringIO
+            StringIO.new gz.string
+          end
+
+          def archive_directory(path)
+            tarfile = StringIO.new("")
+            Gem::Package::TarWriter.new(tarfile) do |tar|
+              Dir[File.join(path, "**/*")].each do |file|
+                mode          = File.stat(file).mode
+                relative_file = "cookbooks/#{file.sub(/^#{Regexp::escape path}\/?/, '')}"
+
+                if File.directory?(file)
+                  tar.mkdir relative_file, mode
+                else
+                  tar.add_file relative_file, mode do |tf|
+                    File.open(file, "rb") { |f| tf.write f.read }
+                  end
+                end
+              end
+            end
+
+            tarfile.rewind
+            gzip(tarfile)
+          end
+
+          def ungzip(tarfile)
+            zipped = Zlib::GzipReader.new(tarfile)
+            unzipped = StringIO.new(zipped.read)
+            zipped.close
+            unzipped
+          end
+
+          def untar(io, destination)
+            Gem::Package::TarReader.new io do |tar|
+              tar.each do |tarfile|
+                destination_file = File.join destination, tarfile.full_name
+
+                if tarfile.directory?
+                  FileUtils.mkdir_p destination_file
+                else
+                  destination_directory = File.dirname(destination_file)
+                  FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
+                  File.open destination_file, "wb" do |file|
+                    file.print tarfile.read
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/helpers/chef.rb

@@ -1,51 +1,51 @@
-require 'ey-core/cli/errors'
-
-module Ey
-  module Core
-    module Cli
-      module Helpers
-        module Chef
-          def run_chef(type, environment, options = {})
-            no_wait = options.delete(:no_wait)
-            options[:streaming] = true unless no_wait
-            request = environment.apply(type, options)
-            puts "Started #{type} chef run".green
-            if no_wait
-              return
-            end
-            streamable_instance_update = nil
-            if request.read_channel
-              request.subscribe do |m|
-                print m["message"] if m.is_a?(Hash)
-              end
-              puts "" # fix console output from stream
-            else
-              request.wait_for { |r| r.ready? }
-            end
-            if request.successful
-              puts "#{type.capitalize} chef run completed".green
-            else
-              puts "#{type.capitalize} chef run failed".red
-              ap request
-              if server = environment.servers.first
-                puts "For logs try `ey-core logs --server #{server.provisioned_id}` --environment #{environment.name}"
-              end
-            end
-          end
-
-          def upload_recipes(environment, path="cookbooks/")
-            recipes_path = Pathname.new(path)
-
-            if recipes_path.exist? && recipes_path.to_s.match(/\.(tgz|tar\.gz)/)
-              environment.upload_recipes(recipes_path)
-            elsif recipes_path.exist?
-              environment.upload_recipes(archive_directory(path))
-            else
-              raise RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}, use --file to specify a different path"
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'ey-core/cli/errors'
+
+module Ey
+  module Core
+    module Cli
+      module Helpers
+        module Chef
+          def run_chef(type, environment, options = {})
+            no_wait = options.delete(:no_wait)
+            options[:streaming] = true unless no_wait
+            request = environment.apply(type, options)
+            puts "Started #{type} chef run".green
+            if no_wait
+              return
+            end
+            streamable_instance_update = nil
+            if request.read_channel
+              request.subscribe do |m|
+                print m["message"] if m.is_a?(Hash)
+              end
+              puts "" # fix console output from stream
+            else
+              request.wait_for { |r| r.ready? }
+            end
+            if request.successful
+              puts "#{type.capitalize} chef run completed".green
+            else
+              puts "#{type.capitalize} chef run failed".red
+              ap request
+              if server = environment.servers.first
+                puts "For logs try `ey-core logs --server #{server.provisioned_id}` --environment #{environment.name}"
+              end
+            end
+          end
+
+          def upload_recipes(environment, path="cookbooks/")
+            recipes_path = Pathname.new(path)
+
+            if recipes_path.exist? && recipes_path.to_s.match(/\.(tgz|tar\.gz)/)
+              environment.upload_recipes(recipes_path)
+            elsif recipes_path.exist?
+              environment.upload_recipes(archive_directory(path))
+            else
+              raise RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}, use --file to specify a different path"
+            end
+          end
+        end
+      end
+    end
+  end
+end