tacoma 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7671a33039dd0abccfbbcc88c7efed13253439b8
-  data.tar.gz: f4c1d1a2b23c01dd82a2d103b1ec95130b848d14
+  metadata.gz: b4c0fa806b894208e53ad3bd5ecd00e36285855b
+  data.tar.gz: 185e15e296c11fcfc138ce5299995ecfa4a7db6b
 SHA512:
-  metadata.gz: dad5d74aee8aef2678289fa14cbef7a61b0df78d231cf0b90e3a022d6cff9c08b5bdc2085d24a7fcad70783c63bfb56e50f37001280026513c7307ff95fe6368
-  data.tar.gz: d09385047512791d49be9aa98db74c0deca50a4a934d04ac8e0955c93966d89b181237b81747d0c20e381c6d7df5b5e70dfcbe7466160c6839619bd2fdde0183
+  metadata.gz: 4ced14e1f23035c5cd6fe6d116a98d19de8b26a28157c7760e6d70e04243ec029243cee8305208ba24601ae9354d9d2edf4055c1736d3cfb5a52e93f72628e12
+  data.tar.gz: 2daf30e0eab0de3a9068379ac7bc2e1d40b0038dff1fbb22ec87691fdd005102913f4bc8fab16c100a25feb69ff13a4675f49ccb51918da227d0bfc34e6c90bd

data/README.md

@@ -18,11 +18,13 @@ The format of the `.tacoma.yml` file is pretty straighforward
        aws_identity_file: "/path/to/pem/file/my_project.pem"
        aws_secret_access_key: "YOURSECRETACCESSKEY"
        aws_access_key_id: "YOURACCESSKEYID"
+       region: "REGION"
        repo: "$HOME/projects/my_project"
 	 another_project:
        aws_identity_file: "/path/to/another_pem.pem"
        aws_secret_access_key: "ANOTHERECRETACCESSKEY"
        aws_access_key_id: "ANOTHERACCESSKEYID"
+       region: "REGION"
        repo: "$HOME/projects/another_project"
 
 Once setup with a file like this, you can run
@@ -49,7 +51,9 @@ Will display the current tacoma version and list all available configuration tem
 
      tacoma current
      
-Will display the currently active tacoma environment.  
+Will display the currently active tacoma environment.
+
+If you don't indicate a specific region, tacoma will use the "eu-west-1" region by default.
 
 ## Bash Completion
 

data/lib/tacoma/command.rb

@@ -8,12 +8,13 @@ module Tacoma
 
   
   module Tool
-
+    DEFAULT_AWS_REGION = 'eu-west-1'
 
     class << self
       attr_accessor :aws_identity_file
       attr_accessor :aws_secret_access_key
       attr_accessor :aws_access_key_id
+      attr_accessor :region
       attr_accessor :repo
 
       include CacheEnvironment 
@@ -24,24 +25,31 @@ module Tacoma
       end
 
       def load_vars(environment)
-        config = Tool.config
-        if config.keys.include?(environment) == false
-          puts "Cannot find #{environment} key, check your YAML config file"
-          return false
-        end
-
-        if config[environment]
-          @aws_identity_file = config[environment]['aws_identity_file']
-          @aws_secret_access_key = config[environment]['aws_secret_access_key']
-          @aws_access_key_id = config[environment]['aws_access_key_id']
-          @repo = config[environment]['repo']
-        end
+        return false unless exists?(environment)
+
+        config = Tool.config  
+        @aws_identity_file = config[environment]['aws_identity_file']
+        @aws_secret_access_key = config[environment]['aws_secret_access_key']
+        @aws_access_key_id = config[environment]['aws_access_key_id']
+        @region = config[environment]['region'] || DEFAULT_AWS_REGION
+        @repo = config[environment]['repo']
       end
       
       # Assume there is a ~/.aws/credentials file with a valid format
       def current_environment
          read_environment_from_cache
       end
+
+      private
+      def exists?(environment)
+        config = Tool.config
+        if config.keys.include?(environment) == false
+          puts "Cannot find #{environment} key, check your YAML config file"
+          return false
+        else
+          return true
+        end
+      end
     end
   end
 
@@ -88,6 +96,7 @@ module Tacoma
         @aws_identity_file = Tool.aws_identity_file
         @aws_secret_access_key = Tool.aws_secret_access_key
         @aws_access_key_id = Tool.aws_access_key_id
+        @region = Tool.region
         @repo = Tool.repo
 
 
@@ -105,6 +114,7 @@ module Tacoma
           puts "export AWS_SECRET_KEY=#{@aws_secret_access_key}"
           puts "export AWS_ACCESS_KEY=#{@aws_access_key_id}"
           puts "export AWS_ACCESS_KEY_ID=#{@aws_access_key_id}"
+          puts "export AWS_DEFAULT_REGION=#{@region}"
         end
         
         update_environment_to_cache(environment)

data/lib/tacoma/version.rb

@@ -1,3 +1,3 @@
 module Tacoma
-  VERSION='1.0.11'
+  VERSION='1.0.12'
 end

data/lib/template/aws_credentials

@@ -3,3 +3,4 @@
 [default]
 aws_access_key_id = <%= @aws_access_key_id %>
 aws_secret_access_key = <%= @aws_secret_access_key %>
+region = <%= @region %>

data/lib/template/tacoma.yml

@@ -11,10 +11,12 @@ my_first_project:
   aws_identity_file: "/path/to/pem/file/my_project.pem"
   aws_secret_access_key: "YOURSECRETACCESSKEY"
   aws_access_key_id: "YOURACCESSKEYID"
+  region: 'REGION'  
   repo: "$HOME/projects/my_first_project"
 
 my_second_project:
   aws_identity_file: "/path/to/pem/file/my_second_project.pem"
   aws_secret_access_key: "ANOTHERSECRETACCESSKEY"
   aws_access_key_id: "ANOTHERACCESSKEYID"
+  region: 'REGION'
   repo: "/usr/share/projects/my_second_project"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tacoma
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Juan Lupión
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor