hashicorptools 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d826c8e7a72e6a5229d4b7650689ea65b751319a
-  data.tar.gz: b28dba48ac700d728f46dda423e4342707564cc6
+  metadata.gz: e997046905e7f5ff9d2f068d1447834f488867ad
+  data.tar.gz: 2337b65ce059f69d4e8a00712210cbe8d6a52b38
 SHA512:
-  metadata.gz: de41ed4cbae046e4a308553be81156a095a70c39a243b0f5c6c554180e3922917740b4b62b0fec5adbf9207348fb727d31ccd78fcf46a052eb1eb7a4b153b35d
-  data.tar.gz: 937d599532610b2870238e9529fc213690ffd76497def92dcbd1da25e8b0557828cca3a6ca927723c0614cb891bb99d2222302e16e8ab170d4cd4df91ef2cd41
+  metadata.gz: a9879db2aa89689f994dfbecb5bc93d40481bd54de26aa99798fae4563b7878db2cec8064eacc70c9781de66bf5c59fe56c5538dfabdc59eb5b0a15d6b5d63ed
+  data.tar.gz: 818bc8fb19ef7cad3e64e6a6bdfd2a79d9a106a5a13490057b10025b7728f85b5882789ef9d413220048ffc81dcb66b8d8db65966af2447af9eb3d2b8fc2d34f

data/.ruby-gemset

@@ -0,0 +1 @@
+hashicorptools

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.5

data/Gemfile

@@ -15,9 +15,9 @@ gem 'git'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.8.0"
+  gem "rspec"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "juwelier", git: 'https://github.com/controlshift/juwelier.git'
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -1,106 +1,167 @@
+GIT
+  remote: https://github.com/controlshift/juwelier.git
+  revision: 35eb60a50ab62b97472671a9bda5c26d91010ec4
+  specs:
+    juwelier (2.1.2)
+      activesupport (~> 3.2.16)
+      bluecloth
+      builder
+      bundler (>= 1.13)
+      coveralls
+      cucumber (>= 1.1.4)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      mhennemeyer-output_catcher
+      mocha
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+      redgreen
+      rr (>= 1.0.4)
+      semver
+      shoulda
+      simplecov
+      test-construct
+      test-unit
+      timecop
+      yard (>= 0.8.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activesupport (3.2.22.5)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     addressable (2.4.0)
-    aws-sdk (2.3.13)
-      aws-sdk-resources (= 2.3.13)
-    aws-sdk-core (2.3.13)
+    aws-sdk (2.6.30)
+      aws-sdk-resources (= 2.6.30)
+    aws-sdk-core (2.6.30)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.13)
-      aws-sdk-core (= 2.3.13)
+    aws-sdk-resources (2.6.30)
+      aws-sdk-core (= 2.6.30)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
+    aws-sigv4 (1.0.0)
+    bluecloth (2.2.0)
     builder (3.2.2)
-    byebug (9.0.5)
+    byebug (9.0.6)
+    coveralls (0.8.16)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3.0)
+      thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.1.1)
     dynect_rest (0.4.6)
       rest-client
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    gherkin (4.0.0)
     git (1.3.0)
-    github_api (0.14.0)
+    github_api (0.14.5)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2
-    hashie (3.4.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.6)
     highline (1.7.8)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
+    jmespath (1.3.1)
     json (1.8.3)
-    json_pure (1.8.3)
-    jwt (1.5.1)
-    mime-types (2.99.2)
+    jwt (1.5.6)
+    metaclass (0.0.4)
+    mhennemeyer-output_catcher (1.0.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
     multi_json (1.12.1)
+    multi_test (0.1.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    oauth2 (1.1.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pkg-config (1.1.7)
-    rack (1.6.4)
-    rake (11.1.2)
+    power_assert (0.4.1)
+    rack (2.0.1)
+    rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.8.0)
+    redgreen (1.2.2)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.11.2)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rr (1.2.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    thor (0.19.1)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    test-construct (1.2.2)
+    test-unit (3.2.3)
+      power_assert
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    timecop (0.8.1)
+    tins (1.13.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    yard (0.9.5)
 
 PLATFORMS
   ruby
@@ -114,11 +175,11 @@ DEPENDENCIES
   dotenv
   dynect_rest
   git
-  jeweler (~> 2.0.1)
+  juwelier!
   rdoc (~> 3.12)
-  rspec (~> 2.8.0)
+  rspec
   simplecov
   thor
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "hashicorptools"
   gem.homepage = "http://github.com/woodhull/hashicorptools"
@@ -21,10 +21,10 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Wrappers for terraform and packer}
   gem.email = "systems@controlshiftlabs.com"
   gem.authors = ["Nathan Woodhull"]
-  gem.executables = ['ec2_host'] 
+  gem.executables = ['ec2_host']
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.12

data/hashicorptools.gemspec

@@ -1,25 +1,27 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hashicorptools 0.0.7 ruby lib
+# stub: hashicorptools 0.0.12 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "hashicorptools"
-  s.version = "0.0.7"
+  s.name = "hashicorptools".freeze
+  s.version = "0.0.12"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Woodhull"]
-  s.date = "2016-08-22"
-  s.description = "Wrappers for terraform and packer"
-  s.email = "systems@controlshiftlabs.com"
-  s.executables = ["ec2_host"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Woodhull".freeze]
+  s.date = "2016-12-02"
+  s.description = "Wrappers for terraform and packer".freeze
+  s.email = "systems@controlshiftlabs.com".freeze
+  s.executables = ["ec2_host".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
+    ".ruby-gemset",
+    ".ruby-version",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -42,57 +44,96 @@ Gem::Specification.new do |s|
     "spec/hashicorptools_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/woodhull/hashicorptools"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "Wrappers for terraform and packer"
+  s.homepage = "http://github.com/woodhull/hashicorptools".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "Wrappers for terraform and packer".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws-sdk>, ["~> 2"])
-      s.add_runtime_dependency(%q<dynect_rest>, [">= 0"])
-      s.add_runtime_dependency(%q<aws-sdk-v1>, [">= 0"])
-      s.add_runtime_dependency(%q<dotenv>, [">= 0"])
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<byebug>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+      s.add_runtime_dependency(%q<dynect_rest>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<dotenv>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<git>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_runtime_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_runtime_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+      s.add_development_dependency(%q<dynect_rest>.freeze, [">= 0"])
+      s.add_development_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dotenv>.freeze, [">= 0"])
+      s.add_development_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<git>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<aws-sdk>, ["~> 2"])
-      s.add_dependency(%q<dynect_rest>, [">= 0"])
-      s.add_dependency(%q<aws-sdk-v1>, [">= 0"])
-      s.add_dependency(%q<dotenv>, [">= 0"])
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<byebug>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+      s.add_dependency(%q<dynect_rest>.freeze, [">= 0"])
+      s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+      s.add_dependency(%q<dotenv>.freeze, [">= 0"])
+      s.add_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<git>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+      s.add_dependency(%q<dynect_rest>.freeze, [">= 0"])
+      s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+      s.add_dependency(%q<dotenv>.freeze, [">= 0"])
+      s.add_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+      s.add_dependency(%q<byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<git>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<aws-sdk>, ["~> 2"])
-    s.add_dependency(%q<dynect_rest>, [">= 0"])
-    s.add_dependency(%q<aws-sdk-v1>, [">= 0"])
-    s.add_dependency(%q<dotenv>, [">= 0"])
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<byebug>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+    s.add_dependency(%q<dynect_rest>.freeze, [">= 0"])
+    s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+    s.add_dependency(%q<dotenv>.freeze, [">= 0"])
+    s.add_dependency(%q<thor>.freeze, [">= 0"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+    s.add_dependency(%q<dynect_rest>.freeze, [">= 0"])
+    s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
+    s.add_dependency(%q<dotenv>.freeze, [">= 0"])
+    s.add_dependency(%q<thor>.freeze, [">= 0"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

data/lib/hashicorptools/packer.rb

@@ -22,7 +22,7 @@ module Hashicorptools
       byebug
     end
 
-    desc "list", "list all available telize amis"
+    desc "list", "list all available amis"
     def list
       amis.each do |ami|
         puts ami.image_id
@@ -34,7 +34,26 @@ module Hashicorptools
       clean_amis
     end
 
-    desc "boot", "start up an instance of the latest version of AMI" 
+    desc "clean_snapshots", "clean obsolete EBS snapshots not associated with any AMI"
+    def clean_snapshots
+      snapshots = ec2.snapshots.with_owner('self')
+      snapshots.each do |snapshot|
+        match = snapshot.description.match(/Created by CreateImage\(.+\) for (ami-[0-9a-f]+) from vol-.+/)
+        if match.nil?
+          puts "Skipping #{snapshot.id} - #{snapshot.description}"
+          next
+        end
+
+        ami_id = match[1]
+        unless ec2.images[ami_id].exists?
+          puts "Removing obsolete snapshot #{snapshot.id} - #{snapshot.description}"
+          snapshot = AWS::EC2::Snapshot.new(snapshot.id)
+          snapshot.delete
+        end
+      end
+    end
+
+    desc "boot", "start up an instance of the latest version of AMI"
     def boot
       run_instances_resp = ec2.run_instances(image_id: current_ami('base-image').image_id,
         min_count: 1,
@@ -71,6 +90,10 @@ module Hashicorptools
       current_ami('base-image').image_id
     end
 
+    def format_variable(key, value)
+      "-var '#{key}=#{value}'"
+    end
+
     def tag_name
       raise 'implement me'
     end
@@ -117,8 +140,10 @@ module Hashicorptools
 
         puts "Deregistering old AMIs..."
         amis_to_remove.each do |ami|
+          ebs_mappings = ami.block_device_mappings
           puts "Deregistering #{ami.image_id}"
           ami.deregister
+          delete_ami_snapshots(ebs_mappings)
         end
 
         puts "Currently active AMIs..."
@@ -129,5 +154,13 @@ module Hashicorptools
         puts "no AMIs to clean."
       end
     end
+
+    def delete_ami_snapshots(ebs_mappings)
+      ebs_mappings.each do |volume, attributes|
+        puts "Deleting snapshot #{attributes[:snapshot_id]}"
+        snapshot = AWS::EC2::Snapshot.new(attributes[:snapshot_id])
+        snapshot.delete
+      end
+    end
   end
 end

data/lib/hashicorptools/terraform.rb

@@ -1,6 +1,6 @@
 module Hashicorptools
   class Terraform < Thor
-    TERRAFORM_VERSION = '0.7'
+    TERRAFORM_VERSION = '0.7.11'
 
     include Ec2Utilities
     include Variables
@@ -55,9 +55,17 @@ module Hashicorptools
       end
 
       no_commands do
+        define_method "before_shared_#{cmd}" do
+          # no-op
+        end
+
         define_method "after_#{cmd}" do
           # no-op
         end
+
+        define_method "after_shared_#{cmd}" do
+          # no-op
+        end
       end
 
       desc cmd, "terraform #{cmd} for shared plan"
@@ -66,11 +74,17 @@ module Hashicorptools
         enforce_version!
 
         execute(shared_state_path) do
+          send("before_shared_#{cmd}")
+
           terraform_command = "terraform #{cmd} #{variables(env_variable_keys.merge(settings))} -state #{shared_state_path} #{shared_config_directory}"
           if (options[:debug])
             puts "[DEBUG] running command: '#{terraform_command}"
           end
-          system terraform_command
+          result = system terraform_command
+
+          if result
+            send("after_shared_#{cmd}")
+          end
         end
       end
     end

data/lib/hashicorptools/variables.rb

@@ -6,7 +6,13 @@ module Hashicorptools
     end
 
     def variables(settings_overrides = {})
-      aws_credentials_settings(settings_overrides).collect{|key,value| "-var '#{key}=\"#{value}\"'" }.join(' ')
+      aws_credentials_settings(settings_overrides).collect{|key,value| format_variable(key, value)}.join(' ')
+    end
+
+    protected
+
+    def format_variable(key, value)
+      "-var '#{key}=\"#{value}\"'"
     end
   end
-end
+end

data/spec/hashicorptools_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Hashicorptools" do
   it "fails" do
+    pending
     fail "hey buddy, you should probably rename this file and start specing for real"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -125,17 +125,199 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: juwelier
+  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: simplecov
+  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: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: dynect_rest
+  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: aws-sdk-v1
+  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: dotenv
+  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: thor
+  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: activesupport
+  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: byebug
+  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: git
+  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: rspec
+  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: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +347,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +383,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -242,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer