biosphere 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 647938b02f253417fc66f2c441c07ab40ab6b79e
-  data.tar.gz: 48d3703a751c9395c977f7f390b1c7d2db5e24be
+  metadata.gz: 189e28cdc58fbf296bf95ecc2fc6d179781f464a
+  data.tar.gz: 3924f72d34e55d811cd034afd98aab37341f759c
 SHA512:
-  metadata.gz: c98f1859dba18cbb6f3b75c4ce62757a6c810e102b77e3e5c932b3c8f762df452f63a8f21a4ba228f53d55eaf47343099dd162efa5ca3747a98feb7379677ebc
-  data.tar.gz: b555e8c058376a6ab67b41a9561f87761f6004856765c0bfba03198d7db3b06b5b93fde64158c81ee62b31f00ef733c1828ff4953086a6f4903be4734f9908f0
+  metadata.gz: caba813ea80f19c8972bf3aecb98c779b69f3329250f930d36d9ebb33c9ab2e1c44eac0cdf18aa5f18f3a32e029cbac7150560036a611e0ef947304e59dca5c9
+  data.tar.gz: 091e550d18b35fb2787334ea09cb8085ff5cde378183ddec0b3a4b52876a9610dd9a0ed8c771906d8ea832b29ebdfd551ebba894d289fd0302d28c418b2acfee

data/bin/biosphere

@@ -16,6 +16,7 @@ class BiosphereOpts
         options = OpenStruct.new
         options.build_dir = "build"
         options.src = "./"
+        options.force = false
         options.version = ::Biosphere::Version
 
         opt_parser = OptionParser.new do |opts|
@@ -51,6 +52,10 @@ class BiosphereOpts
                 exit
             end
 
+            opts.on("--force", "Don't prompt for user input") do
+                options.force = true
+            end
+
         end
 
         opt_parser.parse!(args)
@@ -136,16 +141,20 @@ if options.src
 
     unless state.node[:deployments][""].nil?
         answer = ""
-        while answer.empty? || (answer != "y" && answer != "n")
-            puts "\e[31mDeployment with an empty name, do you want to clean these out now? [y/n]\e[0m"
-            answer = STDIN.gets.chomp
-        end
+        if !options.force
+            while answer.empty? || (answer != "y" && answer != "n")
+                puts "\e[31mDeployment with an empty name, do you want to clean these out now? [y/n]\e[0m"
+                answer = STDIN.gets.chomp
+            end
 
-        if answer == "n"
-          puts "Remember to clean these out later, this state won't work with Kubernetes"
-        elsif answer == "y"
-          state.node[:deployments].delete("")
-          puts "\e[32mRemoved deployment with empty name\e[0m"
+            if answer == "n"
+            puts "Remember to clean these out later, this state won't work with Kubernetes"
+            elsif answer == "y"
+            state.node[:deployments].delete("")
+            puts "\e[32mRemoved deployment with empty name\e[0m"
+            end
+        else
+            puts "Forcing since --force was set"
         end
     end
 end
@@ -204,9 +213,13 @@ elsif ARGV[0] == "deployment" && options.src
 elsif ARGV[0] == "statereset" && options.src
 
     answer = ""
-    while answer.empty? || (answer != "y" && answer != "n")
-        print "\nAre you sure you want to do a full state reset for #{options.build_dir} y/n: "
-        answer = STDIN.gets.chomp
+    if !options.force
+        while answer.empty? || (answer != "y" && answer != "n")
+            print "\nAre you sure you want to do a full state reset for #{options.build_dir} y/n: "
+            answer = STDIN.gets.chomp
+        end
+    else
+        answer = "y"
     end
 
     if answer == "n"
@@ -244,7 +257,12 @@ elsif ARGV[0] == "commit" && options.src
 
     s3.set_lock()
     s3.retrieve("#{options.build_dir}/#{deployment}.tfstate")
-    tf_plan_str = %x( terraform plan -state=#{options.build_dir}/#{deployment}.tfstate -out #{options.build_dir}/plan #{options.build_dir}/#{deployment}  )
+    begin
+        tf_plan_str = %x( terraform plan -state=#{options.build_dir}/#{deployment}.tfstate -out #{options.build_dir}/plan #{options.build_dir}/#{deployment}  )
+    rescue Errno::ENOENT => e
+        STDERR.puts "Could not find terraform. Install with with \"brew install terraform\"".colorize(:red)
+        s3.release_lock()
+    end
     tfplanning = Biosphere::CLI::TerraformPlanning.new()
     plan = tfplanning.generate_plan(suite.deployments[deployment], tf_plan_str)
     if !plan
@@ -265,9 +283,13 @@ elsif ARGV[0] == "commit" && options.src
     targets = plan.get_resources.collect { |x| "-target=#{x}" }.join(" ")
     puts "Targets: #{targets}"
     answer = ""
-    while answer.empty? || (answer != "y" && answer != "n")
-        print "\nDoes the plan look reasonable? (Answering yes will apply the changes) y/n: "
-        answer = STDIN.gets.chomp
+    if !options.force
+        while answer.empty? || (answer != "y" && answer != "n")
+            print "\nDoes the plan look reasonable? (Answering yes will apply the changes) y/n: "
+            answer = STDIN.gets.chomp
+        end
+    else
+        answer = "y"
     end
 
     if answer == "n"
@@ -331,9 +353,13 @@ elsif ARGV[0] == "destroy" && options.src
     s3.set_lock()
     s3.retrieve("#{options.build_dir}/#{deployment}.tfstate")
     answer = ""
-    while answer.empty? || (answer != "y" && answer != "n")
-        print "\nYou are about to destroy deployment #{deployment}? (Answering yes will nuke it from the orbit) y/n: "
-        answer = STDIN.gets.chomp
+    if !options.force
+        while answer.empty? || (answer != "y" && answer != "n")
+            print "\nYou are about to destroy deployment #{deployment}? (Answering yes will nuke it from the orbit) y/n: "
+            answer = STDIN.gets.chomp
+        end
+    else
+        answer = "y"
     end
 
     if answer == "n"

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.2.11"
+  Version = "0.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec