add back elzar gem and scp merged elzar provision directory

relevance · May 7, 2012 · a6346e6 · a6346e6
1 parent c774aef
commit a6346e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/generators/provision_config/provision_config_generator.rb b/lib/generators/provision_config/provision_config_generator.rb
@@ -49,8 +49,9 @@ def create_capistrano_files
   end
 
   def create_provision_directory
-    Elzar.bam! :destination => 'provision', :ruby_version => RelevanceRails.ruby_version,
-      :database => database, :authorized_keys => @authorized_keys, :app_name => name
+    Elzar.create_provision_directory Rails.root.join('provision'),
+      :ruby_version => RelevanceRails.ruby_version, :database => database,
+      :authorized_keys => @authorized_keys, :app_name => name
   end
 
   # TODO: move next two methods to elzar

diff --git a/lib/relevance_rails/provision.rb b/lib/relevance_rails/provision.rb
@@ -2,6 +2,7 @@
 require 'thor'
 require 'relevance_rails/fog_ext/ssh'
 require 'slushy'
+require 'elzar'
 
 module RelevanceRails
   module Provision
@@ -11,7 +12,8 @@ def self.create_ec2(name = nil)
       abort "Please provide a $NAME" unless name
       slushy = provision_ec2_instances(name)
       slushy.bootstrap
-      slushy.converge Rails.root.join('provision')
+      tmpdir = Elzar.merge_and_create_temp_directory Rails.root.join('provision')
+      slushy.converge tmpdir
       server = slushy.server
       puts "Server Instance: #{server.id}"
       puts "Server IP: #{server.public_ip_address}"

diff --git a/lib/relevance_rails/runner.rb b/lib/relevance_rails/runner.rb
@@ -66,9 +66,9 @@ def self.install_relevance_rails(argv, new_rvm_string, current_gemset)
 
       result = if argv.delete('--relevance-dev')
         gem_dir = "#{ENV['rvm_path']}/gems/#{current_gemset}/cache"
-        child_env.run('gem', 'install', "#{gem_dir}/relevance_rails-#{RelevanceRails::VERSION}.gem")
         require 'elzar'
         child_env.run('gem', 'install', "#{gem_dir}/elzar-#{Elzar::VERSION}.gem")
+        child_env.run('gem', 'install', "#{gem_dir}/relevance_rails-#{RelevanceRails::VERSION}.gem")
       else
         child_env.run('gem', 'install', 'relevance_rails', '-v', RelevanceRails::VERSION)
       end

diff --git a/relevance_rails.gemspec b/relevance_rails.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rails', '~> 3.2'
   s.add_runtime_dependency 'slushy', '~> 0.1.1'
   s.add_runtime_dependency 'thor', '~> 0.14.6'
-  # s.add_runtime_dependency 'elzar', '~> 0.1.0'
+  s.add_runtime_dependency 'elzar', '~> 0.1.0'
 
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'fakefs'