Skip to content

Commit

Permalink
Merge pull request #273 from JV-conseil-Internet-Consulting/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
JV-conseil authored Dec 28, 2024
2 parents 499e047 + 036deeb commit 17790a6
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 89 deletions.
4 changes: 2 additions & 2 deletions .bash/osx/jekyll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
{
. ".bash/incl/all.sh"
. ".bash/osx/gem.sh"
. "${HOME}/.env/jekyll/.env"
}

_jvcl_::html_to_liquid() {
Expand Down Expand Up @@ -58,7 +59,6 @@ _jvcl_::jekyll_serve() {

_jvcl_::github_pages() {
(
. "${HOME}/.env/jekyll/.env"
bundle exec github-pages health-check
) || printf "\nERROR: bundle exec github-pages health-check failed\n"
}
Expand All @@ -70,7 +70,7 @@ _jvcl_::main() {
fi
_jvcl_::gem_update
_jvcl_::bundle_update
_jvcl_::github_pages
# _jvcl_::github_pages
_jvcl_::jekyll_serve
}

Expand Down
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ group :jekyll_plugins do

# Non-Jekyll plugins:
gem "jemoji", "~> 0.13.0"
# gem "github-pages", "~> 228"
# gem "github-pages", "~> 232"
end

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
Expand All @@ -73,6 +73,10 @@ end
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.2.0", :install_if => Gem.win_platform?

# The CSV library provides a complete interface to CSV files and data.
# It offers tools to enable you to read and write to and from Strings or IO objects, as needed.
gem "csv", "~> 3.3"

# kramdown v2 ships without the gfm parser by default. If you're using
# kramdown v1, comment out this line.
# gem "kramdown-parser-gfm"
Expand All @@ -85,5 +89,5 @@ gem "wdm", "~> 0.2.0", :install_if => Gem.win_platform?
group :development do
gem "faraday-retry", "~> 2.2.0"
# gem "sass", "~> 3.7"
# gem "webrick", "~> 1.8.1"
gem "webrick", "~> 1.9"
end
65 changes: 5 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ GEM
colorator (1.1.0)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
csv (3.3.2)
drb (2.2.1)
duktape (2.7.0.0)
em-websocket (0.5.3)
Expand All @@ -37,31 +38,12 @@ GEM
net-http (>= 0.5.0)
faraday-retry (2.2.1)
faraday (~> 2.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-aarch64-linux-musl)
ffi (1.17.0-arm-linux-gnu)
ffi (1.17.0-arm-linux-musl)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux-musl)
ffi (1.17.0)
forwardable-extended (2.6.0)
gemoji (4.1.0)
google-protobuf (4.29.2)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-x86_64-linux)
bigdecimal
rake (>= 13)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
Expand Down Expand Up @@ -141,22 +123,8 @@ GEM
minitest (5.25.4)
net-http (0.6.0)
uri
nokogiri (1.18.0-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.0-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.0-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.0-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.0-x86_64-linux-musl)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.1)
Expand All @@ -168,22 +136,8 @@ GEM
rexml (3.4.0)
rouge (4.5.1)
safe_yaml (1.0.5)
sass-embedded (1.83.0-aarch64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-aarch64-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-gnueabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-musleabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-linux-musl)
google-protobuf (~> 4.28)
securerandom (0.4.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -195,20 +149,10 @@ GEM
webrick (1.9.1)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-gnueabihf
arm-linux-musl
arm-linux-musleabihf
arm64-darwin
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl
arm64-darwin-23

DEPENDENCIES
csv (~> 3.3)
duktape
faraday-retry (~> 2.2.0)
jekyll (~> 4.3.4)
Expand All @@ -232,6 +176,7 @@ DEPENDENCIES
tzinfo (>= 1, < 3)
tzinfo-data
wdm (~> 0.2.0)
webrick (~> 1.9)

BUNDLED WITH
2.6.2
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ In [Gemfile.lock](./Gemfile.lock) do not upgrade `sass-embedded (1.62.1-arm64-da
🍿 Fun facts - what does your team eat for breakfast?
🧙 Remember, you can do mighty things with the power of [Markdown](https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax)
<p><a href="http://www.jv-conseil.dev" target="_blank"><img src="https://user-images.githubusercontent.com/8126807/183259498-fc8aa360-60ed-4579-ad2b-168c5a1adc37.svg" width="500px" alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img src="https://user-images.githubusercontent.com/8126807/183259498-fc8aa360-60ed-4579-ad2b-168c5a1adc37.svg" width="500px" alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://sites.google.com/a/jv-conseil.net/fr/logos/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg?width=500" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://sites.google.com/a/jv-conseil.net/fr/logos/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg?width=500" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://cdn.jv-conseil.net/_/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://cdn.jv-conseil.net/_/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://user-images.githubusercontent.com/8126807/184917005-42e9ba53-67fd-4fbc-a3ec-2c4212645907.png" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://user-images.githubusercontent.com/8126807/184917005-42e9ba53-67fd-4fbc-a3ec-2c4212645907.png" width="500"></a></p>
-->

<!-- links -->
Expand Down
4 changes: 2 additions & 2 deletions _config-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ logo: /assets/img/logo.png
author:
# Used by `jekyll-feed`:
name: JV conseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
picture: /assets/img/logo.png
social:
linkedin: vieillefont
Expand All @@ -64,7 +64,7 @@ author:
mastodon: https://mastodon.social/@JVconseil
stackoverflow: 2477854
# twitter: JVconseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev

# Add links to the sidebar.
# menu:
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ logo: /assets/img/logo.png
author:
# Used by `jekyll-feed`:
name: JV conseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
picture: /assets/img/logo.png
social:
linkedin: vieillefont
Expand All @@ -64,7 +64,7 @@ author:
mastodon: https://mastodon.social/@JVconseil
stackoverflow: 2477854
# twitter: JVconseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev

# Add links to the sidebar.
# menu:
Expand Down
4 changes: 2 additions & 2 deletions _data/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
JV-conseil:
# name: <firstname> <lastname>
name: JV conseil
# email: contact@jv-conseil.net
# email: contact@jv-conseil.dev

# Used at the bottom of each page and at the top of the `about` layout
# Markdown enabled, can use multiple paragraphs (enabled by `|`)
Expand Down Expand Up @@ -34,7 +34,7 @@ JV-conseil:
mastodon: https://mastodon.social/@JVconseil
stackoverflow: 2477854
# twitter: JVconseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
# twitter: <username>
# email: <[email protected]>
# rss: https://<url>/feed.xml
Expand Down
2 changes: 1 addition & 1 deletion _data/social.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ stumbleupon:
stackoverflow:
name: Stack Overflow
icon: icon-stackoverflow
prepend: "http://stackoverflow.com/users/"
prepend: "https://stackoverflow.com/users/"
pinterest:
name: Pinterest
icon: icon-pinterest2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ __credits__ = ["JV-conseil"]
__license__ = "BSD 3-Clause License"
__version__ = "1.0.0"
__maintainer__ = "JV-conseil"
__email__ = "contact@jv-conseil.net"
__email__ = "contact@jv-conseil.dev"
__status__ = "Development"

try:
Expand Down
2 changes: 1 addition & 1 deletion assets/bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "deepdive-assets",
"homepage": "https://www.jv-conseil.dev/",
"author": "JV conseil <contact@jv-conseil.net> (https://www.jv-conseil.dev)",
"author": "JV conseil <contact@jv-conseil.dev> (https://www.jv-conseil.dev)",
"license": "MIT",
"private": true,
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permalink: /docs/
---

Here you should be able to find everything you need to know to accomplish the most common tasks when blogging with DeepDive.
Should you think something is missing, [please let me know](mailto:contact@jv-conseil.net).
Should you think something is missing, [please let me know](mailto:contact@jv-conseil.dev).
Should you discover a mistake in the docs (or a bug in general) feel free to [open an issue][issues] on GitHub.

While this manual tries to be beginner-friendly, as a user of Jekyll it is assumed that you are comfortable running shell commands and editing text files.
Expand Down
6 changes: 3 additions & 3 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ At a bare minimum, you should add an `author` key with a `name` and `email` sub-
# file: `_config.yml`
author:
name: JV conseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
~~~

If you would like the author to be displayed in the about section below a post or project\*, add an `about` key and provide markdown content. I recommend using the YAML pipe `|` syntax, so you can include multiple paragraphs:
Expand All @@ -235,7 +235,7 @@ If you would like the author to be displayed in the about section below a post o
# file: `_config.yml`
author:
name: JV conseil
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
about: |
Hi, I'm JV conseil or @jv-conseil...
Expand Down Expand Up @@ -345,7 +345,7 @@ If you'd like to add an email <span class="icon-mail"></span>, RSS <span class="
# file: `_config.yml`
author:
social:
email: contact@jv-conseil.net
email: contact@jv-conseil.dev
rss: {{ site.url }}{{ site.baseurl }}/feed.xml # make sure you provide an absolute URL
download: https://github.com/hydecorp/deepdive/archive/v9.1.6.zip
~~~
Expand Down
8 changes: 4 additions & 4 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Our operations fall under the purview of
🍿 Fun facts - what does your team eat for breakfast?
🧙 Remember, you can do mighty things with the power of [Markdown](https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax)
<p><a href="http://www.jv-conseil.dev" target="_blank"><img src="https://user-images.githubusercontent.com/8126807/183259498-fc8aa360-60ed-4579-ad2b-168c5a1adc37.svg" width="500px" alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img src="https://user-images.githubusercontent.com/8126807/183259498-fc8aa360-60ed-4579-ad2b-168c5a1adc37.svg" width="500px" alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://sites.google.com/a/jv-conseil.net/fr/logos/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg?width=500" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://sites.google.com/a/jv-conseil.net/fr/logos/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg?width=500" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://cdn.jv-conseil.net/_/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://cdn.jv-conseil.net/_/JV-conseil-Internet-Consulting-www.jv-conseil.dev-signature-907f14-2480x205-72dpi.svg" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.net" src="https://user-images.githubusercontent.com/8126807/184917005-42e9ba53-67fd-4fbc-a3ec-2c4212645907.png" width="500"></a></p>
<p><a href="http://www.jv-conseil.dev" target="_blank"><img alt="JV CONSEIL – INTERNET CONSULTING • 2 rue de la Grande Pièce, 78860 Saint Nom-la-Bretèche, France • +33.134621723 • contact@jv-conseil.dev" src="https://user-images.githubusercontent.com/8126807/184917005-42e9ba53-67fd-4fbc-a3ec-2c4212645907.png" width="500"></a></p>
-->
4 changes: 2 additions & 2 deletions jekyll-theme-deepdive.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
spec.name = "jekyll-theme-deepdive"
spec.version = "9.1.7"
spec.authors = ["JV conseil"]
spec.email = ["contact@jv-conseil.net"]
spec.email = ["contact@jv-conseil.dev"]

spec.summary = %q{"Why DeepDive 🌊 Because the format is liquid 💦 😉"}
spec.homepage = "https://www.jv-conseil.dev/"
Expand All @@ -22,7 +22,7 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency "jekyll", ">= 3.9.3", "< 5.0"
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.2.1"
# spec.add_runtime_dependency "github-pages", "~> 228"
# spec.add_runtime_dependency "github-pages", "~> 232"

spec.add_development_dependency "bundler", "~> 2.5.6"
# spec.add_development_dependency "rake", "~> 13.0.6"
Expand Down
2 changes: 1 addition & 1 deletion package-npm.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"config": {
"port": 4000
},
"author": "JV conseil <contact@jv-conseil.net> (https://www.jv-conseil.dev)",
"author": "JV conseil <contact@jv-conseil.dev> (https://www.jv-conseil.dev)",
"license": "EUPL-1.2",
"private": true,
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"config": {
"port": 4000
},
"author": "JV conseil <contact@jv-conseil.net> (https://www.jv-conseil.dev)",
"author": "JV conseil <contact@jv-conseil.dev> (https://www.jv-conseil.dev)",
"license": "EUPL-1.2",
"private": true,
"dependencies": {
Expand Down

0 comments on commit 17790a6

Please sign in to comment.