biosphere 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc686dce74249976a49fd057c0afe79a7fe09912
-  data.tar.gz: aa2aa286f7d61f3c9f0c8693f5368597303c1b8b
+  metadata.gz: 045992d0dc9ffbcdd966f6ff94110d9d9e8b5378
+  data.tar.gz: 9002f10cb4b3dccbf4b0fd9d22400c81e0053afe
 SHA512:
-  metadata.gz: 97e05ad763e9c9869e73b234cd6542f7b0c4451c170f1381b8ae88ed6365763de5653847b97e7bb3a3689cbb36939e389d57ee18e0d84c75f4026c8140c8b67b
-  data.tar.gz: 95c255c267f676aba43ff08b63cc3045a3c9cf7bcde66e6c2bea9c2c0a9dd0b6e19b4c94c8cc34aa30beaa6809a3f9da5657b383fa237e57795676ad22118491
+  metadata.gz: f4f2c56774a1236da21a63956b7487b7f7e04b9f1d6524ed1b03666cd21c58fc6cea82835f6a7ceb31e091904ddb4256e1c76cbc6129ed812f21a2371419e2f6
+  data.tar.gz: 80026305f5df130666ad2e3e1d4706560a84392c1d32eb8197a42df6a435d47c7d104b54e63b2c0fbe0e1dfbeb1a9a15c1c5abf78e8f83848bb9b8c4ccd6feda

data/bin/biosphere

@@ -216,7 +216,7 @@ elsif ARGV[0] == "destroy" && options.src
         puts "\nAborted!"
     elsif answer == "y"
         puts "\nDestroying deployment #{deployment} (this may take several minutes)"
-        tf_apply = %x( terraform destroy -state=#{options.build_dir}/#{deployment}.tfstate #{options.build_dir})
+        tf_apply = %x( terraform destroy -force -state=#{options.build_dir}/#{deployment}.tfstate #{options.build_dir})
         puts "\n" + tf_apply
         s3.save("#{options.build_dir}/#{deployment}.tfstate")
         s3.save("#{options.build_dir}/state.node")

data/lib/biosphere/deployment.rb

@@ -5,7 +5,7 @@ class Biosphere
 
     class Deployment
 
-        attr_reader :export, :name, :_settings
+        attr_reader :export, :name, :_settings, :feature_manifests
         attr_accessor :state, :node
         def initialize(*args)
 
@@ -25,8 +25,10 @@ class Biosphere
             elsif args[0].kind_of?(::Biosphere::Settings)
                 @_settings = args.shift
                 settings = @_settings.settings
+                @feature_manifests = @_settings.feature_manifests
             end
 
+
             @export = {
                 "provider" => {},
                 "resource" => {},
@@ -60,6 +62,10 @@ class Biosphere
             @deployments = []
             @outputs = []
 
+            if @feature_manifests
+                node[:feature_manifests] = @feature_manifests
+            end
+
             self.setup(settings)
 
         end
@@ -187,7 +193,6 @@ class Biosphere
 
                 @export["resource"][resource[:type].to_s][resource[:name].to_s] = proxy.output
             end
-
         end
 
         def to_json(pretty=false)

data/lib/biosphere/settings.rb

@@ -43,17 +43,58 @@ class Biosphere
                 return @settings_hash
             end
 
+            def add_feature_manifest(feature, manifests=nil)
+                if manifests
+                    if !manifests.is_a?(Array)
+                        manifests = [manifests]
+                    end
+
+                    c = @feature_manifests_hash ||= ::Hash.new
+                    c = DeepDup.deep_dup(c)
+                    a = (c[feature] ||= ::Array.new)
+                    c[feature] = (a + manifests).uniq
+                    @feature_manifests_hash = c
+                end
+
+                return feature_manifests(feature)
+            end
+
+            def set_feature_manifests(obj)
+                @feature_manifests_hash = obj
+            end
+
+            def feature_manifests(feature=nil)
+                if feature
+                    if @feature_manifests_hash
+                        return @feature_manifests_hash[feature]
+                    else
+                        return nil
+                    end
+                else
+                    return @feature_manifests_hash
+                end
+            end
+
             def path()
                 return @path
-            end            
+            end
+
+            # Finds files from relative path
+            def find_files(p)
+                entries = Dir[($current_biosphere_path_stack + "/" + p)] - [".", ".."]
+                return entries
+            end
+
+            
         end
 
-        class_attribute :settings_hash, :path
+        class_attribute :settings_hash, :feature_manifests_hash, :path
 
-        attr_accessor :settings, :path
+        attr_accessor :settings, :path, :feature_manifests
 
         def initialize(settings = {})
             @settings = DeepDup.deep_dup(self.class.settings_hash)
+            @feature_manifests = DeepDup.deep_dup(self.class.feature_manifests_hash)
             @path = self.class.path
             if settings
                 @settings.deep_merge!(settings)
@@ -64,7 +105,9 @@ class Biosphere
             return @settings[key]
         end
 
+        # Initiate defaults
         settings({})
+        set_feature_manifests({})
 
         self.path = ""
 

data/lib/biosphere/terraformproxy.rb

@@ -144,6 +144,7 @@ class Biosphere
             src_path = Pathname.new(@src_path.last + "/" + File.dirname(filename)).cleanpath.to_s
             # Push current src_path and overwrite @src_path so that it tracks recursive loads
             @src_path << src_path
+            $current_biosphere_path_stack = src_path
 
             #puts "Trying to open file: " + src_path + "/" + File.basename(filename)
             if File.exists?(src_path + "/" + File.basename(filename))

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.1.1"
+  Version = "0.1.2"
 end

metadata

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