punchcard 0.2.0 → 0.2.1

data/README.rdoc

@@ -9,7 +9,7 @@ Create a directory to hold your app, then create a Gemfile:
   source :rubygems
   gem 'pg'
   # gem 'sqlite3' # if you want to run using sqlite or test locally
-  gem 'punchcard', ">= 0.1.3", :path => '../github/punchcard'
+  gem 'punchcard'
   
 Create a Rakefile:
 
@@ -43,13 +43,14 @@ Open http://localhost:9292
 
 == Hosting on Heroku
 
-Starting from the initial bootstrap above, make sure you have the pg gem in your bundle, then do the
-following in the terminal:
+Starting from the initial bootstrap above, make sure you have the pg gem in your bundle and did run
+bundle install to create the Gemfile.lock, then do the following in the terminal:
 
-  $ git init
-  $ git commit -am "Initial commit"
+  $ git init && git add .
+  $ git commit -m "Initial commit"
   $ heroku create [APPNAME] --stack bamboo-mri-1.9.2
   $ git push heroku master
+  $ heroku rake db:migrate
   
 Now head over to your app's url! You'll still need to add users, see below.
   

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/punchcard.rb

@@ -9,7 +9,13 @@ require 'logger'
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = Logger::WARN
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'] || {:adapter => 'sqlite3', :database => "punchcard_#{ENV['RACK_ENV'] || 'development'}.sqlite3"})
+
+if ENV['DATABASE_URL']
+  dbconfig = YAML.load(File.read('config/database.yml'))
+  ActiveRecord::Base.establish_connection dbconfig[ENV['RACK_ENV']]
+else
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => "punchcard_#{ENV['RACK_ENV'] || 'development'}.sqlite3")
+end
 
 require 'punchcard/person'
 require 'punchcard/punch'

data/punchcard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{punchcard}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Christoph Olszowka