wombat-cli 0.6.1 → 0.6.2

data/spec/unit/common_spec.rb

@@ -1,116 +1,116 @@
-require "wombat/common"
-require "yaml"
-
-describe "Wombat::Common" do
-  let(:common) do 
-    klass = Class.new { include Wombat::Common }
-
-    return klass.new
-  end
-
-  describe "#conf" do
-    describe "when files_dir is set" do
-      it "sets files_dir to default value" do
-
-        content = common.conf
-
-        expect(content["files_dir"]).to eq("files")
-      end
-    end
-  end
-
-  describe "#lock" do
-    describe "when a lock does not exist" do
-      it "warn and return 1" do
-
-        expect(File).to receive(:exist?).
-          with("wombat.lock").
-          and_return(false)
-
-        expect(common).to receive(:warn)
-
-        lock = common.lock
-
-        expect(lock).to be(1)
-      end
-    end
-
-    describe "when a lock does exist" do
-      it "load lock file" do
-
-        expect(File).to receive(:exist?).
-          with("wombat.lock").
-          and_return(true)
-
-        expect(File).to receive(:read).
-          with("wombat.lock").
-          and_return("{")
-        
-        expect(JSON).to receive(:parse).with("{")
-        
-        common.lock
-      end
-    end
-  end
-
-  describe "#wombat" do
-    describe "when WOMBAT_YML is set" do
-      it "loads a configuration file from WOMBAT_YML" do
-        stub_const("ENV", {"WOMBAT_YML" => "aesthetics.yml"})
-
-        expect(File).to receive(:exist?).
-          with("aesthetics.yml").
-          and_return(true)
-
-        expect(File).to receive(:read).
-          with("aesthetics.yml").
-          and_return("---")
-
-        expect(YAML).to receive(:load).with("---")
-
-        common.wombat
-      end
-    end
-
-    describe "when WOMBAT_YML is not set" do
-      it "loads a configuration file from a default location" do
-        stub_const("ENV", {})
-
-        expect(File).to receive(:exist?).
-          with("wombat.yml").
-          and_return(true)
-
-        expect(File).to receive(:read).
-          with("wombat.yml").
-          and_return("---")
-
-        expect(YAML).to receive(:load).with("---")
-
-        common.wombat
-      end
-    end
-
-    describe "when a configuration file does not exist" do
-      it "copies example configuration file to default location" do
-        stub_const("ENV", {})
-
-        expect(File).to receive(:exist?).
-          with("wombat.yml").
-          and_return(false)
-
-        expect(common).to receive(:warn)
-
-        expect(FileUtils).to receive(:cp_r).
-          with(/generator_files\/wombat\.yml/, Dir.pwd)
-
-        expect(File).to receive(:read).
-          with("wombat.yml").
-          and_return("---")
-
-        expect(YAML).to receive(:load).with("---")
-
-        common.wombat
-      end
-    end
-  end
-end
+require "wombat/common"
+require "yaml"
+
+describe "Wombat::Common" do
+  let(:common) do 
+    klass = Class.new { include Wombat::Common }
+
+    return klass.new
+  end
+
+  describe "#conf" do
+    describe "when files_dir is set" do
+      it "sets files_dir to default value" do
+
+        content = common.conf
+
+        expect(content["files_dir"]).to eq("files")
+      end
+    end
+  end
+
+  describe "#lock" do
+    describe "when a lock does not exist" do
+      it "warn and return 1" do
+
+        expect(File).to receive(:exist?).
+          with("wombat.lock").
+          and_return(false)
+
+        expect(common).to receive(:warn)
+
+        lock = common.lock
+
+        expect(lock).to be(1)
+      end
+    end
+
+    describe "when a lock does exist" do
+      it "load lock file" do
+
+        expect(File).to receive(:exist?).
+          with("wombat.lock").
+          and_return(true)
+
+        expect(File).to receive(:read).
+          with("wombat.lock").
+          and_return("{")
+        
+        expect(JSON).to receive(:parse).with("{")
+        
+        common.lock
+      end
+    end
+  end
+
+  describe "#wombat" do
+    describe "when WOMBAT_YML is set" do
+      it "loads a configuration file from WOMBAT_YML" do
+        stub_const("ENV", {"WOMBAT_YML" => "aesthetics.yml"})
+
+        expect(File).to receive(:exist?).
+          with("aesthetics.yml").
+          and_return(true)
+
+        expect(File).to receive(:read).
+          with("aesthetics.yml").
+          and_return("---")
+
+        expect(YAML).to receive(:load).with("---")
+
+        common.wombat
+      end
+    end
+
+    describe "when WOMBAT_YML is not set" do
+      it "loads a configuration file from a default location" do
+        stub_const("ENV", {})
+
+        expect(File).to receive(:exist?).
+          with("wombat.yml").
+          and_return(true)
+
+        expect(File).to receive(:read).
+          with("wombat.yml").
+          and_return("---")
+
+        expect(YAML).to receive(:load).with("---")
+
+        common.wombat
+      end
+    end
+
+    describe "when a configuration file does not exist" do
+      it "copies example configuration file to default location" do
+        stub_const("ENV", {})
+
+        expect(File).to receive(:exist?).
+          with("wombat.yml").
+          and_return(false)
+
+        expect(common).to receive(:warn)
+
+        expect(FileUtils).to receive(:cp_r).
+          with(/generator_files\/wombat\.yml/, Dir.pwd)
+
+        expect(File).to receive(:read).
+          with("wombat.yml").
+          and_return("---")
+
+        expect(YAML).to receive(:load).with("---")
+
+        common.wombat
+      end
+    end
+  end
+end

data/terraform/README.md

@@ -1,13 +1,13 @@
-# Terraform 
- - `wombat.tf` is a Terraform configuration for the wombat
-
-
-## Using Terraform
-1. Install Terraform https://www.terraform.io/downloads.html
-2. configure AWS keys for Terraform
-  - either with env vars `TF_VAR_access_key TF_VAR_secret_key` or a terraform.tfvars file
-  - https://gist.github.com/scarolan/60ae8a2d5f2a8fdb5c55
-3. `terraform plan` to see what resources would be built
-4. `terraform apply` to build (or update) resources
-5. `terraform output` to display outputs (in our case public IPs)
-6. `terraform destroy` to destroy resources
+# Terraform 
+ - `wombat.tf` is a Terraform configuration for the wombat
+
+
+## Using Terraform
+1. Install Terraform https://www.terraform.io/downloads.html
+2. configure AWS keys for Terraform
+  - either with env vars `TF_VAR_access_key TF_VAR_secret_key` or a terraform.tfvars file
+  - https://gist.github.com/scarolan/60ae8a2d5f2a8fdb5c55
+3. `terraform plan` to see what resources would be built
+4. `terraform apply` to build (or update) resources
+5. `terraform output` to display outputs (in our case public IPs)
+6. `terraform destroy` to destroy resources

data/terraform/templates/terraform.tfvars.erb

@@ -1,12 +1,12 @@
-# We have to define these, but we leave them blank so that Terraform
-# knows to read them from environment vars or ~/.aws/credentials
-access_key = ""
-secret_key = ""
-key_name = ""
-customer = "wombat"
-
-# Default AMIs for building the demo
-ami-chef-server = "<%= @chef_server_ami %>"
-ami-automate = "<%= @automate_ami %>"
-ami-build-node = "<%= @automate_builder_ami %>"
-ami-workstation = "<%= @workstation_ami %>"
+# We have to define these, but we leave them blank so that Terraform
+# knows to read them from environment vars or ~/.aws/credentials
+access_key = ""
+secret_key = ""
+key_name = ""
+customer = "wombat"
+
+# Default AMIs for building the demo
+ami-chef-server = "<%= @chef_server_ami %>"
+ami-automate = "<%= @automate_ami %>"
+ami-build-node = "<%= @automate_builder_ami %>"
+ami-workstation = "<%= @workstation_ami %>"