awsecrets 1.2.0 → 1.3.0

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/awsecrets.gemspec +2 -2
  3. data/lib/awsecrets/version.rb +1 -1
  4. data/lib/awsecrets.rb +11 -9
  5. metadata +16 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 49a365b0df22555fb0a1a71c5f63c4657f716543
4
- data.tar.gz: 37be3e865afe4008932b376bd8991ccd21ad5344
3
+ metadata.gz: d347993193efd44beb1101bf8a976d5221eb01c4
4
+ data.tar.gz: e360ac81026d0127a83acb3611e4763680cf8c16
5
5
  SHA512:
6
- metadata.gz: 31ae12abad3989488e251eed4f9db76a590496244a0bc49627a3fd318b7090a7fb99fe37b5f48ab4f7c74d6f9e165ec2362f84f6398e181627ae62b7a1d9b849
7
- data.tar.gz: 179b61e467817fe36cf3f08880ac3cb863d400b26cd2131cf2fe2bea1a20b43292433674a818044477357f5a8aaa9eff2cb6adf0a49b8d9c3372f959ccf8ea81
6
+ metadata.gz: dc69946bc46629ef9ea7747761021fd85ffeaa264c5a216d0595ebf26f8b581d7364889e48d178fd28f8075349451ac0c6c4d3f7dd2ff8de3a36e7531316cee4
7
+ data.tar.gz: 8a8a7dc68133b40c9d72fa8767c0580783f401fecf8de6d047b6364ce1e80b89c9e6e26cd353b9fcdf7082dce928675691ad5ac3056bb16960a5ff73345b7e8d
data/awsecrets.gemspec CHANGED
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
19
19
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
20
20
  spec.require_paths = ['lib']
21
21
 
22
- spec.add_runtime_dependency 'aws-sdk', '~> 2.1'
23
- spec.add_runtime_dependency 'aws_config'
22
+ spec.add_runtime_dependency 'aws-sdk', '>= 2.2.7', '< 2.4'
23
+ spec.add_runtime_dependency 'aws_config', '0.0.4'
24
24
  spec.add_development_dependency 'bundler', '~> 1.9'
25
25
  spec.add_development_dependency 'rake', '~> 10.0'
26
26
  spec.add_development_dependency 'rspec'
data/lib/awsecrets/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Awsecrets
2
- VERSION = '1.2.0'
2
+ VERSION = '1.3.0'
3
3
  end
data/lib/awsecrets.rb CHANGED
@@ -28,8 +28,7 @@ module Awsecrets
28
28
 
29
29
  def self.load_method_args
30
30
  return false unless @profile
31
- aws_config = AWSConfig.profiles[@profile]
32
- @region = aws_config.config_hash[:region] if aws_config && @region.nil?
31
+ @region = AWSConfig[@profile]['region'] if AWSConfig[@profile]['region'] && @region.nil?
33
32
  @credentials = Aws::SharedCredentials.new(profile_name: @profile)
34
33
  true
35
34
  end
@@ -44,8 +43,7 @@ module Awsecrets
44
43
  rescue OptionParser::InvalidOption
45
44
  end
46
45
  return unless @profile
47
- aws_config = AWSConfig.profiles[@profile]
48
- @region = aws_config.config_hash[:region] if aws_config && @region.nil?
46
+ @region = AWSConfig[@profile]['region'] if AWSConfig[@profile]['region'] && @region.nil?
49
47
  @credentials = Aws::SharedCredentials.new(profile_name: @profile)
50
48
  end
51
49
 
@@ -60,7 +58,8 @@ module Awsecrets
60
58
  @credentials = @credentials = Aws::Credentials.new(
61
59
  ENV['AWS_ACCESS_KEY_ID'],
62
60
  ENV['AWS_SECRET_ACCESS_KEY'],
63
- ENV['AWS_SESSION_TOKEN']) # Not necessary
61
+ ENV['AWS_SESSION_TOKEN'] # Not necessary
62
+ )
64
63
  end
65
64
  end
66
65
 
@@ -72,7 +71,8 @@ module Awsecrets
72
71
  if @credentials.nil? && creds && creds.include?('aws_access_key_id') && creds.include?('aws_secret_access_key')
73
72
  @credentials = Aws::Credentials.new(
74
73
  creds['aws_access_key_id'],
75
- creds['aws_secret_access_key'])
74
+ creds['aws_secret_access_key']
75
+ )
76
76
  end
77
77
  end
78
78
 
@@ -83,8 +83,10 @@ module Awsecrets
83
83
 
84
84
  def self.load_config
85
85
  return unless @region.nil?
86
- aws_config = AWSConfig.profiles[@profile]
87
- aws_config = AWSConfig.profiles['default'] unless aws_config
88
- @region = aws_config.config_hash[:region] if aws_config
86
+ @region = if AWSConfig[@profile] && AWSConfig[@profile]['region']
87
+ AWSConfig[@profile]['region']
88
+ else
89
+ AWSConfig['default']['region']
90
+ end
89
91
  end
90
92
  end
metadata CHANGED
@@ -1,43 +1,49 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: awsecrets
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - k1LoW
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-02-25 00:00:00.000000000 Z
11
+ date: 2016-06-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: 2.2.7
20
+ - - "<"
18
21
  - !ruby/object:Gem::Version
19
- version: '2.1'
22
+ version: '2.4'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - "~>"
27
+ - - ">="
25
28
  - !ruby/object:Gem::Version
26
- version: '2.1'
29
+ version: 2.2.7
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '2.4'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: aws_config
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - ">="
37
+ - - '='
32
38
  - !ruby/object:Gem::Version
33
- version: '0'
39
+ version: 0.0.4
34
40
  type: :runtime
35
41
  prerelease: false
36
42
  version_requirements: !ruby/object:Gem::Requirement
37
43
  requirements:
38
- - - ">="
44
+ - - '='
39
45
  - !ruby/object:Gem::Version
40
- version: '0'
46
+ version: 0.0.4
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: bundler
43
49
  requirement: !ruby/object:Gem::Requirement