Merge branch 'master' of github.com:kartikrustagi/Words

Conflicts: config.ru
kartikrustagi · Apr 5, 2012 · 08ada68 · 08ada68
2 parents 99b82cb + 350b767
commit 08ada68
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 *~
+*.bundle
 *.pyc
+*.swp
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
 gem "sinatra"
-gem "haml"
+gem "haml", :require => 'Haml'
 gem "sequel"
-gem "shotgun"
-gem "mysql"
+gem "shotgun", :group => :development
+gem "mysql", :group => :development
+gem "pg", :group => :deployment
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,6 +3,7 @@ GEM
   specs:
     haml (3.1.4)
     mysql (2.8.1)
+    pg (0.13.2)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -21,6 +22,7 @@ PLATFORMS
 DEPENDENCIES
   haml
   mysql
+  pg
   sequel
   shotgun
   sinatra
diff --git a/app.rb b/app.rb
@@ -1,5 +1,4 @@
-require 'sinatra/base'
-require 'Haml'
+require "bundler/setup"
 
 require_relative 'db/db_config.rb'
 require_relative 'db/models/init.rb'

diff --git a/config.ru b/config.ru
@@ -1,5 +1,4 @@
-require 'sinatra/base'
-require 'haml'
+require "bundler/setup"
 
 path = File.expand_path("../",__FILE__)
 $LOAD_PATH.unshift(".") unless $LOAD_PATH.include?(".")