got far too messy

forward3d · Jan 22, 2016 · 1c6dad5 · 1c6dad5
1 parent 2776517
commit 1c6dad5
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 44 deletions.
diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,6 @@ end
 
 group :ui do
   gem 'sinatra', '~> 1.4', '>= 1.4.6'
-  gem 'sinatra-activerecord', '~> 2.0', '>= 2.0.9'
   gem 'thin', '~> 1.6', '>= 1.6.4'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,17 +4,12 @@ GEM
     activemodel (4.2.5)
       activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
     activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
     aws-sdk (2.2.12)
       aws-sdk-resources (= 2.2.12)
     aws-sdk-core (2.2.12)
@@ -63,9 +58,6 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sinatra-activerecord (2.0.9)
-      activerecord (>= 3.2)
-      sinatra (~> 1.0)
     sqlite3 (1.3.11)
     thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
@@ -90,7 +82,6 @@ DEPENDENCIES
   rubyzip (~> 1.1, >= 1.1.7)
   sequel (~> 4.30)
   sinatra (~> 1.4, >= 1.4.6)
-  sinatra-activerecord (~> 2.0, >= 2.0.9)
   sqlite3 (~> 1.3, >= 1.3.11)
   thin (~> 1.6, >= 1.6.4)
 

diff --git a/Rakefile b/Rakefile
diff --git a/config.ru b/config.ru
@@ -1,10 +1,4 @@
 $:.unshift(File.dirname(__FILE__))
 
-require 'rubygems'
-require 'rubygems/package'
-require 'bundler/setup'
-Bundler.require(:default, :ui)
-load 'environment.rb'
-
 require 'ui'
 run Uphold::Ui
diff --git a/db/migrate/20160122155556_create_tests.rb b/db/migrate/20160122155556_create_tests.rb
diff --git a/dev/.gitignore b/dev/.gitignore
@@ -5,4 +5,3 @@ conf.d/*.yml
 custom/engines/*.rb
 custom/transports/*.rb
 tests/*.rb
-db/*.sqlite3
diff --git a/dev/db/.gitkeep b/dev/db/.gitkeep
diff --git a/ui.rb b/ui.rb
@@ -6,8 +6,6 @@
 
 module Uphold
   class Ui < ::Sinatra::Base
-    register ::Sinatra::ActiveRecordExtension
-    set :database, adapter: 'sqlite3', database: '/var/uphold/uphold.sqlite3'
     include Logging
 
     helpers do