biosphere 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189e28cdc58fbf296bf95ecc2fc6d179781f464a
-  data.tar.gz: 3924f72d34e55d811cd034afd98aab37341f759c
+  metadata.gz: 1502995009f69c7c5443594f62ffd8a13737a470
+  data.tar.gz: f2f605a347d1535e1ac33414abf27abeb6b25073
 SHA512:
-  metadata.gz: caba813ea80f19c8972bf3aecb98c779b69f3329250f930d36d9ebb33c9ab2e1c44eac0cdf18aa5f18f3a32e029cbac7150560036a611e0ef947304e59dca5c9
-  data.tar.gz: 091e550d18b35fb2787334ea09cb8085ff5cde378183ddec0b3a4b52876a9610dd9a0ed8c771906d8ea832b29ebdfd551ebba894d289fd0302d28c418b2acfee
+  metadata.gz: 56e6151183ca3d81ab3fb2b70478f289dc4c0a8664212bbcd55c4b6ecd183a430855c97cd46a89a2d2746d34f1d567e693d4775f13f429da76f6a40a075a24e1
+  data.tar.gz: 34ae7d91b1b20c289f4633bd68c53752120501083e4eecac1c5df66d786be06a525c063868c1ca0548c90d71f0353b37727045b8e9b1523bea9d854aff1397a2

data/bin/biosphere

@@ -9,6 +9,26 @@ require 'colorize'
 require 'biosphere/s3.rb'
 require 'pty'
 
+
+# Asks a question
+# Choises is an array of valid answers, such as ['y', 'n']
+# If optional force is set to true then the first choise option is returned.
+def ask_question(question, choices, force: false, color: :yellow)
+    answer = ""
+    if force
+        puts question + " Forcing since --force is set"
+        return choices.first
+    end
+
+    while answer.empty? || !choices.include?(answer.downcase)
+        puts (question + " [" + choices.join('/') + "]").colorize(color)
+        answer = STDIN.gets.chomp
+    end
+
+    return answer
+end
+
+
 class BiosphereOpts
 
     def self.parse(args)
@@ -139,6 +159,19 @@ if options.src
         state.load()
     end
 
+    destroyed_deployments = state.node[:deployments].keys - suite.deployments.keys
+    if destroyed_deployments.length > 0
+        destroyed_deployments.each do |deployment_name|
+            answer = ask_question("State file has remins of an old deployment #{deployment_name}. Do you want to clean these now?", ['y', 'n'], force: options.force)
+            if answer == "y"
+                puts "Clearing #{deployment_name}"
+                state.node[:deployments].delete(deployment_name)
+            else
+                puts "Leaving #{deployment_name}, this might affect for example action kubectl."
+            end
+        end
+    end
+
     unless state.node[:deployments][""].nil?
         answer = ""
         if !options.force
@@ -148,10 +181,10 @@ if options.src
             end
 
             if answer == "n"
-            puts "Remember to clean these out later, this state won't work with Kubernetes"
+                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"
+                state.node[:deployments].delete("")
+                puts "\e[32mRemoved deployment with empty name\e[0m"
             end
         else
             puts "Forcing since --force was set"
@@ -159,6 +192,14 @@ if options.src
     end
 end
 
+# If we are doing something which is allowed to modify the state
+if ["build", "action", "commit"].include?(ARGV[0])
+    if !state.node[:biosphere]
+        state.node[:biosphere] = {}
+    end
+    state.node[:biosphere][:version] = ::Biosphere::Version
+end
+
 if ARGV[0] == "build" && options.src
     suite.evaluate_resources()
 
@@ -174,6 +215,8 @@ if ARGV[0] == "build" && options.src
     end
 
     puts "Wrote #{count} files under #{options.build_dir}"
+    state.node[:biosphere][:last_build_time] = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
+
     state.save()
     s3.save("#{options.build_dir}/state.node") unless localmode
 
@@ -229,6 +272,9 @@ elsif ARGV[0] == "statereset" && options.src
         state.filename = "#{options.build_dir}/state.node"
         state.save()
         s3.save("#{options.build_dir}/state.node") unless localmode
+        suite.deployments.each do |name, deployment|
+            s3.delete_object()
+        end
     end
 
 elsif ARGV[0] == "commit" && options.src
@@ -327,6 +373,7 @@ elsif ARGV[0] == "commit" && options.src
 
         puts "Loading outputs for #{deployment} from #{state_file}"
         suite.deployments[deployment].load_outputs(state_file)
+        state.node[:biosphere][:last_commit_time] = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
         state.save()
         s3.save("#{options.build_dir}/#{deployment}.tfstate")
         s3.save("#{options.build_dir}/state.node")
@@ -394,3 +441,4 @@ else
     STDERR.puts "\nERROR: Unknown command #{ARGV[0]}. Maybe you wanted to do: \"biosphere action #{ARGV[0]}\"?"
     exit -1
 end
+

data/lib/biosphere/version.rb

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

metadata

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