Permalink
Browse files

Removed "tags" file and "todo.txt". Updated rake to latest, and fixed…

… resulting deprecation warnings.
  • Loading branch information...
1 parent 435021e commit 8934cb42fd69c1bb0c8e52178dc1a3597e6f40f0 @harrism committed Jun 13, 2011
Showing with 30 additions and 130 deletions.
  1. +2 −23 Gemfile
  2. +26 −24 Gemfile.lock
  3. +2 −1 Rakefile
  4. +0 −38 tags
  5. +0 −44 todo.txt
View
25 Gemfile
@@ -2,13 +2,10 @@ source 'http://rubygems.org'
gem 'rails', '3.0.7'
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-#gem 'sqlite3-ruby', :require => 'sqlite3'
-
gem 'ruby-mysql'
+gem 'rdoc'
+
# Haml Markup
gem 'haml'
@@ -25,24 +22,6 @@ gem 'devise'
# Oauth, for facebook (and other) logins
gem "oa-oauth", :require => "omniauth/oauth"
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri', '1.4.1'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for certain environments:
-# gem 'rspec', :group => :test
-# group :test do
-# gem 'webrat'
-# end
-
group :development do
gem 'populator'
gem 'faker'
View
@@ -28,27 +28,27 @@ GEM
activemodel (= 3.0.7)
activesupport (= 3.0.7)
activesupport (3.0.7)
- addressable (2.2.4)
+ addressable (2.2.6)
arel (2.0.10)
bcrypt-ruby (2.1.4)
builder (2.1.2)
- devise (1.2.0)
+ devise (1.3.4)
bcrypt-ruby (~> 2.1.2)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
erubis (2.6.6)
abstract (>= 1.0.0)
faker (0.9.5)
i18n (~> 0.4)
- faraday (0.5.7)
+ faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
geokit (1.5.0)
- geokit-rails3 (0.1.2)
+ geokit-rails3 (0.1.3)
geokit (~> 1.5.0)
- rails (~> 3.0.0)
- haml (3.0.25)
+ rails (~> 3.0.4)
+ haml (3.1.2)
i18n (0.5.0)
jquery-rails (1.0.2)
railties (~> 3.0)
@@ -59,25 +59,25 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- multi_json (0.0.5)
- multipart-post (1.1.0)
- nokogiri (1.4.4)
- oa-core (0.2.0)
- rack (~> 1.1)
- oa-oauth (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
+ multi_json (1.0.3)
+ multi_xml (0.2.2)
+ multipart-post (1.1.2)
+ oa-core (0.2.6)
+ oa-oauth (0.2.6)
+ faraday (~> 0.6.1)
+ multi_json (~> 1.0.0)
+ multi_xml (~> 0.2.2)
+ oa-core (= 0.2.6)
oauth (~> 0.4.0)
- oauth2 (~> 0.1.1)
+ oauth2 (~> 0.4.1)
oauth (0.4.4)
- oauth2 (0.1.1)
- faraday (~> 0.5.0)
- multi_json (~> 0.0.4)
- orm_adapter (0.0.4)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ orm_adapter (0.0.5)
polyglot (0.3.1)
populator (1.0.0)
- rack (1.2.2)
+ rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -95,14 +95,15 @@ GEM
activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.8.7)
+ rake (0.9.2)
+ rdoc (3.6.1)
ruby-mysql (2.9.4)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
- warden (1.0.3)
- rack (>= 1.0.0)
+ warden (1.0.4)
+ rack (>= 1.0)
PLATFORMS
ruby
@@ -117,4 +118,5 @@ DEPENDENCIES
oa-oauth
populator
rails (= 3.0.7)
+ rdoc
ruby-mysql
View
@@ -5,6 +5,7 @@ require File.expand_path('../config/application', __FILE__)
require 'rake'
require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+include Rake::DSL
Fruitmap::Application.load_tasks
View
38 tags
@@ -1,38 +0,0 @@
-1276737535
-Application /home/harrism/src/fruitmap/config/application.rb class Application
-ApplicationController /home/harrism/src/fruitmap/app/controllers/application_controller.rb class ApplicationController
-ApplicationHelper /home/harrism/src/fruitmap/app/helpers/application_helper.rb module ApplicationHelper
-BrowsingTest /home/harrism/src/fruitmap/test/performance/browsing_test.rb class BrowsingTest
-CreateFruits /home/harrism/src/fruitmap/db/migrate/20100508235750_create_fruits.rb class CreateFruits
-Fruit /home/harrism/src/fruitmap/app/models/fruit.rb class Fruit
-FruitTest /home/harrism/src/fruitmap/test/unit/fruit_test.rb class FruitTest
-Fruitmap /home/harrism/src/fruitmap/config/application.rb module Fruitmap
-FruitsController /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb class FruitsController
-FruitsControllerTest /home/harrism/src/fruitmap/test/functional/fruits_controller_test.rb class FruitsControllerTest
-FruitsHelper /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb module FruitsHelper
-FruitsHelperTest /home/harrism/src/fruitmap/test/unit/helpers/fruits_helper_test.rb class FruitsHelperTest
-MarketController /home/harrism/src/fruitmap/app/controllers/market_controller.rb class MarketController
-MarketControllerTest /home/harrism/src/fruitmap/test/functional/market_controller_test.rb class MarketControllerTest
-MarketHelper /home/harrism/src/fruitmap/app/helpers/market_helper.rb module MarketHelper
-MarketHelperTest /home/harrism/src/fruitmap/test/unit/helpers/market_helper_test.rb class MarketHelperTest
-RenameLatitudeLongitudeToLatLng /home/harrism/src/fruitmap/db/migrate/20100518182621_rename_latitude_longitude_to_lat_lng.rb class RenameLatitudeLongitudeToLatLng
-TestCase /home/harrism/src/fruitmap/test/test_helper.rb class ActiveSupport::TestCase
-create /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def create
-destroy /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def destroy
-down /home/harrism/src/fruitmap/db/migrate/20100508235750_create_fruits.rb def self.down
-down /home/harrism/src/fruitmap/db/migrate/20100518182621_rename_latitude_longitude_to_lat_lng.rb def self.down
-edit /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def edit
-gmap_div /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_div
-gmap_header /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_header
-gmap_icon_url /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_icon_url
-gmap_icon_urls /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_icon_urls
-gmap_markers /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_markers
-gmap_show_info_window /home/harrism/src/fruitmap/app/helpers/fruits_helper.rb def gmap_show_info_window
-index /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def index
-index /home/harrism/src/fruitmap/app/controllers/market_controller.rb def index
-new /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def new
-show /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def show
-test_homepage /home/harrism/src/fruitmap/test/performance/browsing_test.rb def test_homepage
-up /home/harrism/src/fruitmap/db/migrate/20100508235750_create_fruits.rb def self.up
-up /home/harrism/src/fruitmap/db/migrate/20100518182621_rename_latitude_longitude_to_lat_lng.rb def self.up
-update /home/harrism/src/fruitmap/app/controllers/fruits_controller.rb def update
View
@@ -1,44 +0,0 @@
-
-- Usability/Interface
-Add a description "What is this/why/How to use"
-Be able to search during fruit creation
-Instructions and suggestions during new fruit creation
-search form not very easy to use in terms of distance
-Sketch ideas for website look and feel
-Add ajax history state so back button works
-paginate fruit list/search results
-Hide "Message Log"
-
-
-- Data
-Create list of fruit trees (to create demo)
-Define necessary data fields for fruit -- which are required, which are optional?
-Fruit data: Time of fruiting
-Photos
-Fruit Accessibility
-
-- Bugs
-_list.html.haml -- "Created by" error (fruit.user) -- improperly fixed?
-
-- Future Site features
-Forum
-Blog
-beginner and expert menus
-
-- Other
-Legal disclaimer about safety and responsibility
-Good name
-Comms plan
-Source code management
-
-- Names
-forageMaps!
-Fruitmaps
-Fruitspot
-Fructose
-fruit fix
-fruiterer
-fmap
-fruitcart
-gather
-gatherer

0 comments on commit 8934cb4

Please sign in to comment.