terraframe 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dcd49ea8fc966a851305a7ba0141c7a1f20010c
-  data.tar.gz: be6ff6375b82ca3a50dda7b258717ca8f5b41064
+  metadata.gz: 00d384598fcee65d58735e3c41a56f4a4970d399
+  data.tar.gz: 1b798d833ae2d4d8ec3d5eb8642d12660448b0d1
 SHA512:
-  metadata.gz: 75eae91b7b578746992c9c9ec9dcb03e3ce3398a6f69b42b65b146676248bb2101ca2c5941fa60bc120fe982d934650dc3d7ba8b7b6e48e49a5112946026d36a
-  data.tar.gz: 2f80d7729c29a43c714d573e4c8552dae0c3482b48c64ec1d5d2ac6700b76c80ae5a7e428446a7bd1a9de98a38dd8b4d63ea91e1d1c600513e3d5b67d848f38f
+  metadata.gz: b72417f33acbe501eff732c849aa5a0d6711afe50ee86b7f3909aeef66759e5ab508ec0c77a766312eafae813c57540177211bf06a2f8a37041a362ec86c08bf
+  data.tar.gz: 65f00999504ed3840a655c69a22230fc72cbe2a7127d8d24c3c4dc93ee4aeed9efe89e09b778e345bc77c6df2418f0b863af5baaf03e51b0d9b1f1fb8cf2e53f

data/lib/terraframe/aws/aws_context.rb

@@ -25,7 +25,7 @@ module Terraframe
 
         :aws_instance => Terraframe::AWS::AWSTaggedResource,
         :aws_route_table => Terraframe::AWS::AWSTaggedResource,
-        :aws_security_group => Terraframe::AWS::AWSTaggedResource,
+        :aws_security_group => Terraframe::AWS::AWSSecurityGroupResource,
         :aws_subnet => Terraframe::AWS::AWSTaggedResource,
         :aws_vpc => Terraframe::AWS::AWSTaggedResource
       }

data/lib/terraframe/aws/aws_resources.rb

@@ -15,7 +15,7 @@ module Terraframe
     end
 
     class AWSTaggedResource < Terraframe::Resource
-      def initialize(name, vars, &block)
+      def initialize(name, vars, context, &block)
         @fields = {}
         @vars = Hashie::Mash.new(vars)
 
@@ -23,10 +23,10 @@ module Terraframe
         @fields["tags"]["Name"] = name
 
         instance_eval &block
-    end
+      end
 
       def tags(&block)
-        tag_set = Terraframe::AWS::AWSTagBlock.new(@vars, &block)
+        tag_set = Terraframe::AWS::AWSTagBlock.new(@vars, @context, &block)
         @fields["tags"].merge!(tag_set.fields)
       end
 
@@ -37,5 +37,12 @@ module Terraframe
 
     class AWSTagBlock < Terraframe::ScriptItem
     end
+
+    class AWSSecurityGroupResource < AWSResource
+      def initialize(name, vars, context, &block)
+        super(name, vars, context, &block)
+        @fields["name"] = name
+      end
+    end
   end
 end

data/lib/terraframe/resource.rb

@@ -4,9 +4,45 @@ module Terraframe
   class Resource < Terraframe::ScriptItem
     attr_reader :resource_name
 
-    def initialize(resource_name, vars, &block)
+    def initialize(resource_name, vars, context, &block)
       @resource_name = resource_name
-      super(vars, &block)
+      super(vars, context, &block)
     end
+
+    def connection(&block)
+      connection_set = Connection.new(vars, context, &block)
+      @fields["connection"] = connection_set.fields
+    end
+
+    def provisioner(provisioner_type, &block)
+      provisioner_type = provisioner_type.to_sym
+
+      @fields["provisioner"] = @fields["provisioner"] || []
+
+      provisioner_set = Provisioner.new(vars, context, &block)
+      @fields["provisioner"] << { cleanup_provisioner_type(provisioner_type) => provisioner_set.fields }
+    end
+
+    def cleanup_provisioner_type(provisioner_type)
+      case provisioner_type.to_sym
+      when :remote_exec
+        "remote-exec"
+      when :local_exec
+        "local-exec"
+      else
+        provisioner_type
+      end
+    end
+  end
+
+  
+
+  class Provisioner < Terraframe::ScriptItem
+    def connection(&block)
+      connection_set = Connection.new(vars, context, &block)
+      @fields["connection"] = connection_set.fields
+    end
+  end
+  class Connection < Terraframe::ScriptItem
   end
 end

data/lib/terraframe/script_item.rb

@@ -5,16 +5,21 @@ module Terraframe
   class ScriptItem
     attr_reader :fields
     attr_reader :vars
+    attr_reader :context
 
-    def initialize(vars, &block)
+    def initialize(vars, context, &block)
       @fields = {}
+      @context = context
       @vars = Hashie::Mash.new(vars)
 
       instance_eval &block
     end
 
     def to_json(*a)
-      @fields.to_json(*a)
+      sanitized = @fields
+      sanitized.delete("\#")
+
+      sanitized.to_json(*a)
     end
 
     ## DSL FUNCTIONS BELOW

data/lib/terraframe/state.rb

@@ -3,6 +3,8 @@ require 'hashie/mash'
 
 module Terraframe
   class State
+    # TODO: support outputs!
+
     attr_reader :vars
     attr_reader :logger
 
@@ -50,7 +52,8 @@ module Terraframe
         raise msg
       end
 
-      provider = @__contexts[type].provider_type.new(vars, &block)
+      handling_context = @__contexts[type]
+      provider = handling_context.provider_type.new(vars, handling_context, &block)
       logger.debug "Provider of type '#{type}': #{provider.inspect}"
       @__output[:provider][type] = provider
 
@@ -63,12 +66,6 @@ module Terraframe
       raise msg
     end
 
-    def provisioner
-      msg = "TODO: implement provisioner support."
-      logger.fatal msg
-      raise msg
-    end
-
     def resource(resource_type, resource_name, &block)
       handling_context_pair = @__contexts.find { |k, v| v.resources.include?(resource_type) }
       if handling_context_pair == nil
@@ -81,7 +78,7 @@ module Terraframe
       resource_class = handling_context.resources[resource_type]
 
       @__output[:resource][resource_type] ||= {}
-      @__output[:resource][resource_type][resource_name.to_s] = resource_class.new(resource_name, vars, &block)
+      @__output[:resource][resource_type][resource_name.to_s] = resource_class.new(resource_name, vars, handling_context, &block)
     end
 
     # anything that is not a provider or a variable should be interpreted 

data/lib/terraframe/version.rb

@@ -1,3 +1,3 @@
 module Terraframe
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraframe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ed Ropple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler