s3cp 1.1.39 → 1.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae74e198a84f87e2677d2d5f34a06d8b8d1bf98
-  data.tar.gz: a2b805625ede7d6d8e0a10ddc52bc1af99463f39
+  metadata.gz: 0290c1eaaabbc90626e8a996868953051a421e66
+  data.tar.gz: c122054dbd6b8dcaa3ae610027c84667d57c06b3
 SHA512:
-  metadata.gz: 2404847e0d7983e1b6b6a85570b064a8172c70e6477e98ccb8923005df97a99ba0606148b7f84ee1b226888ac5a298a28586a83019c6afe67eefb3e2f28f48fe
-  data.tar.gz: 798e97b27f48650f9f44f70e4430b11b6561ff7f0f5b192c02dc1af148b034532c8a0222c2b4e4d90b74a353420015890f1bd64bfb76bae5a53e8460d2ce996b
+  metadata.gz: fe1d294a160d801372d7fa81590a037627033aaa2264644436598c258dd030e7abab6f2beca427e44f6588fa6288353a75b02071220e83af8aa3ac88951838b4
+  data.tar.gz: 4b98037c37e4d3a4e6fb4357204d20918cea037aac329c8dbcb3057c270c3618a17b94397e5d8f34589bf12e0f51a55f75b58c8a1b95b782f342f94b0d365ffb

data/History.txt

@@ -1,3 +1,8 @@
+
+=== 1.1.40 (2015-12-21)
+
+* Fixed:  Don't load Ruby 1.8.x compatibility library for Ruby 2.1.8 (#18) [Chris Mear]
+
 === 1.1.39 (2015-03-02)
 
 * Upgrade gem dependencies:  aws-sdk 1.63.0, nokogiri 1.6.6.2.

data/bin/s3open

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

data/bin/s3open~

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

data/lib/s3cp/s3cat.rb~

@@ -0,0 +1,144 @@
+# Copyright (C) 2010-2012 Alex Boisvert and Bizo Inc. / All rights reserved.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file  distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 's3cp/utils'
+require 'progressbar'
+require 'tempfile'
+
+# Parse arguments
+options = {}
+options[:tty] = $stdout.isatty
+
+op = OptionParser.new do |opts|
+  opts.banner = "s3cat [path]"
+  opts.separator ''
+
+  opts.on("--debug", "Debug mode") do
+    options[:debug] = true
+  end
+
+  opts.on("--tty", "TTY mode") do |tty|
+    options[:tty] = tty
+  end
+
+  opts.on("--edit", "Edit mode") do |edit|
+    options[:edit] = edit
+  end
+
+  opts.on("--head SIZE", "Download only 'head' part of the file, e.g. 4KB, 1024B, 2GB") do |size|
+    options[:head] = S3CP.size_in_bytes(size)
+  end
+
+  opts.on("--tail SIZE", "Download only 'tail' part of the file, e.g. 4KB, 1024B, 2GB") do |size|
+    options[:tail] = S3CP.size_in_bytes(size)
+  end
+
+  opts.on("--range START-END", "Download only range (in absolute positions) portion, e.g. 1GB-2GB, 16K-128k, 128k-, -128k") do |range|
+    range_start, range_end = range.split("-")
+    options[:range_start] = S3CP.size_in_bytes(range_start) if range_start && (!range_start.empty?)
+    options[:range_end] = S3CP.size_in_bytes(range_end) - 1 if range_end && (!range_end.empty?)
+    range_start, range_end = range.split("-")
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts op
+    exit
+  end
+end
+op.parse!(ARGV)
+
+unless ARGV.size > 0
+  puts op
+  exit
+end
+
+url = ARGV[0]
+
+if options[:debug]
+  puts "URL: #{url}"
+  puts "Options: \n#{options.inspect}"
+end
+
+S3CP.standard_exception_handling(options) do
+  @bucket, @prefix = S3CP.bucket_and_key(url)
+  fail "Your URL looks funny, doesn't it?" unless @bucket
+
+  S3CP.load_config()
+
+  read_options = {}
+  read_options[:debug] = options[:debug]
+  read_options[:head] = options[:head] if options[:head]
+  read_options[:tail] = options[:tail] if options[:tail]
+  read_options[:range_start] = options[:range_start] if options[:range_start]
+  read_options[:range_end] = options[:range_end] if options[:range_end]
+
+  @s3 = S3CP.connect().buckets[@bucket]
+
+
+  if options[:edit] && (options[:head] || options[:tail] || options[:range_start] || options[:range_end])
+    fail "--edit option is not intended to be used with --head, --tail nor --range"
+  end
+
+  if options[:tty] || options[:edit]
+    # store contents to file to display with PAGER
+    size = @s3.objects[@prefix].content_length
+
+    progress_bar = ProgressBar.new(File.basename(@prefix), size).tap do |p|
+      p.file_transfer_mode
+    end
+
+    file = Tempfile.new(File.basename(@prefix) + '_')
+    out = File.new(file.path, "wb")
+    begin
+      @s3.objects[@prefix].read_as_stream(read_options) do |chunk|
+        out.write(chunk)
+        progress_bar.inc chunk.size
+      end
+      progress_bar.finish
+    ensure
+      out.close()
+    end
+    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(read_options) do |chunk|
+      begin
+        $stdout.print(chunk)
+      rescue Errno::EPIPE
+        break
+      end
+    end
+  end
+end
+

data/lib/s3cp/utils.rb

@@ -16,7 +16,7 @@
 # the License.
 
 require 'rubygems'
-require 'extensions/kernel' if RUBY_VERSION =~ /1.8/
+require 'extensions/kernel' if RUBY_VERSION =~ /^1.8/
 require 'aws/s3'
 require 'optparse'
 require 'date'

data/lib/s3cp/version.rb

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

data/lib/s3cp/version.rb~

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3cp
 version: !ruby/object:Gem::Version
-  version: 1.1.39
+  version: 1.1.40
 platform: ruby
 authors:
 - Alex Boisvert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extensions
@@ -137,6 +137,7 @@ files:
 - lib/s3cp/completion.rb
 - lib/s3cp/s3buckets.rb
 - lib/s3cp/s3cat.rb
+- lib/s3cp/s3cat.rb~
 - lib/s3cp/s3cp.rb
 - lib/s3cp/s3du.rb
 - lib/s3cp/s3lifecycle.rb
@@ -164,6 +165,8 @@ files:
 - bin/s3ls
 - bin/s3mod
 - bin/s3mv
+- bin/s3open
+- bin/s3open~
 - bin/s3rm
 - bin/s3stat
 - bin/s3tree