Skip to content

Commit

Permalink
Rails 6.0.0.beta2
Browse files Browse the repository at this point in the history
swrobel committed Feb 26, 2019
1 parent ab449e7 commit d61b666
Showing 28 changed files with 506 additions and 150 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem 'rails', '~> 5.2.0.beta2'
gem 'rails', '~> 6.0.0.beta2'

gem 'bootsnap'
gem 'bootstrap', '~> 4.2'
gem 'friendly_id'
gem 'friendly_id', github: 'norman/friendly_id'
gem 'pg'
gem 'puma'
gem 'react-rails'
138 changes: 80 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,60 +1,79 @@
GIT
remote: https://github.com/norman/friendly_id.git
revision: a605404b083f015079f6e5dbd1f3df994a8a8fb1
specs:
friendly_id (5.2.5)
activerecord (>= 4.0.0)

GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.6)
actioncable (5.2.2)
actionpack (= 5.2.2)
actioncable (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
actionmailbox (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
activejob (= 6.0.0.beta2)
activerecord (= 6.0.0.beta2)
activestorage (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
mail (>= 2.7.1)
actionmailer (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
actionview (= 6.0.0.beta2)
activejob (= 6.0.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.2)
actionview (= 5.2.2)
activesupport (= 5.2.2)
actionpack (6.0.0.beta2)
actionview (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.2)
activesupport (= 5.2.2)
actiontext (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
activerecord (= 6.0.0.beta2)
activestorage (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
nokogiri (>= 1.8.5)
actionview (6.0.0.beta2)
activesupport (= 6.0.0.beta2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.2)
activesupport (= 5.2.2)
activejob (6.0.0.beta2)
activesupport (= 6.0.0.beta2)
globalid (>= 0.3.6)
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
arel (>= 9.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
activemodel (6.0.0.beta2)
activesupport (= 6.0.0.beta2)
activerecord (6.0.0.beta2)
activemodel (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
activestorage (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
activerecord (= 6.0.0.beta2)
marcel (~> 0.3.1)
activesupport (5.2.2)
activesupport (6.0.0.beta2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (9.0.0)
zeitwerk (~> 1.3, >= 1.3.1)
ast (2.4.0)
autoprefixer-rails (9.4.7)
autoprefixer-rails (9.4.9)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bindex (0.5.0)
bootsnap (1.3.2)
bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap (4.2.1)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
@@ -64,10 +83,10 @@ GEM
concurrent-ruby (1.1.4)
connection_pool (2.2.2)
crass (1.0.4)
dotenv (2.6.0)
dotenv-rails (2.6.0)
dotenv (= 2.6.0)
railties (>= 3.2, < 6.0)
dotenv (2.7.1)
dotenv-rails (2.7.1)
dotenv (= 2.7.1)
railties (>= 3.2, < 6.1)
em-proxy (0.1.9)
eventmachine
erubi (1.8.0)
@@ -76,10 +95,8 @@ GEM
facter (2.5.1)
facter (2.5.1-universal-darwin)
CFPropertyList (~> 2.2)
ffi (1.9.25)
ffi (1.10.0)
formatador (0.2.5)
friendly_id (5.2.5)
activerecord (>= 4.0.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
@@ -141,14 +158,14 @@ GEM
minitest (5.11.3)
msgpack (1.2.6)
nenv (0.3.0)
newrelic_rpm (6.0.0.351)
newrelic_rpm (6.1.0.352)
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.13.0)
parallel (1.14.0)
parser (2.6.0.0)
ast (~> 2.4.0)
pg (1.1.4)
@@ -158,25 +175,28 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
psych (3.1.0)
puma (3.12.0)
rack (2.0.6)
rack-proxy (0.6.5)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack-toolbar (0.1.4)
rails (5.2.2)
actioncable (= 5.2.2)
actionmailer (= 5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
activemodel (= 5.2.2)
activerecord (= 5.2.2)
activestorage (= 5.2.2)
activesupport (= 5.2.2)
rails (6.0.0.beta2)
actioncable (= 6.0.0.beta2)
actionmailbox (= 6.0.0.beta2)
actionmailer (= 6.0.0.beta2)
actionpack (= 6.0.0.beta2)
actiontext (= 6.0.0.beta2)
actionview (= 6.0.0.beta2)
activejob (= 6.0.0.beta2)
activemodel (= 6.0.0.beta2)
activerecord (= 6.0.0.beta2)
activestorage (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
bundler (>= 1.3.0)
railties (= 5.2.2)
railties (= 6.0.0.beta2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@@ -188,12 +208,12 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
railties (6.0.0.beta2)
actionpack (= 6.0.0.beta2)
activesupport (= 6.0.0.beta2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rb-fsevent (0.10.3)
@@ -206,28 +226,29 @@ GEM
railties (>= 3.2)
tilt
redis (4.1.0)
rubocop (0.63.1)
rubocop (0.65.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubydns (0.8.5)
eventmachine (~> 1.0.0)
sassc (2.0.0)
ffi (~> 1.9.6)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.0)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
scenic (1.4.1)
scenic (1.5.1)
activerecord (>= 4.0.0)
railties (>= 4.0.0)
shellany (0.0.1)
@@ -268,6 +289,7 @@ GEM
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
zeitwerk (1.3.1)

PLATFORMS
ruby
@@ -277,7 +299,7 @@ DEPENDENCIES
bootsnap
bootstrap (~> 4.2)
dotenv-rails
friendly_id
friendly_id!
guard
guard-bundler
guard-rubocop
@@ -289,7 +311,7 @@ DEPENDENCIES
pgreset
puma
rack-toolbar
rails (~> 5.2.0.beta2)
rails (~> 6.0.0.beta2)
rails_12factor
react-rails
redis
@@ -304,4 +326,4 @@ RUBY VERSION
ruby 2.6.1p33

BUNDLED WITH
1.17.3
2.0.1
106 changes: 104 additions & 2 deletions bin/bundle
Original file line number Diff line number Diff line change
@@ -1,3 +1,105 @@
#!/usr/bin/env ruby
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
load Gem.bin_path('bundler', 'bundle')
# frozen_string_literal: true

#
# This file was generated by Bundler.
#
# The application 'bundle' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require "rubygems"

m = Module.new do
module_function

def invoked_as_script?
File.expand_path($0) == File.expand_path(__FILE__)
end

def env_var_version
ENV["BUNDLER_VERSION"]
end

def cli_arg_version
return unless invoked_as_script? # don't want to hijack other binstubs
return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
bundler_version = nil
update_index = nil
ARGV.each_with_index do |a, i|
if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
bundler_version = a
end
next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
bundler_version = $1 || ">= 0.a"
update_index = i
end
bundler_version
end

def gemfile
gemfile = ENV["BUNDLE_GEMFILE"]
return gemfile if gemfile && !gemfile.empty?

File.expand_path("../../Gemfile", __FILE__)
end

def lockfile
lockfile =
case File.basename(gemfile)
when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
else "#{gemfile}.lock"
end
File.expand_path(lockfile)
end

def lockfile_version
return unless File.file?(lockfile)
lockfile_contents = File.read(lockfile)
return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
Regexp.last_match(1)
end

def bundler_version
@bundler_version ||= begin
env_var_version || cli_arg_version ||
lockfile_version || "#{Gem::Requirement.default}.a"
end
end

def load_bundler!
ENV["BUNDLE_GEMFILE"] ||= gemfile

# must dup string for RG < 1.8 compatibility
activate_bundler(bundler_version.dup)
end

def activate_bundler(bundler_version)
if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
bundler_version = "< 2"
end
gem_error = activation_error_handling do
gem "bundler", bundler_version
end
return if gem_error.nil?
require_error = activation_error_handling do
require "bundler/version"
end
return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
exit 42
end

def activation_error_handling
yield
nil
rescue StandardError, LoadError => e
e
end
end

m.load_bundler!

if m.invoked_as_script?
load Gem.bin_path("bundler", "bundle")
end
Loading

0 comments on commit d61b666

Please sign in to comment.