tacoma 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8310f820be44f0ffc85fbbd01ce2efb9028474d8
-  data.tar.gz: fe8857502b48b144263b084421670df5c1ad0307
+  metadata.gz: 7671a33039dd0abccfbbcc88c7efed13253439b8
+  data.tar.gz: f4c1d1a2b23c01dd82a2d103b1ec95130b848d14
 SHA512:
-  metadata.gz: 9f83ea8a3d456d8faf5f3ad1f1f9d1d51633a197a22a520f831fc8236eca3877ed44a9592f542a4c6df39bc8ebc927dd8cd21b44b3d467abeb90b16472174f20
-  data.tar.gz: 0afe0672977d5094ac2a460dc332ee33f04f951765a4e0bacf439771dfd426e636309abb235eebab9e3ad52d9e23b15d4fbba8fac9eb05300871634c2bc80a17
+  metadata.gz: dad5d74aee8aef2678289fa14cbef7a61b0df78d231cf0b90e3a022d6cff9c08b5bdc2085d24a7fcad70783c63bfb56e50f37001280026513c7307ff95fe6368
+  data.tar.gz: d09385047512791d49be9aa98db74c0deca50a4a934d04ac8e0955c93966d89b181237b81747d0c20e381c6d7df5b5e70dfcbe7466160c6839619bd2fdde0183

data/CHANGELOG

@@ -1,3 +1,5 @@
+1.0.11
+	- Current tacoma environment gets cached in $HOME/.tacoma_current_environment
 1.0.10
 	- Added 'tacoma current' command, which will display the current tacoma environment
 1.0.9 

data/Gemfile

@@ -1,4 +1,3 @@
-source 'http://rubygems.org'
-
-gem 'thor'
+source 'https://rubygems.org'
 
+gemspec

data/README.md

@@ -33,7 +33,7 @@ And it will list all the configured entries.  Running
 
      tacoma switch project
 
-Will display the export commands for the AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID credential environment variables, will add the specified identity file into the SSH agent, and will generate configuration files for the supported tools, which at this time are
+Will add the specified identity file into the SSH agent, and will generate configuration files for the supported tools, which at this time are
 
 - [Fog](https://github.com/fog/fog), which should work with Capistrano's capify-ec2.
 - [Boto](https://github.com/boto/boto)
@@ -41,12 +41,15 @@ Will display the export commands for the AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_I
 - [route53](https://github.com/pcorliss/ruby_route_53)
 - [aws cli](https://github.com/aws/aws-cli)
 
-Running tacoma switch with the --with-exports option will also echo shell export sentences for the most common incarnations of the AWS env vars.
+Running `tacoma switch` with the `--with-exports` option will also echo shell export sentences for the most common incarnations of the AWS env vars.
 
      tacoma version
 
 Will display the current tacoma version and list all available configuration templates (providers).
 
+     tacoma current
+     
+Will display the currently active tacoma environment.  
 
 ## Bash Completion
 

data/contrib/tacoma.completion.sh

@@ -5,7 +5,7 @@ _tacoma()
   cur="${COMP_WORDS[COMP_CWORD]}"
   prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-  commands="cd help install list switch"
+  commands="cd current help install list switch version"
 
   case "${prev}" in
     cd)

data/lib/tacoma.rb

@@ -1,2 +1,3 @@
+require_relative './tacoma/cache_environment'
 require_relative './tacoma/command'
 require_relative './tacoma/version'

data/lib/tacoma/cache_environment.rb

@@ -0,0 +1,24 @@
+module CacheEnvironment
+
+    def environment_cache_path
+      "#{Dir.home}/.tacoma_current_environment" 
+    end
+
+    def update_environment_to_cache(environment)
+      begin
+        File.open(environment_cache_path, 'w') { |file| file.write(environment) }
+      rescue 
+        puts "Cannot write at #{environment_cache_path}"
+      end
+    end
+
+    def read_environment_from_cache
+      str = begin
+        File.open(environment_cache_path, &:readline)
+      rescue  
+        nil
+      end
+      str 
+    end
+
+end

data/lib/tacoma/command.rb

@@ -5,13 +5,19 @@ require 'pathname'
 
 module Tacoma
 
+
+  
   module Tool
+
+
     class << self
       attr_accessor :aws_identity_file
       attr_accessor :aws_secret_access_key
       attr_accessor :aws_access_key_id
       attr_accessor :repo
 
+      include CacheEnvironment 
+
       def config
         filename = File.join(Dir.home, ".tacoma.yml")
         return YAML::load_file(filename)
@@ -34,19 +40,7 @@ module Tacoma
       
       # Assume there is a ~/.aws/credentials file with a valid format
       def current_environment
-        current_filename = File.join(Dir.home, ".aws/credentials")
-        File.open(current_filename).each do |line|
-          if /aws_access_key_id/ =~ line
-            current_access_key_id = line[20..-2] # beware the CRLF
-            config = Tool.config
-            for key in config.keys
-              if config[key]['aws_access_key_id'] == current_access_key_id
-                return "#{key}"
-              end
-            end
-          end
-        end  
-        nil
+         read_environment_from_cache
       end
     end
   end
@@ -55,6 +49,8 @@ module Tacoma
 
     include Thor::Actions
 
+    include CacheEnvironment  
+
     desc "list", "Lists all known AWS environments"
     def list
       Tool.config.keys.each do |key|
@@ -94,6 +90,8 @@ module Tacoma
         @aws_access_key_id = Tool.aws_access_key_id
         @repo = Tool.repo
 
+
+
         # set configurations for tools
         TOOLS.each do |tool, config_path|
           template_path = Pathname.new("#{self.class.source_root}/../template/#{tool}").realpath.to_s
@@ -108,6 +106,9 @@ module Tacoma
           puts "export AWS_ACCESS_KEY=#{@aws_access_key_id}"
           puts "export AWS_ACCESS_KEY_ID=#{@aws_access_key_id}"
         end
+        
+        update_environment_to_cache(environment)
+        
         return true
       else
         return false
@@ -143,9 +144,9 @@ module Tacoma
       end
     end
 
-  def self.source_root
-    File.dirname(__FILE__)
-  end
+    def self.source_root
+      File.dirname(__FILE__)
+    end
 
   end
 

data/lib/tacoma/version.rb

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

data/tacoma.gemspec

@@ -1,5 +1,3 @@
-require "bundler/setup"
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tacoma/version'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: tacoma
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Juan Lupión
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy command line tool for AWS credentials management
@@ -74,13 +74,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - README.md
 - bin/tacoma
 - contrib/tacoma.completion.sh
 - lib/tacoma.rb
+- lib/tacoma/cache_environment.rb
 - lib/tacoma/command.rb
 - lib/tacoma/version.rb
 - lib/template/aws_credentials
@@ -100,20 +101,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: This tool reads a YAML file with the credentials for your AWS accounts and
   loads them into  your environment.
 test_files: []
-has_rdoc: