engineyard-serverside 1.5.27.pre3 → 1.5.27.pre4

data/lib/engineyard-serverside/deploy.rb

@@ -32,6 +32,7 @@ module EY
           setup_services
           check_for_ey_config
           symlink_configs
+          setup_sqlite3_if_necessary
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
           run_with_callbacks(:compile_assets) # defined in RailsAssetSupport
@@ -323,6 +324,33 @@ Deploy again if your services configuration appears incomplete or out of date.
         end
       end
 
+      def setup_sqlite3_if_necessary
+        if gemfile? && lockfile && lockfile.uses_sqlite3?
+          [
+           ["Create databases directory if needed", "mkdir -p #{c.shared_path}/databases"],
+           ["Creating SQLite database if needed", "touch #{c.shared_path}/databases/#{c.framework_env}.sqlite3"],
+           ["Create config directory if needed", "mkdir -p #{c.release_path}/config"],
+           ["Generating SQLite config", <<-WRAP],
+cat > #{c.shared_path}/config/database.sqlite3.yml<<'YML'
+#{c.framework_env}:
+  adapter: sqlite3
+  database: #{c.shared_path}/databases/#{c.framework_env}.sqlite3
+  pool: 5
+  timeout: 5000
+YML
+WRAP
+           ["Symlink database.yml", "ln -nfs #{c.shared_path}/config/database.sqlite3.yml #{c.release_path}/config/database.yml"],
+          ].each do |what, cmd|
+            info "~> #{what}"
+            run(cmd)
+          end
+
+          owner = [c.user, c.group].join(':')
+          info "~> Setting ownership to #{owner}"
+          sudo "chown -R #{owner} #{c.release_path}"
+        end
+      end
+
       def symlink_configs(release_to_link=c.release_path)
         info "~> Preparing shared resources for release."
         symlink_tasks(release_to_link).each do |what, cmd|

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -31,6 +31,10 @@ module EY
         any_ruby_adapter || any_jruby_adapter
       end
 
+      def uses_sqlite3?
+        !any_database_adapter? && @contents.index(/^\s+sqlite3\s\([^\)]+\)$/)
+      end
+
       def parse
         parse_from_metadata ||
           parse_from_dependencies ||

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.27.pre3'
+    VERSION = '1.5.27.pre4'
   end
 end

data/lib/vendor/celluloid/lib/celluloid/calls.rb

@@ -91,4 +91,3 @@ module Celluloid
     end
   end
 end
-

data/lib/vendor/celluloid/lib/celluloid/events.rb

@@ -1,11 +1,11 @@
 module Celluloid
   # Exceptional system events which need to be processed out of band
   class SystemEvent < Exception; end
-  
+
   # An actor has exited for the given reason
   class ExitEvent < SystemEvent
     attr_reader :actor, :reason
-    
+
     def initialize(actor, reason = nil)
       @actor, @reason = actor, reason
       super reason.to_s

data/lib/vendor/celluloid/lib/celluloid/responses.rb

@@ -2,15 +2,15 @@ module Celluloid
   # Responses to calls
   class Response
     attr_reader :call_id, :value
-    
+
     def initialize(call_id, value)
       @call_id, @value = call_id, value
     end
   end
-  
+
   # Call completed successfully
   class SuccessResponse < Response; end
-  
+
   # Call was aborted due to caller error
   class ErrorResponse < Response
     def value

data/spec/basic_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying an application without Bundler" do
   before(:all) do
     $DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
     $DISABLE_LOCKFILE = true
-    @deploy_dir = Pathname.new(Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}"))
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/bundler_deploy_spec.rb

@@ -7,7 +7,7 @@ describe "Deploying an application that uses Bundler" do
   end
 
   def deploy_test_application
-    @deploy_dir = Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.3'
+gem 'sqlite3'

data/spec/fixtures/lockfiles/1.0.21-rails-31-with-sqlite

@@ -0,0 +1,89 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.5)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rails (= 3.1.3)
+  sqlite3

data/spec/nodejs_deploy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Deploying an application that uses Node.js and NPM" do
   def deploy_test_application
-    @deploy_dir = Dir.mktmpdir( "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/rails31_deploy_spec.rb

@@ -1,62 +1,6 @@
 require 'spec_helper'
 
 describe "Deploying a Rails 3.1 application" do
-  def deploy_test_application(assets_enabled = true, &block)
-    $DISABLE_GEMFILE = false
-    $DISABLE_LOCKFILE = false
-    @deploy_dir = Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}")
-
-    # set up EY::Serverside::Server like we're on a solo
-    EY::Serverside::Server.reset
-    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
-
-    # run a deploy
-    @config = EY::Serverside::Deploy::Configuration.new({
-      "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir,
-      "group"         => `id -gn`.strip,
-      "stack"         => 'nginx_passenger',
-      "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
-      'app'           => 'rails31',
-      'framework_env' => 'staging'
-    })
-
-    # pretend there is a shared bundled_gems directory
-    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
-    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
-      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
-    end
-
-    # Set up the application directory to have the requested asset options.
-    prepare_rails31_app(assets_enabled)
-
-    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(@config)
-    @deployer.deploy(&block)
-  end
-
-  def prepare_rails31_app(assets_enabled)
-    FileUtils.mkdir_p(File.join(@config.release_path, 'config'))
-      app_rb = File.join(@config.release_path, 'config', 'application.rb')
-      app_rb_contents = <<-EOF
-module Rails31
-  class Application < Rails::Application
-    config.assets.enabled = #{assets_enabled ? 'true' : 'false'}
-  end
-end
-EOF
-      File.open(app_rb, 'w') {|f| f.write(app_rb_contents)}
-      rakefile = File.join(@config.release_path, 'Rakefile')
-      rakefile_contents = <<-EOF
-desc 'Precompile yar assetz'
-task 'assets:precompile' do
-  sh 'touch precompiled'
-end
-EOF
-    File.open(rakefile, 'w') {|f| f.write(rakefile_contents)}
-    FileUtils.mkdir_p(File.join(@config.release_path, 'app', 'assets'))
-  end
-
   context "with default production settings" do
     before(:all) do
       deploy_test_application

data/spec/services_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying an application with services" do
   before(:each) do
     #$DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
     #$DISABLE_LOCKFILE = true
-    @deploy_dir = Pathname.new(Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}"))
+    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/spec_helper.rb

@@ -75,4 +75,60 @@ Spec::Runner.configure do |config|
     $DISABLE_LOCKFILE = false
     EY::Serverside.dna_json = {}.to_json
   end
+
+  def deploy_test_application(assets_enabled = true, &block)
+    $DISABLE_GEMFILE = false
+    $DISABLE_LOCKFILE = false
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+
+    # set up EY::Serverside::Server like we're on a solo
+    EY::Serverside::Server.reset
+    EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
+
+    # run a deploy
+    @config = EY::Serverside::Deploy::Configuration.new({
+      "strategy"      => "IntegrationSpec",
+      "deploy_to"     => @deploy_dir,
+      "group"         => `id -gn`.strip,
+      "stack"         => 'nginx_passenger',
+      "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
+      'app'           => 'rails31',
+      'framework_env' => 'staging'
+    })
+
+    # pretend there is a shared bundled_gems directory
+    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
+      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
+    end
+
+    # Set up the application directory to have the requested asset options.
+    prepare_rails31_app(assets_enabled)
+
+    @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+    @deployer = FullTestDeploy.new(@config)
+    @deployer.deploy(&block)
+  end
+
+  def prepare_rails31_app(assets_enabled)
+    FileUtils.mkdir_p(File.join(@config.release_path, 'config'))
+      app_rb = File.join(@config.release_path, 'config', 'application.rb')
+      app_rb_contents = <<-EOF
+module Rails31
+  class Application < Rails::Application
+    config.assets.enabled = #{assets_enabled ? 'true' : 'false'}
+  end
+end
+EOF
+      File.open(app_rb, 'w') {|f| f.write(app_rb_contents)}
+      rakefile = File.join(@config.release_path, 'Rakefile')
+      rakefile_contents = <<-EOF
+desc 'Precompile yar assetz'
+task 'assets:precompile' do
+  sh 'touch precompiled'
+end
+EOF
+    File.open(rakefile, 'w') {|f| f.write(rakefile_contents)}
+    FileUtils.mkdir_p(File.join(@config.release_path, 'app', 'assets'))
+  end
 end

data/spec/sqlite3_deploy_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe "Deploying an application with sqlite3 as the only DB adapter in the Gemfile.lock" do
+  before do
+    @release_path  = nil
+    @shared_path   = nil
+    @framework_env = nil
+
+    deploy_test_application do |deployer|
+      gemfile                    = File.expand_path('../fixtures/gemfiles/1.0.21-rails-31-with-sqlite', __FILE__)
+      lockfile                   = File.expand_path('../fixtures/lockfiles/1.0.21-rails-31-with-sqlite', __FILE__)
+      deployer.gemfile_contents  = File.read(gemfile)
+      deployer.lockfile_contents = File.read(lockfile)
+
+      @shared_path               = deployer.shared_path
+      @release_path              = deployer.release_path
+      @framework_env             = deployer.framework_env
+    end
+  end
+    
+
+  it 'should symlink database.sqlite3.yml' do
+    File.exist?(File.join(@release_path, 'config', 'database.yml')).should be_true
+  end
+
+  it 'should create database.sqlite3.yml in a shared location' do
+    File.exist?(File.join(@shared_path, 'config', 'database.sqlite3.yml')).should be_true
+  end
+
+  it 'should put a reference to a shared database in database.sqlite3.yml' do
+    contents = File.read(File.join(@release_path, 'config', 'database.yml'))
+    contents.should include(File.expand_path(File.join(@shared_path, 'databases', "#{@framework_env}.sqlite3")))
+  end
+
+  it 'should create the shared database' do
+    File.exist?(File.join(@shared_path, 'databases', "#{@framework_env}.sqlite3")).should be_true
+  end
+
+end

data/spec/support/integration.rb

@@ -66,7 +66,7 @@ class FullTestDeploy < EY::Serverside::Deploy
   end
 
   def deploy
-    yield if block_given?
+    yield(self) if block_given?
     super
   end
 
@@ -99,6 +99,7 @@ end
 module EY::Serverside::Strategies::IntegrationSpec
   module Helpers
 
+
     def update_repository_cache
       cached_copy = c.repository_cache
 
@@ -120,6 +121,18 @@ module EY::Serverside::Strategies::IntegrationSpec
       generate_gemfile_in(cached_copy)
     end
 
+    def release_path
+      c.release_path
+    end
+
+    def shared_path
+      c.shared_path
+    end
+
+    def framework_env
+      c.framework_env
+    end
+
     def create_revision_file_command
       "echo 'revision, yo' > #{c.release_path}/REVISION"
     end
@@ -128,6 +141,10 @@ module EY::Serverside::Strategies::IntegrationSpec
       "FONDLED THE CODE"
     end
 
+    def gemfile_contents=(contents)
+      @gemfile_contents = contents
+    end
+
     def gemfile_contents
       @gemfile_contents || <<-EOF
 source :rubygems
@@ -137,7 +154,12 @@ gem 'ey_config'
       EOF
     end
 
+    def lockfile_contents=(contents)
+      @lockfile_contents = contents
+    end
+
     # Generated using Bundler v1.0.21
+
     def lockfile_contents
       @lockfile_contents || <<-EOF
 GEM

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 2511085049
+  hash: 2326528959
   prerelease: 7
   segments: 
   - 1
   - 5
   - 27
   - pre
-  - 3
-  version: 1.5.27.pre3
+  - 4
+  version: 1.5.27.pre4
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -327,6 +327,7 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -339,6 +340,7 @@ files:
 - spec/fixtures/lockfiles/1.0.18-mysql
 - spec/fixtures/lockfiles/1.0.18-mysql2
 - spec/fixtures/lockfiles/1.0.18-pg
+- spec/fixtures/lockfiles/1.0.21-rails-31-with-sqlite
 - spec/fixtures/lockfiles/1.0.6-no-bundler
 - spec/fixtures/lockfiles/1.0.6-with-any-bundler
 - spec/fixtures/lockfiles/1.0.6-with-bundler
@@ -353,6 +355,7 @@ files:
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
 - spec/spec_helper.rb
+- spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
@@ -395,6 +398,7 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gemfiles/1.0.21-rails-31-with-sqlite
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -407,6 +411,7 @@ test_files:
 - spec/fixtures/lockfiles/1.0.18-mysql
 - spec/fixtures/lockfiles/1.0.18-mysql2
 - spec/fixtures/lockfiles/1.0.18-pg
+- spec/fixtures/lockfiles/1.0.21-rails-31-with-sqlite
 - spec/fixtures/lockfiles/1.0.6-no-bundler
 - spec/fixtures/lockfiles/1.0.6-with-any-bundler
 - spec/fixtures/lockfiles/1.0.6-with-bundler
@@ -421,4 +426,5 @@ test_files:
 - spec/server_spec.rb
 - spec/services_deploy_spec.rb
 - spec/spec_helper.rb
+- spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb