Skip to content

Commit

Permalink
Merge pull request #11 from k1LoW/update-aws_config
Browse files Browse the repository at this point in the history
Update aws_config to 0.1.0
  • Loading branch information
k1LoW authored Mar 22, 2017
2 parents f1f2320 + 306d1b6 commit 9a6e971
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
11 changes: 8 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ require 'bundler/gem_tasks'
begin
require 'rspec/core/rake_task'
require 'octorelease'
require 'rubocop/rake_task'
rescue LoadError
end

RSpec::Core::RakeTask.new(:spec)

task default: :spec
task spec: 'spec:all'
namespace :spec do
task all: ['spec:core',
'spec:rubocop']
RSpec::Core::RakeTask.new(:core)
RuboCop::RakeTask.new
end
2 changes: 1 addition & 1 deletion awsecrets.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_runtime_dependency 'aws-sdk', '~> 2'
spec.add_runtime_dependency 'aws_config', '0.0.4'
spec.add_runtime_dependency 'aws_config', '~> 0.1.0'
spec.add_development_dependency 'bundler', '~> 1.9'
spec.add_development_dependency 'rake', '~> 10.0'
spec.add_development_dependency 'rspec'
Expand Down
5 changes: 1 addition & 4 deletions lib/awsecrets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def self.load(profile: nil, region: nil, secrets_path: 'secrets.yml')
# 3. YAML file (secrets.yml)
load_yaml
# 4. The AWS credentials file
load_creds
# load_creds
# 5. The CLI configuration file
load_config

Expand Down Expand Up @@ -83,9 +83,6 @@ def self.load_yaml
)
end

def self.load_creds
end

def self.load_config
@region ||= if AWSConfig[@profile] && AWSConfig[@profile]['region']
AWSConfig[@profile]['region']
Expand Down
1 change: 1 addition & 0 deletions spec/configration_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'spec_helper'

# rubocop:disable Metrics/BlockLength
describe Awsecrets do
let(:fixtures_path) do
File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
Expand Down
1 change: 1 addition & 0 deletions spec/precedence_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'spec_helper'

# rubocop:disable Metrics/BlockLength
describe Awsecrets do
let(:fixtures_path) do
File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
Expand Down

0 comments on commit 9a6e971

Please sign in to comment.