Permalink
Browse files

Updated Gemfile, accounts.gemspec, and require statements

  • Loading branch information...
1 parent 646355c commit 682e0804de3ff52840ccd3c3c51883e05bd06f32 Larry Siden, Westside Consulting LLC committed Jan 10, 2012
Showing with 41 additions and 31 deletions.
  1. +2 −0 Gemfile
  2. +18 −11 Gemfile.lock
  3. +10 −10 accounts.gemspec
  4. +6 −10 demo/web_app.rb
  5. +5 −0 lib/accounts.rb
View
@@ -1,2 +1,4 @@
source :rubygems
gemspec # references accounts.gemspec
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem "selenium-webdriver", "!= 2.16.0" # broken
View
@@ -1,3 +1,9 @@
+GIT
+ remote: git://github.com/rack/rack.git
+ revision: 08e0eb07ae555ab08db8cbf82236dec573839d2d
+ specs:
+ rack (1.4.0)
+
PATH
remote: .
specs:
@@ -8,7 +14,7 @@ PATH
dm-types
logger
mail
- rack (~> 1.3.6)
+ rack
sinatra
thin
@@ -26,7 +32,7 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.4)
+ childprocess (0.2.8)
ffi (~> 1.0.6)
cucumber (1.1.4)
builder (>= 2.1.2)
@@ -87,7 +93,7 @@ GEM
eventmachine (0.12.10)
fastercsv (1.5.4)
ffi (1.0.11)
- gherkin (2.7.1)
+ gherkin (2.7.2)
json (>= 1.4.6)
haml (3.1.4)
i18n (0.6.0)
@@ -106,21 +112,20 @@ GEM
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
- rack (1.3.6)
rack-protection (1.2.0)
rack
rack-test (0.6.1)
rack (>= 1.0)
rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
+ rspec-mocks (2.8.0)
rubyzip (0.9.5)
selenium-webdriver (2.15.0)
childprocess (>= 0.2.1)
@@ -162,6 +167,8 @@ DEPENDENCIES
haml
mail-single_file_delivery
mail-store-agent
+ rack!
rdoc
rspec
+ selenium-webdriver (!= 2.16.0)
sinatra-contrib
View
@@ -31,6 +31,16 @@ Your app must provide the pages and forms that will post to these paths.
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
+ s.add_runtime_dependency 'data_mapper'
+ s.add_runtime_dependency 'dm-types'
+ s.add_runtime_dependency 'dm-timestamps'
+ s.add_runtime_dependency 'dm-postgres-adapter'
+ s.add_runtime_dependency 'mail'
+ s.add_runtime_dependency 'rack'
+ s.add_runtime_dependency 'sinatra'
+ s.add_runtime_dependency 'thin'
+ s.add_runtime_dependency 'logger'
+
s.add_development_dependency 'capybara'
s.add_development_dependency 'cucumber'
s.add_development_dependency 'rspec'
@@ -39,14 +49,4 @@ Your app must provide the pages and forms that will post to these paths.
s.add_development_dependency 'mail-store-agent'
s.add_development_dependency 'mail-single_file_delivery'
s.add_development_dependency 'haml'
-
- s.add_runtime_dependency 'rack', "~>1.3.6" # https://github.com/rack/rack/issues/299
- s.add_runtime_dependency 'sinatra'
- s.add_runtime_dependency 'thin'
- s.add_runtime_dependency 'data_mapper'
- s.add_runtime_dependency 'dm-types'
- s.add_runtime_dependency 'dm-timestamps'
- s.add_runtime_dependency 'dm-postgres-adapter'
- s.add_runtime_dependency 'mail'
- s.add_runtime_dependency 'logger'
end
View
@@ -1,19 +1,9 @@
# Copyright Westside Consulting LLC, Ann Arbor, MI, USA, 2012
require 'rubygems'
-require 'bundler/setup'
-#Bundler.require(:default, :test, :development) # didn't work
-
-# development
-require 'mail-store-agent'
-require 'mail-single_file_delivery'
-require 'haml'
-require 'pp'
# runtime
-require 'rack'
require 'sinatra/base'
-require 'thin'
require 'data_mapper'
require 'dm-types'
require 'dm-timestamps'
@@ -22,6 +12,12 @@
require 'logger'
require 'accounts'
+# development
+require 'mail-store-agent'
+require 'mail-single_file_delivery'
+require 'haml'
+require 'pp'
+
DataMapper.auto_migrate! # empty database
STDERR.puts "WARNING: called DataMapper.auto_migrate! to clear database"
View
@@ -1,9 +1,14 @@
# Copyright Westside Consulting LLC, Ann Arbor, MI, USA, 2012
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
require 'accounts/version'
require 'accounts/model'
require 'accounts/configure'
require 'accounts/helpers'
+require 'sinatra/base'
module Accounts

0 comments on commit 682e080

Please sign in to comment.