Removed more cruft. Updated debian/rules to use the Makefile. Updated bundle

9 files changed, 19 insertions, 69 deletions

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 2b04e22..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,21 +0,0 @@
-... Because it is needed. 
-
-Version 1.0.13
-  * Buttons now appear in a line. 
-  * Function were called in wrong order on buttons. 
-  * Alerts no longer sorted by source, just by subject.
-  * Alerts sorted by subject then summary.
-  * Page no longer needs to reload on status changes.  No new conglomerate created.
-  * Bug #1111 fix: Alerts do not acknowledge for longer than maximum time.
-  * Bug #1116 fix: Ajax requests take too long, now spawn a new thread -- 
-    see feature 1131 for full fix.
-
-
-Version 1.0.12
-  * Added time scales to bulk alerts acknowledgement.
-  * Change the web page header to be simpler and nicer.
-  * Added link to alert history.
-
-
-Version 1.0.11 and below.
-  * Nothing documented.
diff --git a/Gemfile.lock b/Gemfile.lock
index f207604..716949f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
     do_sqlite3 (0.10.17)
       data_objects (= 0.10.17)
     docile (1.1.5)
-    eventmachine (1.2.3)
+    eventmachine (1.2.5)
     fastercsv (1.5.5)
     haml (4.0.7)
       tilt
@@ -87,7 +87,7 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rmail (1.1.2)
+    rmail (1.1.3)
     ruby_protobuf (0.4.11)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
@@ -148,4 +148,4 @@ DEPENDENCIES
   webmock (~> 1.19.0)
 
 BUNDLED WITH
-   1.11.2
+   1.13.6
diff --git a/Makefile b/Makefile
index d8176f7..a36e32b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,40 +4,33 @@
 ##
 
 OPENBSD_SETUP_FLAGS = --prefix=/usr/local --installdirs=site --ruby-path=/usr/local/bin/ruby18 --mandir=\$$prefix/man/man1 --siteruby=\$$libdir/ruby/site_ruby --siterubyver=\$$siteruby/1.8
+BUNDLER_FLAGS ?= --path=vendor/bundle --jobs=4 --no-deployment
 
-all: man man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1
+all: vendor/bundle man/mauvesend.1 man/mauveserver.1 man/mauveconsole.1 
 
 man:
 	mkdir -p man
 
-man/%.1: bin/%
+man/%.1: bin/% vendor/bundle man
 	bundle exec $< --manual | txt2man -t $(notdir $<) -s 1  > $@
 	test -s $@
 
 clean:
 	$(RM) -r man
-	# Theoretically this will clean up the shebang munging done by the openbsd_tarball task below.
-	if [ -e ./setup.rb ] ; then  \
-		ruby ./setup.rb distclean ; \
-		ruby ./setup.rb config    ; \
-		ruby ./setup.rb setup     ; \
-		ruby ./setup.rb clean ; \
-	fi
 	$(RM) -r tmp
-	$(RM) -r OpenBSD
-	$(RM) setup.rb
 	
-
 distclean: clean
-	if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi
-	$(RM) setup.rb
 	$(RM) -r OpenBSD
+	$(RM) -r vendor/bundle
+
+vendor/bundle: Gemfile
+	@bundle install $(BUNDLER_FLAGS)
 
-test: setup.rb
-	ruby ./setup.rb test
+Gemfile.lock: Gemfile
+	@bundle update
 
-setup.rb: /usr/lib/ruby/1.8/setup.rb
-	ln -sf /usr/lib/ruby/1.8/setup.rb .
+test: vendor/bundle
+	@bundle exec rake test
 
 OpenBSD: OpenBSD/sha256.asc
 
diff --git a/Rakefile b/Rakefile
index feea409..b1fe254 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,5 @@
 require 'rake/testtask'
 
-task :console do
-  $:.push("lib")
-  require 'irb'
-  require 'irb/completion'
-  require 'mauve/server'
-  ARGV.clear
-  IRB.start
-end
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.libs << "lib"
diff --git a/TODO-PJC b/TODO-PJC
deleted file mode 100644
index e54435a..0000000
--- a/TODO-PJC
+++ /dev/null
@@ -1,3 +0,0 @@
- * Javascript ack_time update if ajax synchronicity a bit shite
- * Template SMS bit better with the link URL to the actual alert.
- * Add an internal heartbeat to send to another mauve instance.
diff --git a/debian/mauvealert-server.docs b/debian/mauvealert-server.docs
index e84b576..e845566 100644
--- a/debian/mauvealert-server.docs
+++ b/debian/mauvealert-server.docs
@@ -1,3 +1 @@
-bytemark_example_alerts.sh
-bytemark_policy.txt
 README
diff --git a/debian/mauvealert-server.examples b/debian/mauvealert-server.examples
deleted file mode 100644
index ae5a993..0000000
--- a/debian/mauvealert-server.examples
+++ /dev/null
@@ -1 +0,0 @@
-example.conf
diff --git a/debian/rules b/debian/rules
index c43ea38..4097e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,13 @@
 #!/usr/bin/make -f
-  
-# Ugh
-export GEM_HOME := $(shell pwd)/vendor/bundle
-export PATH     := ${GEM_HOME}/bin:${PATH}
+
+export BUNDLER_FLAGS=--deployment --without='test development' --jobs=4
 
 %:
 	dh $@ --with-systemd
 
-override_dh_auto_build:
-	bundler install --deployment --without="test development" --jobs=4
-	make
-
-override_dh_clean:
-	dh_clean
-	$(RM) -r vendor/
-
+#
+# We test separately in Gitlab.
+#
 override_dh_auto_test:
 	echo "NOP"
 
diff --git a/heartbeat_hammer.sh b/utils/heartbeat_hammer.sh
index 12b74bc..12b74bc 100644
--- a/heartbeat_hammer.sh
+++ b/utils/heartbeat_hammer.sh