From 7de1975fd3533ed3b2d5c46cddbaae65eac57175 Mon Sep 17 00:00:00 2001
From: Duda Dornelles <ddornell@thoughtworks.com>
Date: Wed, 10 Dec 2014 12:31:31 -0200
Subject: No more gemfiles (also means no more control tower for now). Will
 rewrite it eventually for node, i guess

---
 README.md                       |  4 ++--
 install-pixelated.sh            |  4 ++--
 provisioning/provision.sh       |  2 +-
 web-ui/Gemfile                  |  4 ----
 web-ui/Gemfile.lock             | 18 ------------------
 web-ui/Makefile                 |  1 -
 web-ui/config/control-tower.yml |  3 +++
 web-ui/control-tower.yml        |  3 ---
 8 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 web-ui/Gemfile
 delete mode 100644 web-ui/Gemfile.lock
 create mode 100644 web-ui/config/control-tower.yml
 delete mode 100644 web-ui/control-tower.yml

diff --git a/README.md b/README.md
index 4ac65959..f529d8e0 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ The User Agent has 2 components:
 
 ## Quickstart
 
-Dependencies are: node, npm, ruby, bundle, virtualenv, git
+Dependencies are: node, npm, compass (ruby), virtualenv, git
 
-* To install the dependencies on debian/ubuntu you need to run `sudo apt-get install nodejs npm ruby bundler virtualenv git`
+* To install the dependencies on debian/ubuntu you need to run `sudo apt-get install nodejs npm ruby virtualenv git` and then `sudo gem install compass`
 
 * Next step is cloning the repository with `git clone https://github.com/pixelated-project/pixelated-user-agent.git`
 
diff --git a/install-pixelated.sh b/install-pixelated.sh
index a3ffb3e2..22ed9b2a 100755
--- a/install-pixelated.sh
+++ b/install-pixelated.sh
@@ -32,16 +32,16 @@ function check_installed() {
         fi
 }
 
-for dependency in node npm ruby bundle virtualenv git gpg; do
+for dependency in node npm ruby virtualenv git gpg; do
         check_installed $dependency
 done
+gem install compass
 
 # install web-ui dependencies
 cd web-ui
 UIPATH=`pwd`
 npm install
 su - $USERNAME -c "(cd $UIPATH; node_modules/bower/bin/bower install --config.interactive=false)"
-su - $USERNAME -c "(cd $UIPATH; bundle install)"
 LC_ALL=en_US.UTF-8 ./go build
 
 # install service dependencies
diff --git a/provisioning/provision.sh b/provisioning/provision.sh
index b269e258..116aa616 100644
--- a/provisioning/provision.sh
+++ b/provisioning/provision.sh
@@ -2,7 +2,7 @@ sudo apt-get update
 sudo apt-get install -y git nodejs-legacy npm python-setuptools python-dev libffi-dev g++ rng-tools
 sudo easy_install pip
 sudo pip install virtualenv
-sudo gem install bundler
+sudo gem install compass
 
 sudo echo "HRNGDEVICE=/dev/urandom" >> /etc/default/rng-tools
 
diff --git a/web-ui/Gemfile b/web-ui/Gemfile
deleted file mode 100644
index e9cb427d..00000000
--- a/web-ui/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'compass'
-gem 'flight-control-tower'
diff --git a/web-ui/Gemfile.lock b/web-ui/Gemfile.lock
deleted file mode 100644
index f926d679..00000000
--- a/web-ui/Gemfile.lock
+++ /dev/null
@@ -1,18 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    chunky_png (1.3.1)
-    compass (0.12.6)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    flight-control-tower (0.2.1)
-    fssm (0.2.10)
-    sass (3.2.19)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  compass
-  flight-control-tower
diff --git a/web-ui/Makefile b/web-ui/Makefile
index 31d4c671..383fecb7 100644
--- a/web-ui/Makefile
+++ b/web-ui/Makefile
@@ -17,7 +17,6 @@
 DESTDIR=target
 
 compile:
-	bundle install --path=~/pixelated-gems
 	npm install
 	node_modules/bower/bin/bower install
 	./go package
diff --git a/web-ui/config/control-tower.yml b/web-ui/config/control-tower.yml
new file mode 100644
index 00000000..874e1b64
--- /dev/null
+++ b/web-ui/config/control-tower.yml
@@ -0,0 +1,3 @@
+---
+include_pattern: 'app/js/**/*.js'
+exclude_pattern: ''
diff --git a/web-ui/control-tower.yml b/web-ui/control-tower.yml
deleted file mode 100644
index 874e1b64..00000000
--- a/web-ui/control-tower.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-include_pattern: 'app/js/**/*.js'
-exclude_pattern: ''
-- 
cgit v1.2.3