Skip to content

Commit

Permalink
Merge pull request #230 from CocoaPods/amorde/fix-build-env
Browse files Browse the repository at this point in the history 
Update build env to successfully serve locally
  • Loading branch information
@amorde
amorde authored Nov 19, 2023
2 parents d1f5eb8 + ef3160d commit 01c1e63
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 73 deletions.
21 changes: 14 additions & 7 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ source 'https://rubygems.org'

git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }

ruby '3.1.1'

gem 'middleman', '~> 4.0'

gem 'middleman-gh-pages', git: 'https://github.com/orta/middleman-gh-pages.git'
Expand All @@ -13,21 +15,26 @@ gem 'rake'
gem 'redcarpet', github: 'vmg/redcarpet', ref: 'cef9abbcc411d07fd1b8c80e348a80efde2db323'
gem 'sass'

gem 'slim'
gem 'yard', '~> 0.8.6.2'
gem 'slim', '~> 4.0'
gem 'yard'

# We need to use 2.0.9 and not 2.0.10 because of a regression.
# See: https://github.com/rtomayko/tilt/issues/347
gem 'tilt', '2.0.9'
gem 'tilt'

gem 'activesupport', '~> 5.0'
gem 'github-markup'
gem 'nokogiri'
gem 'pygments.rb', '~> 0.6.0'
gem 'pygments.rb'

gem 'concurrent-ruby'

gem 'therubyracer'
# Use mini_racer instead of therubyracer for compatibility with newer Ruby
# https://github.com/rubyjs/therubyracer/issues/467
gem 'mini_racer'

gem 'webrick'

# https://github.com/middleman/middleman-syntax/issues/80
gem 'haml', '~> 5.0'

gem 'cocoapods', '~> 1.0'

Expand Down
125 changes: 63 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,41 @@ GIT
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.6)
CFPropertyList (3.0.6)
rexml
activesupport (5.2.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
backports (3.21.0)
claide (1.0.3)
cocoapods (1.11.2)
backports (3.24.1)
claide (1.1.0)
cocoapods (1.14.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.2)
cocoapods-core (= 1.14.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-downloader (>= 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
Expand All @@ -58,7 +59,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.5.1)
cocoapods-downloader (2.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -71,40 +72,40 @@ GEM
execjs
coffee-script-source (1.12.2)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.2)
contracts (0.13.0)
dotenv (2.7.6)
em-websocket (0.5.2)
dotenv (2.8.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
erubis (2.7.0)
escape (0.0.4)
ethon (0.14.0)
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.8.1)
fast_blank (1.0.0)
fastimage (2.2.5)
ffi (1.15.4)
execjs (2.9.1)
fast_blank (1.0.1)
fastimage (2.2.7)
ffi (1.16.3)
foreman (0.87.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
github-markup (4.0.0)
github-markup (4.0.2)
haml (5.2.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.6.0)
http_parser.rb (0.6.0)
http_parser.rb (0.8.0)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.5.1)
kramdown (2.3.1)
json (2.6.3)
kramdown (2.4.0)
rexml
libv8 (3.16.14.19)
libv8-node (18.16.0.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand Down Expand Up @@ -147,41 +148,39 @@ GEM
middleman-sprockets (4.1.1)
middleman-core (~> 4.0)
sprockets (>= 3.0)
middleman-syntax (3.2.0)
middleman-syntax (3.3.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
mini_portile2 (2.8.0)
minitest (5.14.4)
mini_portile2 (2.8.5)
mini_racer (0.8.0)
libv8-node (~> 18.16.0.0)
minitest (5.20.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.4)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.20.1)
posix-spawn (0.3.15)
public_suffix (4.0.6)
pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
racc (1.6.0)
rack (2.2.3)
parallel (1.23.0)
public_suffix (4.0.7)
pygments.rb (2.4.1)
racc (1.7.1)
rack (2.2.8)
rack-livereload (0.3.17)
rack
rake (13.0.6)
rb-fsevent (0.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
ref (2.0.0)
rexml (3.2.5)
rouge (3.26.0)
rexml (3.2.6)
rouge (3.30.0)
ruby-macho (2.5.1)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -194,31 +193,28 @@ GEM
slim (4.1.0)
temple (>= 0.7.6, < 0.9)
tilt (>= 2.0.6, < 2.1)
sprockets (4.0.2)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
rack (>= 2.2.4, < 4)
temple (0.8.2)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (1.1.0)
thor (1.3.0)
thread_safe (0.3.6)
tilt (2.0.9)
tilt (2.0.11)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
xcodeproj (1.21.0)
webrick (1.8.1)
xcodeproj (1.23.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
yajl-ruby (1.2.3)
yard (0.8.6.2)
yard (0.9.34)

PLATFORMS
ruby
Expand All @@ -229,20 +225,25 @@ DEPENDENCIES
concurrent-ruby
foreman
github-markup
haml (~> 5.0)
middleman (~> 4.0)
middleman-gh-pages!
middleman-livereload
middleman-sprockets
middleman-syntax
mini_racer
nokogiri
pygments.rb (~> 0.6.0)
pygments.rb
rake
redcarpet!
sass
slim
therubyracer
tilt (= 2.0.9)
yard (~> 0.8.6.2)
slim (~> 4.0)
tilt
webrick
yard

RUBY VERSION
ruby 3.1.1p18

BUNDLED WITH
2.2.8
2 changes: 1 addition & 1 deletion config.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
def shared_partial(*sources)
sources.inject([]) do |combined, source|
# Partials in Middleman 4 are always loaded within the 'source' folder. We have now added a symlink
# of shared resourecs into it that points to the git submodule at the root of this repo.
# of shared resources into it that points to the git submodule at the root of this repo.
# See: https://middlemanapp.com/basics/upgrade-v4/
combined << partial("shared/includes/#{source}",:locals => { :guides => true })
end.join
Expand Down
8 changes: 5 additions & 3 deletions source/shared/includes/_header.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ ruby:

fin = Date.new(2016,3,21)
days_left = fin.mjd - DateTime.now.mjd

def is_active(page)
page ? { :class => "active" } : {}

instance_exec do
def is_active(page)
page ? { :class => "active" } : {}
end
end

nav.navbar.navbar-static-top role="navigation"
Expand Down

0 comments on commit 01c1e63

Please sign in to comment.