[from now] 2012/10/12 17:29:45

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..19a5d5f
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'sinatra'
+gem 'sinatra-contrib'
+gem 'haml'
+
diff --git a/app.rb b/app.rb
new file mode 100644
index 0000000..3ddbc95
--- /dev/null
+++ b/app.rb
@@ -0,0 +1,13 @@
+require 'sinatra/base'
+require 'sinatra/reloader'
+require 'haml'
+
+class Twiki < Sinatra::Base
+  configure :development do
+    register Sinatra::Reloader
+  end
+
+  get '/' do
+    "Hello"
+  end
+end
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..84e58f9
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,3 @@
+require './app'
+
+Twiki.run! :host => 'locaohost', :port => 9090
\ No newline at end of file
diff --git a/views/index.haml b/views/index.haml
new file mode 100644
index 0000000..e69de29
diff --git a/views/layout.haml b/views/layout.haml
new file mode 100644
index 0000000..e69de29
[from now] 2012/10/12 17:30:05

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
[from now] 2012/10/12 17:34:03

diff --git a/Gemfile b/Gemfile
index 19a5d5f..437aba8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,4 +3,6 @@ source :rubygems
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'haml'
+gem 'omniauth'
+gem 'warden_omniauth'

diff --git a/app.rb b/app.rb
index 3ddbc95..45e4532 100644
--- a/app.rb
+++ b/app.rb
@@ -10,4 +10,5 @@ class Twiki < Sinatra::Base
   get '/' do
     "Hello"
   end
+
 end
[from now] 2012/10/12 18:39:29

diff --git a/Gemfile b/Gemfile
index 437aba8..5be567d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,7 @@
 source :rubygems

 gem 'sinatra'
-gem 'sinatra-contrib'
+gem 'data_mapper'
 gem 'haml'
-gem 'omniauth'
-gem 'warden_omniauth'
-
+gem 'thin'
+gem 'pg'
diff --git a/Procfile b/Procfile
new file mode 100644
index 0000000..a39ae24
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: bundle exec thin start -p $PORT
\ No newline at end of file
diff --git a/app.rb b/app.rb
index 45e4532..7b653b9 100644
--- a/app.rb
+++ b/app.rb
@@ -1,14 +1,7 @@
-require 'sinatra/base'
-require 'sinatra/reloader'
+require 'sinatra'
 require 'haml'
+require 'data_mapper'

-class Twiki < Sinatra::Base
-  configure :development do
-    register Sinatra::Reloader
-  end
-
-  get '/' do
-    "Hello"
-  end
-
+get '/' do
+  "Hello"
 end
diff --git a/config.ru b/config.ru
deleted file mode 100644
index 84e58f9..0000000
--- a/config.ru
+++ /dev/null
@@ -1,3 +0,0 @@
-require './app'
-
-Twiki.run! :host => 'locaohost', :port => 9090
\ No newline at end of file
[from now] 2012/10/12 18:41:12

diff --git a/Gemfile b/Gemfile
index 5be567d..3ffaec1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,6 @@ source :rubygems

 gem 'sinatra'
 gem 'data_mapper'
-gem 'haml'
+gem 'slim'
 gem 'thin'
 gem 'pg'
[from now] 2012/10/12 19:06:30

diff --git a/Gemfile b/Gemfile
index 3ffaec1..8aa295c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,8 @@ source :rubygems

 gem 'sinatra'
 gem 'data_mapper'
+gem 'dm-sqlite-adapter'
+gem 'dm-postgres-adapter'
 gem 'slim'
 gem 'thin'
 gem 'pg'
diff --git a/app.rb b/app.rb
index 7b653b9..fcbd255 100644
--- a/app.rb
+++ b/app.rb
@@ -1,5 +1,5 @@
 require 'sinatra'
-require 'haml'
+require 'slim'
 require 'data_mapper'

 get '/' do
diff --git a/config.ru b/config.ru
new file mode 100644
index 0000000..bec6071
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,3 @@
+require './app'
+
+run Sinatra::Application
\ No newline at end of file
diff --git a/views/index.haml b/views/index.haml
deleted file mode 100644
index e69de29..0000000
diff --git a/views/layout.haml b/views/layout.haml
deleted file mode 100644
index e69de29..0000000
[from now] 2012/10/12 19:06:42

diff --git a/views/index.slim b/views/index.slim
new file mode 100644
index 0000000..65d70d2
--- /dev/null
+++ b/views/index.slim
@@ -0,0 +1 @@
+p Hello World!
\ No newline at end of file
diff --git a/views/layout.slim b/views/layout.slim
new file mode 100644
index 0000000..3f61af4
--- /dev/null
+++ b/views/layout.slim
@@ -0,0 +1,14 @@
+doctype html
+html
+  head
+    meta charset="UTF-8"
+    title twiki
+  body
+    #header
+      h1 twiki.jp
+
+    #content
+      == yield
+
+    #footer
+      p &copy;2012 twiki.jp
\ No newline at end of file
いちおう動作する
favicon追加
develop/production環境で使用するDBライブラリを変更する
Gemfile.lockを追加