From 170636ac01584c568c6f68747d52cf011e91ce64 Mon Sep 17 00:00:00 2001 From: Zander Date: Tue, 11 Sep 2012 23:18:11 -0400 Subject: [PATCH 1/5] Added Gemfile --- Gemfile | 7 +++++ Gemfile.lock | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..efcecb4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +source :rubygems + +gem 'sinatra' +gem 'sqlite3' +gem 'dm-sqlite-adapter' +gem 'data_mapper' +gem 'haml' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..d093f8a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,79 @@ +GEM + remote: http://rubygems.org/ + specs: + addressable (2.2.8) + bcrypt-ruby (3.0.1) + data_mapper (1.2.0) + dm-aggregates (~> 1.2.0) + dm-constraints (~> 1.2.0) + dm-core (~> 1.2.0) + dm-migrations (~> 1.2.0) + dm-serializer (~> 1.2.0) + dm-timestamps (~> 1.2.0) + dm-transactions (~> 1.2.0) + dm-types (~> 1.2.0) + dm-validations (~> 1.2.0) + data_objects (0.10.8) + addressable (~> 2.1) + dm-aggregates (1.2.0) + dm-core (~> 1.2.0) + dm-constraints (1.2.0) + dm-core (~> 1.2.0) + dm-core (1.2.0) + addressable (~> 2.2.6) + dm-do-adapter (1.2.0) + data_objects (~> 0.10.6) + dm-core (~> 1.2.0) + dm-migrations (1.2.0) + dm-core (~> 1.2.0) + dm-serializer (1.2.2) + dm-core (~> 1.2.0) + fastercsv (~> 1.5) + json (~> 1.6) + json_pure (~> 1.6) + multi_json (~> 1.0) + dm-sqlite-adapter (1.2.0) + dm-do-adapter (~> 1.2.0) + do_sqlite3 (~> 0.10.6) + dm-timestamps (1.2.0) + dm-core (~> 1.2.0) + dm-transactions (1.2.0) + dm-core (~> 1.2.0) + dm-types (1.2.2) + bcrypt-ruby (~> 3.0) + dm-core (~> 1.2.0) + fastercsv (~> 1.5) + json (~> 1.6) + multi_json (~> 1.0) + stringex (~> 1.4) + uuidtools (~> 2.1) + dm-validations (1.2.0) + dm-core (~> 1.2.0) + do_sqlite3 (0.10.8) + data_objects (= 0.10.8) + fastercsv (1.5.5) + haml (3.1.7) + json (1.7.5) + json_pure (1.7.5) + multi_json (1.3.6) + rack (1.4.1) + rack-protection (1.2.0) + rack + sinatra (1.3.3) + rack (~> 1.3, >= 1.3.6) + rack-protection (~> 1.2) + tilt (~> 1.3, >= 1.3.3) + sqlite3 (1.3.6) + stringex (1.4.0) + tilt (1.3.3) + uuidtools (2.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + data_mapper + dm-sqlite-adapter + haml + sinatra + sqlite3 From 93547cca027afe54a1d21f0e88a05a6364925c74 Mon Sep 17 00:00:00 2001 From: Zander Date: Tue, 11 Sep 2012 23:30:55 -0400 Subject: [PATCH 2/5] Fixed icons to absolute path rather than relative --- pilltracker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pilltracker.rb b/pilltracker.rb index 1bcc9ef..d8b78fc 100755 --- a/pilltracker.rb +++ b/pilltracker.rb @@ -66,7 +66,7 @@ class Event - @events.each do |event| %li %img{:style => 'float:left;margin:1em;', - :src => event.type == 'took' ? 'pills.png' : 'stethoscope.png'} + :src => event.type == 'took' ? '/pills.png' : '/stethoscope.png'} %div&= event.time.strftime("%Y-%m-%d %H:%M") %div&= "#{event.type}: #{event.description}" From b7079136c038478f7f6cb257ffe60878f8d476ed Mon Sep 17 00:00:00 2001 From: Zander Date: Tue, 11 Sep 2012 23:32:10 -0400 Subject: [PATCH 3/5] Added gitignore for db file --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..98e6ef6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.db From 1e25d279a09f10f5981621bac638d2ee8a210fc9 Mon Sep 17 00:00:00 2001 From: Zander Date: Tue, 11 Sep 2012 23:45:33 -0400 Subject: [PATCH 4/5] Removed Gemfile.lock from source control --- Gemfile.lock | 79 ---------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index d093f8a..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,79 +0,0 @@ -GEM - remote: http://rubygems.org/ - specs: - addressable (2.2.8) - bcrypt-ruby (3.0.1) - data_mapper (1.2.0) - dm-aggregates (~> 1.2.0) - dm-constraints (~> 1.2.0) - dm-core (~> 1.2.0) - dm-migrations (~> 1.2.0) - dm-serializer (~> 1.2.0) - dm-timestamps (~> 1.2.0) - dm-transactions (~> 1.2.0) - dm-types (~> 1.2.0) - dm-validations (~> 1.2.0) - data_objects (0.10.8) - addressable (~> 2.1) - dm-aggregates (1.2.0) - dm-core (~> 1.2.0) - dm-constraints (1.2.0) - dm-core (~> 1.2.0) - dm-core (1.2.0) - addressable (~> 2.2.6) - dm-do-adapter (1.2.0) - data_objects (~> 0.10.6) - dm-core (~> 1.2.0) - dm-migrations (1.2.0) - dm-core (~> 1.2.0) - dm-serializer (1.2.2) - dm-core (~> 1.2.0) - fastercsv (~> 1.5) - json (~> 1.6) - json_pure (~> 1.6) - multi_json (~> 1.0) - dm-sqlite-adapter (1.2.0) - dm-do-adapter (~> 1.2.0) - do_sqlite3 (~> 0.10.6) - dm-timestamps (1.2.0) - dm-core (~> 1.2.0) - dm-transactions (1.2.0) - dm-core (~> 1.2.0) - dm-types (1.2.2) - bcrypt-ruby (~> 3.0) - dm-core (~> 1.2.0) - fastercsv (~> 1.5) - json (~> 1.6) - multi_json (~> 1.0) - stringex (~> 1.4) - uuidtools (~> 2.1) - dm-validations (1.2.0) - dm-core (~> 1.2.0) - do_sqlite3 (0.10.8) - data_objects (= 0.10.8) - fastercsv (1.5.5) - haml (3.1.7) - json (1.7.5) - json_pure (1.7.5) - multi_json (1.3.6) - rack (1.4.1) - rack-protection (1.2.0) - rack - sinatra (1.3.3) - rack (~> 1.3, >= 1.3.6) - rack-protection (~> 1.2) - tilt (~> 1.3, >= 1.3.3) - sqlite3 (1.3.6) - stringex (1.4.0) - tilt (1.3.3) - uuidtools (2.1.3) - -PLATFORMS - ruby - -DEPENDENCIES - data_mapper - dm-sqlite-adapter - haml - sinatra - sqlite3 From 086ae50618e93b7416fb3d5abd26ad97e7083318 Mon Sep 17 00:00:00 2001 From: Zander Date: Tue, 11 Sep 2012 23:47:21 -0400 Subject: [PATCH 5/5] Added Gemfile.lock to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 98e6ef6..848dad4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.db +Gemfile.lock