terraform 0.0.6 → 0.0.7.rc1

data/README.markdown

@@ -42,6 +42,11 @@ The Terraform DSL provides these functions which are commonly used when provisio
     <td>ensure_packages(*package_names)</td>
     <td>Ensures the given packages are installed via apt-get.</td>
   </tr>
+  <tr>
+    <td>ensure_apt_get_update(oldest_acceptable_time)</td>
+    <td>Runs apt-get update if it hasn't been run since the oldest_acceptable_time (a Time object).
+    Defaults to 30 days ago.</td>
+  </tr>
   <tr>
     <td>ensure_ppa(ppa_url)</td>
     <td>Ensures the given PPA (used on Ubuntu) is installed. "ppa_url" is of the form "ppa:user/name".</td>
@@ -110,6 +115,46 @@ machines it gets deployed to. You can see its system provisioning script written
 [here](https://github.com/ooyala/barkeep/blob/master/script/system_setup.rb), and its Fezzik deploy script
 [here](https://github.com/ooyala/barkeep/blob/master/config/tasks/deploy.rake).
 
+Plugins
+----------
+Terraform can be easily extended with custom deps distributed as gems or scripts. A library that defines new
+Terraform deps should call `Terraform.add_plugin(__FILE__)` in any file that adds to the Terraform DSL. For
+example, if you wanted to package a dep as a gem, the contents of your project might look like this:
+
+```
+terraform-yourgem/
+`-lib/
+  `-terraform/
+    `-yourgem.rb
+
+yourgem.rb
+----------
+require "terraform"
+
+module Terraform
+  module DSL
+    # Define your deps
+  end
+end
+
+Terraform.add_plugin(__FILE__)
+```
+
+Then in your application setup script you would write:
+
+```ruby
+require "terraform"
+require "terraform/yourgem"
+
+Terraform.write_terraform_files("./terraform")
+```
+
+This will write out the core Terraform DSL plus all required plugins, ready to be required by your bootstrap
+code on the server.
+
+For more complete example see [terraform-rbenv](https://github.com/dmacdougall/terraform-rbenv), which
+reimplements Terraform's existing rbenv deps as a plugin.
+
 Contribute
 ----------
 When developing this gem you can quickly preview and test your changes by loading your local copy of the gem

data/lib/terraform.rb

@@ -2,9 +2,22 @@ require "terraform/version"
 require "fileutils"
 
 module Terraform
+  # DEPRECATED
+  # Replaced by `write_terraform_files`. Remove in next major version release.
   # Writes the terraform_dsl.rb to the given file or directory.
   def self.write_dsl_file(path)
+    puts "WARNING: `Terraform.write_dsl_file` is deprecated. Instead use `Terraform.write_terraform_files`."
     path = File.join(path, "terraform_dsl.rb") if File.directory?(path)
     FileUtils.cp(File.expand_path(File.join(File.dirname(__FILE__), "terraform/dsl.rb")), path)
   end
+
+  @@plugin_files = Set.new [File.expand_path(File.join(File.dirname(__FILE__), "terraform/dsl.rb"))]
+  def self.register_plugin(path) @@plugin_files.add(path) end
+
+  def self.write_terraform_files(path)
+    FileUtils.mkdir_p(path)
+    @@plugin_files.each do |plugin|
+      FileUtils.cp(File.expand_path(plugin), File.join(path, File.basename(plugin)))
+    end
+  end
 end

data/lib/terraform/dsl.rb

@@ -31,6 +31,7 @@ module Terraform
 
     def satisfy_dependencies
       STDOUT.sync = true # Ensure that we flush logging output as we go along.
+      @dependencies ||= []
       @dependencies.each do |dep|
         unless dep[:met?].call
           puts "* Dependency #{dep[:name]} is not met. Meeting it."
@@ -59,6 +60,16 @@ module Terraform
       end
     end
 
+    def ensure_apt_get_update(oldest_acceptable_time = Time.now - 30*24*60*60)
+      dep "apt-get update" do
+        met? do
+          File.exists?("#{ENV['HOME']}/.apt_get_updated") &&
+            File.mtime("#{ENV['HOME']}/.apt_get_updated") >= oldest_acceptable_time
+        end
+        meet { `sudo apt-get update && touch $HOME/.apt_get_updated` }
+      end
+    end
+
     # Ensure an Ubuntu PPA is installed. The argument is the ppa location, in the form ppa:[USER]/[NAME]
     def ensure_ppa(ppa)
       ppa_part, location = ppa.split(":", 2)
@@ -112,12 +123,14 @@ module Terraform
     end
 
     def ensure_rbenv
-      ensure_package "git-core"
+      # TODO(caleb): The package is 'git-core' in older Ubuntu releases. We should have a mechanism for
+      # handling different releases; see https://github.com/philc/terraform/issues/15.
+      ensure_package "git"
       dep "rbenv" do
         met? { in_path?("rbenv") }
         meet do
-          # These instructions are from https://github.com/sstephenson/rbenv/wiki/Using-rbenv-in-Production
-          shell "wget -q -O - https://raw.github.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash"
+          # These instructions are from https://github.com/fesplugas/rbenv-installer
+          shell "curl https://raw.github.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash"
           # We need to run rbenv init after install, which adjusts the path. If exec is causing us problems
           # down the road, we can perhaps simulate running rbenv init without execing.
           unless ARGV.include?("--forked-after-rbenv") # To guard against an infinite forking loop.

data/lib/terraform/version.rb

@@ -1,3 +1,3 @@
 module Terraform
-  VERSION = "0.0.6"
+  VERSION = "0.0.7.rc1"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: terraform
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Phil Crosby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000Z
+date: 2013-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scope
-  requirement: &28526960 !ruby/object:Gem::Requirement
+  requirement: &70308188001180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *28526960
+  version_requirements: *70308188001180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &28526300 !ruby/object:Gem::Requirement
+  requirement: &70308188000560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *28526300
+  version_requirements: *70308188000560
 description: 
 email:
 - phil.crosby@gmail.com
@@ -65,14 +65,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: terraform
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Set up a cold, inhospitable system using Terraform.
-test_files: []
+test_files:
+- test/test_helper.rb
+- test/unit/terraform/dsl_test.rb
 has_rdoc: