Skip to content

Commit

Permalink
Changed load_dependency to require (thanks to teamon and scottmotte).…
Browse files Browse the repository at this point in the history 
… Updated version number.
  • Loading branch information
@ck
ck committed Jan 13, 2009
1 parent 84ad26e commit 948155b
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 53 deletions.
2 changes: 1 addition & 1 deletion Rakefile
View file
Expand Up @@ -10,7 +10,7 @@ AUTHOR = "Daniel Neighman, Christian Kebekus"
EMAIL = "has.sox@gmail.com"
HOMEPAGE = "http://merbivore.com/"
SUMMARY = "Merb Slice that adds basic activation functionality to merb-auth."
GEM_VERSION = "1.0"
GEM_VERSION = "1.0.7.1"

spec = Gem::Specification.new do |s|
s.rubyforge_project = 'merb'
Expand Down
1 change: 1 addition & 0 deletions config/init.rb
View file
Expand Up @@ -32,6 +32,7 @@

Merb::BootLoader.before_app_loads do

require "datamapper"
DataMapper.setup(:default, "sqlite3::memory:")
class User
include DataMapper::Resource
Expand Down
10 changes: 5 additions & 5 deletions lib/merb-auth-slice-activation.rb
View file
Expand Up @@ -2,10 +2,10 @@

$:.unshift File.dirname(__FILE__)

load_dependency 'merb-slices'
load_dependency 'merb-auth-core'
load_dependency 'merb-auth-more'
load_dependency 'merb-mailer'
require 'merb-slices'
require 'merb-auth-core'
require 'merb-auth-more'
require 'merb-mailer'
require(File.expand_path(File.dirname(__FILE__) / "merb-auth-slice-activation" / "mixins") / "activated_user")

Merb::Plugins.add_rakefiles "merb-auth-slice-activation/merbtasks", "merb-auth-slice-activation/slicetasks", "merb-auth-slice-activation/spectasks"
Expand All @@ -27,7 +27,7 @@ module MerbAuthSliceActivation

# Slice metadata
self.description = "MerbAuthSliceActivation is a merb slice that adds basic activation for merb-auth-based merb applications."
self.version = "1.0"
self.version = "1.0.7.1"
self.author = "Daniel Neighman, Christian Kebekus"

# Stub classes loaded hook - runs before LoadClasses BootLoader
Expand Down
88 changes: 41 additions & 47 deletions merb-auth-slice-activation.gemspec
View file
@@ -1,48 +1,42 @@
# -*- encoding: utf-8 -*-

Gem::Specification.new do |s|
s.name = "merb-auth-slice-activation"
s.version = "1.0.0"
s.date = "2008-12-09"
s.summary = "Adding Activation to merb-auth"
s.email = "has.sox@gmail.com"
s.homepage = "http://github.com/ck/merb-auth-slice-activation"
s.description = "Adding activation via email to merb-auth"
s.has_rdoc = false
s.authors = ["Daniel Neighman", "Christian Kebekus", "Justin Smestad"]
s.files = [
"README.textile",
"Rakefile",
"merb-auth-slice-activation.gemspec",
"app/controllers/activations.rb",
"app/controllers/application.rb",
"app/helpers/application_helper.rb",
"app/helpers/mailer_helper.rb",
"app/mailers/activation_mailer.rb",
"app/mailers/views/activation_mailer/activation.text.erb",
"app/mailers/views/activation_mailer/signup.text.erb",
"app/views/layout/merb_auth_slice_activation.html.erb",
"config/init.rb",
"lib/merb-auth-slice-activation.rb",
"lib/merb-auth-slice-activation/merbtasks.rb",
"lib/merb-auth-slice-activation/slicetasks.rb",
"lib/merb-auth-slice-activation/spectasks.rb",
"lib/merb-auth-slice-activation/mixins/activated_user.rb",
"lib/merb-auth-slice-activation/mixins/activated_user/ar_activated_user.rb",
"lib/merb-auth-slice-activation/mixins/activated_user/dm_activated_user.rb",
"lib/merb-auth-slice-activation/mixins/activated_user/sq_activated_user.rb",
"public/javascripts/master.js",
"public/stylesheets/master.css",
"stubs/app/controllers/activations.rb",
"stubs/app/mailers/views/activation_mailer/activation.text.erb",
"stubs/app/mailers/views/activation_mailer/signup.text.erb"
]
s.test_files = [
"spec/spec_helper.rb",
"spec/controllers/activations_spec.rb",
"spec/mailers/activation_mailer_spec.rb",
"spec/mixins/activated_user_spec.rb"
]
s.rdoc_options = ["--main", "README.textile"]
s.extra_rdoc_files = ["README.textile"]
s.add_dependency("merb", ["> 1.0.0"])
s.add_dependency("merb-auth", ["> 1.0.0"])
end
s.name = %q{merb-auth-slice-activation}
s.version = "1.0.7.1"

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Daniel Neighman, Christian Kebekus"]
s.date = %q{2009-01-13}
s.description = %q{Merb Slice that adds basic activation functionality to merb-auth.}
s.email = %q{has.sox@gmail.com}
s.extra_rdoc_files = ["README.textile", "LICENSE", "TODO"]
s.files = ["LICENSE", "README.textile", "Rakefile", "TODO", "lib/merb-auth-slice-activation", "lib/merb-auth-slice-activation/merbtasks.rb", "lib/merb-auth-slice-activation/mixins", "lib/merb-auth-slice-activation/mixins/activated_user", "lib/merb-auth-slice-activation/mixins/activated_user/ar_activated_user.rb", "lib/merb-auth-slice-activation/mixins/activated_user/dm_activated_user.rb", "lib/merb-auth-slice-activation/mixins/activated_user/sq_activated_user.rb", "lib/merb-auth-slice-activation/mixins/activated_user.rb", "lib/merb-auth-slice-activation/slicetasks.rb", "lib/merb-auth-slice-activation/spectasks.rb", "lib/merb-auth-slice-activation.rb", "spec/controllers", "spec/controllers/activations_spec.rb", "spec/mailers", "spec/mailers/activation_mailer_spec.rb", "spec/mixins", "spec/mixins/activated_user_spec.rb", "spec/spec_helper.rb", "app/controllers", "app/controllers/activations.rb", "app/controllers/application.rb", "app/helpers", "app/helpers/application_helper.rb", "app/helpers/mailer_helper.rb", "app/mailers", "app/mailers/activation_mailer.rb", "app/mailers/views", "app/mailers/views/activation_mailer", "app/mailers/views/activation_mailer/activation.text.erb", "app/mailers/views/activation_mailer/signup.text.erb", "app/views", "app/views/layout", "app/views/layout/merb_auth_slice_activation.html.erb", "public/javascripts", "public/javascripts/master.js", "public/stylesheets", "public/stylesheets/master.css", "stubs/app", "stubs/app/controllers", "stubs/app/controllers/activations.rb", "stubs/app/mailers", "stubs/app/mailers/views", "stubs/app/mailers/views/activation_mailer", "stubs/app/mailers/views/activation_mailer/activation.text.erb", "stubs/app/mailers/views/activation_mailer/signup.text.erb"]
s.has_rdoc = true
s.homepage = %q{http://merbivore.com/}
s.require_paths = ["lib"]
s.rubyforge_project = %q{merb}
s.rubygems_version = %q{1.3.1}
s.summary = %q{Merb Slice that adds basic activation functionality to merb-auth.}

if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 2

if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<merb-slices>, [">= 1.0"])
s.add_runtime_dependency(%q<merb-auth-core>, [">= 1.0"])
s.add_runtime_dependency(%q<merb-auth-more>, [">= 1.0"])
s.add_runtime_dependency(%q<merb-mailer>, [">= 1.0"])
else
s.add_dependency(%q<merb-slices>, [">= 1.0"])
s.add_dependency(%q<merb-auth-core>, [">= 1.0"])
s.add_dependency(%q<merb-auth-more>, [">= 1.0"])
s.add_dependency(%q<merb-mailer>, [">= 1.0"])
end
else
s.add_dependency(%q<merb-slices>, [">= 1.0"])
s.add_dependency(%q<merb-auth-core>, [">= 1.0"])
s.add_dependency(%q<merb-auth-more>, [">= 1.0"])
s.add_dependency(%q<merb-mailer>, [">= 1.0"])
end
end

1 comment on commit 948155b

@motdotla
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks ck

Please sign in to comment.