engineyard-serverside 1.4.3.nodestack → 1.4.7.pre

data/lib/core-ext/README.md

@@ -0,0 +1,3 @@
+# methods for core Ruby classes that aren't available in ruby 1.8.6 (used by ey_resin)
+# versions here are just workarounds
+# FIXME remove this folder when ey_resin (and .rvmrc) updated to ruby 1.8.7 or 1.9.2

data/lib/core-ext/string.rb

@@ -0,0 +1,9 @@
+# methods for String that aren't available in ruby 1.8.6 (used by ey_resin)
+# versions here are just workarounds
+# FIXME remove this module when ey_resin (and .rvmrc) updated to ruby 1.8.7 or 1.9.2
+module ModernString
+  def start_with?(prefix)
+    self.index(prefix) == 0
+  end
+end
+String.send(:include, ModernString)

data/lib/engineyard-serverside.rb

@@ -4,6 +4,8 @@ $LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/json_pure/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/dataflow', File.dirname(__FILE__))
 
+require 'core-ext/string' if RUBY_VERSION == '1.8.6'
+
 require 'escape'
 require 'json'
 require 'dataflow'
@@ -34,7 +36,7 @@ module EY
                       {}.to_json
                     end
     end
-
+    
     RemoteFailure = Class.new StandardError
 
     private

data/lib/engineyard-serverside/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'pathname'
+require 'tmpdir'
 
 module EY
   module Serverside
@@ -214,9 +215,9 @@ module EY
       def propagate
         config          = EY::Serverside::Deploy::Configuration.new
         gem_filename    = "engineyard-serverside-#{EY::Serverside::VERSION}.gem"
-        local_gem_file  = File.join(Gem.dir, 'cache', gem_filename)
+        local_gem_file  = File.join(::Gem.dir, 'cache', gem_filename)
         remote_gem_file = File.join(Dir.tmpdir, gem_filename)
-        gem_binary      = File.join(Gem.default_bindir, 'gem')
+        gem_binary      = File.join(::Gem.default_bindir, 'gem')
 
         barrier(*(EY::Serverside::Server.all.find_all do |server|
           !server.local?            # of course this machine has it

data/lib/engineyard-serverside/configuration.rb

@@ -119,7 +119,7 @@ module EY
       end
 
       def framework_envs
-        "RAILS_ENV=#{environment} RACK_ENV=#{environment} APP_ENV=#{environment} MERB_ENV=#{environment}"
+        "RAILS_ENV=#{environment} RACK_ENV=#{environment} MERB_ENV=#{environment}"
       end
 
       def current_path

data/lib/engineyard-serverside/deploy.rb

@@ -27,6 +27,7 @@ module EY
           create_revision_file
           run_with_callbacks(:bundle)
           symlink_configs
+          generate_configs
           conditionally_enable_maintenance_page
           run_with_callbacks(:migrate)
           callback(:before_symlink)
@@ -136,8 +137,9 @@ module EY
           bundler_installer = if File.exist?(lockfile)
                                 get_bundler_installer(lockfile)
                               else
-                                warn_about_missing_lockfile
-                                bundler_09_installer(default_09_bundler)
+                                missing_lock_version = EY::Serverside::LockfileParser::Parse10::DEFAULT
+                                warn_about_missing_lockfile missing_lock_version
+                                bundler_10_installer missing_lock_version
                               end
 
           sudo "#{$0} _#{EY::Serverside::VERSION}_ install_bundler #{bundler_installer.version}"
@@ -164,15 +166,6 @@ module EY
 
           run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
         end
-        if File.exist?("#{c.release_path}/package.json")
-          unless `which npm` =~ /npm/
-            error "~> package.json detected, BUT npm not installed"
-          else
-            info "~> package.json detected, installing npm packages"
-          
-            run "cd #{c.release_path} && npm install"
-          end
-        end
       end
 
       # task
@@ -227,6 +220,7 @@ module EY
         run create_revision_file_command
       end
 
+      # symlink to shared path; may be overridden by #generate_configs
       def symlink_configs(release_to_link=c.release_path)
         info "~> Symlinking configs"
         [ "chmod -R g+w #{release_to_link}",
@@ -237,8 +231,8 @@ module EY
           "mkdir -p #{release_to_link}/config",
           "ln -nfs #{c.shared_path}/system #{release_to_link}/public/system",
           "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids",
-          "find #{c.shared_path}/config -type f -exec ln -s {} #{release_to_link}/config \\;",
-          "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml",
+          "find #{c.shared_path}/config ! -name 'database.yml*' -type f -exec ln -s {} #{release_to_link}/config \\;",
+          # database.yml generated or symlink created in #generate_database_yml
           "ln -nfs #{c.shared_path}/config/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml",
         ].each do |cmd|
           run cmd
@@ -248,6 +242,84 @@ module EY
         run "if [ -f \"#{c.shared_path}/config/newrelic.yml\" ]; then ln -nfs #{c.shared_path}/config/newrelic.yml #{release_to_link}/config/newrelic.yml; fi"
       end
 
+      def generate_configs(release_to_link=c.release_path)
+        generate_database_yml(release_to_link)
+      end
+
+      # Do nothing if there is no Gemfile.lock to determine what ORM gems are being used
+      # (falls back to using the symlinked shared/database.yml file)
+      def generate_database_yml(release_to_link)
+        return if keep_database_yml?(release_to_link)
+        if config["db_adapter"] || File.exist?("#{c.release_path}/Gemfile.lock")
+          info "~> Generating database.yml from Gemfile.lock"
+          database_yml = "#{release_to_link}/config/database.yml"
+          node         = EY::Serverside.node
+          node_app     = node["engineyard"]["environment"]["apps"].find { |app| app['name'] == c['app'] }
+          abort("Invalid application name for target environment: #{c['app']}") unless node_app
+
+          db_stack_name   = node[:engineyard][:environment][:db_stack_name]
+          instances       = node[:engineyard][:environment][:instances]
+          db_master       = {"public_hostname" => "localhost"} # you know, just in case
+          db_slaves       = []
+          instances.each do |i|
+            case i['role']
+            when 'db_master', 'solo'
+              db_master = i
+            when 'db_slave'
+              db_slaves << i
+            end
+          end
+          db_host         = db_master["public_hostname"]
+          db_slaves_hosts = db_slaves.map {|slave| slave["public_hostname"]}
+
+          if config["db_adapter"]
+            adapter = config["db_adapter"]
+          elsif bundler_gems_include?("mysql2")
+            adapter = "mysql2"
+          elsif bundler_gems_include?("mysql")
+            adapter = "mysql"
+          elsif bundler_gems_include?("pg")
+            adapter = "postgresql"
+          elsif bundler_gems_include?("jdbc-mysql")
+            adapter = "mysql"
+          elsif bundler_gems_include?("jdbc-postgres")
+            adapter = "postgresql"
+          elsif db_stack_name && db_stack_name =~ /postgres/
+            adapter = "postgresql"
+          else
+            adapter = "mysql"
+          end
+
+          File.open(database_yml, "w") do |file|
+            contents = <<-EOS.gsub(/^\s{12}/, '')
+            #{node[:engineyard][:environment][:framework_env]}:
+              adapter:   #{adapter}
+              database:  #{node_app[:database_name]}
+              username:  #{node[:engineyard][:environment][:ssh_username]}
+              password:  #{node[:engineyard][:environment][:ssh_password]}
+              host:      #{db_host}
+              reconnect: true
+            EOS
+            db_slaves_hosts.each_with_index do |host, n|
+              slave_name = n.zero? ? "slave" : "slave_#{n}"
+              contents << <<-EOS.gsub(/^\s{14}/, '')
+              #{slave_name}:
+                adapter:   #{adapter}
+                database:  #{node_app[:database_name]}
+                username:  #{node[:engineyard][:environment][:ssh_username]}
+                password:  #{node[:engineyard][:environment][:ssh_password]}
+                host:      #{host}
+                reconnect: true
+              EOS
+            end
+            file << contents
+          end
+        else
+          info "~> Symlinking database.yml config"
+          run "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml"
+        end
+      end
+
       # task
       def symlink(release_to_link=c.release_path)
         info "~> Symlinking code"
@@ -319,7 +391,7 @@ module EY
         raise
       end
 
-      def warn_about_missing_lockfile
+      def warn_about_missing_lockfile(missing_lock_version)
         info "!>"
         info "!> WARNING: Gemfile.lock is missing!"
         info "!> You can get different gems in production than what you tested with."
@@ -329,30 +401,52 @@ module EY
         info "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
         info "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
         info "!>"
-        info "!> This deployment will use bundler #{default_09_bundler} to run 'bundle install'."
+        info "!> This deployment will use bundler #{missing_lock_version} to run 'bundle install'."
         info "!>"
       end
 
-      def get_bundler_installer(lockfile)
+      def keep_database_yml?(release_to_link=c.release_path)
+        File.exists?(File.join(release_to_link, "config", "keep.database.yml"))
+      end
+
+      # returns true if "bundle list" includes all gems requested
+      def bundler_gems_include?(*gems)
+        lockfile = File.join(c.release_path, "Gemfile.lock")
+        @lockfile_contents ||= File.read(lockfile)
+
+        # Parsing Gemfile.lock which looks like
+        # GEM
+        #   remote: http://rubygems.org/
+        #   specs:
+        #     activemodel (3.0.10)
+        #       activesupport (= 3.0.10)
+        #       builder (~> 2.1.2)
+        #       i18n (~> 0.5.0)
+        #
+        gems.inject(true) {|found_all, gem| found_all && (@lockfile_contents =~ / #{gem} \(/)}
+      end
+
+      def get_bundler_installer(lockfile, options = '')
         parser = LockfileParser.new(File.read(lockfile))
         case parser.lockfile_version
         when :bundler09
-          bundler_09_installer(parser.bundler_version)
+          bundler_09_installer(parser.bundler_version, options)
         when :bundler10
-          bundler_10_installer(parser.bundler_version)
+          bundler_10_installer(parser.bundler_version, options)
         else
           raise "Unknown lockfile version #{parser.lockfile_version}"
         end
       end
       public :get_bundler_installer
 
-      def bundler_09_installer(version)
-        BundleInstaller.new(version, '--without=development --without=test')
+      def bundler_09_installer(version, options = '')
+        default_options = '--without=development --without=test'
+        BundleInstaller.new(version, default_options + options)
       end
 
-      def bundler_10_installer(version)
-        BundleInstaller.new(version,
-          "--deployment --path #{c.shared_path}/bundled_gems --binstubs #{c.binstubs_path} --without development test")
+      def bundler_10_installer(version, options = '')
+        default_options = "--deployment --path #{c.shared_path}/bundled_gems --binstubs #{c.binstubs_path} --without development test"
+        BundleInstaller.new(version, default_options + options)
       end
     end   # DeployBase
 

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -79,11 +79,11 @@ module EY
           when '='
             bundler_version
           when '>='
-            Gem::Version.new(bundler_version) > Gem::Version.new(DEFAULT) ? bundler_version : DEFAULT
+            ::Gem::Version.new(bundler_version) > ::Gem::Version.new(DEFAULT) ? bundler_version : DEFAULT
           when '~>'
-            bundler_gem_version = Gem::Version.new(bundler_version)
+            bundler_gem_version = ::Gem::Version.new(bundler_version)
             recommendation = bundler_gem_version.spermy_recommendation.gsub(/~>\s*(.+)$/, '\1.')
-            DEFAULT.start_with?(recommendation) && Gem::Version.new(DEFAULT) > bundler_gem_version ? DEFAULT : bundler_version
+            DEFAULT.start_with?(recommendation) && ::Gem::Version.new(DEFAULT) > bundler_gem_version ? DEFAULT : bundler_version
           end
         end
 

data/lib/engineyard-serverside/logged_output.rb

@@ -41,11 +41,6 @@ module EY
         EY::Serverside::LoggedOutput.verbose?
       end
 
-      # TODO color output
-      def error(msg)
-        info(msg)
-      end
-
       def info(msg)
         with_logfile do |log|
           Tee.new($stdout, log) << (msg + "\n")

data/lib/engineyard-serverside/task.rb

@@ -54,6 +54,7 @@ module EY
           need_later { server.run(Escape.shell_command(wrapper + [to_run])) }
         end
         barrier *results
+
         # MRI's truthiness check is an internal C thing that does not call
         # any methods... so Dataflow cannot proxy it & we must "x == true"
         # Rubinius, wherefore art thou!?

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.3.nodestack'
+    VERSION = '1.4.7.pre'
   end
 end

data/lib/vendor/ruby_1.8.6_openssl.patch

@@ -0,0 +1,7 @@
+diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
+index 2ebf61a..8a0202a 100644
+--- a/ext/openssl/openssl_missing.h
++++ b/ext/openssl/openssl_missing.h
+@@ -123,2 +122,0 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_
+-int BN_rand_range(BIGNUM *r, BIGNUM *range);
+-int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);

data/spec/custom_deploy_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'fileutils'
 
 describe "the EY::Serverside::Deploy API" do
   it "calls tasks in the right order" do
@@ -29,9 +30,12 @@ describe "the EY::Serverside::Deploy API" do
       def cleanup_old_releases()                   @call_order << 'cleanup_old_releases'                   end
       def conditionally_enable_maintenance_page()  @call_order << 'conditionally_enable_maintenance_page'  end
       def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
+      def generate_database_yml(path)              @call_order << 'generate_database_yml'                  end
     end
 
-    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new)
+    setup_dna_json
+
+    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new('app' => 'myfirstapp'))
     td.deploy
     td.call_order.should == %w(
       push_code
@@ -39,6 +43,7 @@ describe "the EY::Serverside::Deploy API" do
       create_revision_file
       bundle
       symlink_configs
+      generate_database_yml
       conditionally_enable_maintenance_page
       migrate
       symlink
@@ -53,15 +58,17 @@ describe "the EY::Serverside::Deploy API" do
     end
 
     before(:each) do
-      @tempdir = `mktemp -d -t custom_deploy_spec.XXXXX`.strip
-      @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
-      @deploy = TestQuietDeploy.new(@config)
+      @tempdir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+      @config  = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
+      @deploy  = TestQuietDeploy.new(@config)
+    end
+
+    after do
+      FileUtils.rm_rf(@tempdir)
     end
 
     def write_eydeploy(relative_path, contents = "def got_new_methods() 'from the file on disk' end")
-      FileUtils.mkdir_p(File.join(
-          @tempdir,
-          File.dirname(relative_path)))
+      FileUtils.mkdir_p(File.join(@tempdir, File.dirname(relative_path)))
 
       File.open(File.join(@tempdir, relative_path), 'w') do |f|
         f.write contents

data/spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem "activerecord"
+gem "activerecord-jdbcmysql-adapter"

data/spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile.lock

@@ -0,0 +1,29 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.1.3)
+    activerecord-jdbcmysql-adapter (1.1.3)
+      activerecord-jdbc-adapter (= 1.1.3)
+      jdbc-mysql (~> 5.1.0)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    i18n (0.5.0)
+    jdbc-mysql (5.1.13)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activerecord-jdbcmysql-adapter

data/spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem "activerecord"
+gem "activerecord-jdbcpostgresql-adapter"

data/spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile.lock

@@ -0,0 +1,29 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.1.3)
+    activerecord-jdbcpostgresql-adapter (1.1.3)
+      activerecord-jdbc-adapter (= 1.1.3)
+      jdbc-postgres (~> 9.0.0)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    i18n (0.5.0)
+    jdbc-postgres (9.0.801)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activerecord-jdbcpostgresql-adapter