Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aws_config to 0.1.0 #11

Merged
merged 2 commits into from
Mar 22, 2017
Merged

Update aws_config to 0.1.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2879a75
Update aws_config to 0.1.0
k1LoW Mar 22, 2017
306d1b6
Fight to rubocop
k1LoW Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Rakefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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