Skip to content

Commit

Permalink
+ Load the tasks from the correct place.
Browse files Browse the repository at this point in the history
  • Loading branch information
floere committed Jul 21, 2011
1 parent f2b54a7 commit 8218c25
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
9 changes: 4 additions & 5 deletions server/experimental/sinatra/Gemfile
Expand Up @@ -3,11 +3,10 @@ source :gemcutter
# Gems required by Picky.
#
gem 'rake'
gem 'bundler', '>= 0.9.26'
gem 'rack', '~> 1.2.1'
gem 'rack-mount', '~> 0.6.9'
gem 'text', '~> 0.2.0'
gem 'yajl-ruby', '~> 0.7.8', :require => 'yajl'
gem 'rack', '~> 1.3'
gem 'rack-mount', '~> 0.6'
gem 'text', '~> 0.2'
gem 'yajl-ruby', '~> 0.7', :require => 'yajl'

# Should be optional, but isn't yet.
#
Expand Down
45 changes: 22 additions & 23 deletions server/experimental/sinatra/Gemfile.lock
@@ -1,39 +1,39 @@
GEM
remote: http://rubygems.org/
specs:
activemodel (3.0.7)
activesupport (= 3.0.7)
activemodel (3.0.9)
activesupport (= 3.0.9)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.7)
activemodel (= 3.0.7)
activesupport (= 3.0.7)
arel (~> 2.0.2)
activerecord (3.0.9)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activesupport (3.0.7)
activesupport (3.0.9)
arel (2.0.10)
builder (2.1.2)
daemons (1.0.10)
daemons (1.1.4)
diff-lcs (1.1.2)
eventmachine (0.12.10)
haml (3.0.25)
haml (3.1.2)
i18n (0.5.0)
mysql (2.8.1)
picky-client (2.6.0)
picky-client (2.7.0)
activesupport (>= 3.0.0)
yajl-ruby (>= 0.7.8)
rack (1.2.3)
rack-mount (0.6.14)
rack (1.3.1)
rack-mount (0.8.1)
rack (>= 1.0.0)
rack_fast_escape (2009.06.24)
url_escape
rake (0.9.0)
redis (2.2.0)
rake (0.9.2)
redis (2.2.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.3)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
Expand All @@ -45,28 +45,27 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.1)
tzinfo (0.3.27)
tilt (1.3.2)
tzinfo (0.3.29)
url_escape (2009.06.24)
yajl-ruby (0.7.9)
yajl-ruby (0.8.2)

PLATFORMS
ruby

DEPENDENCIES
activerecord (~> 3.0)
activesupport (~> 3.0)
bundler (>= 0.9.26)
haml
mysql
picky-client
rack (~> 1.2.1)
rack-mount (~> 0.6.9)
rack (~> 1.3)
rack-mount (~> 0.6)
rack_fast_escape (= 2009.06.24)
rake
redis
rspec
sinatra
text (~> 0.2.0)
text (~> 0.2)
thin
yajl-ruby (~> 0.7.8)
yajl-ruby (~> 0.7)
2 changes: 1 addition & 1 deletion server/lib/picky/tasks.rb
@@ -1,3 +1,3 @@
all_rake_files = File.expand_path '../tasks/*.rake', __FILE__
all_rake_files = File.expand_path '../../tasks/*.rake', __FILE__

Dir[all_rake_files].each { |rakefile| load rakefile }

0 comments on commit 8218c25

Please sign in to comment.