tacoma 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9da06bc8a4fc6ad6ef4e2b71e5b27446472442
-  data.tar.gz: 6fa8578c3510a586acb5218ada7f7a8bc3fab195
+  metadata.gz: f2cc55778f5dd0d7e576f56f0483072d248a209c
+  data.tar.gz: ea54584fe182d4cfa754d721892d52d968035964
 SHA512:
-  metadata.gz: e697d3fcc7bae802ae2cbee315bc6e930682810ed979970901ce397b26c19dd1b6871dfd6633b9b11ac37304dd7ccc1a1ea32f7d64e89c809eb7eb6f89a1dd72
-  data.tar.gz: d1bd30c973cbe8e6cbe4f993b16d1e28bedb6fb788d363cc4e0cb928d2f9a4c046c8375ea17ee0941aa81111f3e09d09ed6c3703ce59e0f00d33dd1f74bad410
+  metadata.gz: 0393a9b07ac4a55666859553037e39fddc37cea4521cac1d78ce95d087663e8eca4f9eb2a107934930c9f182bc82eb0121c8849c4a3de2dbd68ef281ba37f22f
+  data.tar.gz: a0f8319b113b50a59f13ea5b5c1ff5ef5c974f806e83be3dcb19d7f0ec31b42b6a8d3e88bc7af2031c4b4875c029002184728b6d0534323a52a3bb17e82ee372

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.0.14
+    - New subsection in tacoma.yml file, allowing to define settings for s3cmd on a per-project basis.  See the
+      README for more info
 1.0.11
 	- Current tacoma environment gets cached in $HOME/.tacoma_current_environment
 1.0.10

data/README.md

@@ -13,20 +13,22 @@ Tacoma needs a special file `.tacoma.yml` in your home directory.  It can create
      tacoma install
 
 The format of the `.tacoma.yml` file is pretty straighforward
-
-     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_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"
-
+```yml
+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_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"
+  s3cfg:
+    gpg_passphrase: my_gpg_passphrase
+```
 Once setup with a file like this, you can run
 
      tacoma list
@@ -50,7 +52,7 @@ Running `tacoma switch` with the `--with-exports` option will also echo shell ex
 Will display the current tacoma version and list all available configuration templates (providers).
 
      tacoma current
-     
+
 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.

data/bin/tacoma

@@ -1,5 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 require_relative '../lib/tacoma'
 
 Tacoma::Command.start
-

data/lib/tacoma/cache_environment.rb

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

data/lib/tacoma/command.rb

@@ -2,13 +2,9 @@ require 'yaml'
 require 'thor'
 require 'pathname'
 
-
 module Tacoma
-
-
-  
   module Tool
-    DEFAULT_AWS_REGION = 'eu-west-1'
+    DEFAULT_AWS_REGION = 'eu-west-1'.freeze
 
     class << self
       attr_accessor :aws_identity_file
@@ -16,29 +12,31 @@ module Tacoma
       attr_accessor :aws_access_key_id
       attr_accessor :region
       attr_accessor :repo
+      attr_accessor :s3cfg
 
-      include CacheEnvironment 
+      include CacheEnvironment
 
       def config
-        filename = File.join(Dir.home, ".tacoma.yml")
-        return YAML::load_file(filename)
+        filename = File.join(Dir.home, '.tacoma.yml')
+        YAML.load_file(filename)
       end
 
       def load_vars(environment)
         return false unless exists?(environment)
 
-        config = Tool.config  
+        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']
+        @s3cfg = config[environment]['s3cfg'] || {}
         validate_vars
       end
-      
+
       # Assume there is a ~/.aws/credentials file with a valid format
       def current_environment
-         read_environment_from_cache
+        read_environment_from_cache
       end
 
       private
@@ -46,7 +44,7 @@ module Tacoma
       # shows error message if any attr is missing
       # return false if any attr is missing to exit the program
       def validate_vars
-        errors = self.instance_variables.map do |var|
+        errors = instance_variables.map do |var|
           next unless instance_variable_get(var).to_s.empty?
           "Cannot find #{var} key, check your YAML config file."
         end.compact
@@ -56,71 +54,64 @@ module Tacoma
 
       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
+        return true if config.keys.include?(environment)
+        puts "Cannot find #{environment} key, check your YAML config file"
       end
     end
   end
 
   class Command < Thor
-
     include Thor::Actions
 
-    include CacheEnvironment  
+    include CacheEnvironment
 
-    desc "list", "Lists all known AWS environments"
+    desc 'list', 'Lists all known AWS environments'
     def list
-      Tool.config.keys.each do |key|
+      Tool.config.each_key do |key|
         puts key
       end
     end
 
-    TOOLS = {fog: '.fog', 
-             boto: '.boto', 
-             s3cfg: '.s3cfg', 
-             route53: '.route53', 
-             aws_credentials: '.aws/credentials'}
+    TOOLS = { fog: '.fog',
+              boto: '.boto',
+              s3cfg: '.s3cfg',
+              route53: '.route53',
+              aws_credentials: '.aws/credentials' }.freeze
 
-    desc "version", "Displays current tacoma version"
+    desc 'version', 'Displays current tacoma version'
     def version
       puts "tacoma, version #{Tacoma::VERSION}"
-      puts "Configuration templates available for:"
+      puts 'Configuration templates available for:'
       TOOLS.each do |tool, config_path|
-        puts "   #{tool.to_s} => '~/#{config_path}'"
+        puts "   #{tool} => '~/#{config_path}'"
       end
     end
 
-    desc "current", "Displays current loaded tacoma environment"
+    desc 'current', 'Displays current loaded tacoma environment'
     def current
       puts Tool.current_environment
-      return true
+      true
     end
-    
-    desc "switch ENVIRONMENT", "Prepares AWS config files for the providers. --with-exports will output environment variables"
+
+    desc 'switch ENVIRONMENT', 'Prepares AWS config files for the providers. --with-exports will output environment variables'
     option :'with-exports'
-    
-    def switch(environment)
 
+    def switch(environment)
       if Tool.load_vars(environment)
         @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
-
-
+        @s3cfg = Tool.s3cfg
 
         # set configurations for tools
         TOOLS.each do |tool, config_path|
-          template_path = Pathname.new("#{self.class.source_root}/../template/#{tool}").realpath.to_s
+          template_path = build_template_path(tool)
           file_path = File.join(Dir.home, config_path)
-          template template_path, file_path, :force => true
+          template template_path, file_path, force: true
         end
-        
+
         system("ssh-add #{@aws_identity_file}")
         if options[:'with-exports']
           puts "export AWS_SECRET_ACCESS_KEY=#{@aws_secret_access_key}"
@@ -129,48 +120,50 @@ module Tacoma
           puts "export AWS_ACCESS_KEY_ID=#{@aws_access_key_id}"
           puts "export AWS_DEFAULT_REGION=#{@region}"
         end
-        
+
         update_environment_to_cache(environment)
-        
-        return true
+
+        true
       else
-        return false
+        false
       end
     end
 
-    desc "cd ENVIRONMENT", "Change directory to the project path"
+    desc 'cd ENVIRONMENT', 'Change directory to the project path'
     def cd(environment)
-      if switch(environment)
-        Dir.chdir `echo #{@repo}`.strip
-        puts "Welcome to the tacoma shell"
-        shell = ENV['SHELL'].split('/').last
-        options =
-          case shell
-          when 'zsh'
-            ''
-          else
-            '--login'
-          end
-        system("#{shell} #{options}")
-        Process.kill(:SIGQUIT, Process.getpgid(Process.ppid))
-      end
+      return unless switch(environment)
+
+      Dir.chdir `echo #{@repo}`.strip
+      puts 'Welcome to the tacoma shell'
+      shell = ENV['SHELL'].split('/').last
+      options =
+        case shell
+        when 'zsh'
+          ''
+        else
+          '--login'
+        end
+      system("#{shell} #{options}")
+      Process.kill(:SIGQUIT, Process.getpgid(Process.ppid))
     end
 
-    desc "install", "Create a sample ~/.tacoma.yml file"
+    desc 'install', 'Create a sample ~/.tacoma.yml file'
     def install
-      if (File.exists?(File.join(Dir.home, ".tacoma.yml")))
+      if File.exist?(File.join(Dir.home, '.tacoma.yml'))
         puts "File ~/.tacoma.yml already present, won't overwrite"
       else
-        template_path=Pathname.new("#{self.class.source_root}/../template/tacoma.yml").realpath.to_s
-        new_path = File.join(Dir.home, ".tacoma.yml")
+        template_path = build_template_path('tacoma.yml')
+        new_path = File.join(Dir.home, '.tacoma.yml')
         template template_path, new_path
       end
     end
 
+    def build_template_path(template_name)
+      "#{self.class.source_root}/../template/#{template_name}".realpath.to_s
+    end
+
     def self.source_root
       File.dirname(__FILE__)
     end
-
   end
-
 end

data/lib/tacoma/version.rb

@@ -1,3 +1,3 @@
 module Tacoma
-  VERSION='1.0.13'
+  VERSION = '1.0.14'.freeze
 end

data/lib/template/s3cfg

@@ -1,38 +1,38 @@
 [default]
 access_key = <%= @aws_access_key_id %>
-bucket_location = US
-cloudfront_host = cloudfront.amazonaws.com
-cloudfront_resource = /2010-07-15/distribution
-default_mime_type = binary/octet-stream
-delete_removed = False
-dry_run = False
-encoding = UTF-8
-encrypt = False
-follow_symlinks = False
-force = False
-get_continue = False
-gpg_command = None
-gpg_decrypt = %(gpg_command)s -d --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
-gpg_encrypt = %(gpg_command)s -c --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
-gpg_passphrase = 
-guess_mime_type = True
-host_base = s3.amazonaws.com
-host_bucket = %(bucket)s.s3.amazonaws.com
-human_readable_sizes = False
-list_md5 = False
-log_target_prefix = 
-preserve_attrs = True
-progress_meter = True
-proxy_host = 
-proxy_port = 0
-recursive = False
-recv_chunk = 4096
-reduced_redundancy = False
+bucket_location = <%= @s3cfg['bucket_location'] || 'US' %>
+cloudfront_host = <%= @s3cfg['cloudfront_host'] || 'cloudfront.amazonaws.com' %>
+cloudfront_resource = <%= @s3cfg['cloudfront_resource'] || '/2010-07-15/distribution' %>
+default_mime_type = <%= @s3cfg['default_mime_type'] || 'binary/octet-stream' %>
+delete_removed = <%= @s3cfg['delete_removed'] || 'False' %>
+dry_run = <%= @s3cfg['dry_run'] || 'False' %>
+encoding = <%= @s3cfg['encoding'] || 'UTF-8' %>
+encrypt = <%= @s3cfg['encrypt'] || 'False' %>
+follow_symlinks = <%= @s3cfg['follow_symlinks'] || 'False' %>
+force = <%= @s3cfg['force'] || 'False' %>
+get_continue = <%= @s3cfg['get_continue'] || 'False' %>
+gpg_command = <%= @s3cfg['gpg_command'] || 'None' %>
+gpg_decrypt = <%= @s3cfg['gpg_decrypt'] || '%(gpg_command)s -d --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s' %>
+gpg_encrypt = <%= @s3cfg['gpg_encrypt'] || '%(gpg_command)s -c --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s' %>
+gpg_passphrase = <%= @s3cfg['gpg_passphrase'] || '' %>
+guess_mime_type = <%= @s3cfg['guess_mime_type'] || 'True' %>
+host_base = <%= @s3cfg['host_base'] || 's3.amazonaws.com' %>
+host_bucket = <%= @s3cfg['host_bucket'] || '%(bucket)s.s3.amazonaws.com' %>
+human_readable_sizes = <%= @s3cfg['human_readable_sizes'] || 'False' %>
+list_md5 = <%= @s3cfg['list_md5'] || 'False' %>
+log_target_prefix = <%= @s3cfg['log_target_prefix'] || '' %>
+preserve_attrs = <%= @s3cfg['preserve_attrs'] || 'True' %>
+progress_meter = <%= @s3cfg['progress_meter'] || 'True' %>
+proxy_host = <%= @s3cfg['proxy_host'] || '' %>
+proxy_port = <%= @s3cfg['proxy_port'] || '0' %>
+recursive = <%= @s3cfg['recursive'] || 'False' %>
+recv_chunk = <%= @s3cfg['recv_chunk'] || '4096' %>
+reduced_redundancy = <%= @s3cfg['reduced_redundancy'] || 'False' %>
 secret_key = <%= @aws_secret_access_key %>
-send_chunk = 4096
-simpledb_host = sdb.amazonaws.com
-skip_existing = False
-socket_timeout = 300
-urlencoding_mode = normal
-use_https = False
-verbosity = WARNING
+send_chunk = <%= @s3cfg['send_chunk'] || '4096' %>
+simpledb_host = <%= @s3cfg['simpledb_host'] || 'sdb.amazonaws.com' %>
+skip_existing = <%= @s3cfg['skip_existing'] || 'False' %>
+socket_timeout = <%= @s3cfg['socket_timeout'] || '300' %>
+urlencoding_mode = <%= @s3cfg['urlencoding_mode'] || 'normal' %>
+use_https = <%= @s3cfg['use_https'] || 'False' %>
+verbosity = <%= @s3cfg['verbosity'] || 'WARNING' %>

data/tacoma.gemspec

@@ -3,23 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tacoma/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "tacoma"
+  spec.name          = 'tacoma'
   spec.version       = Tacoma::VERSION
-  spec.authors       = ["Juan Lupión"]
-  spec.email         = ["pantulis@gmail.com"]
-  spec.description   = %q{Easy command line tool for AWS credentials management}
-  spec.summary       = "This tool reads a YAML file with the credentials for your AWS accounts and loads them into  your environment."
-  spec.homepage      = "https://github.com/pantulis/tacoma"
-  spec.license       = "MIT"
+  spec.authors       = ['Juan Lupión']
+  spec.email         = ['pantulis@gmail.com']
+  spec.description   = 'Easy command line tool for AWS credentials management'
+  spec.summary       = 'This tool reads a YAML file with the credentials for your AWS accounts and loads them into  your environment.'
+  spec.homepage      = 'https://github.com/pantulis/tacoma'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($\)
+  spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  
   spec.add_runtime_dependency 'thor', '~> 0'
-  spec.add_development_dependency "minitest", '~> 0'
-  spec.add_development_dependency "bundler", '~> 0'
-  spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency 'bundler', '~> 0'
+  spec.add_development_dependency 'minitest', '~> 0'
+  spec.add_development_dependency 'rake', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tacoma
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Juan Lupión
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"