s3utils 0.2.0 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/s3utils.rb +17 -18
  2. data/lib/s3utils/version.rb +1 -1
  3. metadata +2 -8
@@ -138,35 +138,34 @@ module S3Utils
138
138
  abort "Error: " + e.message
139
139
  end
140
140
  end
141
+ def test_aws_config(s3)
142
+ begin
143
+ #test connection by checking for 1 bucket name
144
+ s3.buckets.each do |bucket|
145
+ break
146
+ end
147
+ rescue Exception => e
148
+ abort "Error: " + e.message
149
+ end
150
+
151
+ end
141
152
  def s3
142
153
  @s3 ||= begin
143
- access_key, secret_key = nil, nil
154
+ aws_key_opts = {}
144
155
 
145
156
  if ENV["AWS_CREDENTIAL_FILE"]
146
157
  File.open(ENV["AWS_CREDENTIAL_FILE"]) do |file|
147
158
  file.lines.each do |line|
148
- access_key = $1 if line =~ /^AWSAccessKeyId=(.*)$/
149
- secret_key = $1 if line =~ /^AWSSecretKey=(.*)$/
159
+ aws_key_opts[:access_key_id] = $1 if line =~ /^AWSAccessKeyId=(.*)$/
160
+ aws_key_opts[:secret_access_key] = $1 if line =~ /^AWSSecretKey=(.*)$/
150
161
  end
151
162
  end
152
- elsif ENV["AWS_ACCESS_KEY"] || ENV["AWS_SECRET_KEY"]
153
- access_key = ENV["AWS_ACCESS_KEY"]
154
- secret_key = ENV["AWS_SECRET_KEY"]
155
163
  end
156
164
 
157
165
  opt = ENV["HTTPS_PROXY"] ? {:proxy_uri => ENV["HTTPS_PROXY"]} : {}
158
- AWS.config({ :access_key_id => access_key,
159
- :secret_access_key => secret_key}.merge opt)
160
- begin
161
- s3 = AWS::S3.new
162
- #test connection by checking for 1 bucket name
163
- s3.buckets.each do |bucket|
164
- bucket.name
165
- break
166
- end
167
- rescue Exception => e
168
- abort "Error: " + e.message
169
- end
166
+ AWS.config(aws_key_opts.merge opt)
167
+ s3 = AWS::S3.new
168
+ test_aws_config(s3)
170
169
  s3
171
170
  end
172
171
  end
@@ -1,3 +1,3 @@
1
1
  module S3Utils
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3utils
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-24 00:00:00.000000000 Z
12
+ date: 2012-12-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aws-sdk
@@ -72,18 +72,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
72
72
  - - ! '>='
73
73
  - !ruby/object:Gem::Version
74
74
  version: '0'
75
- segments:
76
- - 0
77
- hash: -1735772303624336136
78
75
  required_rubygems_version: !ruby/object:Gem::Requirement
79
76
  none: false
80
77
  requirements:
81
78
  - - ! '>='
82
79
  - !ruby/object:Gem::Version
83
80
  version: '0'
84
- segments:
85
- - 0
86
- hash: -1735772303624336136
87
81
  requirements: []
88
82
  rubyforge_project:
89
83
  rubygems_version: 1.8.24