Merge pull request #283 from entwanderer/master

simonoff · web-flow · commit 2569a655fe1c · 2016-11-09T22:15:38.000+02:00
Fixing outdated/incorrect example code in Readme and some typos
diff --git a/README.md b/README.md
@@ -62,20 +62,18 @@ end
 Copy from [here](https://github.com/rubyzip/rubyzip/blob/05916bf89181e1955118fd3ea059f18acac28cc8/samples/example_recursive.rb )
 
 ```ruby
-require 'rubygems'
 require 'zip'
+
 # This is a simple example which uses rubyzip to
 # recursively generate a zip file from the contents of
 # a specified directory. The directory itself is not
 # included in the archive, rather just its contents.
 #
 # Usage:
-# require /path/to/the/ZipFileGenerator/Class
-# directoryToZip = "/tmp/input"
-# outputFile = "/tmp/out.zip"
-# zf = ZipFileGenerator.new(directoryToZip, outputFile)
-# zf.write()
-
+#   directory_to_zip = "/tmp/input"
+#   output_file = "/tmp/out.zip"
+#   zf = ZipFileGenerator.new(directory_to_zip, output_file)
+#   zf.write()
 class ZipFileGenerator
   # Initialize with the directory to zip and the location of the output archive.
   def initialize(input_dir, output_file)
@@ -117,7 +115,7 @@ class ZipFileGenerator
 
   def put_into_archive(disk_file_path, io, zip_file_path)
     io.get_output_stream(zip_file_path) do |f|
-      f.puts(File.open(disk_file_path, 'rb').read)
+      f.write(File.open(disk_file_path, 'rb').read)
     end
   end
 end
diff --git a/samples/example_recursive.rb b/samples/example_recursive.rb
@@ -6,7 +6,7 @@
 # included in the archive, rather just its contents.
 #
 # Usage:
-#   directoryToZip = "/tmp/input"
+#   directory_to_zip = "/tmp/input"
 #   output_file = "/tmp/out.zip"
 #   zf = ZipFileGenerator.new(directory_to_zip, output_file)
 #   zf.write()

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# included in the archive, rather just its contents.`
`7`	`7`	`#`
`8`	`8`	`# Usage:`
`9`		`-# directoryToZip = "/tmp/input"`
	`9`	`+# directory_to_zip = "/tmp/input"`
`10`	`10`	`# output_file = "/tmp/out.zip"`
`11`	`11`	`# zf = ZipFileGenerator.new(directory_to_zip, output_file)`
`12`	`12`	`# zf.write()`