s3cmd 1.0.1 → 1.1.0

data/bin/s3cmd

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require "s3cmd"
-S3Cmd::Main.start
+
+S3Cmd::CLI.start

data/lib/s3cmd.rb

@@ -1,13 +1,18 @@
-require "rubygems"
 require "aws"
+require "logger"
 require "mime/types"
 require "proxifier/env"
+require "rubygems"
 require "thor"
 
 module S3Cmd
   require "s3cmd/version"
 
-  class Main < Thor
+  class CLI < Thor
+    class_option :access_key, :aliases => :a, :desc => "AWS access key to use"
+    class_option :credentials_file, :aliases => :c, :desc => "AWS credentials file containing the access and secret key", :default => File.expand_path("~/.aws-credentials")
+    class_option :secret_key, :aliases => :s, :desc => "AWS secret key to use"
+
     desc "list-buckets", "lists all of your buckets"
     def list_buckets
       puts s3.buckets
@@ -16,7 +21,7 @@ module S3Cmd
     desc "create-bucket name", "creates a bucket"
     method_option :region, :default => "US"
     def create_bucket(name)
-      bucket = s3.bucket(name, true)
+      s3.bucket(name, true)
     end
 
     desc "list-keys bucket", "list the keys of a bucket"
@@ -26,12 +31,11 @@ module S3Cmd
 
     desc "get bucket key", "get the file for the key from the bucket"
     def get(bucket, key)
-      bucket = s3.bucket(bucket)
-      $stdout << bucket.get(key)
+      puts s3.bucket(bucket).get(key)
     end
 
     desc "put bucket key file", "puts a file for the key in the bucket"
-    method_option :type, :desc => "override the content type of the file", :type => :string
+    option :type, :desc => "override the content type of the file"
     def put(bucket, key, file)
       bucket = s3.bucket(bucket)
       type = options[:type] || MIME::Types.of(file).first.to_s
@@ -39,36 +43,45 @@ module S3Cmd
     end
 
     private
-      def s3
-        @s3 ||= begin
-          access_key, secret_key = nil, nil
-
-          if ENV["AWS_CREDENTIAL_FILE"]
-            File.open(ENV["AWS_CREDENTIAL_FILE"]) do |file|
-              file.lines.each do |line|
-                access_key = $1 if line =~ /^AWSAccessKeyId=(.*)$/
-                secret_key = $1 if line =~ /^AWSSecretKey=(.*)$/
-              end
-            end
-          elsif ENV["AWS_ACCESS_KEY"] || ENV["AWS_SECRET_KEY"]
-            access_key = ENV["AWS_ACCESS_KEY"]
-            secret_key = ENV["AWS_SECRET_KEY"]
-          end
+    def credentials
+      return @credentials if defined?(@credentials)
 
-          unless access_key
-            $stderr.puts "AWS_CREDENTIAL_FILE must containt AWSAccessKeyId or AWS_ACCESS_KEY must be set"
-            exit 1
-          end
-          unless secret_key
-            $stderr.puts "AWS_CREDENTIAL_FILE must containt AWSSecretKey or AWS_SECRET_KEY must be set"
-            exit 1
+      access_key = secret_key = nil
+
+      if options[:access_key] || options[:secret_key]
+        access_key = options[:access_key]
+        secret_key = options[:secret_key]
+      else
+        File.open(options[:credentials_file]) do |file|
+          file.lines.each do |line|
+            access_key = $1 if line =~ /^AWSAccessKeyId=(.*)$/
+            secret_key = $1 if line =~ /^AWSSecretKey=(.*)$/
           end
+        end
+      end
 
-          logger = Logger.new(STDERR)
-          logger.level = Logger::FATAL
+      @credentials = [access_key, secret_key]
+    end
 
-          Aws::S3.new(access_key, secret_key, :logger => logger)
-        end
+    def s3
+      return @s3 if defined?(@s3)
+
+      access_key, secret_key = credentials
+
+      unless access_key
+        $stderr.puts("No access key provided")
+        exit 1
       end
+
+      unless secret_key
+        $stderr.puts("No secret key provided")
+        exit 1
+      end
+
+      logger = Logger.new(STDERR)
+      logger.level = Logger::FATAL
+
+      @s3 = Aws::S3.new(access_key, secret_key, :logger => logger)
+    end
   end
 end

data/lib/s3cmd/version.rb

@@ -1,3 +1,3 @@
 module S3Cmd
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3cmd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,58 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws
-  requirement: &70223744207040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223744207040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70223744206520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.22'
   type: :runtime
   prerelease: false
-  version_requirements: *70223744206520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: proxifier
-  requirement: &70223744205940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70223744205940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70223744205460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.18.1
   type: :runtime
   prerelease: false
-  version_requirements: *70223744205460
-description: ! 'Provides a s3cmd binary that allows you to create and list buckets
-  as well as list the keys of a bucket and get and upload files
-
-  to s3.
-
-'
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+description: Provides a s3cmd executable that allows you to create and list buckets
+  as well as list the keys of a bucket and get and upload files to S3.
 email:
 - samuel@kadolph.com
 executables:
@@ -71,8 +103,6 @@ files:
 - bin/s3cmd
 - lib/s3cmd/version.rb
 - lib/s3cmd.rb
-- LICENSE
-- README.md
 homepage: https://github.com/samuelkadolph/s3cmd
 licenses: []
 post_install_message: 
@@ -91,10 +121,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -435846521099755325
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Simple cli tool for interacting with S3.
+summary: s3cmd is simple cli tool for interacting with S3.
 test_files: []

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (C) 2011 by Samuel Kadolph
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README.md

@@ -1,23 +0,0 @@
-# s3cmd
-
-## Installing
-
-### Recommended
-
-```
-gem install s3cmd
-```
-
-### Edge
-
-```
-git clone https://github.com/samuelkadolph/s3cmd
-cd s3cmd && rake install
-```
-
-## Usage
-
-```
-s3cmd create-bucket foo
-s3cmd put foo abc/def somefile
-```