miasma-aws 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be997cc62659a51d4ae788959b0e583eda2057b
-  data.tar.gz: 0ede4c40792335c6b4deab9b55566f943916d212
+  metadata.gz: 2967860cfc9a00bdddaeec82c625e67b0deebbc2
+  data.tar.gz: 5aed93a44a616148a18a432b2e5f6a94b41c2958
 SHA512:
-  metadata.gz: 599452ef733b413350ed1a723cdce5289e8bae389e7528d250d0404627054621bb86955085e43d15e47ce2a9c7ae625f7639e7adb21db35ab29edb23505853f2
-  data.tar.gz: 486b6b394e09d03aaf8247ee52ee14e01e02d0dad6a6606631da754507c4acc2a862a84d61e3a58c23c2a3cc135e33784b3eaf04b27ce8460a79ef7ac1e35090
+  metadata.gz: 83cc2ff04ee739492a8c721d532c1c801f4e2a409c1472c5221c8e5cb67524406b067fa832d1307113e6621ae38eb83e08808cbaca507c0e798463a644f81e1e
+  data.tar.gz: 8ed083d3348fd7dfc087c7195275b5c272bb8500e05c1a45eda9fef0978862cd3aee6ad55105916a4f43dd9aab3318e96f1cd99149713e0152bd5eb71e3fb984

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.1.12
+* Update default file paths to use `Dir.home` instead of ~ expansion
+* Fix bug reading .aws/credentials when whitespace is used
+* Add support for .aws/config
+* Auto detect us-east-1 region and do not use custom s3 endpoint
+
 ## v0.1.10
 * Fix disable rollback mapping value to on failure
 

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.10')
+  VERSION = Gem::Version.new('0.1.12')
 end

data/lib/miasma/contrib/aws.rb

@@ -327,8 +327,9 @@ module Miasma
 
         def self.included(klass)
           klass.class_eval do
-            attribute :aws_profile_name, String
-            attribute :aws_credentials_file, String, :required => true, :default => File.expand_path('~/.aws/credentials')
+            attribute :aws_profile_name, String, :default => 'default'
+            attribute :aws_credentials_file, String, :required => true, :default => File.join(Dir.home, '.aws/credentials')
+            attribute :aws_config_file, String, :required => true, :default => File.join(Dir.home, '.aws/config')
             attribute :aws_access_key_id, String, :required => true
             attribute :aws_secret_access_key, String, :required => true
             attribute :aws_region, String, :required => true
@@ -364,34 +365,49 @@ module Miasma
         # @return [TrueClass]
         def custom_setup(creds)
           if(creds[:aws_profile_name])
-            creds.replace(load_aws_credentials(creds[:aws_profile_name]).merge(creds))
+            creds.replace(
+              load_aws_file(
+                aws_config_file,
+                creds[:aws_profile_name]
+              ).merge(
+                load_aws_file(
+                  aws_credentials_file,
+                  creds[:aws_profile_name]
+                )
+              ).merge(creds)
+            )
           end
         end
 
-        # Load credentials from the AWS credentials file
+        # Load configuration from the AWS configuration file
         #
+        # @param file_path [String] path to configuration file
         # @param profile [String] name of profile to load
         # @return [Smash]
-        def load_aws_credentials(profile)
-          credentials = Smash.new.tap do |creds|
-            key = nil
-            File.readlines(aws_credentials_file).each do |line|
-              line.strip!
-              if(line.start_with?('[') && line.end_with?(']'))
-                key = line.tr('[]', '')
-                creds[key] = Smash.new
-              else
-                creds[key].merge!(Smash[*line.split('=')])
+        def load_aws_file(file_path, profile)
+          if(File.exists?(file_path))
+            l_config = Smash.new.tap do |creds|
+              key = nil
+              File.readlines(file_path).each do |line|
+                line.strip!
+                if(line.start_with?('[') && line.end_with?(']'))
+                  key = line.tr('[]', '').strip
+                  creds[key] = Smash.new
+                else
+                  creds[key].merge!(Smash[*line.split('=').map(&:strip)])
+                end
               end
             end
-          end
-          credentials.fetch(
-            :default, Smash.new
-          ).merge(
-            credentials.fetch(
-              profile, Smash.new
+            l_config.fetch(
+              :default, Smash.new
+            ).merge(
+              l_config.fetch(
+                profile, Smash.new
+              )
             )
-          )
+          else
+            Smash.new
+          end
         end
 
         # Setup for API connections

data/lib/miasma/contrib/aws/storage.rb

@@ -23,7 +23,7 @@ module Miasma
           args[:aws_region] = args.fetch(:aws_bucket_region, 'us-east-1')
           super(args)
           aws_region = cache_region
-          if(aws_bucket_region)
+          if(aws_bucket_region && aws_bucket_region != 'us-east-1')
             self.aws_host = "s3-#{aws_bucket_region}.amazonaws.com"
           else
             self.aws_host = 's3.amazonaws.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -137,4 +137,3 @@ signing_key:
 specification_version: 4
 summary: Smoggy AWS API
 test_files: []
-has_rdoc: