merb-slices 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,75 +1,67 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb-Slices is a Merb plugin for using and creating application 'slices' which help you modularize your application."
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Fabien Franzen"
-GEM_EMAIL  = "info@fabien.be"
-
-GEM_NAME    = "merb-slices"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-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.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile Generators TODO) + Dir.glob("{lib,spec}/**/*")
-  s.bindir = "bin"
-  s.executables = %w( slice )
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-slices/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Slices::VERSION
+
+    gemspec.name        = "merb-slices"
+    gemspec.description = "Merb plugin that supports reusable application 'slices'."
+    gemspec.summary     = "Merb plugin for using and creating application 'slices' which help you modularize your application."
+
+    gemspec.authors     = [ "Fabien Franzen" ]
+    gemspec.email       = "info@fabien.be"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(Generators LICENSE Rakefile README TODO) + Dir['{bin,lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
+
+    # Executable files
+    gemspec.executables = 'slice'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  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
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Slices::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/generators/templates/common/Rakefile

@@ -1,53 +1,36 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "<%= base_name %>"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = "<%= Merb::VERSION %>"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= <%= Merb::VERSION %>')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO application.rb) + Dir.glob("{lib,spec,app,public,stubs,views}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require 'merb-core/version'
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+begin
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = '0.0.0'
+
+    gemspec.name        = "<%= base_name %>"
+    gemspec.description = "The description of your slice"
+    gemspec.summary     = "The summary of your slice"
+
+    gemspec.authors     = [ "Your name" ]
+    gemspec.email       = "your@email.com"
+    gemspec.homepage    = "http://example.org/"
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-slices', '~> <%= Merb::VERSION %>'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
 <% if testing_framework.to_sym == :rspec %>
 require 'spec/rake/spectask'
 require 'merb-core/test/tasks/spectasks'

data/lib/generators/templates/common/lib/%base_name%/spectasks.rb

@@ -1,3 +1,5 @@
+require 'spec/rake/spectask'
+
 namespace :slices do
   namespace :<%= symbol_name %> do
       

data/lib/generators/templates/full/Rakefile

@@ -1,53 +1,36 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "<%= base_name %>"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = "<%= Merb::VERSION %>"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= <%= Merb::VERSION %>')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require 'merb-core/version'
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+begin
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = '0.0.0'
+
+    gemspec.name        = "<%= base_name %>"
+    gemspec.description = "The description of your slice"
+    gemspec.summary     = "The summary of your slice"
+
+    gemspec.authors     = [ "Your name" ]
+    gemspec.email       = "your@email.com"
+    gemspec.homepage    = "http://example.org/"
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-slices', '~> <%= Merb::VERSION %>'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
 <% if testing_framework.to_sym == :rspec %>
 require 'spec/rake/spectask'
 require 'merb-core/test/tasks/spectasks'

data/lib/generators/templates/full/lib/%base_name%.rb

@@ -2,7 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  dependency 'merb-slices', :immediate => true
+  require 'merb-slices'
   Merb::Plugins.add_rakefiles "<%= base_name %>/merbtasks", "<%= base_name %>/slicetasks", "<%= base_name %>/spectasks"
 
   # Register the Slice for the current host application
@@ -76,7 +76,4 @@ if defined?(Merb::Plugins)
   # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   <%= module_name %>.setup_default_structure!
   
-  # Add dependencies for other <%= module_name %> classes below. Example:
-  # dependency "<%= base_name %>/other"
-  
 end

data/lib/merb-slices/merbtasks.rb

@@ -1,5 +1,3 @@
-require "merb-core/tasks/merb_rake_helper"
-
 desc "Show information on application slices"
 task :slices => [ "slices:list" ]
 
@@ -18,17 +16,4 @@ namespace :slices do
     end    
   end
   
-  desc "Install a slice into the local gems dir (GEM=your-slice)"
-  task :install_as_gem do
-    if ENV['GEM']
-      ENV['GEM_DIR'] ||= File.join(Merb.root, 'gems')
-      options = { :install_dir => ENV['GEM_DIR'], 
-                  :cache => true, :ignore_dependencies => true }
-      options[:version] = ENV['VERSION'] if ENV['VERSION']
-      Merb::RakeHelper.install_package(ENV['GEM'], options)
-    else
-      puts "No slice GEM specified"
-    end
-  end
-  
 end

data/lib/merb-slices/module.rb

@@ -1,8 +1,6 @@
 module Merb
   module Slices
     
-    VERSION = "0.9.8"
-    
     class << self
       
       # Retrieve a slice module by name 

data/lib/merb-slices/version.rb

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

data/lib/merb-slices.rb

@@ -1,3 +1,4 @@
+require 'merb-slices/version'
 require 'merb-slices/module'
 
 if defined?(Merb::Plugins)

data/spec/full_slice_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 

data/spec/full_slice_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 

data/spec/merb-slice_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Slices do
   

data/spec/slice_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Merb::Generators::SliceGenerator do
   

data/spec/slices/full-test-slice/Rakefile

@@ -1,52 +1,34 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "full-test-slice"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = "0.9.8"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 0.9.8')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require 'merb-core/version'
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+begin
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = '0.0.0'
+
+    gemspec.name        = "full-test-slice"
+    gemspec.description = "The description of your slice"
+    gemspec.summary     = "The summary of your slice"
+
+    gemspec.authors     = [ "Your name" ]
+    gemspec.email       = "your@email.com"
+    gemspec.homepage    = "http://example.org/"
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-slices', "#{Merb::VERSION}"
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'spec/rake/spectask'

data/spec/slices/full-test-slice/lib/full-test-slice/spectasks.rb

@@ -1,3 +1,5 @@
+require 'spec/rake/spectask'
+
 namespace :slices do
   namespace :full_test_slice do
       

data/spec/slices/full-test-slice/lib/full-test-slice.rb

@@ -2,7 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  dependency 'merb-slices', :immediate => true
+  require 'merb-slices'
   Merb::Plugins.add_rakefiles "full-test-slice/merbtasks", "full-test-slice/slicetasks", "full-test-slice/spectasks"
 
   # Register the Slice for the current host application
@@ -76,7 +76,4 @@ if defined?(Merb::Plugins)
   # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   FullTestSlice.setup_default_structure!
   
-  # Add dependencies for other FullTestSlice classes below. Example:
-  # dependency "full-test-slice/other"
-  
 end

data/spec/slices/thin-test-slice/Rakefile

@@ -1,43 +1,32 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "thin-test-slice"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = "0.9.8"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 0.9.8')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO application.rb) + Dir.glob("{lib,spec,app,public,stubs,views}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require 'merb-core/version'
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = '0.0.0'
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+    gemspec.name        = "thin-test-slice"
+    gemspec.description = "The description of your slice"
+    gemspec.summary     = "The summary of your slice"
+
+    gemspec.authors     = [ "Your name" ]
+    gemspec.email       = "your@email.com"
+    gemspec.homepage    = "http://example.org/"
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-slices', "#{Merb::VERSION}"
+
+  end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end

data/spec/slices/thin-test-slice/lib/thin-test-slice.rb

@@ -2,7 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  dependency 'merb-slices', :immediate => true
+  require 'merb-slices'
   Merb::Plugins.add_rakefiles "thin-test-slice/merbtasks", "thin-test-slice/slicetasks"
 
   # Register the Slice for the current host application
@@ -89,7 +89,4 @@ if defined?(Merb::Plugins)
   # For a thin slice we just add application.rb, :view and :public locations.
   ThinTestSlice.setup_default_structure!
   
-  # Add dependencies for other ThinTestSlice classes below. Example:
-  # dependency "thin-test-slice/other"
-  
 end

data/spec/slices/very-thin-test-slice/Rakefile

@@ -1,43 +1,32 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "very-thin-test-slice"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "Merb Slice that provides ..."
-GEM_VERSION = "0.9.8"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 0.9.8')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO application.rb) + Dir.glob("{lib,spec,app,public,stubs,views}/**/*")
-end
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require 'merb-core/version'
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = '0.0.0'
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+    gemspec.name        = "very-thin-test-slice"
+    gemspec.description = "The description of your slice"
+    gemspec.summary     = "The summary of your slice"
+
+    gemspec.authors     = [ "Your name" ]
+    gemspec.email       = "your@email.com"
+    gemspec.homepage    = "http://example.org/"
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-slices', "#{Merb::VERSION}"
+
+  end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end

data/spec/slices/very-thin-test-slice/lib/very-thin-test-slice.rb

@@ -2,7 +2,7 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  dependency 'merb-slices', :immediate => true
+  require 'merb-slices'
   Merb::Plugins.add_rakefiles "very-thin-test-slice/merbtasks", "very-thin-test-slice/slicetasks"
 
   # Register the Slice for the current host application

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,8 +1,20 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
 
-require 'rubygems'
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# Use current merb-gen sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-gen/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'merb-gen'
-require 'merb-slices'
+
+# The lib under test
+require "merb-slices"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
 
 require 'generators/base'
 require 'generators/full'

data/spec/thin_slice_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 
@@ -17,7 +17,7 @@ describe Merb::Generators::ThinSliceGenerator do
       @generator.invoke!
       files = Dir[slices_path / 'testing-thin' / '**' / '*'].map do |path| 
         path.relative_path_from(slices_path)
-      end
+      end.sort
       expected = [
         "testing-thin/application.rb", "testing-thin/lib", "testing-thin/lib/testing-thin", 
         "testing-thin/lib/testing-thin/merbtasks.rb", "testing-thin/lib/testing-thin/slicetasks.rb", 
@@ -28,7 +28,7 @@ describe Merb::Generators::ThinSliceGenerator do
         "testing-thin/stubs/application.rb", "testing-thin/TODO", "testing-thin/views", 
         "testing-thin/views/layout", "testing-thin/views/layout/testing_thin.html.erb", 
         "testing-thin/views/main", "testing-thin/views/main/index.html.erb"
-      ]
+      ].sort
       files.should == expected
     end
     
@@ -38,4 +38,4 @@ describe Merb::Generators::ThinSliceGenerator do
     
   end
   
-end
+end

data/spec/thin_slice_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 

data/spec/very_thin_slice_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 
@@ -17,7 +17,7 @@ describe Merb::Generators::VeryThinSliceGenerator do
       @generator.invoke!
       files = Dir[slices_path / 'testing-very-thin' / '**' / '*'].map do |path| 
         path.relative_path_from(slices_path)
-      end
+      end.sort
       expected = [
         "testing-very-thin/application.rb", "testing-very-thin/lib", 
         "testing-very-thin/lib/testing-very-thin", 
@@ -26,7 +26,7 @@ describe Merb::Generators::VeryThinSliceGenerator do
         "testing-very-thin/lib/testing-very-thin.rb", 
         "testing-very-thin/LICENSE", "testing-very-thin/Rakefile", 
         "testing-very-thin/README", "testing-very-thin/TODO"
-      ]
+      ].sort
       files.should == expected
     end
     
@@ -36,4 +36,4 @@ describe Merb::Generators::VeryThinSliceGenerator do
     
   end
   
-end
+end

data/spec/very_thin_slice_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 slices_path = File.dirname(__FILE__) / 'slices'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-slices
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Fabien Franzen
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
-default_executable: 
+date: 2010-02-20 00:00:00 +00:00
+default_executable: slice
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
@@ -20,35 +20,49 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
-description: Merb-Slices is a Merb plugin for using and creating application 'slices' which help you modularize your application.
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin that supports reusable application 'slices'.
 email: info@fabien.be
 executables: 
 - slice
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
+- Generators
 - LICENSE
 - README
 - Rakefile
-- Generators
 - TODO
+- bin/slice
 - lib/generators/base.rb
 - lib/generators/full.rb
+- lib/generators/templates/common/LICENSE
+- lib/generators/templates/common/Rakefile
+- lib/generators/templates/common/TODO
 - lib/generators/templates/common/application.rb
 - lib/generators/templates/common/lib/%base_name%/merbtasks.rb
 - lib/generators/templates/common/lib/%base_name%/slicetasks.rb
 - lib/generators/templates/common/lib/%base_name%/spectasks.rb
-- lib/generators/templates/common/LICENSE
 - lib/generators/templates/common/public/javascripts/master.js
 - lib/generators/templates/common/public/stylesheets/master.css
-- lib/generators/templates/common/Rakefile
-- lib/generators/templates/common/TODO
+- lib/generators/templates/full/README
+- lib/generators/templates/full/Rakefile
+- lib/generators/templates/full/TODO
 - lib/generators/templates/full/app/controllers/application.rb
 - lib/generators/templates/full/app/controllers/main.rb
 - lib/generators/templates/full/app/helpers/application_helper.rb
@@ -57,84 +71,83 @@ files:
 - lib/generators/templates/full/config/init.rb
 - lib/generators/templates/full/config/router.rb
 - lib/generators/templates/full/lib/%base_name%.rb
-- lib/generators/templates/full/Rakefile
-- lib/generators/templates/full/README
 - lib/generators/templates/full/spec/%base_name%_spec.rb
 - lib/generators/templates/full/spec/requests/main_spec.rb
 - lib/generators/templates/full/spec/spec_helper.rb
 - lib/generators/templates/full/stubs/app/controllers/application.rb
 - lib/generators/templates/full/stubs/app/controllers/main.rb
-- lib/generators/templates/full/TODO
-- lib/generators/templates/thin/lib/%base_name%.rb
 - lib/generators/templates/thin/README
+- lib/generators/templates/thin/lib/%base_name%.rb
 - lib/generators/templates/thin/stubs/application.rb
 - lib/generators/templates/thin/views/layout/%symbol_name%.html.erb
 - lib/generators/templates/thin/views/main/index.html.erb
-- lib/generators/templates/very_thin/lib/%base_name%.rb
 - lib/generators/templates/very_thin/README
+- lib/generators/templates/very_thin/lib/%base_name%.rb
 - lib/generators/thin.rb
 - lib/generators/very_thin.rb
+- lib/merb-slices.rb
 - lib/merb-slices/controller_mixin.rb
 - lib/merb-slices/merbtasks.rb
 - lib/merb-slices/module.rb
 - lib/merb-slices/module_mixin.rb
 - lib/merb-slices/router_ext.rb
-- lib/merb-slices.rb
+- lib/merb-slices/version.rb
 - spec/full_slice_generator_spec.rb
 - spec/full_slice_spec.rb
 - spec/merb-slice_spec.rb
 - spec/slice_generator_spec.rb
+- spec/slices/full-test-slice/LICENSE
+- spec/slices/full-test-slice/README
+- spec/slices/full-test-slice/Rakefile
+- spec/slices/full-test-slice/TODO
 - spec/slices/full-test-slice/app/controllers/application.rb
 - spec/slices/full-test-slice/app/controllers/main.rb
 - spec/slices/full-test-slice/app/helpers/application_helper.rb
 - spec/slices/full-test-slice/app/views/layout/full_test_slice.html.erb
 - spec/slices/full-test-slice/app/views/main/index.html.erb
 - spec/slices/full-test-slice/config/init.rb
+- spec/slices/full-test-slice/lib/full-test-slice.rb
 - spec/slices/full-test-slice/lib/full-test-slice/merbtasks.rb
 - spec/slices/full-test-slice/lib/full-test-slice/slicetasks.rb
 - spec/slices/full-test-slice/lib/full-test-slice/spectasks.rb
-- spec/slices/full-test-slice/lib/full-test-slice.rb
-- spec/slices/full-test-slice/LICENSE
 - spec/slices/full-test-slice/public/javascripts/master.js
 - spec/slices/full-test-slice/public/stylesheets/master.css
-- spec/slices/full-test-slice/Rakefile
-- spec/slices/full-test-slice/README
 - spec/slices/full-test-slice/stubs/app/controllers/application.rb
 - spec/slices/full-test-slice/stubs/app/controllers/main.rb
-- spec/slices/full-test-slice/TODO
+- spec/slices/thin-test-slice/LICENSE
+- spec/slices/thin-test-slice/README
+- spec/slices/thin-test-slice/Rakefile
+- spec/slices/thin-test-slice/TODO
 - spec/slices/thin-test-slice/application.rb
+- spec/slices/thin-test-slice/lib/thin-test-slice.rb
 - spec/slices/thin-test-slice/lib/thin-test-slice/merbtasks.rb
 - spec/slices/thin-test-slice/lib/thin-test-slice/slicetasks.rb
-- spec/slices/thin-test-slice/lib/thin-test-slice.rb
-- spec/slices/thin-test-slice/LICENSE
 - spec/slices/thin-test-slice/public/javascripts/master.js
 - spec/slices/thin-test-slice/public/stylesheets/master.css
-- spec/slices/thin-test-slice/Rakefile
-- spec/slices/thin-test-slice/README
 - spec/slices/thin-test-slice/stubs/application.rb
-- spec/slices/thin-test-slice/TODO
 - spec/slices/thin-test-slice/views/layout/thin_test_slice.html.erb
 - spec/slices/thin-test-slice/views/main/index.html.erb
-- spec/slices/very-thin-test-slice/application.rb
-- spec/slices/very-thin-test-slice/lib/very-thin-test-slice/merbtasks.rb
-- spec/slices/very-thin-test-slice/lib/very-thin-test-slice/slicetasks.rb
-- spec/slices/very-thin-test-slice/lib/very-thin-test-slice.rb
 - spec/slices/very-thin-test-slice/LICENSE
-- spec/slices/very-thin-test-slice/Rakefile
 - spec/slices/very-thin-test-slice/README
+- spec/slices/very-thin-test-slice/Rakefile
 - spec/slices/very-thin-test-slice/TODO
+- spec/slices/very-thin-test-slice/application.rb
+- spec/slices/very-thin-test-slice/lib/very-thin-test-slice.rb
+- spec/slices/very-thin-test-slice/lib/very-thin-test-slice/merbtasks.rb
+- spec/slices/very-thin-test-slice/lib/very-thin-test-slice/slicetasks.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/thin_slice_generator_spec.rb
 - spec/thin_slice_spec.rb
 - spec/very_thin_slice_generator_spec.rb
 - spec/very_thin_slice_spec.rb
 has_rdoc: true
-homepage: http://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 
@@ -145,16 +158,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
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Merb-Slices is a Merb plugin for using and creating application 'slices' which help you modularize your application.
+summary: Merb plugin for using and creating application 'slices' which help you modularize your application.
 test_files: []