Commit 391732a2 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'

[Rails5] Update files by `rails app:update`

See merge request gitlab-org/gitlab-ce!17828
parents 93e216e6 36bedfb7
Loading
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
#!/usr/bin/env ruby

# Remove this block when upgraded to rails 5.0.
unless %w[1 true].include?(ENV["RAILS5"])
  begin
    load File.expand_path('../spring', __FILE__)
  rescue LoadError => e
    raise unless e.message.include?('spring')
  end
APP_PATH = File.expand_path('../../config/application', __FILE__)
end

APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot'
require 'rails/commands'
+9 −4
Original line number Diff line number Diff line
#!/usr/bin/env ruby

# Remove this block when upgraded to rails 5.0.
unless %w[1 true].include?(ENV["RAILS5"])
  begin
    load File.expand_path('../spring', __FILE__)
  rescue LoadError => e
    raise unless e.message.include?('spring')
  end
end

require_relative '../config/boot'
require 'rake'
Rake.application.run
+41 −9
Original line number Diff line number Diff line
#!/usr/bin/env ruby
require 'pathname'

def rails5?
  %w[1 true].include?(ENV["RAILS5"])
end

require "pathname"

# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
APP_ROOT = Pathname.new File.expand_path("../../", __FILE__)

if rails5?
  def system!(*args)
    system(*args) || abort("\n== Command #{args} failed ==")
  end
end

Dir.chdir APP_ROOT do
  # This script is a starting point to setup your application.
  # Add necessary setup steps to this file:

  puts "== Installing dependencies =="

  if rails5?
    system! "gem install bundler --conservative"
    system("bundle check") || system!("bundle install")
  else
    system "gem install bundler --conservative"
    system "bundle check || bundle install"
  end

  # puts "\n== Copying sample files =="
  # unless File.exist?("config/database.yml")
  #   system "cp config/database.yml.sample config/database.yml"
  #   cp "config/database.yml.sample", "config/database.yml"
  # end

  puts "\n== Preparing database =="

  if rails5?
    system! "bin/rails db:setup"
  else
    system "bin/rake db:reset"
  end

  puts "\n== Removing old logs and tempfiles =="

  if rails5?
    system! "bin/rails log:clear tmp:clear"
  else
    system "rm -f log/*"
    system "rm -rf tmp/cache"
  end

  puts "\n== Restarting application server =="

  if rails5?
    system! "bin/rails restart"
  else
    system "touch tmp/restart.txt"
  end
end

bin/update

0 → 100755
+29 −0
Original line number Diff line number Diff line
#!/usr/bin/env ruby
require 'pathname'
require 'fileutils'
include FileUtils

# path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)

def system!(*args)
  system(*args) || abort("\n== Command #{args} failed ==")
end

chdir APP_ROOT do
  # This script is a way to update your development environment automatically.
  # Add necessary update steps to this file.

  puts '== Installing dependencies =='
  system! 'gem install bundler --conservative'
  system('bundle check') || system!('bundle install')

  puts "\n== Updating database =="
  system! 'bin/rails db:migrate'

  puts "\n== Removing old logs and tempfiles =="
  system! 'bin/rails log:clear tmp:clear'

  puts "\n== Restarting application server =="
  system! 'bin/rails restart'
end
+8 −3
Original line number Diff line number Diff line
require 'rubygems'
def rails5?
  %w[1 true].include?(ENV["RAILS5"])
end

# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'rubygems' unless rails5?

gemfile = rails5? ? "Gemfile.rails5" : "Gemfile"
ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__)

# Set up gems listed in the Gemfile.
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
Loading