presigner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd5bde556dc86fa8d6e946e1cd9c423e7cd29cf1
-  data.tar.gz: df74d7f9af9bfd23812b94426ae090cc41b20697
+  metadata.gz: 02cd85a3175bbb93c9ee386eea94baa8e8395c45
+  data.tar.gz: c087b0160933cbca516fc35c44c2dfedcffc8f4e
 SHA512:
-  metadata.gz: 952044ea5da7766be47a7557694dbdfeca4ae7d363ef59a5f72b00ab1008d6a1a5594fb3f7bdfa0034fe001de55249d956102d663db67d158ec3330de534c86f
-  data.tar.gz: b3c192704a994e667b770575a6a6931a4eb5aac038ee30a006c810639d17aa8153abed69b257e972bf836bd95302725727ade19e3e8a237c33067f9a95902615
+  metadata.gz: 4c54525782582f34096da95dd28388412a728be49f2fe053e54ff44360b1c0faa09d2b2d3c953caeabf615ac8d1c4984648aa6479050ce238ae46d9ed63135d7
+  data.tar.gz: 1a0268130c725d049fa6ec82d130ada5bf486a331ac2220398924f594ee06b54be55dfae51e140aa0a7016823b9c99d908d71fd6149da9cef84077bb8674734d

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 ## Usage
 
 ```bash
-$ presigner --bucket foobucket --key bar.txt --duration 3600 --profile default
+$ presigner generate --bucket foobucket --key bar.txt --duration 3600 --profile default
 ```
 
 - Currently, You can provide duration only in seconds.

data/bin/presigner

@@ -7,10 +7,26 @@ class PresignerCLI < Thor
   option :bucket,  :required => true
   option :key,     :required => true
   option :profile
+  option :access_key
+  option :secret_key
   option :duration
+  option :region
   desc "generate",  "generate S3 presigned URL"
 
   def generate
+    aws_opts = {}
+    if options[:access_key] and options[:secret_key]
+      aws_opts[:access_key] = options[:access_key]
+      aws_opts[:secret_key] = options[:secret_key]
+    elsif options[:profile]
+      prov = AWS::Core::CredentialProviders::
+               SharedCredentialFileProvider.new(profile_name: options[:profile])
+      aws_opts[:credential_provider] = prov
+    end
+
+    aws_opts[:region] = options[:region] if options[:region]
+    AWS.config(aws_opts)
+
     presigner= Presigner.new(options)
     url = presigner.generate
     $stdout.puts url

data/lib/presigner.rb

@@ -8,9 +8,6 @@ class Presigner
   DEFAULT_DURATION = 60 * 30
 
   def initialize(options)
-    prov = AWS::Core::CredentialProviders::
-             SharedCredentialFileProvider.new(profile_name: options[:profile])
-    AWS.config(credential_provider: prov)
     @bucket = options[:bucket]
     @key = options[:key]
     @duration = options[:duration].nil? ? DEFAULT_DURATION : options[:duration].to_i
@@ -23,7 +20,17 @@ class Presigner
 
     s3 = AWS::S3.new
     # check if specified bucket and key exist.
-    target_obj = s3.buckets[bucket].objects[key]
+    begin
+      target_obj = s3.buckets[bucket].objects[key]
+      if !target_obj.exists?
+        $stderr.puts "Specified bucket or key does not exist."
+        exit 1
+      end
+    rescue AWS::S3::Errors::Forbidden
+      $stderr.puts "Access to the S3 object is denied. Credential or target name might be wrong"
+      exit 1
+    end
+
     if !target_obj.exists?
       $stderr.puts "Specified bucket or key does not exist."
       exit 1
@@ -32,11 +39,11 @@ class Presigner
     presigner = AWS::S3::PresignV4.new(target_obj)
     expires = calc_duration
 
-    url = presigner.presign(:get, expires: expires, secure: true)
+    url = presigner.presign(:get, expires: base + duration, secure: true)
     url
   end
 
   def calc_duration
-    base + duration
+    duration
   end
 end

data/lib/presigner/version.rb

@@ -1,3 +1,3 @@
 class Presigner
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: presigner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masao Mochizuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler