biosphere 0.0.14 → 0.1.0

data/lib/biosphere/terraformproxy.rb

@@ -15,6 +15,10 @@ class Biosphere
 
         end
 
+        def state
+            return @caller.state.node
+        end
+
         def method_missing(symbol, *args)
             #puts ">>>>>>>> method missing: #{symbol}, #{args}"
 
@@ -32,15 +36,6 @@ class Biosphere
 
     end
 
-
-    class PlanProxy
-        attr_accessor :node
-        def initialize()
-            @node = Node.new
-        end
-
-    end
-
     class ResourceProxy
         attr_reader :output
         attr_reader :caller
@@ -50,46 +45,52 @@ class Biosphere
             @caller = caller
         end
 
-
-
-
         def respond_to?(symbol, include_private = false)
             return true
         end
 
         def set(symbol, value)
-            @output[symbol] = value
-        end
-
-        def method_missing(symbol, *args)
-            #puts ">>>>>>>> method missing: #{symbol}, #{args}"
-
-            if @caller.methods.include?(symbol)
-                return @caller.method(symbol).call(*args)
-            end
-
-            # Support getter here
-            if args.length == 0
-                return @output[symbol]
-            end
 
             # Support setter here
             if [:ingress, :egress, :route].include?(symbol)
                 @output[symbol] ||= []
-                if args[0].kind_of?(Array)
-                    @output[symbol] += args[0]
+                if value.kind_of?(Array)
+                    @output[symbol] += value
                 else
-                    @output[symbol] << args[0]
+                    @output[symbol] << value
                 end
             else
-                @output[symbol] = args[0]
+                @output[symbol] = value
             end
 
-            # We need to first gzip and then base64-encode the user_data string to work around the 16kb size limitation in AWS
             if symbol === :user_data
-              @output[symbol] = Base64.strict_encode64(Zlib::Deflate.new(nil, 31).deflate(args[0], Zlib::FINISH))
+              @output[symbol] = Base64.strict_encode64(Zlib::Deflate.new(nil, 31).deflate(value, Zlib::FINISH))
             end
         end
+
+        def get(symbol)
+            return @output[symbol]
+        end
+
+        def node
+            return @caller.node
+        end
+
+        def state
+            return @caller.state.node
+        end
+
+        def id_of(type,name)
+            "${#{type}.#{name}.id}"
+        end
+
+        def output_of(type, name, *values)
+            "${#{type}.#{name}.#{values.join(".")}}"
+        end
+
+        def method_missing(symbol, *args)
+            return @caller.method(symbol).call(*args)
+        end
     end
 
     class TerraformProxy
@@ -97,14 +98,12 @@ class Biosphere
         attr_accessor :export
         attr_accessor :resources
         attr_accessor :actions
-        attr_accessor :plans
-        attr_accessor :plan_proxy
         attr_reader :src_path
 
         include Kube
 
 
-        def initialize(script_name, plan_proxy = nil)
+        def initialize(script_name, suite)
             @script_name = script_name
             @src_path = [File.dirname(script_name)]
 
@@ -114,16 +113,16 @@ class Biosphere
                 "variable" => {},
                 "output" => {}
             }
-            if !plan_proxy
-                plan_proxy = PlanProxy.new
-            end
-            @plan_proxy = plan_proxy
-            @resources = []
+            @suite = suite
             @actions = {}
-            @plans = []
+            @deployments = []
 
         end
 
+        def register(deployment)
+            @suite.register(deployment)
+        end
+
         def load_from_file()
             self.from_file(@script_name)
         end
@@ -159,25 +158,8 @@ class Biosphere
             @src_path.pop
         end
 
-
         include Biosphere::Mixing::FromFile
 
-        def provider(name, spec={})
-            @export["provider"][name.to_s] = spec
-        end
-
-        def variable(name, value)
-            @export["variable"][name] = {
-                "default" => value
-            }
-        end
-
-        def output(name, value)
-            @export["output"][name] = {
-                "value" => value
-            }
-        end
-
         def action(name, description, &block)
             @actions[name] = {
                 :name => name,
@@ -188,26 +170,6 @@ class Biosphere
             }
         end
 
-        def plan(name, &block)
-            plan = {
-                :name => name,
-                :block => block,
-                :location => caller[0]
-            }
-            @plans << plan
-        end
-
-        def node
-            return @plan_proxy.node
-        end
-
-        def evaluate_plans()
-            @plans.each do |resource|
-                @plan_proxy.instance_eval(&resource[:block])
-            end
-
-        end
-
         def call_action(name, context)
             context.caller = self
             context.src_path = @actions[name][:src_path]
@@ -215,40 +177,6 @@ class Biosphere
             context.instance_eval(&@actions[name][:block])
         end
 
-        def resource(type, name, &block)
-            @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"
-            end
-
-            spec = {}
-            resource = {
-                :name => name,
-                :type => type,
-                :location => caller[0] + "a"
-            }
-
-            if block_given?
-                resource[:block] = block
-            else
-                STDERR.puts("WARNING: No block set for resource call '#{type}', '#{name}' at #{caller[0]}")
-            end
-
-
-
-            @resources << resource
-
-        end
-
-        def evaluate_resources()
-            @resources.each do |resource|
-                proxy = ResourceProxy.new(self)
-                proxy.instance_eval(&resource[:block])
-
-                @export["resource"][resource[:type].to_s][resource[:name].to_s] = proxy.output
-            end
-        end
-
         def id_of(type,name)
             "${#{type}.#{name}.id}"
         end
@@ -257,22 +185,12 @@ class Biosphere
             "${#{type}.#{name}.#{values.join(".")}}"
         end
 
-        def add_resource_alias(type)
-            define_singleton_method type.to_sym do |name, spec={}|
-              resource(type, name, spec)
-            end
-        end
-
-        def use_resource_shortcuts!
-            require_relative 'resource_shortcuts'
+        def state
+            return @suite.state
         end
 
-        def to_json(pretty=false)
-            if pretty
-                return JSON.pretty_generate(@export)
-            else
-                return JSON.generate(@export)
-            end
+        def suite
+            return @suite
         end
     end
 

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.0.14"
+  Version = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: deep_dup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: "Terraform's HCL lacks quite many programming features like iterators,
   true variables, advanced string manipulation, functions etc.\n\n  This Ruby tool
   provides an easy-to-use DSL to define Terraform compatible .json files which can
@@ -121,11 +149,14 @@ files:
 - bin/biosphere
 - examples/example.rb
 - lib/biosphere.rb
+- lib/biosphere/deployment.rb
 - lib/biosphere/ipaddressallocator.rb
 - lib/biosphere/kube.rb
 - lib/biosphere/mixing/from_file.rb
 - lib/biosphere/node.rb
 - lib/biosphere/s3.rb
+- lib/biosphere/settings.rb
+- lib/biosphere/state.rb
 - lib/biosphere/suite.rb
 - lib/biosphere/terraformproxy.rb
 - lib/biosphere/version.rb