merb-auth 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,108 +1,63 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-require 'fileutils'
-include FileUtils
-require 'rake/clean'
+require 'rubygems'
+require 'rake'
 
-RUBY_FORGE_PROJECT  = "merb-auth"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "merb-auth.  The official authentication plugin for merb.  Setup for the default stack"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../../merb/merb-core/lib/merb-core/version', __FILE__)
 
-GEM_AUTHOR = "Daniel Neighman"
-GEM_EMAIL  = "has.sox@gmail.com"
+# Load this library's version information
+require File.expand_path('../lib/merb-auth/version', __FILE__)
 
-GEM_NAME    = "merb-auth"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
+begin
 
-RELEASE_NAME    = "REL #{GEM_VERSION}"
+  require 'jeweler'
 
-gems = %w[
-  merb-auth-core merb-auth-more merb-auth-slice-password
-]
+  Jeweler::Tasks.new do |gemspec|
 
-desc "Publish Merb More gem to RubyForge, one by one."
-task :release do
-  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{GEM_NAME}-#{GEM_VERSION}.#{ext}" }
+    gemspec.version     = Merb::Auth::VERSION
 
-  begin
-    sh %{rubyforge login}
-    sh %{rubyforge add_release #{RUBY_FORGE_PROJECT} #{GEM_NAME} #{GEM_VERSION} #{packages.join(' ')}}
-    sh %{rubyforge add_file #{RUBY_FORGE_PROJECT} #{GEM_NAME} #{GEM_VERSION} #{packages.join(' ')}}
-  rescue Exception => e
-    puts
-    puts "Release failed: #{e.message}"
-    puts
-    puts "Set PKG_BUILD environment variable if you do a subrelease (0.9.4.2008_08_02 when version is 0.9.4)"
-  end
-  
-  %w(merb-auth-core merb-auth-more merb-auth-slice-password).each do |gem|
-    Dir.chdir(gem){ sh "#{Gem.ruby} -S rake release" }
-  end
-end
+    gemspec.name        = "merb-auth"
+    gemspec.description = "Merb plugin that provides authentication support"
+    gemspec.summary     = "The official authentication plugin for merb.  Setup for the default stack"
 
-merb_auth_spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name         = GEM_NAME
-  s.version      = GEM_VERSION
-  s.platform     = Gem::Platform::RUBY
-  s.author       = GEM_AUTHOR
-  s.email        = GEM_EMAIL
-  s.homepage     = "http://www.merbivore.com"
-  s.summary      = PROJECT_SUMMARY
-  s.description  = PROJECT_SUMMARY
-  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  s.add_dependency "merb-core", "~> #{GEM_VERSION}"
-  gems.each do |gem|
-    s.add_dependency gem, "~> #{GEM_VERSION}"
-  end
-end
+    gemspec.authors     = [ "Daniel Neighman" ]
+    gemspec.email       = "has.sox@gmail.com"
+    gemspec.homepage    = "http://merbivore.com/"
 
-CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache"]
+    # Needs to be listed explicitly because jeweler
+    # otherwise thinks that everything inside the
+    # merb-auth repo belongs to the merb-auth meta gem
+    gemspec.files = [
+      'LICENSE',
+      'Rakefile',
+      'README.textile',
+      'TODO',
+      'lib/merb-auth.rb',
+      'lib/merb-auth/version.rb'
+    ]
 
-Rake::GemPackageTask.new(merb_auth_spec) do |package|
-  package.gem_spec = merb_auth_spec
-end
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core',                "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'merb-auth-core',           "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'merb-auth-more',           "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'merb-auth-slice-password', "~> #{Merb::VERSION}"
 
-task :package => ["lib/merb-auth.rb", :build_children]
-desc "Create merb-auth.rb"
-task "lib/merb-auth.rb" do
-  mkdir_p "lib"
-  File.open("lib/merb-auth.rb","w+") do |file|
-    file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
-    gems.each do |gem|
-      next if gem == "merb-gen"
-      file.puts "require '#{gem}'"
-    end
   end
-end
-
-task :build_children do
-  %w(merb-auth-core merb-auth-more merb-auth-slice-password).each do |dir|
-    Dir.chdir(dir) { sh "#{Gem.ruby} -S rake package" }
-  end  
-end
 
-desc "install the plugin as a gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+  Jeweler::GemcutterTasks.new
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc "Run all specs"
-task :spec do
-  gems.each do |gem|
-    Dir.chdir(gem) { sh "#{Gem.ruby} -S rake spec" }
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end

data/lib/merb-auth/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Auth
+    VERSION = '1.1.0.pre'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2009-11-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-core
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-more
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-slice-password
@@ -50,29 +50,31 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
-description: merb-auth.  The official authentication plugin for merb.  Setup for the default stack
+description: Merb plugin that provides authentication support
 email: has.sox@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.textile
 files: 
 - LICENSE
 - README.textile
 - Rakefile
 - TODO
 - lib/merb-auth.rb
+- lib/merb-auth/version.rb
 has_rdoc: true
-homepage: http://www.merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,16 +85,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb-auth
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: merb-auth.  The official authentication plugin for merb.  Setup for the default stack
+summary: The official authentication plugin for merb.  Setup for the default stack
 test_files: []