cloudshaper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720390f8ef2c81bf799239154777e8b0177a7d4b
-  data.tar.gz: 952a846501c2d3d5e32b34800cd1d70fd9b7e81d
+  metadata.gz: 993c81cd51249cfba9467ea7fcbdf922a1d520dd
+  data.tar.gz: c2ac2bdea9eb45c58004053069af40567aced2d9
 SHA512:
-  metadata.gz: 610e4fc75444a2e2721aaccf6a0cfc76e8c56a979848a65d500f0d87934661d91f81cc06e2d91744450d742a357a4067d1f2352eb4efae53e8e462d40d76e5a1
-  data.tar.gz: 8def0b2aef1901b0e1b84fba5c3d061aa9bdab0062dca156200efe18f402a2d4bfe3f3c448e8a8b297b44bffaff74170874dfc78f42ebedf1855e148bc8c2608
+  metadata.gz: 27de4a1c4291b51e313559fc4fe23614ec25889c0134704e5c0414ec2136809b71de27d4bd815f16e04f8f2e1c8b6e2cc817ed370457e0496c8d1beb9f44b7b5
+  data.tar.gz: c576febad8b279a24f829ba7ed1b16857958e5dc18bbfb81d20869eda2866fabf12fb9032c246f4bfccb2d0b3d1067737388006375d5e52a34aa2192811f4841

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     cloudshaper (0.0.4)
-      rake (~> 10.4)
+      thor (~> 0.19.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,6 +16,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
@@ -24,4 +25,5 @@ DEPENDENCIES
   bundler
   cloudshaper!
   minitest (~> 5.6)
+  rake (~> 10.4)
   simplecov (= 0.10.0)

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/dalehamel/terraform_dsl.svg)](https://travis-ci.org/dalehamel/terraform_dsl)
+[![Build Status](https://travis-ci.org/dalehamel/cloudshaper.svg)](https://travis-ci.org/dalehamel/cloudshaper)
 
-# Terraform DSL
+# Cloudshaper
 
 This is a simple DSL for wrapping hashicorp's [terraform configuration](https://terraform.io/docs/configuration/index.html).
 
@@ -50,13 +50,13 @@ Create a stack module, like one of our [examples](examples), such as our [simple
 Generally, you need to do:
 
 ```
-require 'terraform_dsl'
+require 'cloudshaper'
 ```
 
-And then subclass Terraform::StackModule
+And then subclass Cloudshaper::StackModule
 
 ```
-class MyAwesomeStackModule < Terraform::StackModule
+class MyAwesomeStackModule < Cloudshaper::StackModule
 ```
 
 Within that class, define resources using a similar syntax to [terraform's configuration](https://terraform.io/docs/configuration/index.html).
@@ -107,7 +107,7 @@ common:
       region: us-east-1
 stacks:
   - name: teststack
-    uuid: 1433296428_0safh8-Y # must be unique
+    uuid: 8adcbfb1-fdcc-4558-8958-ea8a9e1874ea # must be unique
     description: just a test stack
     root: simpleapp
     variables:
@@ -117,43 +117,13 @@ stacks:
 
 You may also specify a 'common' block, that will be merged into all stacks.
 
-Terraform stacks need somewhere to store their state. By default, this will be the local filesystem.
+Cloudshaper stacks need somewhere to store their state. By default, this will be the local filesystem.
 
 It's highly recommended that you use a [remote backend](https://www.terraform.io/docs/commands/remote-config.html) instead, so that you can share your stacks.
 
-### Tasks
+### Commands
 
-Create a rake file that loads your modules, and calls Terraform::Tasks.loadall.
-
-```
-## Loads terraform tasks and modules
-require 'terraform_dsl'
-Terraform::Tasks.loadall
-
-```
-
-This will add some terraform tasks for managing your terraform stacks:
-
-```
-rake terraform:apply[name]          # Apply pending changes for a stack
-rake terraform:apply_all            # Apply all pending stack changes
-rake terraform:destroy[name]        # Destroy a stack
-rake terraform:get[name]            # Fetch modules for a stack
-rake terraform:get_all              # Fetch modules for all stacks
-rake terraform:init                 # Initialize stacks.yml if it does not exist
-rake terraform:list                 # List all available stacks
-rake terraform:load                 # Loads available stack modules
-rake terraform:plan[name]           # Show pending changes for a stack
-rake terraform:pull[name]           # Pulls stack state from remote location
-rake terraform:pull_all             # Pulls stack states from remote location
-rake terraform:push[name]           # Push stack state to remote location
-rake terraform:push_all             # Push stack states to remote location
-rake terraform:remote_config[name]  # Sets up remote config for a stack
-rake terraform:remote_config_all    # Sets up remote config for all stacks that support it
-rake terraform:show[name]           # Show details about a stack by name
-rake terraform:show_all             # Show all pending stack changes
-rake terraform:uuid                 # Generate a UUID for a stack, so stacks do not clobber each other
-```
+TODO
 
 # Credits
 

data/bin/cloudshaper

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'cloudshaper/cli'
+
+begin
+  ENV["THOR_DEBUG"] = "1"
+  Cloudshaper::CLI.start(ARGV)
+rescue Thor::UndefinedCommandError, Thor::UnknownArgumentError, Thor::AmbiguousCommandError, Thor::InvocationError => e
+  $stderr.puts(e.message)
+  exit(64)
+rescue Thor::Error => e
+  $stderr.puts(e.message)
+  exit(1)
+end

data/{terraform_dsl.gemspec → cloudshaper.gemspec}

@@ -1,16 +1,16 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'terraform_dsl/version'
+require 'cloudshaper/version'
 
 Gem::Specification.new do |spec|
   spec.name        = 'cloudshaper'
-  spec.version     = Terraform::VERSION
+  spec.version     = Cloudshaper::VERSION
   spec.summary     = 'Wrap hashicorps "terraform" in a ruby DSL for managing stack templates'
-  spec.description = 'Terraform DSL provides a syntax for managing terraform infrastructure entirely in git'
+  spec.description = 'Cloudshaper provides a syntax for managing terraform infrastructure entirely in git'
   spec.authors     = ['Dale Hamel']
   spec.email       = 'dale.hamel@srvthe.net'
   spec.files       = Dir['lib/**/*']
-  spec.homepage    = 'https://rubygems.org/gems/terraform_dsl'
+  spec.homepage    = 'https://github.com/dalehamel/cloudshaper'
   spec.license     = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rake', '~> 10.4'
+  spec.add_runtime_dependency 'thor', '~> 0.19.1'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'minitest', '~> 5.6'
 end

data/lib/{terraform_dsl → cloudshaper}/aws/remote_s3.rb

@@ -1,4 +1,4 @@
-module Terraform
+module Cloudshaper
   module Aws
     # Support AWS S3 remote state backend
     module RemoteS3

data/lib/{terraform_dsl → cloudshaper}/aws/tagging.rb

@@ -1,4 +1,4 @@
-module Terraform
+module Cloudshaper
   # Aws provider-specific functionality, to be mixed in to stack elements
   module Aws
     def self.taggable?(resource_type)
@@ -17,7 +17,7 @@ module Terraform
     def post_processing_aws
       return unless Aws.taggable?(@resource_type)
       @fields[:tags] ||= {}
-      @fields[:tags][:terraform_stack_id] = var(:terraform_stack_id)
+      @fields[:tags][:cloudshaper_stack_id] = var(:cloudshaper_stack_id)
     end
   end
 end

data/lib/cloudshaper/cli.rb

@@ -0,0 +1,98 @@
+require 'thor'
+require 'cloudshaper'
+
+module Cloudshaper
+  class CLI < Thor
+    class_option "template_dir", type: "string", default: "templates"
+    class_option "remote_state", type: "boolean"
+
+    desc "list", "List all available stacks"
+    def list
+      Cloudshaper::Stacks.stacks.each do |name, _stack|
+        puts name
+      end
+    end
+
+    desc "show NAME", "Show details about a stack by name"
+    def show(name)
+      stack = load_stack(name, options)
+      puts stack
+    end
+
+    desc "plan NAME", "Show pending changes for a stack"
+    def plan(name)
+      stack = load_stack(name, options)
+      stack.plan
+    end
+
+    desc "apply NAME", "Apply all pending stack changes"
+    def apply(name)
+      stack = load_stack(name, options)
+      stack.apply
+      push(name) if remote_state?
+    end
+
+    desc "destroy NAME", "Destroy a stack"
+    def destroy(name)
+      stack = load_stack(name, options)
+      stack.destroy
+      push(name) if remote_state?
+    end
+
+    desc "pull NAME", "Pull stack state from remote location"
+    def pull(name)
+      stack = load_stack(name, options)
+      remote_config(name)
+      stack.pull
+    end
+
+    desc "push NAME", "Push stack state from remote location"
+    def push(name)
+      stack = load_stack(name, options)
+      remote_config(name)
+      stack.push
+    end
+
+    desc "remote_config NAME", "Sets up remote config for a stack"
+    def remote_config(name)
+      stack = load_stack(name, options)
+      stack.remote_config
+    end
+
+    desc "init", "Initialize stacks.yml if it does not exist"
+    def init
+      Cloudshaper::Stacks.init
+      puts "Created stacks.yml, you're ready to configure your stack"
+    end
+
+    desc "uuid", "Generate a UUID for your stacks, so they don't clobber each other"
+    def uuid
+      puts SecureRandom.uuid
+    end
+
+    desc "version", "Prints the version of cloudshaper"
+    def version
+      puts Cloudshaper::VERSION
+    end
+
+  private
+
+    def load_stack(stack, options)
+      puts options
+      load_modules(options['template_dir'])
+      Cloudshaper::Stacks.load
+      pull(stack) if remote_state?
+      stack = Cloudshaper::Stacks.stacks[stack]
+      stack.get
+      stack
+    end
+
+    def remote_state?
+      options["remote_stack"]
+    end
+
+    def load_modules(dir)
+      Dir.glob("#{File.join(Dir.pwd, dir)}/*.rb").each { |t| puts t; require_relative t }
+    end
+  end
+end

data/lib/{terraform_dsl → cloudshaper}/command.rb

@@ -1,4 +1,4 @@
-module Terraform
+module Cloudshaper
   # Wraps terraform command execution
   class Command
     attr_accessor :command
@@ -11,7 +11,7 @@ module Terraform
 
     def env
       vars = {}
-      @stack.variables.each { |k, v| vars["TF_VAR_#{k}"] = v[:default] }
+      @stack.module.each_variable { |k, v| vars["TF_VAR_#{k}"] = v[:default] }
       @stack.module.secrets.each do |_provider, secrets|
         secrets.each do |k, v|
           vars[k.to_s] = v

data/lib/cloudshaper/module.rb

@@ -0,0 +1,30 @@
+require 'cloudshaper/stack_element'
+require 'cloudshaper/stack_modules'
+require 'cloudshaper/stack_module'
+require 'cloudshaper/stacks'
+
+module Cloudshaper
+  # Supports terraform 'modules'. In our case, we call them submodules because
+  # Module is a ruby keyword. We also support directly referencing other ruby-defined modules.
+  class Module < StackElement
+    def initialize(parent_module, &block)
+      super(parent_module, &block)
+
+      if StackModules.has? @fields[:source].to_s
+        mod = StackModules.get @fields[:source].to_s
+        module_path = File.join(Stacks.dir, parent_module.id, mod.name)
+        FileUtils.mkdir_p(module_path)
+        @fields[:source] = File.expand_path(module_path)
+
+        file_path = File.join(module_path, 'stack_module.tf.json')
+        build_submodule(file_path, parent_module, mod)
+      end
+    end
+
+    def build_submodule(file_path, parent_module, child_module)
+      return if File.exists? file_path
+      child_module.build(cloudshaper_stack_id: parent_module.id)
+      File.open(file_path, 'w') { |f| f.write(child_module.generate) }
+    end
+  end
+end

data/lib/cloudshaper/output.rb

@@ -0,0 +1,6 @@
+require 'cloudshaper/stack_element'
+
+module Cloudshaper
+  class Output < StackElement
+  end
+end

data/lib/{terraform_dsl → cloudshaper}/provider.rb

@@ -1,12 +1,14 @@
-require 'terraform_dsl/secrets'
-require 'terraform_dsl/stack_element'
+require 'cloudshaper/secrets'
+require 'cloudshaper/stack_element'
 
-module Terraform
+module Cloudshaper
   # Implements DSL for a terraform provider, and a means of loading secrets.
   class Provider < StackElement
     def load_secrets(name)
       @secrets ||= {}
-      @secrets[name.to_sym] = SECRETS[name.to_sym]
+      if SECRETS.has_key? name.to_sym
+        @secrets[name.to_sym] = SECRETS[name.to_sym]
+      end
       @secrets
     end
   end

data/lib/{terraform_dsl → cloudshaper}/remote.rb

@@ -1,6 +1,6 @@
-require 'terraform_dsl/aws/remote_s3'
+require 'cloudshaper/aws/remote_s3'
 
-module Terraform
+module Cloudshaper
   # Wrap 'remote' commands, such as config, pull, and push
   # This allows us to store state remotely using different providers
   class Remote < Command

data/lib/{terraform_dsl → cloudshaper}/resource.rb

@@ -1,6 +1,6 @@
-require 'terraform_dsl/stack_element'
+require 'cloudshaper/stack_element'
 
-module Terraform
+module Cloudshaper
   # Defines a terraform resource
   class Resource < StackElement
     attr_reader :resource_name

data/lib/{terraform_dsl → cloudshaper}/stack.rb

@@ -1,9 +1,9 @@
-require 'terraform_dsl/stacks'
-require 'terraform_dsl/stack_modules'
-require 'terraform_dsl/command'
-require 'terraform_dsl/remote'
+require 'cloudshaper/stacks'
+require 'cloudshaper/stack_modules'
+require 'cloudshaper/command'
+require 'cloudshaper/remote'
 
-module Terraform
+module Cloudshaper
   # Wrapper to instantiate a stack from a yaml definition
   class Stack
     class MalformedConfig < Exception; end
@@ -20,15 +20,17 @@ module Terraform
                 :stack_dir, :stack_id, :remote
 
     def initialize(config)
-      @name = config['name']
-      @uuid = config['uuid']
-      @description = config['description'] || ''
-      @variables = config['variables'] || {}
+      @name = config.fetch('name')
+      @uuid = config.fetch('uuid')
       @remote = config['remote'] || {}
-      @stack_id = "terraform_#{@name}_#{@uuid}"
-      @module = StackModules.get(config['root'])
-      @variables['terraform_stack_id'] = @stack_id
+      @description = config['description'] || ''
+
+      @stack_id = "cloudshaper#{@name}_#{@uuid}"
       @stack_dir = File.join(Stacks.dir, @stack_id)
+
+      @module = StackModules.get(config.fetch('root'))
+      @variables = config['variables'] || {}
+      @variables['cloudshaper_stack_id'] = @stack_id
       @module.build(@variables.map { |k, v| [k.to_sym, v] }.to_h)
     end
 
@@ -64,10 +66,6 @@ module Terraform
       Remote.new(self, :config).execute
     end
 
-    def variables
-      @module.variables
-    end
-
     def to_s
       <<-eos
 Name: #{@name}

data/lib/{terraform_dsl → cloudshaper}/stack_element.rb

@@ -1,6 +1,6 @@
-require 'terraform_dsl/aws/tagging'
+require 'cloudshaper/aws/tagging'
 
-module Terraform
+module Cloudshaper
   # Defines a single terraform stack element, subclass for any element defined in terraform DSL
   class StackElement
     include Aws
@@ -24,7 +24,7 @@ module Terraform
         end
         add_field(symbol, args[0])
       else
-        add_field(symbol, Terraform::StackElement.new(@module, &block).fields)
+        add_field(symbol, Cloudshaper::StackElement.new(@module, &block).fields)
       end
     end
 
@@ -38,6 +38,11 @@ module Terraform
       "${var.#{variable_name}}"
     end
 
+    # Reference a list variable
+    def var_list(variable_name)
+      ["${split(\",\",var.#{variable_name})}"]
+    end
+
     # Syntax to handle interpolation of resource variables
     def value_of(resource_type, resource_name, value_type)
       "${#{resource_type}.#{resource_name}.#{value_type}}"

data/lib/{terraform_dsl → cloudshaper}/stack_module.rb

@@ -1,14 +1,14 @@
 require 'json'
 require 'fileutils'
 
-require 'terraform_dsl/stack_modules'
-require 'terraform_dsl/resource'
-require 'terraform_dsl/provider'
-require 'terraform_dsl/variable'
-require 'terraform_dsl/module'
-require 'terraform_dsl/output'
-
-module Terraform
+require 'cloudshaper/stack_modules'
+require 'cloudshaper/resource'
+require 'cloudshaper/provider'
+require 'cloudshaper/variable'
+require 'cloudshaper/module'
+require 'cloudshaper/output'
+
+module Cloudshaper
   # Stack Modules contain stack elements. A stack is made up of a root module, which may have submodules
   class StackModule
     class << self
@@ -30,13 +30,14 @@ module Terraform
       end
     end
 
-    attr_accessor :secrets
+    attr_accessor :name, :secrets
 
-    def initialize(_name, &block)
+    def initialize(name, &block)
+      @name = name
       @stack_elements = { resource: {}, provider: {}, variable: {}, output: {}, module: {} }
       @secrets = {}
       @block = block
-      variable(:terraform_stack_id) {}
+      variable(:cloudshaper_stack_id) { default '' }
     end
 
     def clone
@@ -55,18 +56,24 @@ module Terraform
       JSON.pretty_generate(elements)
     end
 
-    def variables
-      elements[:variable]
+    def id
+      get(:cloudshaper_stack_id)
     end
 
-    def outputs
-      @stack_elements[:output]
+    def get(variable)
+      elements[:variable].fetch(variable)[:default]
     end
 
-    def get(variable)
-      @stack_elements[:variable].fetch(variable)[:default]
+    def each_variable(&b)
+      elements[:variable].each(&b)
     end
 
+    def get_resource(type, id)
+      @stack_elements[:resource].fetch(type).fetch(id)
+    end
+
+    private
+
     def elements
       elements = @stack_elements.clone
       variables = StackModule.flatten_variable_arrays(@stack_elements[:variable])
@@ -77,45 +84,45 @@ module Terraform
       elements
     end
 
-    def id
-      get(:terraform_stack_id)
-    end
-
-    private
-
     def register_resource(resource_type, name, &block)
       @stack_elements[:resource] ||= {}
       @stack_elements[:resource][resource_type.to_sym] ||= {}
-      @stack_elements[:resource][resource_type.to_sym][name.to_sym] = Terraform::Resource.new(self, name, resource_type, &block).fields
+      @stack_elements[:resource][resource_type.to_sym][name.to_sym] = Cloudshaper::Resource.new(self, name, resource_type, &block).fields
     end
 
     def register_variable(name, &block)
-      new_variable = Terraform::Variable.new(self, &block).fields
-      unless @stack_elements[:variable].key?(name.to_sym)
-        @stack_elements[:variable][name.to_sym] = { default: new_variable[:default] || '' }
+      return if @stack_elements[:variable].key?(name)
+
+      new_variable = Cloudshaper::Variable.new(self, &block).fields
+      if new_variable[:default].nil?
+        @stack_elements[:variable][name.to_sym] = {}
+      else
+        @stack_elements[:variable][name.to_sym] = {
+          default: new_variable[:default]
+        }
       end
     end
 
     def register_output(name, &block)
-      new_output = Terraform::Output.new(self, &block).fields
+      new_output = Cloudshaper::Output.new(self, &block).fields
       @stack_elements[:output][name.to_sym] = new_output
     end
 
     def register_module(name, &block)
-      new_module = Terraform::Module.new(self, name, &block).fields
+      new_module = Cloudshaper::Module.new(self, &block).fields
       @stack_elements[:module][name.to_sym] = new_module
     end
 
     def register_provider(name, &block)
-      provider = Terraform::Provider.new(self, &block)
+      provider = Cloudshaper::Provider.new(self, &block)
       @secrets.merge!(provider.load_secrets(name))
       @stack_elements[:provider][name.to_sym] = provider.fields
     end
 
-    alias_method :resource, :register_resource
-    alias_method :variable, :register_variable
-    alias_method :provider, :register_provider
-    alias_method :output,   :register_output
-    alias_method :submodule,    :register_module
+    alias_method :resource,  :register_resource
+    alias_method :variable,  :register_variable
+    alias_method :provider,  :register_provider
+    alias_method :output,    :register_output
+    alias_method :submodule, :register_module
   end
 end

data/lib/{terraform_dsl → cloudshaper}/stack_modules.rb

@@ -1,4 +1,4 @@
-module Terraform
+module Cloudshaper
   # Stack module factory, register a module and provide clones of it
   class StackModules
     class ModuleNotFound < StandardError; end
@@ -10,13 +10,17 @@ module Terraform
         @stack_modules[name.downcase] = stack_module
       end
 
+      def has?(stack_module_name)
+        @stack_modules.key?(stack_module_name.downcase)
+      end
+
       def get(stack_module_name)
         fail ModuleNotFound, "#{stack_module_name} module module not found" unless @stack_modules.key?(stack_module_name.downcase)
         @stack_modules[stack_module_name.downcase].clone
       end
 
       def reset!
-        @stack_modules ||= {}
+        @stack_modules = {}
       end
     end
     reset!

data/lib/{terraform_dsl → cloudshaper}/stacks.rb

@@ -1,9 +1,9 @@
 require 'yaml'
 require 'securerandom'
 
-require 'terraform_dsl/stack'
+require 'cloudshaper/stack'
 
-module Terraform
+module Cloudshaper
   # Singleton to keep track of stack templates
   class Stacks
     class MalformedConfig < StandardError; end
@@ -30,10 +30,6 @@ module Terraform
         end
       end
 
-      def uuid
-        "#{Time.now.utc.to_i}_#{SecureRandom.urlsafe_base64(6)}"
-      end
-
       def base_config
         {
           'common' => {},
@@ -44,7 +40,7 @@ module Terraform
       def base_stack_config
         {
           'name' => 'SET_NAME',
-          'uuid' => uuid,
+          'uuid' => SecureRandom.uuid,
           'description' => 'SET_A_DESCRIPTION',
           'root' => 'SET_A_TEMPLATE',
           'variables' => {}

data/lib/cloudshaper/variable.rb

@@ -0,0 +1,6 @@
+require 'cloudshaper/stack_element'
+
+module Cloudshaper
+  class Variable < StackElement
+  end
+end

data/lib/cloudshaper/version.rb

@@ -0,0 +1,3 @@
+module Cloudshaper
+  VERSION = '0.0.5'
+end

data/lib/cloudshaper.rb

@@ -0,0 +1,4 @@
+require 'cloudshaper/stack'
+require 'cloudshaper/stacks'
+require 'cloudshaper/stack_module'
+require 'cloudshaper/version'

data/lib/tasks/terraform.rake

@@ -1,32 +1,32 @@
-require 'terraform_dsl'
+require 'cloudshaper'
 
 namespace 'terraform' do
   desc 'Loads available stack modules'
   task :load do
-    Terraform::Stacks.load
+    Cloudshaper::Stacks.load
   end
 
   desc 'Initialize stacks.yml if it does not exist'
   task :init do
-    Terraform::Stacks.init
+    Cloudshaper::Stacks.init
   end
 
   desc 'Fetch modules for a stack'
   task :get, [:name] => :load do |_t, args|
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.get
   end
 
   desc 'Fetch modules for all stacks'
   task get_all: :load do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       stack.get
     end
   end
 
   desc 'List all available stacks'
   task list: :load do
-    Terraform::Stacks.stacks.each do |name, _stack|
+    Cloudshaper::Stacks.stacks.each do |name, _stack|
       puts name
     end
   end
@@ -34,14 +34,14 @@ namespace 'terraform' do
   desc 'Show details about a stack by name'
   task :show, [:name] => :load do |_t, args|
     fail 'Specify a name' unless args[:name]
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     puts stack
     stack.plan
   end
 
   desc 'Show all pending stack changes'
   task show_all: [:load, :get_all] do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       puts stack
       stack.plan
     end
@@ -50,20 +50,20 @@ namespace 'terraform' do
   desc 'Show pending changes for a stack'
   task :plan, [:name] => :load do |_t, args|
     fail 'Specify a name' unless args[:name]
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.plan
   end
 
   desc 'Apply pending changes for a stack'
   task :apply, [:name] => :load do |_t, args|
     fail 'Specify a name' unless args[:name]
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.apply
   end
 
   desc 'Apply all pending stack changes'
   task apply_all: :load do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       puts stack
       stack.apply
     end
@@ -72,19 +72,19 @@ namespace 'terraform' do
   desc 'Destroy a stack'
   task :destroy, [:name] => :load do |_t, args|
     fail 'Specify a name' unless args[:name]
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.destroy
   end
 
   desc 'Push stack state to remote location'
   task :push, [:name] => [:load, :remote_config] do |_t, args|
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.push
   end
 
   desc 'Push stack states to remote location'
   task push_all: [:load, :remote_config_all] do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       puts stack
       stack.push
     end
@@ -92,13 +92,13 @@ namespace 'terraform' do
 
   desc 'Pulls stack state from remote location'
   task :pull, [:name] => [:load, :remote_config] do |_t, args|
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.pull
   end
 
   desc 'Pulls stack states from remote location'
   task pull_all: [:load, :remote_config_all] do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       puts stack
       stack.pull
     end
@@ -106,13 +106,13 @@ namespace 'terraform' do
 
   desc 'Sets up remote config for a stack'
   task :remote_config, [:name] => [:load] do |_t, args|
-    stack = Terraform::Stacks.stacks[args[:name]]
+    stack = Cloudshaper::Stacks.stacks[args[:name]]
     stack.remote_config
   end
 
   desc 'Sets up remote config for all stacks that support it'
   task remote_config_all: :load do
-    Terraform::Stacks.stacks.each do |_name, stack|
+    Cloudshaper::Stacks.stacks.each do |_name, stack|
       puts stack
       stack.remote_config
     end
@@ -120,7 +120,7 @@ namespace 'terraform' do
 
   desc 'Generate a UUID for a stack, so stacks do not clobber each other'
   task :uuid do
-    uuid = Terraform::Stacks.uuid
+    uuid = Cloudshaper::Stacks.uuid
     puts "uuid: #{uuid}"
     puts 'Add this as a field to a new stack to prevent clobbering stacks with the same name'
   end

data/test/stack_module_test.rb

@@ -1,7 +1,18 @@
 require 'test_helper'
 
 class StackModuleTest < Minitest::Test
-  include Terraform
+  include Cloudshaper
+
+  def setup
+    StackModules.reset!
+  end
+
+  def test_multiple_modules_same_name_raises_exception
+    StackModule.define 'same_name_test'
+    assert_raises(StackModules::ModuleAlreadyRegistered) do
+      StackModule.define 'same_name_test'
+    end
+  end
 
   def test_multiple_instantiations_of_module
     StackModule.define 'factory_instantiation_test' do
@@ -19,48 +30,45 @@ class StackModuleTest < Minitest::Test
     first.build(ports: '80')
     second.build(ports: '443')
 
-    sg_first = first.elements[:resource][:aws_security_group][:a]
-    sg_second = second.elements[:resource][:aws_security_group][:a]
+    sg_first = first.get_resource(:aws_security_group, :a)
+    sg_second = second.get_resource(:aws_security_group, :a)
 
     assert_equal '80', sg_first[:ingress].fetch(:from_port)
     assert_equal '443', sg_second[:ingress].fetch(:from_port)
   end
 
-  #   it 'should register variables with default values' do
-  #     mod = StackModule.define('variable_register_default') { variable(:name) { default 'default' } }
-  #     mod.build
+  def test_module_build_registers_variable_with_defaults
+    mod = StackModule.define('variable_register_default') do
+      variable(:name) { default 'spam' }
+    end
+    mod.build
 
-  #     expect(mod.variables).to be_a(Hash)
-  #     expect(mod.variables).to include(:name)
-  #     expect(mod.variables[:name]).to be_a(Hash)
-  #     expect(mod.variables[:name]).to include(:default)
-  #     expect(mod.variables[:name][:default]).to eq('default')
-  #   end
+    assert_equal 'spam', mod.get(:name)
+  end
 
-  #   it 'should register variables without default values' do
-  #     mod = StackModule.define('variable_register_nodefault') { variable(:name) {} }
-  #     mod.build
+  def test_required_variable_has_no_default_value
+    mod = StackModule.define('resource_required_variable') { variable(:name) {} }
+    mod.build
 
-  #     expect(mod.variables).to be_a(Hash)
-  #     expect(mod.variables).to include(:name)
-  #     expect(mod.variables[:name]).to be_a(Hash)
-  #     expect(mod.variables[:name]).to include(:default)
-  #     expect(mod.variables[:name][:default]).to eq('')
-  #   end
+    assert_nil mod.get(:name)
+  end
 
-  #   it 'should accept variables at runtime' do
-  #     mod = StackModule.define('variable_override') { variable(:name) { default 'default' } }
-  #     mod.build(name: 'not-default')
+  def test_module_build_registers_variables_at_runtime
+    mod = StackModule.define('variable_override') do
+      variable(:name) { default 'default' }
+    end
+    mod.build(name: 'not-default')
 
-  #     expect(mod.variables[:name][:default]).to eql('not-default')
-  #   end
-  # end
+    assert_equal 'not-default', mod.get(:name)
+  end
 
   def test_register_resource
-    mod = StackModule.define('register_resource') { resource('aws_instance', :a) { default 'default' } }
+    mod = StackModule.define('register_resource') do
+      resource('aws_instance', :a) { default 'default' }
+    end
     mod.build
 
-    instance = mod.elements.fetch(:resource).fetch(:aws_instance).fetch(:a)
+    instance = mod.get_resource(:aws_instance, :a)
     assert_equal 'default', instance.fetch(:default)
   end
 
@@ -74,7 +82,7 @@ class StackModuleTest < Minitest::Test
     end
     mod.build
 
-    instance = mod.elements.fetch(:resource).fetch(:aws_instance).fetch(:a)
+    instance = mod.get_resource(:aws_instance, :a)
     assert_equal 'root', instance.fetch(:connection).fetch(:user)
   end
 
@@ -90,7 +98,7 @@ class StackModuleTest < Minitest::Test
     end
     mod.build
 
-    instance    = mod.elements.fetch(:resource).fetch(:aws_instance).fetch(:a)
+    instance    = mod.get_resource(:aws_instance, :a)
     provisioner = instance.fetch(:provisioner).first
     connection  = provisioner.fetch(:file).fetch(:connection)
     assert_equal 'root', connection.fetch(:user)
@@ -105,7 +113,7 @@ class StackModuleTest < Minitest::Test
     end
     mod.build
 
-    sg = mod.elements.fetch(:resource).fetch(:aws_security_group).fetch(:a)
+    sg = mod.get_resource(:aws_security_group, :a)
     ingress = sg.fetch(:ingress)
 
     assert_kind_of Array, ingress
@@ -123,30 +131,8 @@ class StackModuleTest < Minitest::Test
     end
     mod.build(ports: '22,80,443')
 
-
-    sg = mod.elements.fetch(:resource).fetch(:aws_security_group).fetch(:a)
+    sg = mod.get_resource(:aws_security_group, :a)
     ingress = sg.fetch(:ingress)
     assert_equal [{from_port: "22"}, {from_port: "80"}, {from_port: "443"}], ingress
   end
-
-
-  #   it 'it should be able to access overridden default variables at runtime' do
-  #     mod = StackModule.define 'resource_overriden_runtime_variable' do
-  #       variable(:ports) { default '22' }
-  #       resource 'aws_security_group', :a do
-  #         get(:ports).split(',').each do |port|
-  #           ingress { from_port port }
-  #         end
-  #       end
-  #     end
-
-  #     mod.build(ports: '22,80,443')
-
-  #     sg = mod.elements[:resource][:aws_security_group][:a]
-  #     expect(sg).to include(:ingress)
-  #     expect(sg[:ingress]).to be_a(Array)
-  #     expect(sg[:ingress].first).to eq(from_port: '22')
-  #     expect(sg[:ingress].last).to eq(from_port: '443')
-  #   end
-  # end
 end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 
-require 'terraform_dsl'
+require 'cloudshaper'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cloudshaper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dale Hamel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +66,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.6'
-description: Terraform DSL provides a syntax for managing terraform infrastructure
-  entirely in git
+description: Cloudshaper provides a syntax for managing terraform infrastructure entirely
+  in git
 email: dale.hamel@srvthe.net
-executables: []
+executables:
+- cloudshaper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,6 +82,8 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/cloudshaper
+- cloudshaper.gemspec
 - examples/secretconfig/README.md
 - examples/secretconfig/atlas.json
 - examples/secretconfig/aws.json
@@ -77,30 +94,29 @@ files:
 - examples/secretconfig/heroku.json
 - examples/secretconfig/mailgun.json
 - examples/simple_app.rb
-- lib/tasks/tasks.rb
+- lib/cloudshaper.rb
+- lib/cloudshaper/aws/remote_s3.rb
+- lib/cloudshaper/aws/tagging.rb
+- lib/cloudshaper/cli.rb
+- lib/cloudshaper/command.rb
+- lib/cloudshaper/module.rb
+- lib/cloudshaper/output.rb
+- lib/cloudshaper/provider.rb
+- lib/cloudshaper/remote.rb
+- lib/cloudshaper/resource.rb
+- lib/cloudshaper/secrets.rb
+- lib/cloudshaper/stack.rb
+- lib/cloudshaper/stack_element.rb
+- lib/cloudshaper/stack_module.rb
+- lib/cloudshaper/stack_modules.rb
+- lib/cloudshaper/stacks.rb
+- lib/cloudshaper/variable.rb
+- lib/cloudshaper/version.rb
 - lib/tasks/terraform.rake
-- lib/terraform_dsl.rb
-- lib/terraform_dsl/aws/remote_s3.rb
-- lib/terraform_dsl/aws/tagging.rb
-- lib/terraform_dsl/command.rb
-- lib/terraform_dsl/module.rb
-- lib/terraform_dsl/output.rb
-- lib/terraform_dsl/provider.rb
-- lib/terraform_dsl/remote.rb
-- lib/terraform_dsl/resource.rb
-- lib/terraform_dsl/secrets.rb
-- lib/terraform_dsl/stack.rb
-- lib/terraform_dsl/stack_element.rb
-- lib/terraform_dsl/stack_module.rb
-- lib/terraform_dsl/stack_modules.rb
-- lib/terraform_dsl/stacks.rb
-- lib/terraform_dsl/variable.rb
-- lib/terraform_dsl/version.rb
-- terraform_dsl.gemspec
 - test/stack_module_test.rb
 - test/stack_test.rb
 - test/test_helper.rb
-homepage: https://rubygems.org/gems/terraform_dsl
+homepage: https://github.com/dalehamel/cloudshaper
 licenses:
 - MIT
 metadata: {}

data/lib/tasks/tasks.rb

@@ -1,12 +0,0 @@
-require 'rake'
-
-module Terraform
-  # Loads all rake tasks when terraform_dsl is included by a rake script
-  class Tasks
-    def self.loadall
-      Dir.glob("#{File.join(File.dirname(__dir__), 'tasks')}/*.rake").each { |r| load r }
-      template_path = ENV['TERRAFORM_TEMPLATE_PATH'] || 'templates'
-      Dir.glob("#{File.join(Dir.pwd, template_path)}/*.rb").each { |t| require_relative t }
-    end
-  end
-end

data/lib/terraform_dsl/module.rb

@@ -1,38 +0,0 @@
-require 'terraform_dsl/stack_element'
-require 'terraform_dsl/stack_modules'
-require 'terraform_dsl/stack_module'
-require 'terraform_dsl/stacks'
-
-module Terraform
-  # Supports terraform 'modules'. In our case, we call them submodules because
-  # Module is a ruby keyword. We also support directly referencing other ruby-defined modules.
-  class Module < StackElement
-    def initialize(parent_module, module_name, &block)
-      super(parent_module, &block)
-
-      if @fields[:source].match(/^module_/)
-        build_submodule(parent_module, module_name)
-      end
-    end
-
-    private
-
-    def build_submodule(parent_module, module_name)
-      generated = generate_child_module(parent_module)
-      module_path = File.join(Stacks.dir, parent_module.id, module_name.to_s)
-      FileUtils.mkdir_p(module_path)
-      File.open(File.join(module_path, 'stack_module.tf.json'), 'w') { |f| f.write(generated) }
-      @fields[:source] = File.expand_path(module_path)
-    end
-
-    def generate_child_module(parent_module)
-      variables = @fields.clone
-      variables.delete(:source)
-      variables[:terraform_stack_id] = parent_module.id
-      child_name = @fields[:source].gsub(/^module_/, '')
-      child_module = StackModules.get(child_name)
-      child_module.build(variables)
-      child_module.generate
-    end
-  end
-end

data/lib/terraform_dsl/output.rb

@@ -1,6 +0,0 @@
-require 'terraform_dsl/stack_element'
-
-module Terraform
-  class Output < StackElement
-  end
-end

data/lib/terraform_dsl/variable.rb

@@ -1,6 +0,0 @@
-require 'terraform_dsl/stack_element'
-
-module Terraform
-  class Variable < StackElement
-  end
-end

data/lib/terraform_dsl/version.rb

@@ -1,3 +0,0 @@
-module Terraform
-  VERSION = '0.0.4'
-end

data/lib/terraform_dsl.rb

@@ -1,6 +0,0 @@
-require 'terraform_dsl/stack'
-require 'terraform_dsl/stacks'
-require 'terraform_dsl/stack_module'
-require 'terraform_dsl/version'
-
-require 'tasks/tasks' if defined? Rake