the-maestro 0.3.9 → 0.4.0

data/README.rdoc

@@ -12,29 +12,45 @@ Maestro currently supports the following Linux distributions:
  Debian (5.0)
  Fedora (8)
  CentOS (5.4)
+ 
+Maestro has been tested with the following Ruby versions (thanks {RVM}[http://rvm.beginrescueend.com]!):
+
+MRI (1.8.7, 1.9.1, 1.9.2)
+JRuby (1.5.2)
 
 
 == Using Maestro with Ruby On Rails
 
-=== Installation
+=== Installation with Ruby On Rails 3
+
+Add the following gem dependency to your Rails project's <code>Gemfile</code>:
+
+    gem 'the-maestro', '0.4.0', :require => 'maestro'
+
+Then run the following to install the Maestro gem:
+
+    bundle install
+
+
+=== Installation with Ruby On Rails 2
 
 Add the following gem dependency to your Rails project's <code>config/environment.rb</code> file:
 
     Rails::Initializer.run do |config|
 
-      config.gem "the-maestro", :lib => "maestro", :version => "0.3.9", :source => "http://gemcutter.org"
+      config.gem "the-maestro", :lib => "maestro", :version => "0.4.0", :source => "http://gemcutter.org"
 
     end
 
 Then run the following to install the Maestro gem:
 
-    sudo rake gems:install
+    rake gems:install
 
 You may optionally unpack Maestro into vendor/gems by running:
 
-    sudo rake gems:unpack:dependencies
+    rake gems:unpack:dependencies
 
-You'll interact with Maestro through custom Rake tasks that Maestro adds to your Rails project. Until {this}[https://rails.lighthouseapp.com/projects/8994/tickets/59] Rails issue is resolved, you'll need to add this to your Rails project's Rakefile:
+You'll interact with Maestro through custom Rake tasks that Maestro adds to your Rails project. Due to {this}[https://rails.lighthouseapp.com/projects/8994/tickets/59] issue in Rails 2 (fixed in Rails 3), you'll need to add this to your Rails project's Rakefile:
 
     require 'maestro/tasks'
 
@@ -355,7 +371,7 @@ Maestro can also be used in stand alone mode, as a simple command line cloud man
 
 Install the Maestro gem by running the following command:
 
-    sudo gem install the-maestro
+    gem install the-maestro
 
 === Requirements
 

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0

data/lib/maestro.rb

@@ -1,12 +1,13 @@
 require "maestro/dsl_property"
 require "find"
-require "ftools"
+require "fileutils"
 require "maestro/cloud"
 require "maestro/cloud/aws"
 require "maestro/operating_system"
 require "log4r"
 require "log4r/configurator"
 require "maestro/log4r/console_formatter"
+require 'maestro/railtie' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 
 
 def aws_cloud(name, &block)
@@ -53,12 +54,12 @@ module Maestro
   #     MAESTRO_DIR/config/maestro/cookbooks
   #     MAESTRO_DIR/config/maestro/roles
   def self.create_config_dirs
-    if defined? RAILS_ROOT
+    if rails?
       create_configs(rails_config_dir)
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       create_configs(standalone_config_dir)
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
   end
 
@@ -75,12 +76,12 @@ module Maestro
   #     MAESTRO_DIR/log/maestro
   #     MAESTRO_DIR/log/maestro/clouds
   def self.create_log_dirs
-    if defined? RAILS_ROOT
+    if rails?
       create_logs(rails_log_dir)
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       create_logs(standalone_log_dir)
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
   end
 
@@ -88,45 +89,45 @@ module Maestro
   # * element[0] boolean indicating whether your maestro configs are valid
   # * element[1] Array of Strings containing a report of the validation
   def self.validate_configs
-    if defined? RAILS_ROOT
+    if rails?
       validate_rails_config
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       validate_standalone_config
     else
-      return [false, ["Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"]]
+      return [false, ["Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"]]
     end
   end
 
   # Returns a Hash of Clouds defined in the Maestro clouds configuration directory
   def self.clouds
-    if defined? RAILS_ROOT
+    if rails?
       get_clouds(clouds_config_dir(rails_maestro_config_dir))
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       get_clouds(clouds_config_dir(standalone_maestro_config_dir))
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
   end
 
   # Returns the top level log directory
   def self.log_directory
-    if defined? RAILS_ROOT
+    if rails?
       rails_log_dir
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       standalone_log_dir
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
   end
 
   # Returns the maestro log directory
   def self.maestro_log_directory
-    if defined? RAILS_ROOT
+    if rails?
       rails_log_dir + "/maestro"
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       standalone_log_dir + "/maestro"
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
   end
 
@@ -137,12 +138,12 @@ module Maestro
     require 'archive/tar/minitar'
 
     dir = nil
-    if defined? RAILS_ROOT
+    if rails?
       dir = rails_maestro_config_dir
     elsif ENV.has_key? MAESTRO_DIR_ENV_VAR
       dir = standalone_maestro_config_dir
     else
-      raise "Maestro not configured correctly. Either RAILS_ROOT or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
+      raise "Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['#{MAESTRO_DIR_ENV_VAR}'] must be defined"
     end
     temp_file = Dir.tmpdir + "/" + MAESTRO_CHEF_ARCHIVE
     File.delete(temp_file) if File.exist?(temp_file)
@@ -171,6 +172,16 @@ module Maestro
 
   private
 
+  # Rails environment detected?
+  def self.rails?
+    defined?(RAILS_ROOT) || (defined?(Rails) && defined?(Rails.root) && Rails.root)
+  end
+
+  # Rails 3 environment detected?
+  def self.rails3?
+    defined?(Rails) && Rails::VERSION::MAJOR == 3
+  end
+
   # Creates the Maestro config directory structure in the given directory
   #
   # - dir: The base directory in which to create the maestro config directory structure
@@ -292,16 +303,25 @@ module Maestro
     return [valid, error_messages]
   end
 
+  def self.rails_root
+    root = if defined?(Rails.root) && Rails.root
+      Rails.root
+    else
+      RAILS_ROOT
+    end
+    root
+  end
+
   def self.rails_config_dir
-    "#{RAILS_ROOT}/config"
+    "#{rails_root}/config"
   end
 
   def self.rails_log_dir
-    "#{RAILS_ROOT}/log"
+    "#{rails_root}/log"
   end
 
   def self.rails_maestro_config_dir
-    "#{RAILS_ROOT}#{MAESTRO_RAILS_CONFIG_DIRECTORY}"
+    "#{rails_root}#{MAESTRO_RAILS_CONFIG_DIRECTORY}"
   end
 
   def self.standalone_maestro_config_dir
@@ -344,6 +364,7 @@ module Maestro
   # Returns and array of all Cloud files found in clouds_directory
   def self.get_cloud_config_files(clouds_directory)
     config_files = []
+    return config_files if !File.exists?(clouds_directory)
     Find.find(clouds_directory) do |path|
       if FileTest.file?(path) && (File.extname(path).eql?(".rb"))
         config_files << path

data/lib/maestro/cloud.rb

@@ -1,4 +1,4 @@
-require "ftools"
+require "fileutils"
 require "maestro/role"
 require "maestro/node"
 require 'maestro/validator'
@@ -321,7 +321,7 @@ module Maestro
           outputter = Log4r::FileOutputter.new("#{@name}-file", :formatter => FileFormatter.new, :filename => cloud_log_file, :truncate => false)
           @logger.add(outputter)
         rescue RuntimeError => rerr
-          if !rerr.message.eql?("Maestro not configured correctly. Either RAILS_ROOT or ENV['MAESTRO_DIR'] must be defined")
+          if !rerr.message.eql?("Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['MAESTRO_DIR'] must be defined")
             @logger.error "Unexpected Error"
             @logger.error rerr
           end

data/lib/maestro/node.rb

@@ -74,7 +74,7 @@ module Maestro
             @logger.add(outputter)
           end
         rescue RuntimeError => rerr
-          if !rerr.message.eql?("Maestro not configured correctly. Either RAILS_ROOT or ENV['MAESTRO_DIR'] must be defined")
+          if !rerr.message.eql?("Maestro not configured correctly. Either RAILS_ROOT, Rails.root, or ENV['MAESTRO_DIR'] must be defined")
             @logger.error "Unexpected Error"
             @logger.error rerr
           end

data/lib/maestro/operating_system/cent_os.rb

@@ -15,8 +15,8 @@ module Maestro
            "sudo rm /usr/local/src/rubygems-1.3.6.tgz",
            "sudo gem sources -a http://gems.opscode.com",
            "sudo gem install rake --no-rdoc --no-ri",
-           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.0'",
-           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.0/bin/chef-solo /usr/bin/chef-solo"]
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.8'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.8/bin/chef-solo /usr/bin/chef-solo"]
       end
     end
   end

data/lib/maestro/operating_system/debian.rb

@@ -18,8 +18,8 @@ module Maestro
            "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
            "sudo gem sources -a http://gems.opscode.com",
            "sudo gem install rake --no-rdoc --no-ri",
-           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.0'",
-           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.0/bin/chef-solo /usr/bin/chef-solo"]
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.8'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.8/bin/chef-solo /usr/bin/chef-solo"]
       end
     end
 

data/lib/maestro/operating_system/fedora.rb

@@ -15,8 +15,8 @@ module Maestro
            "sudo rm /usr/local/src/rubygems-1.3.6.tgz",
            "sudo gem sources -a http://gems.opscode.com",
            "sudo gem install rake --no-rdoc --no-ri",
-           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.0'",
-           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.0/bin/chef-solo /usr/bin/chef-solo"]
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.8'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.8/bin/chef-solo /usr/bin/chef-solo"]
       end
     end
   end

data/lib/maestro/operating_system/ubuntu.rb

@@ -16,8 +16,8 @@ module Maestro
            "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
            "sudo gem sources -a http://gems.opscode.com",
            "sudo gem install rake --no-rdoc --no-ri",
-           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.0'",
-           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.0/bin/chef-solo /usr/bin/chef-solo"]
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.8'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.8/bin/chef-solo /usr/bin/chef-solo"]
       end
     end
 
@@ -38,8 +38,8 @@ module Maestro
            "sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
            "sudo gem sources -a http://gems.opscode.com",
            "sudo gem install rake --no-rdoc --no-ri",
-           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.0'",
-           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.0/bin/chef-solo /usr/bin/chef-solo"]
+           "sudo gem install chef --no-rdoc --no-ri --version '= 0.9.8'",
+           "sudo ln -sfv $(gem environment gemdir)/gems/chef-0.9.8/bin/chef-solo /usr/bin/chef-solo"]
       end
     end
 

data/lib/maestro/railtie.rb

@@ -0,0 +1,10 @@
+require 'rails'
+require "active_model/railtie"
+
+module Maestro
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "maestro/tasks.rb"
+    end
+  end
+end

data/test/integration/helper.rb

@@ -4,5 +4,4 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'maestro'
 require 'shoulda'
-require 'ftools'
 require 'fileutils'

data/test/unit/test_invalid_mode.rb

@@ -5,7 +5,8 @@ class TestInvalidMode < Test::Unit::TestCase
 
   should "be invalid due to no rails or standalone" do
     result = Maestro.validate_configs
-    assert !result[0], result[1]
+    assert !result[0]
+    assert result[1].any? {|message| !message.index("Maestro not configured correctly.").nil? }
   end
 
 end

data/test/unit/test_maestro.rb

@@ -5,7 +5,7 @@ class TestMaestro < Test::Unit::TestCase
 
   context "Maestro" do
 
-    context "Rails mode" do
+    context "Rails 2 mode" do
       setup do
         Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'rails'))
       end
@@ -33,10 +33,59 @@ class TestMaestro < Test::Unit::TestCase
           assert_log_directories_do_not_exist("#{RAILS_ROOT}/log")
         end
       end
+
+      should "get clouds" do
+        assert_nothing_raised do
+          Maestro.create_config_dirs
+          Maestro.clouds
+          delete_config_directories("#{RAILS_ROOT}/config")
+        end
+      end
+    end
+
+
+    context "Rails 3 mode" do
+      setup do
+        class ::Rails
+          def self.root
+            File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'rails')
+          end
+        end
+      end
+
+      teardown do
+        class ::Rails
+          class <<self
+            undef :root if defined?(Rails.root)
+          end
+        end
+      end
+
+      should "create config dirs" do
+        assert_nothing_raised do
+          assert_config_directories_do_not_exist("#{Rails.root}/config")
+          Maestro.create_config_dirs
+          assert_config_directories_exist("#{Rails.root}/config")
+          delete_config_directories("#{Rails.root}/config")
+          assert_config_directories_do_not_exist("#{Rails.root}/config")
+        end
+      end
+
+      should "create log dirs" do
+        assert_nothing_raised do
+          assert_log_directories_do_not_exist("#{Rails.root}/log")
+          Maestro.create_log_dirs
+          assert_log_directories_exist("#{Rails.root}/log")
+          delete_log_directories("#{Rails.root}/log")
+          assert_log_directories_do_not_exist("#{Rails.root}/log")
+        end
+      end
       
       should "get clouds" do
         assert_nothing_raised do
+          Maestro.create_config_dirs
           Maestro.clouds
+          delete_config_directories("#{Rails.root}/config")
         end
       end
     end
@@ -75,7 +124,10 @@ class TestMaestro < Test::Unit::TestCase
 
       should "get clouds" do
         assert_nothing_raised do
+          base_dir = ENV[Maestro::MAESTRO_DIR_ENV_VAR]
+          Maestro.create_config_dirs
           Maestro.clouds
+          delete_config_directories("#{base_dir}/config")
         end
       end
     end

data/test/unit/test_rails_mode.rb

@@ -3,14 +3,14 @@ require 'helper'
 # Unit tests for Rails mode
 class TestRailsMode < Test::Unit::TestCase
 
-  context "Rails mode" do
+  context "Rails2 mode" do
     teardown do
       Object.send(:remove_const, "RAILS_ROOT")
     end
 
     should "be invalid due to missing RAILS_ROOT" do
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro not configured correctly").nil? }
       # so teardown doesn't fail
       Object.const_set("RAILS_ROOT", "blah")
@@ -19,59 +19,165 @@ class TestRailsMode < Test::Unit::TestCase
     should "be invalid due to missing maestro directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-maestro'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro config directory does not exist").nil? }
     end
 
     should "be invalid due to maestro not a directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-maestro-not-a-directory'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro config directory is not a directory").nil? }
     end
 
     should "be invalid due to missing clouds directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-clouds'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro clouds config directory does not exist").nil? }
     end
 
     should "be invalid due to clouds not a directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-clouds-not-a-directory'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro clouds config directory is not a directory").nil? }
     end
 
     should "be invalid due to missing cookbooks directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-cookbooks'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef cookbooks directory does not exist").nil? }
     end
 
     should "be invalid due to cookbooks not a directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-cookbooks-not-a-directory'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef cookbooks directory is not a directory").nil? }
     end
 
     should "be invalid due to missing roles directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-roles'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef roles directory does not exist").nil? }
     end
 
     should "be invalid due to roles not a directory" do
       Object.const_set("RAILS_ROOT", File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-roles-not-a-directory'))
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef roles directory is not a directory").nil? }
     end
-
   end
 
+
+  context "Rails3 mode" do
+    setup do
+    end
+    
+    teardown do
+      class ::Rails
+        class <<self
+          undef :root if defined?(Rails.root)
+        end
+      end
+    end
+
+    should "be invalid due to missing Rails.root" do
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Maestro not configured correctly").nil? }
+    end
+
+    should "be invalid due to missing maestro directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-maestro')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Maestro config directory does not exist").nil? }
+    end
+
+    should "be invalid due to maestro not a directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-maestro-not-a-directory')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Maestro config directory is not a directory").nil? }
+    end
+
+    should "be invalid due to missing clouds directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-clouds')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Maestro clouds config directory does not exist").nil? }
+    end
+
+    should "be invalid due to clouds not a directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-clouds-not-a-directory')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Maestro clouds config directory is not a directory").nil? }
+    end
+
+    should "be invalid due to missing cookbooks directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-cookbooks')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Chef cookbooks directory does not exist").nil? }
+    end
+
+    should "be invalid due to cookbooks not a directory" do
+       class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-cookbooks-not-a-directory')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Chef cookbooks directory is not a directory").nil? }
+    end
+
+    should "be invalid due to missing roles directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-roles')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Chef roles directory does not exist").nil? }
+    end
+
+    should "be invalid due to roles not a directory" do
+      class ::Rails
+        def self.root
+          File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-roles-not-a-directory')
+        end
+      end
+      result = Maestro.validate_configs
+      assert !result[0]
+      assert result[1].any? {|message| !message.index("Chef roles directory is not a directory").nil? }
+    end
+  end
 end

data/test/unit/test_standalone_mode.rb

@@ -10,63 +10,63 @@ class TestStandaloneMode < Test::Unit::TestCase
   
     should "be invalid due to missing maestro directory env var" do
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro not configured correctly").nil? }
     end
   
     should "be invalid due to missing maestro directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-maestro')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro config directory does not exist").nil? }
     end
   
     should "be invalid due to maestro not a directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-maestro-not-a-directory')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro config directory is not a directory").nil? }
     end
   
     should "be invalid due to missing clouds directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-clouds')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro clouds config directory does not exist").nil? }
     end
 
     should "be invalid due to clouds not a directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-clouds-not-a-directory')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Maestro clouds config directory is not a directory").nil? }
     end
 
     should "be invalid due to missing cookbooks directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-cookbooks')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef cookbooks directory does not exist").nil? }
     end
 
     should "be invalid due to cookbooks not a directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-cookbooks-not-a-directory')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef cookbooks directory is not a directory").nil? }
     end
 
     should "be invalid due to missing roles directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-missing-roles')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef roles directory does not exist").nil? }
     end
 
     should "be invalid due to roles not a directory" do
       ENV[Maestro::MAESTRO_DIR_ENV_VAR] = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures', 'invalid-roles-not-a-directory')
       result = Maestro.validate_configs
-      assert !result[0], result[1]
+      assert !result[0]
       assert result[1].any? {|message| !message.index("Chef roles directory is not a directory").nil? }
     end
 

data/the-maestro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{the-maestro}
-  s.version = "0.3.9"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Ploetz"]
-  s.date = %q{2010-08-01}
+  s.date = %q{2010-10-05}
   s.description = %q{Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/maestro/operating_system/debian.rb",
      "lib/maestro/operating_system/fedora.rb",
      "lib/maestro/operating_system/ubuntu.rb",
+     "lib/maestro/railtie.rb",
      "lib/maestro/role.rb",
      "lib/maestro/tasks.rb",
      "lib/maestro/validator.rb",
@@ -80,7 +81,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bploetz/maestro}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Maestro: Conduct your clouds.}
   s.test_files = [
     "test/integration/base_aws.rb",
@@ -116,7 +117,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, ["= 2.10.2"])
       s.add_runtime_dependency(%q<net-ssh>, ["= 2.0.15"])
       s.add_runtime_dependency(%q<net-scp>, ["= 1.0.2"])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: the-maestro
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Brian Ploetz
@@ -9,99 +14,144 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 -04:00
+date: 2010-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-scp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: log4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 7
         version: 1.1.7
-    version: 
+  type: :runtime
+  version_requirements: *id009
 description: Maestro is a cloud provisioning, configuration, and management utility for your Ruby and Ruby On Rails applications.
 email: 
 executables: []
@@ -130,6 +180,7 @@ files:
 - lib/maestro/operating_system/debian.rb
 - lib/maestro/operating_system/fedora.rb
 - lib/maestro/operating_system/ubuntu.rb
+- lib/maestro/railtie.rb
 - lib/maestro/role.rb
 - lib/maestro/tasks.rb
 - lib/maestro/validator.rb
@@ -182,21 +233,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Maestro: Conduct your clouds."