From d555903e0111df5be778ea6289f272389bbf9bf9 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil.gentili.dg@gmail.com>
Date: Tue, 22 Sep 2015 12:19:14 +0200
Subject: [PATCH] travis

---
 .travis.yml    |  5 ++++-
 Gemfile        |  3 +++
 travis/cibuild | 13 +++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 Gemfile

diff --git a/.travis.yml b/.travis.yml
index e0efdf6..0316580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
-language: bash
+language: ruby
+rvm:
+ - 2.1
+
 sudo: required
 addons:
   apt:
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..db4b33f
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "http://production.cf.rubygems.org/"
+
+gem "ronn"
diff --git a/travis/cibuild b/travis/cibuild
index fb6d66b..eba4f41 100755
--- a/travis/cibuild
+++ b/travis/cibuild
@@ -5,11 +5,8 @@ desc="$(git log -1 --pretty=%B)"
 echo "$desc" | grep -q madebytravisci && exit
 
 sudo apt-get update &>/dev/null
-sudo apt-get install busybox ruby-ronn build-essential devscripts lintian diff patch patchutils gnupg expect dpkg-dev ruby-rdiscount ruby rubygems &>/dev/null
+sudo apt-get install busybox ruby-ronn build-essential devscripts lintian diff patch patchutils gnupg expect dpkg-dev &>/dev/null
 
-sudo gem install ronn
-
-sudo ln -s /var/lib/gems/1.8/gems/ronn-0.7.3/bin/ronn /usr/bin/
 
 
 gpg --import s.key
@@ -17,7 +14,7 @@ gpg --import s.key
 echo '#!/usr/bin/expect -f
 set timeout 2
 set passphrase "'${gpg}'"
-spawn dpkg-buildpackage -Zgzip -kC5C1D8BA [lindex $argv 0] [lindex $argv 1] [lindex $argv 2] [lindex $argv 3]
+spawn dpkg-buildpackage -Zgzip -kC5C1D8BA
 expect {
  "*passphrase:*" {
   send -- "$passphrase\r"
@@ -94,8 +91,8 @@ cd $video
 # Generate deb
 git status | grep -q video.sh && {
 cd debian/*/
-ronn --roff $video/README-IT.md
-ronn --roff $video/README.md
+bundle exec ronn --roff $video/README-IT.md
+bundle exec ronn --roff $video/README.md
 mv README-IT debian/video-dl-it.1
 mv README debian/video-dl.1
 cp $video/video.sh video-dl/
@@ -123,7 +120,7 @@ echo "---
 layout: default
 ---
 ">it.md
-sed 's/https\:\/\/github\.com\/danog\/video-dl\/blob\/master\/README\.md/http\:\/\/daniil\.it\/video-dl/' $video/README.md >> it.md
+sed 's/https\:\/\/github\.com\/danog\/video-dl\/blob\/master\/README\.md/http\:\/\/daniil\.it\/video-dl/' $video/README-IT.md >> it.md
 cp -a * $temp
 cd $video