ironfan 5.0.11 → 6.0.0

data/lib/ironfan.rb

@@ -1,235 +1,170 @@
 require 'ironfan/requirements'
 
 module Ironfan
-  @@clusters ||= Hash.new
-  @@realms ||= Hash.new
-
-  # path to search for cluster definition files
-  def self.cluster_path
-    return Array(Chef::Config[:cluster_path]) if Chef::Config[:cluster_path]
-    raise "Holy smokes, you have no cookbook_path or cluster_path set up. Follow chef's directions for creating a knife.rb." if Chef::Config[:cookbook_path].blank?
-    cl_path = Chef::Config[:cookbook_path].map{|dir| File.expand_path('../clusters', dir) }.uniq
-    ui.warn "No cluster path set. Taking a wild guess that #{cl_path.inspect} is \nreasonable based on your cookbook_path -- but please set cluster_path in your knife.rb"
-    Chef::Config[:cluster_path] = cl_path
-  end
+  module_function
 
   #
-  # Delegates
-  def self.clusters
-    @@clusters
+  # Attributes
+  #
+  def clusters
+    Ironfan::Dsl::Cluster.definitions
   end
 
-  #
-  # Delegates
-  def self.realms
-    @@realms
+  def realms
+    Ironfan::Dsl::Realm.definitions
   end
 
-  def self.ui=(ui) @ui = ui ; end
-  def self.ui()    @ui      ; end
+  def ui=(ui)           @ui = ui           ; end
+  def ui()              @ui                ; end
 
-  def self.chef_config=(cc) @chef_config = cc ; end
-  def self.chef_config()    @chef_config      ; end
+  def chef_config=(cc)  @chef_config = cc  ; end
+  def chef_config()     @chef_config       ; end
 
-  # execute against multiple targets in parallel
-  def self.parallel(targets)
-    raise 'missing block' unless block_given?
-    results = []
-    [targets].flatten.each_with_index.map do |target, idx|
-      sleep(0.25) # avoid hammering with simultaneous requests
-      Thread.new(target) do |target|
-        results[idx] = safely(target.inspect) do
-          yield target
-        end
-      end
-    end.each(&:join) # wait for all the blocks to return
-    results
-  end
+  def knife_config=(kc) @knife_config = kc ; end
+  def knife_config()    @knife_config      ; end
 
   #
-  # Defines a cluster with the given name.
+  # Dsl constructors
   #
-  # @example
-  #   Ironfan.cluster 'demosimple' do
-  #     cloud :ec2 do
-  #       availability_zones  ['us-east-1d']
-  #       flavor              "t1.micro"
-  #       image_name          "ubuntu-natty"
-  #     end
-  #     role                  :base_role
-  #     role                  :chef_client
-  #
-  #     facet :sandbox do
-  #       instances 2
-  #       role                :nfs_client
-  #     end
-  #   end
-  #
-  #
-  def self.cluster(name, attrs={}, &block)
-    name = name.to_sym
-    # If this is being called as Ironfan.cluster('foo') with no additional arguments,
-    # return the cached cluster object if it exists
-    if @@clusters[name] and attrs.empty? and not block_given?
-      return @@clusters[name]
-    else # Otherwise we're being asked to (re)initialize and cache a cluster definition
-      cl = Ironfan::Dsl::Cluster.new(:name => name)
-      cl.receive!(attrs, &block)
-      @@clusters[name] = cl.resolve
+  def cluster(name, attrs = {}, &blk)
+    existing = clusters[name.to_sym]
+    return existing if attrs.empty? && !block_given?
+    if existing
+      existing.receive!(attrs, &blk)
+      # existing.resolve!
+    else
+      cl = Ironfan::Dsl::Cluster.define(attrs.merge(name: name.to_sym), &blk)
+      # cl.resolve!
     end
   end
 
-  def self.realm(name, attrs={}, &block)
-    name = name.to_sym
-    if @@realms[name] and attrs.empty? and not block_given?
-      return @@realms[name]
+  def realm(name, attrs = {}, &blk)
+    existing = realms[name.to_sym]
+    return existing if attrs.empty? && !block_given?
+    if existing
+      existing.receive!(attrs, &blk)
+      # existing.resolve!
     else
-      rlm = Ironfan::Dsl::Realm.new(:name => name)
-      rlm.receive!(attrs, &block)
-      rlm.clusters.keys.each{|k| @@clusters[k.to_sym] = rlm.clusters[k].resolve}
-      @@realms[name] = rlm
+      rlm = Ironfan::Dsl::Realm.define(attrs.merge(name: name.to_sym), &blk)
+      # rlm.resolve!
     end
   end
 
-  def self.load_realm(name)
-    name = name.to_sym
-    raise ArgumentError, "Please supply a realm name" if name.to_s.empty?
-    return @@realms[name] if @@realms[name]
-
-    load_cluster_files
-
-    unless @@realms[name] then die("Couldn't find a realm definition for #{name} in #{cluster_path}") end
-
-    @@realms[name]
-  end
-
-  #
-  # Return cluster if it's defined. Otherwise, search Ironfan.cluster_path
-  # for an eponymous file, load it, and return the cluster it defines.
   #
-  # Raises an error if a matching file isn't found, or if loading that file
-  # doesn't define the requested cluster.
+  # Dsl loaders
   #
-  # @return [Ironfan::Cluster] the requested cluster
-  def self.load_cluster(name)
-    name = name.to_sym
-    raise ArgumentError, "Please supply a cluster name" if name.to_s.empty?
-    return @@clusters[name] if @@clusters[name]
+  def clusters_dir
+    return Array(chef_config[:cluster_path]) if chef_config[:cluster_path]
+    raise "Holy smokes, you have no cookbook_path or cluster_path set up. Follow chef's directions for creating a knife.rb." if chef_config[:cookbook_path].blank?
+    cl_path = chef_config[:cookbook_path].map{|dir| File.expand_path('../clusters', dir) }.uniq
+    ui.warn "No cluster path set. Taking a wild guess that #{cl_path.inspect} is \nreasonable based on your cookbook_path -- but please set cluster_path in your knife.rb"
+    chef_config[:cluster_path] = cl_path
+  end
 
-    load_cluster_files
+  def realms_dir
+    clusters_dir.map{ |dir| File.expand_path('../realms', dir) }.uniq
+  end
 
-    unless @@clusters[name] then die("Couldn't find a cluster definition for #{name} in #{cluster_path}") end
+  def load_cluster name
+    raise ArgumentError.new('Please supply a cluster name') if name.blank?
+    load_dsl_definition(name, clusters_dir)
+    clusters[name.to_sym] or die("Couldn't find a cluster definition for <#{name}> in #{clusters_dir}")
+  end
 
-    @@clusters[name]
+  def load_realm name
+    raise ArgumentError.new('Please supply a realm name') if name.blank?
+    load_dsl_definition(name, realms_dir)
+    realms[name.to_sym] or die("Couldn't find a realm definition for <#{name}> in #{realms_dir}")
   end
 
-  def self.load_cluster_files
-    cluster_path.each do |cp_dir|
-      Dir[ File.join(cp_dir, '*.rb') ].each do |filename|
-        Chef::Log.info("Loading cluster file #{filename}")
-        require filename
-        clusters.values.each{|cluster| cluster.source_file ||= filename}
-      end
+  def load_dsl_definition(name, location)
+    Chef::Log.info "Looking for <#{name}> dsl definition in #{location}"
+    if named_file = dsl_files(location).detect{ |dsl_file| File.basename(dsl_file, '.rb') == name }
+      load_dsl_file named_file
+    else
+      dsl_files(location).each{ |f| load_dsl_file f }
     end
   end
 
-  #
-  # Map from cluster name to file name
-  #
-  # @return [Hash] map from cluster name to file name
-  def self.cluster_filenames
-    return @cluster_filenames if @cluster_filenames
-    @cluster_filenames = {}
-    cluster_path.each do |cp_dir|
-      Dir[ File.join(cp_dir, '*.rb') ].each do |filename|
-        cluster_name = File.basename(filename).gsub(/\.rb$/, '')
-        @cluster_filenames[cluster_name.to_sym] ||= filename
-      end
-    end
-    @cluster_filenames
+  def dsl_files location
+    Dir.glob File.join(location, '**/*.rb')    
+  end
+
+  def load_dsl_file filename
+    Chef::Log.info "Loading dsl file #{filename}"
+    require filename
   end
 
   #
-  # Utility to die with an error message.
-  # If the last arg is an integer, use it as the exit code.
+  # Common utility methods
   #
-  def self.die *strings
-    exit_code = strings.last.is_a?(Integer) ? strings.pop : -1
-    strings.each{|str| ui.warn str }
+  def die(*messages)
+    exit_code = messages.last.is_a?(Integer) ? messages.pop : -1
+    messages.each{ |msg| ui.warn msg }
     exit exit_code
   end
 
-  #
-  # Utility to turn an error into a warning
-  #
-  # @example
-  #   Ironfan.safely do
-  #     Ironfan.fog_connection.associate_address(self.fog_server.id, address)
-  #   end
-  #
-  def self.safely(info="")
+  def parallel(targets, &actions)
+    raise ArgumentError.new('Must provide a block to run in parallel') unless block_given?
+    results = []
+    [targets].flatten.each_with_index.map do |target, idx|
+      sleep(0.25) # avoid hammering with simultaneous requests
+      Thread.new(target) do |target|
+        results[idx] = safely(target.inspect) do
+          yield target
+        end
+      end
+    end.each(&:join) # wait for all the blocks to return
+    results
+  end
+
+  def safely(operation = '', &action)
     begin
       yield
     rescue StandardError => err
-      ui.warn("Error running #{info}:")
-      ui.warn(err)
-      Chef::Log.error( err )
-      Chef::Log.error( err.backtrace.join("\n") )
+      ui.warn "Error running #{operation}:"
+      ui.warn err
+      Chef::Log.error err
+      Chef::Log.error err.backtrace.join("\n")
       return err
     end
   end
 
-  #
-  # Utility to retry a flaky operation three times, with ascending wait times
-  #
-  # FIXME: Add specs to test the rescue here. It's a PITA to debug naturally or
-  #
-  # Manual test:
-  # bundle exec ruby -e "require 'chef'; require 'ironfan'; Ironfan.tell_you_thrice { p 'hah'; raise 'hell' }"
-  def self.tell_you_thrice(options={})
-    options = { name:           "problem",
-                error_class:    StandardError,
-                retries:        3,
-                multiplier:     3 }.merge!(options)
-    try     = 0
-    message = ''
+  def tell_you_thrice(options = {}, &action)
+    error_class = options[:error_class] || StandardError
+    retries     = options[:retries]     || 3
+    multiplier  = options[:multiplier]  || 3  
 
+    attempt = 0
     begin
-      try += 1
+      attempt += 1
       yield
-    rescue options[:error_class] => err
-      raise unless try < options[:retries]
-      pause_for = options[:multiplier] * try
+    rescue error_class => err
+      raise if attempt > retries
+      pause_for = multiplier * attempt
       Chef::Log.debug "Caught error (was #{err.inspect}). Sleeping #{pause_for} seconds."
       sleep pause_for
       retry
     end
   end
 
-  #
-  # Utility to show a step of the overall process
-  #
-  def self.step(name, desc, *style)
+  def step(name, desc, *style)
     ui.info("  #{"%-15s" % (name.to_s+":")}\t#{ui.color(desc.to_s, *style)}")
   end
 
-  def self.substep(name, desc, color = :gray)
+  def substep(name, desc, color = :gray)
     step(name, "  - #{desc}", color) if (verbosity >= 1 or color != :gray)
   end
 
-  def self.verbosity
-    chef_config[:verbosity].to_i
+  def verbosity
+    knife_config[:verbosity].to_i
   end
 
-  # Output a TODO to the logs if you've switched on pestering
-  def self.todo(*args)
-    Chef::Log.debug(*args) if Chef::Config[:show_todo]
+  def todo(*args)
+    Chef::Log.debug(*args) if knife_config[:show_todo]
   end
 
-  #
-  # Utility to do mock out a step during a dry-run
-  #
-  def self.unless_dry_run
+  def unless_dry_run(&action)
     if dry_run?
       ui.info("      ... but not really")
       return nil
@@ -237,12 +172,12 @@ module Ironfan
       yield
     end
   end
-  def self.dry_run?
-    chef_config[:dry_run]
+
+  def dry_run?
+    knife_config[:dry_run]
   end
 
-  # Intentionally skipping an implied step
-  def self.noop(source,method,*params)
+  def noop(source, method, *params)
     # Chef::Log.debug("#{method} is a no-op for #{source} -- skipping (#{params.join(',')})")
   end
 end

data/spec/chef/cluster_bootstrap_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 ironfan_go!
-require 'chef/knife/cluster_bootstrap'
 
 describe Chef::Knife::ClusterBootstrap do
   let(:cluster) do
@@ -29,13 +28,13 @@ describe Chef::Knife::ClusterBootstrap do
       subject.config[:yes] = true
     end
     context 'full slice' do
-      let(:slice){ ['gunbai'] }
+      let(:slice){ ['samurai-gunbai'] }
       it 'fails if there are multiple environments' do
         expect{ subject.run }.to raise_error("Cannot bootstrap multiple chef environments")
       end
     end
     context 'partial slice' do
-      let(:slice){ ['gunbai-hub'] }
+      let(:slice){ ['samurai-gunbai-hub'] }
       it 'runs' do
         subject.should_receive(:run_bootstrap).once
         subject.run
@@ -44,8 +43,4 @@ describe Chef::Knife::ClusterBootstrap do
 
   end
 
-  # it 'loads computers from json' do
-  #   computers.length.should == 2
-  #   computers.first.server.full_name.should == 'gunbai-hub-0'
-  # end
 end

data/spec/chef/cluster_launch_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 ironfan_go!
-require 'chef/knife/cluster_launch'
 
 describe Chef::Knife::ClusterLaunch do
   let(:cluster) do
@@ -29,7 +28,7 @@ describe Chef::Knife::ClusterLaunch do
       subject.config[:bootstrap] = true
     end
     context 'full slice' do
-      let(:slice){ ['gunbai'] }
+      let(:slice){ ['samurai-gunbai'] }
       it 'fails if there are multiple environments' do
         expect{ subject.run }.to raise_error("Cannot bootstrap multiple chef environments")
       end

data/spec/fixtures/realms/samurai.rb

@@ -0,0 +1,26 @@
+Ironfan.realm 'samurai' do
+  cluster 'gunbai' do
+    cloud(:ec2) do
+      permanent           false
+      availability_zones ['us-east-1d']
+      flavor              't1.micro'
+      backing             'ebs'
+      image_name          'natty'
+      bootstrap_distro    'ubuntu10.04-ironfan'
+      chef_client_script  'client.rb'
+      mount_ephemerals
+    end
+
+    environment           :dev
+
+    role                  :ssh
+    cloud(:ec2).security_group(:ssh).authorize_port_range(22..22)
+
+    facet :hub do
+    end
+
+    facet :spoke do
+      environment           :other
+    end
+  end
+end

data/spec/integration/minimal-chef-repo/knife/credentials/.gitignore

@@ -0,0 +1 @@
+knife-user-*

data/spec/integration/minimal-chef-repo/knife/credentials/ironfantest-validator.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAti1Hi8y9u0pSbaYTPZOSH/Q55J8cncUnOKvRRihSFjcKv9PP
+G4KAaZNySNVZxN9QQnBGReLuq671ZqLqkugy1FtDeC/HjdYdNW1hyI6or9oPYZ1r
+zak1ws/DpE8IyRYABmtpQ4qi2B8coQymjRFInL80ctk48cRkm3Y2cxr9+y3nyrJY
+x7JSMIyNgmL/5SVF/MZ+scbFESdK/bBfTYh2wxTYAXnebsXbuGJEHqxPjzIttmFC
+x8FHJx+F5MJVqdVncYI3w/ktN/02K8ejvIR+BcKqarIQxagDCig3R56Yicd4PfPP
+lWYCsojxS5mq5PmwEg2rYTJUblV7UYub74OO0wIDAQABAoIBAFIz9Ei8xhAw5Sjc
++2mZoSISDd1/fmYihCQqQ3Ao2YF0rMEKTjXXmSIKilMbEjqnmYuhJdR7Jb8KX2lE
+shw/8k+oLrWYua7ioqNtC+Z3mN5gwvgFFJPkeoHBRkJp90jlSHWdGg6EDB8BSuXQ
+04Zr+hvgm0YHho5xVARiPweJcnlX5fI3RlwcTaC0gIpx2cgh/PdxkV6ivCumd2FZ
+nAb2EK4VTtkZx7AkFZX0Qs04wuI6DVOxKCH0wNq3060E467bRde37P3XEgnwVoLz
+vQMiD+so4jhs14wpRDNX6YdW0pimWOASUwDL39BT8xzZc4Xhbw62DuqU2EpaTxJm
+FiM9tOECgYEA6cPy0z9nBPT70oTGMAsGV+kZ9M+kaIkgTtu831BRzO7DvScC7HS0
+LT0pdYaLVcikDtLgDeVIV83av8l41R4jR4roei1DMp+f5yQWOnLeDqG+uqyOHP9v
+pyYApmx/dfuTZ0d7xjU5CMle24xCrxNhUnZ0K3h+csPFw6ZgNFUNzfUCgYEAx4Eu
+DBCiM4fL3Pge56iSMeZBbd44be2iv0JjcDGwwzW9sC4nS6UhUXRiY05OnRZCXCEe
+sXtGdWVQJUFWclnFrtnpYJlXjRhB4UR6qm53jtJdpN34mVqFpOFiJdRMB6eTunoy
+wVvAy4sDwd+A8uQCNp28od91j+ImgdoCpMdE5KcCgYEA09mp+bpO4ZYnlZyQg7+q
+CweMZ2m6ZKZJKk5Ht9XxnBiSOZzeMG5/TzRLm1/IbIC99VU0ikNNMY20ffTXVcTP
+UinYD8lvSbSR1IbGwkeRaI8667AvxqXTiRaOpkRTqxfIeWO2D2Xyfz0Hg050rHeS
+zondM/wqFFXJp0rjium97fUCgYBnyx1ZyY2ZoZy+aZgqjdkBfPmtX1+cUXXKa4+w
+XynHZb46Wsi24kJjTlmhsKvVri74H4MIc0pE6WC5ATUoaOwf+98fEqgqD+S2fhoT
+cUViWK+/hnw/zIibL2cQp1Km6NhCvDCLyGCVhM1/n/hGZbmBEK+Cx+8x3EaMaA/Y
+CpQdIQKBgQCVUB4/mV46FenaTfbDD1dEGRgyXKmkTmJyUmwPvHEJgA5fb5cDi28l
+NMkqnZDx2SdPsxJM/JFrViPX6FsK+1cpg5b+IBTPYVYchtXgbm4NytCIr67VxIwi
+TncqU0OTD5vYpKeFcaidsAI89Xmc69t5rQp2xsuaaJJeCXi/l1D0+Q==
+-----END RSA PRIVATE KEY-----

data/spec/integration/minimal-chef-repo/knife/credentials/ironfantester.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAusYm0m90VKacujHjuzyYXUsRYvth9cN4C4rWBD3u/SBN0eGY
+bWJG2AmxlYEP8IbaMIALiLa5zOhL+hBsFWz1LQdMt3eJrMu+qua0is1kXTtOTFxG
+gj/Nkw9JkUXrOUjN3FmJYppBPJiDG3lyy3ero4dcHaBDJ6VfbeiH7DKHSH8xRV18
+EIGjkQL2+o/koz7MMtfQx92Q9W+o+wJPiwqkT9LokO/RQGS0oJ5xqTnZtKJbBYlL
+Oo4K2ggvGuKcmfTpnsclZCxdZtJtOrMmHKQ+S4CxwY/piRD9bnxDQVkTwcEIaYwJ
+PD91vEQKZvkht71pqsQMiwIG6ha992XaCDE9RwIDAQABAoIBAFQ523P2Uu2BnRfS
+O7JJ5yPbIGIUnt5nYZFC8LRFAasgkDdflo9tTClMZcrXwspi5a4NcCYc0Lj44JpK
+IZOf6Qh/TDdILsu/raIAG9akPOhWQD7rNdiy0Q/KSxC6CRNyI3OE5RGUImsjE6ym
+HgBnXP2HoyCxDteoGdrEi9cWCi/EdljUHlygLcGuDAogJ6ttu8gslmbRP2pkTjul
+3aDjJB1788zaKQ+d95y4mT97Gc2LrOCdp3s9z1XCYqQvxMYo1Dh3D9xCZwCC7Xr7
+VEWPY7t0uTMM3n8afAT2735p9KUz9hgv5Q8fY0diX4PmgT5rDcPlQhJNd9kcikU9
+hoEfSYECgYEA6c7dd159ggMwRWDWUbneFl8vD+UUI5gsecNcd6Fde7BW7/uGzPyL
+1g0V2qFdnpOuKpJ+WCnclmE4mXvi2oFeMoJ00SsQCp6MvMyDF732VVczOpBmBjIY
+RTuepXPgZTkTlebZBKBR70lA1Vf1Z+gu7c3XTjxwXXnMcI6aKnCqBSECgYEAzIBw
+rRSRpjlegKzmsBtG1a/UWoFBJyKSBYS0gYcYTOCNrr2nnB0eXRJhMeiWSC+CvyEP
+WVby8+4QSXV4JzfYVgyUgTPgXuJPppLfl3Ldb7q68vDfcyX4XQI+41AirNfpyyyz
+sz7pBHV+LyGjTn8eHgtK+FjLVTh33tSs4ro2jWcCgYAHL2JC7tZwjmSHXUh4znty
+uI4bsPCDf4OuYkCPNJhI2sxxJ4um9QPfGhvX0imsW+F4UXQshWzP+kDhBpucF2mr
+p7KrUuV1ThYJH0fQDPhq+vkKDbH08skoJ4LilsMImU5uxt9YcwzRi7DAXame/dWj
+XTYGo3jYhouv0dIPB9NRwQKBgQDLpMOPt8Hqk4qF/KekiyUYugVvMvOccxKSKDpQ
+GiWauKqebgIwtdZ8vEbJmmG89ILwrY1JXAqH2nOhkzbZZwUpe1GO8AfotNi4ed3q
+RNo53us37aG2WwNeK1RQrIY7NK9+Qb+ZKXaFmDLV4FttWay2Imy/rjydWqQT5Bld
+li2o1QKBgET6ytLgQ9ZDVW7e2e1NecKzsQHEjY8RYQTpEDM/swG+IycIEO+zjNtH
+cWu7TqdkrByxr/KX6hU5HNhRooQJtuqwlyxaGBUBGl6W6fTw2NJBuqAku37Amx2z
+4yAPq7VZfxUpXYmYaKp4msI1FPoLH7rD5z8NzgyxGNh9Ko9GBNCA
+-----END RSA PRIVATE KEY-----

data/spec/ironfan/cluster_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-require 'ironfan'
-
 describe Ironfan::Dsl::Cluster do
   subject do
     Ironfan.cluster 'foo' do
@@ -12,6 +10,7 @@ describe Ironfan::Dsl::Cluster do
       role :is_last, :last
       role :is_first, :first
     end
+    Ironfan.cluster('foo').resolve
   end
 
   its(:environment) { should eql :dev }

data/spec/ironfan/diff_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'gorillib/diff'
-require_relative '../spec_helper/dummy_diff_drawer.rb'
 
 describe Gorillib::DiffFormatter do
   it 'writes the indices of displayed elements for both sides' do

data/spec/ironfan/dsl_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'ironfan'
 
 describe Ironfan::Dsl do
   context 'when joining requirement pairs' do
@@ -58,17 +57,21 @@ describe Ironfan::Dsl do
 
   context 'when aggregating requirements' do
     before(:each) do
-      Ironfan::Dsl.class_eval{ @@testing = true }
-
       Ironfan::Dsl::Component.template(%w[foo]) do
+        require_strict_versioning false
+
         cookbook_req 'a', '>= 1.2.3'
         def project(*_) end
       end
       Ironfan::Dsl::Component.template(%w[bar]) do
+        require_strict_versioning false
+
         cookbook_req 'a', '>= 1.2.5'
         def project(*_) end
       end
       Ironfan::Dsl::Component.template(%w[baz]) do
+        require_strict_versioning false
+
         cookbook_req 'a', '>= 1.2.7'
         def project(*_) end
       end

data/spec/ironfan/ec2/cloud_provider_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
-require 'ironfan'
-
 describe Ironfan::Dsl::Cluster do
-  let (:cluster) do
-    Ironfan.cluster "sparky" do
+  let(:cluster) do
+    Ironfan.cluster 'sparky' do
 
       cloud(:ec2) do
-        security_group(:ssh).authorize_port_range 22..22
+        security_group(:ssh).authorize_port_range(22..22)
         flavor 't1.micro'
       end
 
@@ -15,28 +13,29 @@ describe Ironfan::Dsl::Cluster do
         instances 3
         cloud(:ec2) do
           flavor 'm1.small'
-          mount_ephemerals({ :disks => { 0 => { :mount_point => '/data' } } })
+          mount_ephemerals(disks: { 0 => { mount_point: '/data' } })
         end
-      end
-
+      end      
     end
+
+    Ironfan.cluster('sparky').resolve
   end
 
-  describe 'web facet server resolution' do
-    before { @facet = cluster.facets.values.first }
-    subject { @facet }
-    its(:name) { should eql "web" }
+  context 'web facet server resolution' do
+    subject(:facet){ cluster.facets.values.first }
+
+    its(:name){ should eq('web') }
 
-    it 'should have the right number of servers' do
-      @facet.servers.length.should == 3
+    it 'has the right number of servers' do
+      facet.servers.length.should eq(3)
     end
 
-    it 'should have one cloud provider, EC2' do
-      @facet.servers[0].clouds.keys.should == [ :ec2 ]
+    it 'has one cloud provider, EC2' do
+      facet.servers[0].clouds.keys.should eq([:ec2])
     end
 
-    it 'should have its first ephemeral disk mounted at /data' do
-      @facet.servers[0].implied_volumes[1].mount_point.should == '/data'
+    it 'has its first ephemeral disk mounted at /data' do
+      facet.servers[0].implied_volumes[1].mount_point.should eq('/data')
     end
   end