murlsh 1.9.1 → 1.9.2

data/ChangeLog

@@ -1,3 +1,8 @@
+1.9.2
+	2001-10-02
+
+	Update for Heroku Cedar stack. User DATABASE_URL environment variable.
+
 1.9.1
 	2011-10-02
 

data/README.textile

@@ -51,7 +51,7 @@ mkdir murlsh_deploy <or any other name>
 cd murlsh_deploy
 murlsh .
 git init
-heroku create <choose a name>
+heroku create --stack cedar <choose a name>
 
 rake app:gemfile
 bundle install
@@ -68,7 +68,8 @@ git add .
 git commit
 git push heroku master
 
-heroku rake db:migrate
+heroku addons:add shared-database
+heroku run rake db:migrate
 </code>
 </pre>
 

data/Rakefile

@@ -22,9 +22,17 @@ end
 config = YAML.load_file('config.yaml')
 
 # for Heroku
-db_config_file = File.join(File.dirname(__FILE__), 'config', 'database.yml')
-if File.exist?(db_config_file)
-  config['db'] = YAML.load_file(db_config_file)['production']
+if ENV['DATABASE_URL']
+  db_parsed = URI(ENV['DATABASE_URL'])
+
+  config['db'] = {
+    :adapter =>
+      db_parsed.scheme == 'postgres' ? 'postgresql' : db_parsed.scheme,
+    :host => db_parsed.host,
+    :username => db_parsed.user,
+    :password => db_parsed.password,
+    :database => db_parsed.path[1..-1],
+  )
 end
 
 heroku_info = {}

data/config.ru

@@ -14,9 +14,17 @@ require 'murlsh'
 config = YAML.load_file('config.yaml')
 
 # for Heroku
-db_config_file = File.join(File.dirname(__FILE__), 'config', 'database.yml')
-if File.exist?(db_config_file)
-  config['db'] = YAML.load_file(db_config_file)['production']
+if ENV['DATABASE_URL']
+  db_parsed = URI(ENV['DATABASE_URL'])
+
+  config['db'] = {
+    :adapter =>
+      db_parsed.scheme == 'postgres' ? 'postgresql' : db_parsed.scheme,
+    :host => db_parsed.host,
+    :username => db_parsed.user,
+    :password => db_parsed.password,
+    :database => db_parsed.path[1..-1],
+  }
 end
 
 # use Rack::ShowExceptions

data/lib/murlsh/version.rb

@@ -1,3 +1,3 @@
 module Murlsh
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 9
-  - 1
-  version: 1.9.1
+  - 2
+  version: 1.9.2
 platform: ruby
 authors: 
 - Matthew M. Boedicker