From b2b9f351188e658d22120dcd5962eabf20a414d2 Mon Sep 17 00:00:00 2001
From: Artem Vasiliev <artem.job@gmail.com>
Date: Wed, 10 Jul 2019 17:43:13 +0300
Subject: [PATCH] feat: bump Ruby to current stable version
---
.gitignore | 3 ++-
.ruby-version | 2 +-
Dockerfile | 2 +-
Gemfile | 2 +-
Gemfile.lock | 6 +++---
README.md | 7 ++++++-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3590ef8..ef8138e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
npm-debug.log
.bash_history
.cache
-build/
+/build
.guard_history
yarn-error.log
+/vendor/bundle
diff --git a/.ruby-version b/.ruby-version
index 6bf7c6f..4560fb9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.6.3
diff --git a/Dockerfile b/Dockerfile
index e86007a..c49578f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.6.3
RUN apt-get -y update && apt-get -y upgrade
diff --git a/Gemfile b/Gemfile
index 2f3cbc3..8e641f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
# frozen_string_literal: true
source 'https://rubygems.org'
-ruby '2.5.1'
+ruby '2.6.3'
gem 'activesupport'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3482a0d..8173116 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
docile (1.3.0)
- ffi (1.9.23)
+ ffi (1.11.1)
formatador (0.2.5)
guard (2.14.2)
formatador (>= 0.2.4)
@@ -117,7 +117,7 @@ DEPENDENCIES
webmock
RUBY VERSION
- ruby 2.5.1p57
+ ruby 2.6.3p62
BUNDLED WITH
- 1.16.1
+ 1.17.2
diff --git a/README.md b/README.md
index cd30aa4..e5d6c06 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Place your app-specific code in app/ dir, and utility code that you'd like to ex
* Clone the repo: `git clone https://github.com/artemv/ruby-starter-kit.git my-app`
## 1 - In your machine
-* Install Ruby 2.5.1 from https://www.ruby-lang.org/en/downloads/ or via RVM (https://rvm.io/)
+* Install Ruby 2.6.3 from https://www.ruby-lang.org/en/downloads/ or via RVM (https://rvm.io/)
* Install Bundler and dependencies:
```
cd my-app
@@ -24,6 +24,11 @@ gem install bundler
bundle install
```
+If `bundle install` fails trying to install `ffi` and you're on MacOS Mojave, try this and repeat:
+```
+LDFLAGS="-L/usr/local/opt/libffi/lib" PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig" gem install ffi -v '1.11.1' --source 'https://rubygems.org/'
+```
+
Alternatively if you are using Yeoman you can install it using its generator as described [here](https://github.com/artemv/generator-ruby-starter-kit).
## 2 - Using Docker
--
GitLab