Use bundle to execute commands

yegor256 · Jul 5, 2017 · fd510aa · fd510aa
1 parent 1c754f4
commit fd510aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/bash/deploy.sh b/bash/deploy.sh
@@ -7,6 +7,7 @@ URL=$1
 BRANCH=$2
 BRANCH_FROM=$3
 DEPLOY_CONFIG=$4
+BUNDLE=$5
 SRC=$(pwd)
 TEMP=$(mktemp -d -t jgd-XXX)
 trap "rm -rf ${TEMP}" EXIT
@@ -22,10 +23,18 @@ cd "${CLONE}"
 echo -e "\nBuilding Jekyll site:"
 rm -rf _site
 
-if [ -r ${DEPLOY_CONFIG} ]; then
-  jekyll build --config _config.yml,${DEPLOY_CONFIG}
+if [ -r ${BUNDLE} ]; then
+  if [ -r ${DEPLOY_CONFIG} ]; then
+    bundle exec jekyll build --config _config.yml,${DEPLOY_CONFIG}
+  else
+    bundle exec jekyll build
+  fi
 else
-  jekyll build
+  if [ -r ${DEPLOY_CONFIG} ]; then
+    jekyll build --config _config.yml,${DEPLOY_CONFIG}
+  else
+    jekyll build
+  fi
 fi
 
 if [ ! -e _site ]; then

diff --git a/bin/jgd b/bin/jgd
@@ -12,6 +12,7 @@ Usage: jgd [options]
   opt :branch, 'Destination branch', type: String, default: 'gh-pages'
   opt :branch_from, 'Source branch', type: String, default: 'master'
   opt :config, 'Deploy Config File', type: String, default: '_config-deploy.yml'
+  opt :bundle, 'Use bundle'
 end
 
 branch = opts[:branch]
@@ -22,6 +23,7 @@ fail 'branch-from can\'t be empty' if branch_from.empty?
 fail 'config can\'t be empty' if config.empty?
 url = opts[:url]
 url = `git config --get remote.origin.url`.strip if url.empty?
+bundle = opts[:bundle]
 
 spec = Gem::Specification.find_by_name('jgd')
 root = spec.gem_dir

diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+gem build jgd.gemspec
+gem install jgd-2.0.snapshot.gem