yutani 0.1.15 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483c5e58654c42e69d8e7e788857ce69fd1b7e86
-  data.tar.gz: b54ada05a35257c53244c48c8de8875e177ecc57
+  metadata.gz: bb2d4ad0c04c2786185ef8c2fc5dee90be6460a3
+  data.tar.gz: f178131e875565618b1ce5d80bec675d2139e2cd
 SHA512:
-  metadata.gz: 68fe75b176ce425ec09c835c5156e040b46f5b3ef36f1f34d6c810af6f3ba5055da50902acdc6aafefe8246b9183352164f8f86594a3b6a8f2e4e350c2b0b931
-  data.tar.gz: dc0b8699b5b7269b02e6c5bee8673d667315394171f38b267ae0acc821d82ff51266aee34481bad849390b889a0bfad0ad75f5b7e55925c69d8c486a7a7034cb
+  metadata.gz: 680b9f75c7ac957e049625be0ed4008f4e4ee00806f3877deca9333770692d2d5db3efffade73d7cb945387fc7835facaff6a81704b985f6a15ca2c207aaa99e
+  data.tar.gz: ba161b43a65b0f9269964e9f4dc093630762b69986223ac7f50433493c177958193290862f6aeac51c5dac07adb810b280b81616ffc922ae663a742fa92221e1

data/lib/yutani/cli.rb

@@ -22,7 +22,7 @@ module Yutani
 
     desc 'build', 'Evaluates DSL scripts and creates terraform files'
     def build
-      scripts_dir = Yutani::Config::DEFAULTS['scripts_dir']
+      scripts_dir = Yutani.config['scripts_dir']
 
       files = Dir.glob(File.join(scripts_dir, '*.rb'))
       if files.empty?
@@ -32,10 +32,6 @@ module Yutani
       files.each do |script|
         Yutani.eval_file(script)
       end
-
-      unless Yutani.stacks.empty?
-        Yutani.stacks.each {|s| s.to_fs}
-      end
     end
 
     # we need to know these things:
@@ -45,8 +41,9 @@ module Yutani
     desc 'watch', 'Run build upon changes to scripts'
     def watch
       Listen.to(
-        Yutani::Config::DEFAULTS['scripts_dir'],
-        Yutani::Config::DEFAULTS['includes_dir']
+        Yutani.config['scripts_dir'],
+        Yutani.config['includes_dir'],
+        Yutani.config['templates_dir']
       ) do |m, a, d|
 
         Yutani.logger.info "Re-build triggered: #{m} modified" unless m.empty?
@@ -133,6 +130,10 @@ module Yutani
           FileUtils.mkdir Yutani::Config::DEFAULTS['includes_dir']
         end
 
+        unless Dir.exists? Yutani::Config::DEFAULTS['templates_dir']
+          FileUtils.mkdir Yutani::Config::DEFAULTS['templates_dir']
+        end
+
         hiera_dir = Yutani::Config::DEFAULTS['hiera_config'][:yaml][:datadir]
         FileUtils.mkdir hiera_dir unless Dir.exists? hiera_dir
 

data/lib/yutani/remote_config.rb

@@ -0,0 +1,67 @@
+require 'open3'
+
+module Yutani
+  class TerraformCommandError < StandardError; end
+
+  class RemoteConfig
+    include Hiera
+
+    def initialize(&block)
+      Docile.dsl_eval(self, &block) if block_given?
+    end
+
+    def command
+      cmds = []
+      cmds << "terraform remote config"
+      cmds << "-backend=#{@backend}"
+
+      @backend_config.fields.each do |k,v|
+        cmds << "-backend-config=\"#{k}=#{v}\""
+      end
+
+      cmds << "-pull=false"
+
+      cmds.join(' ')
+    end
+
+    def execute!
+      _, stderr, ret_code = Open3.capture3(command)
+
+      if ret_code != 0
+        raise TerraformCommandError,
+          "running the command \"#{command}\" returned error: #{stderr}"
+      end
+    end
+
+    def backend(backend_type)
+      @backend = backend_type
+    end
+
+    def backend_config(&block)
+      @backend_config = BackendConfig.new(&block)
+    end
+
+    class BackendConfig
+      attr_reader :fields
+
+      def initialize(&block)
+        @fields = {}
+
+        Docile.dsl_eval(self, &block)
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        true
+      end
+
+      def method_missing(name, *args, &block)
+        if block_given?
+          raise StandardError,
+            "backend_config properties do not accept blocks as parameters"
+        else
+          @fields[name] = args.first
+        end
+      end
+    end
+  end
+end

data/lib/yutani/resource.rb

@@ -13,7 +13,7 @@ module Yutani
     end
 
     def resource_name
-      @namespace.join('_')
+      @namespace.to_underscored_string
     end
 
     def to_h
@@ -25,7 +25,8 @@ module Yutani
     end
 
     def ref(resource_type, *namespace, attr)
-      "${%s}" % [resource_type, namespace.join('_'), attr].join('.')
+      "${%s}" % [resource_type, namespace.to_underscored_string, attr].
+        join('.')
     end
 
     def template(path, **kv)

data/lib/yutani/stack.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'fileutils'
 
 module Yutani
   class Stack
@@ -7,17 +8,18 @@ module Yutani
     attr_accessor :resources, :providers, :outputs, :variables
 
     def initialize(*namespace, &block)
-      @resources   = []
-      @providers   = []
-      @outputs     = {}
-      @variables   = {}
-      @namespace   = namespace
+      @resources     = []
+      @providers     = []
+      @remote_config = nil
+      @outputs       = {}
+      @variables     = {}
+      @namespace     = namespace
 
       Docile.dsl_eval(self, &block) if block_given?
     end
 
     def name
-      @namespace.join('_')
+      @namespace.to_underscored_string
     end
 
     def resource(resource_type, *namespace, &block)
@@ -30,6 +32,10 @@ module Yutani
         Provider.new(name, &block)
     end
 
+    def remote_config(&block)
+      @remote_config = RemoteConfig.new(&block)
+    end
+
     # troposphere-like methods
     def add_resource(resource)
       @resources << resource
@@ -40,15 +46,14 @@ module Yutani
     end
 
     def inc(&block)
-      includes_dir = Yutani::Config::DEFAULTS['includes_dir']
-      path = File.join(includes_dir, yield)
+      path = File.join(Yutani.config['includes_dir'], yield)
 
       eval File.read(path), block.binding, path
     end
 
     # this generates the contents of *.tf.main
     def to_h
-      h = { 
+      h = {
         resource: @resources.inject(DeepMergeHash.new){|resources,r|
           resources.deep_merge!(r.to_h)
         },
@@ -74,34 +79,18 @@ module Yutani
     end
 
     def dir_path
-      name
-    end
-
-    def tar(filename)
-      File.open(filename, 'w+') do |tarball|
-        create_dir_tree('./').to_tar(tarball)
-      end
+      File.join(Yutani.config['terraform_dir'], name)
     end
 
-    def to_fs(prefix='./terraform')
-      create_dir_tree(prefix).to_fs
-    end
+    def to_fs
+      FileUtils.mkdir_p(dir_path)
+      FileUtils.cd(dir_path) do
+        File.open('main.tf.json', 'w+', 0644) do |f|
+          f.write pretty_json
+        end
 
-    def create_dir_tree(prefix)
-      dir_tree(DirectoryTree.new(prefix), '')
-    end
-
-    def dir_tree(dt, prefix)
-      full_dir_path = File.join(prefix, self.dir_path)
-      main_tf_path = File.join(full_dir_path, 'main.tf.json')
-
-      dt.add_file(
-        main_tf_path,
-        0644,
-        self.pretty_json
-      )
-
-      dt
+        @remote_config.execute! unless @remote_config.nil?
+      end
     end
   end
 end

data/lib/yutani/utils.rb

@@ -1,5 +1,11 @@
 require 'hashie'
 
+class Array
+  def to_underscored_string
+    map{|n| n.to_s.gsub('-', '_') }.join('_')
+  end
+end
+
 module Yutani
 	class IndifferentHash < Hash
     include Hashie::Extensions::MergeInitializer
@@ -31,6 +37,6 @@ module Yutani
           v
         end
       end
-    end 
+    end
   end
 end

data/lib/yutani/version.rb

@@ -1,3 +1,3 @@
 module Yutani
-  VERSION = '0.1.15'
+  VERSION = '0.1.18'
 end

data/lib/yutani.rb

@@ -7,19 +7,17 @@ require 'yutani/version'
 require 'yutani/config'
 require 'yutani/hiera'
 require 'yutani/cli'
-require 'yutani/directory_tree'
 require 'yutani/stack'
 require 'yutani/resource'
+require 'yutani/remote_config'
 require 'yutani/provider'
 require 'yutani/template'
 require 'yutani/utils'
 
 module Yutani
-  @stacks = []
-
   class << self
     # do we need :logger?
-    attr_accessor :hiera, :stacks, :logger
+    attr_accessor :hiera, :logger
 
     def logger
       @logger ||= (
@@ -32,7 +30,7 @@ module Yutani
     # DSL statement
     def stack(*namespace, &block)
       s = Stack.new(*namespace, &block)
-      @stacks << s
+      s.to_fs
       s
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yutani
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.18
 platform: ruby
 authors:
 - Louis Garman
@@ -172,9 +172,9 @@ files:
 - lib/yutani.rb
 - lib/yutani/cli.rb
 - lib/yutani/config.rb
-- lib/yutani/directory_tree.rb
 - lib/yutani/hiera.rb
 - lib/yutani/provider.rb
+- lib/yutani/remote_config.rb
 - lib/yutani/resource.rb
 - lib/yutani/stack.rb
 - lib/yutani/template.rb

data/lib/yutani/directory_tree.rb

@@ -1,43 +0,0 @@
-require 'rubygems/package'
-require 'fileutils'
-
-module Yutani
-  # An abstraction of a real directory tree on disk
-  # Permits us to decide later whether this will be written to disk
-  # or embedded in a tarball, or sent over scp, etc.
-  class DirectoryTree
-    File = Struct.new(:path, :permissions, :content)
-
-    attr_reader :files, :prefix
-
-    def initialize(prefix = './')
-      @prefix = prefix
-      @files = []
-    end
-
-    def add_file(path, permissions, content)
-      @files << File.new(::File.join(@prefix, path), permissions.to_i, content)
-    end
-
-    def to_fs
-      @files.each do |f|
-        FileUtils.mkdir_p(::File.dirname(f.path))
-        ::File.open(f.path, 'w+', f.permissions) do |new_f|
-          new_f.write f.content
-        end
-      end
-    end
-
-    def to_tar(io = STDOUT)
-      Gem::Package::TarWriter.new(io) do |tar|
-        @files.each do |f|
-          tar.mkdir(::File.dirname(f.path), '0755')
-
-          tar.add_file_simple(f.path, f.permissions, f.content.bytes.size) do |tar_file|
-            tar_file.write f.content
-          end
-        end
-      end
-    end
-  end
-end