biosphere 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6bf1b3024023b7f683aea94a5d9410fb3e5ea2
-  data.tar.gz: 2595a001d0345ef607f32a7966c577ddc91da16a
+  metadata.gz: 6e587744cb4b79991175f86016bcd023fce26456
+  data.tar.gz: e7b5a2b107cf724d4cc7f319528e55daf5396c84
 SHA512:
-  metadata.gz: 26671009ac8d5ecc2a8a30ca584532aefb447928f1363ee237f5611713d213998a6ea48c813621a9ab8578bc6aa7d69b959ee8809151198a96d9283dc8bf345e
-  data.tar.gz: 79c83f3259d51e817a70de605256c3cff2759d1d76d73928f0de10d0ee046d35093f9ea5eea767f9697e9ba203f27a87b266bd9a8c75acc1f0cc4ed87092cbcb
+  metadata.gz: cd23b2e88b6a75729ec8e18b3e2e39929d526ecbc07ea87d0c710639c610d191e3b225c0876ad93a487e00489103e07bedb6e2100bf3b82c697ae3b6a33287e3
+  data.tar.gz: 85e154e3075e05572e3ea6b5d35d7591a8a3b302502044e3bc0479b0e3f1dc5078760043d5061edbcca62bbb41256ad0c506d4af5984cd3d9ffa8a35b35b5b7f

data/bin/biosphere

@@ -164,6 +164,23 @@ elsif ARGV[0] == "deployment" && options.src
         puts "Deployment: #{name}"
     end
 
+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
+    end
+
+    if answer == "n"
+        puts "\nOk, will not proceed with state reset"
+    elsif answer == "y"
+        state = Biosphere::State.new
+        state.filename = "#{options.build_dir}/state.node"
+        state.save()
+        s3.save("#{options.build_dir}/state.node")
+    end
+
 elsif ARGV[0] == "commit" && options.src
 
     if !ARGV[1]

data/lib/biosphere/deployment.rb

@@ -10,10 +10,11 @@ class Biosphere
         def initialize(*args)
 
             @parent = nil
-            @name = "unnamed"
+            @name = ""
             if args[0].kind_of?(::Biosphere::Deployment) || args[0].kind_of?(::Biosphere::Suite)
                 @parent = args.shift
-            elsif args[0].kind_of?(String)
+            end
+            if args[0].kind_of?(String)
                 @name = args.shift
             end
 
@@ -36,15 +37,9 @@ class Biosphere
                 "output" => {}
             }
 
+            settings[:deployment_name] = @name
+
             if @parent.is_a?(::Biosphere::Suite)
-                if settings[:deployment_name]
-                    @name = settings[:deployment_name]
-                else
-                    puts "\nYou need to specify :deployment_name in the Deployment settings. For example:"
-                    puts "cluster = AdsDeliveryCluster.new(suite, MyDeliveryTestSettings.new({deployment_name: \"my-delivery-test-cluster\"})\n\n"
-                    raise RuntimeError.new "No :deployment_name specified in Deployment settings"
-                end
-                
                 @parent.register(self)
             elsif @parent
                 @node = @parent.node
@@ -109,6 +104,9 @@ class Biosphere
         end
 
         def resource(type, name, &block)
+            if self.name
+                name = self.name + "_" + name
+            end
             @export["resource"][type.to_s] ||= {}
             if @export["resource"][type.to_s][name.to_s]
                 throw "Tried to create a resource of type #{type} called '#{name}' when one already exists"
@@ -132,13 +130,20 @@ class Biosphere
         end
 
         def output(name, value, &block)
-            @export["output"][name] = {
+            if self.name
+                resource_name = self.name + "_" + name
+            else
+                resource_name = name
+            end
+
+            @export["output"][resource_name] = {
                 "value" => value
             }
 
             if block_given?
                 output = {
                     :name => name,
+                    :resource_name => resource_name,
                     :block => block
                 }
 
@@ -154,8 +159,8 @@ class Biosphere
             end
             
             @outputs.each do |output|
-                value = outputs[output[:name]]
-                instance_exec(output[:name], value["value"], value, &output[:block])
+                value = outputs[output[:resource_name]]
+                instance_exec(self.name, output[:name], value["value"], value, &output[:block])
             end
         end
 
@@ -195,6 +200,17 @@ class Biosphere
             end
         end
 
+        def id_of(type,name)
+            "${#{type}.#{name}.id}"
+        end
+
+        def output_of(type, name, *values)
+            if self.name
+                name = self.name + "_" + name
+            end
+            "${#{type}.#{name}.#{values.join(".")}}"
+        end
+
         def to_json(pretty=false)
             if pretty
                 return JSON.pretty_generate(@export)

data/lib/biosphere/kube.rb

@@ -176,7 +176,7 @@ class Biosphere
 
         def self.load_resources(file, context={})
             resources = []
-            #puts "Loading file #{File.absolute_path(file)}"
+            puts "Loading file #{File.absolute_path(file)}"
             data = IO.read(file)
             begin
                 str = ERB.new(data).result(OpenStruct.new(context).instance_eval { binding })
@@ -184,7 +184,7 @@ class Biosphere
                 puts "Error evaluating erb templating for #{file}. Error: #{e}"
                 m = /\(erb\):([0-9]+):/.match(e.backtrace.first)
                 if m
-                    puts "Error at line #{m[1]}. This is before ERB templating."
+                    puts "Error at line #{m[1]}. This is before ERB templating. Remember to run biosphere build if you changed settings."
                     linenumber = m[1].to_i
                     if linenumber > 0 # Linenumbers seems to be off with 1 as the array is starting at zero
                         linenumber = linenumber - 1

data/lib/biosphere/s3.rb

@@ -51,6 +51,24 @@ class S3
         end
     end
 
+    def delete_object(path_to_file)
+        filename = path_to_file.split('/')[-1]
+        key = "#{@main_key}/#{filename}"
+        puts "Fetching #{filename} from S3 from #{key}"
+        begin
+            resp = @client.delete_object({
+                :bucket => @bucket_name,
+                :key => key
+            })
+        rescue Aws::S3::Errors::NoSuchKey
+            puts "Couldn't find remote file #{filename} from S3 at #{key}"
+        rescue
+            puts "\nError occurred while deleting file #{path_to_file}."
+            puts "Error: #{$!}"
+            exit 1
+        end
+    end
+
     def set_lock()
         begin
             resp = @client.get_object({

data/lib/biosphere/terraformproxy.rb

@@ -81,10 +81,17 @@ class Biosphere
         end
 
         def id_of(type,name)
+            if self.name
+                name = self.name + "_" + name
+            end
             "${#{type}.#{name}.id}"
         end
 
         def output_of(type, name, *values)
+            if self.name
+                name = self.name + "_" + name
+            end
+            
             "${#{type}.#{name}.#{values.join(".")}}"
         end
 

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.1.9"
+  Version = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec