s3cp 1.1.9 → 1.1.10

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.10 (2012-12-13)
+
+* Added:   New `s3edit` command for easy editing of files.
+           Basically s3cp file locally, launch $EDITOR and s3cp file back to S3.
+
 === 1.1.9 (2012-11-27)
 
 * Added:   New `s3tree` command similar to Unix `tree` command.

data/bin/s3edit

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+ARGV.unshift "--edit"
+require 's3cp/s3cat'
+

data/bin/s3edit~

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+ARGV.unshift "--delimiter", ENV["S3CP_DELIMITER"] || "/"
+require 's3cp/s3ls'
+

data/lib/s3cp/s3cat.rb

@@ -35,6 +35,10 @@ op = OptionParser.new do |opts|
     options[:tty] = tty
   end
 
+  opts.on("--edit", "Edit mode") do |edit|
+    options[:edit] = edit
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -61,7 +65,7 @@ S3CP.load_config()
 
 @s3 = S3CP.connect().buckets[@bucket]
 
-if options[:tty]
+if options[:tty] || options[:edit]
   # store contents to file to display with PAGER
   size = @s3.objects[@prefix].content_length
 
@@ -69,7 +73,7 @@ if options[:tty]
     p.file_transfer_mode
   end
 
-  file = Tempfile.new('s3cat')
+  file = Tempfile.new(File.basename(@prefix) + '_')
   out = File.new(file.path, "wb")
   begin
     @s3.objects[@prefix].read_as_stream do |chunk|
@@ -80,7 +84,24 @@ if options[:tty]
   ensure
     out.close()
   end
-  exec "#{ENV['PAGER'] || 'less'} #{file.path}"
+  if options[:edit]
+    before_md5 = S3CP.md5(file.path)
+    system "#{ENV['EDITOR'] || 'vi'} #{file.path}"
+    if ($? == 0)
+      if (S3CP.md5(file.path) != before_md5)
+        ARGV.clear
+        ARGV << file.path
+        ARGV << url
+        load "s3cp/s3cp.rb"
+      else
+        puts "File unchanged."
+      end
+    else
+      puts "Edit aborted (result code #{$?})."
+    end
+  else
+    system "#{ENV['PAGER'] || 'less'} #{file.path}"
+  end
   file.delete()
 else
   @s3.objects[@prefix].read_as_stream do |chunk|

data/lib/s3cp/s3cp.rb

@@ -237,19 +237,6 @@ def with_headers(msg)
   msg
 end
 
-def md5(filename)
-  digest = Digest::MD5.new()
-  file = File.open(filename, 'r')
-  begin
-    file.each_line do |line|
-      digest << line
-    end
-  ensure
-    file.close()
-  end
-  digest.hexdigest
-end
-
 def operation(options)
   operation = "Copy"
   operation = "Move" if options[:move]
@@ -275,7 +262,7 @@ def local_to_s3(bucket_to, key, file, options = {})
   log(with_headers("#{operation(options)} #{file} to s3://#{bucket_to}/#{key}"))
 
   expected_md5 = if options[:checksum] || options[:sync]
-     md5(file)
+     S3CP.md5(file)
   end
 
   actual_md5 = if options[:sync]
@@ -378,7 +365,7 @@ def s3_to_local(bucket_from, key_from, dest, options = {})
       end
 
       actual_md5 = if options[:sync] && File.exist?(dest)
-         md5(dest)
+         S3CP.md5(dest)
       end
 
       if !options[:sync] || (expected_md5 != actual_md5)
@@ -411,14 +398,14 @@ def s3_to_local(bucket_from, key_from, dest, options = {})
     end
 
     if options[:checksum] && expected_md5 != nil
-      actual_md5 = md5(dest)
+      actual_md5 = S3CP.md5(dest)
       if actual_md5 != expected_md5
         STDERR.puts "Warning: invalid MD5 checksum.  Expected: #{expected_md5} Actual: #{actual_md5}"
       end
     end
 
     retries += 1
-  end until options[:checksum] == false || expected_md5.nil? || md5(dest) == expected_md5
+  end until options[:checksum] == false || expected_md5.nil? || S3CP.md5(dest) == expected_md5
 
   @s3.buckets[bucket_from].objects[key_from].delete() if options[:move]
 end

data/lib/s3cp/utils.rb

@@ -96,6 +96,20 @@ module S3CP
     (n * (10.0 ** decimals)).round * (10.0 ** (-decimals))
   end
 
+  # Calculate the MD5 checksum for the given file
+  def md5(filename)
+    digest = Digest::MD5.new()
+    file = File.open(filename, 'r')
+    begin
+      file.each_line do |line|
+        digest << line
+      end
+    ensure
+      file.close()
+    end
+    digest.hexdigest
+  end
+
   # Return a formatted string for a file size.
   #
   # Valid units are "b" (bytes), "kb" (kilobytes), "mb" (megabytes),

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.9"
+  VERSION = "1.1.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 10
+  version: 1.1.10
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2012-12-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: extensions
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,9 +30,9 @@ dependencies:
         version: "0.6"
   requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: highline
+  name: extensions
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,9 +46,9 @@ dependencies:
         version: 1.5.1
   requirement: *id002
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: aws-sdk
+  name: highline
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,9 +62,9 @@ dependencies:
         version: 1.6.3
   requirement: *id003
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: progressbar
+  name: aws-sdk
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,9 +78,9 @@ dependencies:
         version: 0.10.0
   requirement: *id004
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: progressbar
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,9 +94,9 @@ dependencies:
         version: 2.5.0
   requirement: *id005
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: rspec
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,6 +110,8 @@ dependencies:
         version: 0.8.7
   requirement: *id006
   type: :development
+  prerelease: false
+  name: rake
 description: 
 email: 
 - alex.boisvert@gmail.com
@@ -122,6 +122,7 @@ executables:
 - s3cp_complete
 - s3dir
 - s3du
+- s3edit
 - s3ls
 - s3mod
 - s3mv
@@ -135,34 +136,36 @@ extra_rdoc_files:
 - README.md
 - History.txt
 files: 
-- lib/s3cp/completion.rb
+- lib/s3cp/s3cat.rb
+- lib/s3cp/s3tree.rb
 - lib/s3cp/s3ls.rb
-- lib/s3cp/version.rb
 - lib/s3cp/s3du.rb
 - lib/s3cp/s3mod.rb
-- lib/s3cp/utils.rb
-- lib/s3cp/s3tree.rb
-- lib/s3cp/s3cp.rb
-- lib/s3cp/s3cat.rb
+- lib/s3cp/completion.rb
 - lib/s3cp/s3buckets.rb
-- lib/s3cp/s3rm.rb
+- lib/s3cp/version.rb
+- lib/s3cp/s3cp.rb
 - lib/s3cp/s3stat.rb
+- lib/s3cp/utils.rb
+- lib/s3cp/s3rm.rb
 - lib/s3cp/s3up.rb
 - History.txt
 - README.md
-- bin/s3up
-- bin/s3mv
-- bin/s3rm
+- bin/s3edit~
 - bin/s3dir
+- bin/s3mv
+- bin/s3cat
+- bin/s3ls
+- bin/s3edit
 - bin/s3buckets
+- bin/s3tree
 - bin/s3mod
-- bin/s3du
-- bin/s3cat
+- bin/s3up
 - bin/s3cp_complete
+- bin/s3du
 - bin/s3cp
-- bin/s3ls
+- bin/s3rm
 - bin/s3stat
-- bin/s3tree
 homepage: 
 licenses: []