desert 0.3.3 → 0.3.4

data/CHANGES

@@ -1,3 +1,7 @@
+0.3.4
+- Fix problems with plugin migrations numbered higher than 7
+- Cleanups to specs: cruise rake task, improved docs, and specs run on OSX
+
 0.3.3
 - Fixed [#20770] Can't get specs to run for desert-based plugin bug (http://rubyforge.org/tracker/index.php?func=detail&aid=20770&group_id=6426&atid=24920)
 - Fixed [#21564] Can't see desert rake tasks (http://rubyforge.org/tracker/index.php?func=detail&aid=21564&group_id=6426&atid=24920)

data/README.rdoc

@@ -273,13 +273,30 @@ test/specs for all installed plugins, which may not be what you want.
 
 To run specs, you need to:
 
-* Make sure you have the necessary gems installed (rr, rspec)
+* Make sure you have the necessary gems installed: 
+
+  sudo geminstaller
+
+* On OSX, you may have to manually install sqlite3-ruby gem 
+
+  sudo env ARCHFLAGS="-arch i386" gem install sqlite3-ruby
+
+* If sqlite3-ruby fails to compile, install it.
+
+  OSX: sudo port install sqlite3
+  Debian: sudo aptitude install sqlite sqlite3 libsqlite-dev libsqlite3-dev
+  
 * Install git http://git.or.cz/
-* Create a database named desert_test
-* Update the database.yml file in <tt>spec/rails_root/config/database.yml</tt>
 * Install the dependencies
+
+  rake install_dependencies
+
 * Run the specs
 
+  rake
+
+== Notes on Rails version dependencies
+
 Desert is a library that heavily monkey patches Rails. To ensure that Desert works with
 multiple versions of Rails, its tests are run against the supported versions of Rails.
 

data/Rakefile

@@ -6,12 +6,12 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 desc "Runs the Rspec suite"
-task(:default) do
+task :default do
   run_suite
 end
 
 desc "Runs the Rspec suite"
-task(:spec) do
+task :spec do
   run_suite
 end
 
@@ -21,12 +21,12 @@ def run_suite
 end
 
 desc "Copies the trunk to a tag with the name of the current release"
-task(:tag_release) do
+task :tag_release do
   tag_release
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.3.3"
+PKG_VERSION = "0.3.4"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -36,29 +36,44 @@ PKG_FILES = FileList[
   'examples/**/*.rb'
 ]
 
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps."
-  s.test_files = "examples/spec_suite.rb"
-  s.description = s.summary
-
-  s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
-  s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
-
-  s.test_files = Dir.glob('spec/*_spec.rb')
-  s.require_path = 'lib'
-  s.author = "Pivotal Labs"
-  s.email = "opensource@pivotallabs.com"
-  s.homepage = "http://pivotallabs.com"
-  s.rubyforge_project = "pivotalrb"
+def gemspec
+  Gem::Specification.new do |s|
+    s.name = PKG_NAME
+    s.version = PKG_VERSION
+    s.summary = "Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps."
+    s.test_files = "examples/spec_suite.rb"
+    s.description = s.summary
+
+    s.files = PKG_FILES.to_a
+    s.require_path = 'lib'
+
+    s.has_rdoc = true
+    s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
+    s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
+
+    s.test_files = Dir.glob('spec/*_spec.rb')
+    s.require_path = 'lib'
+    s.author = "Pivotal Labs"
+    s.email = "opensource@pivotallabs.com"
+    s.homepage = "http://pivotallabs.com"
+    s.rubyforge_project = "pivotalrb"
+  end
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+desc 'Generate updated gemspec with unique version, which will cause gem to be auto-built on github.'
+task :update_gemspec do
+  spec = gemspec
+  spec.version = PKG_VERSION + '.' + Time.now.strftime('%Y%m%d%H%M%S')
+  File.open('desert.gemspec', 'w') do |output|
+    output << spec.to_ruby
+  end
+end
+
+# desc "Creates a gem and also updates desert.gemspec to keep github version in sync"
+# task :update_gem_and_
+# 
+Rake::GemPackageTask.new(gemspec) do |pkg|
+  Rake::Task['update_gemspec'].invoke
   pkg.need_zip = true
   pkg.need_tar = true
 end
@@ -70,7 +85,7 @@ def tag_release
 end
 
 desc "Install dependencies to run the build. This task uses Git."
-task(:install_dependencies) do
+task :install_dependencies do
   require "lib/desert/supported_rails_versions"
   system("git clone git://github.com/rails/rails.git spec/rails_root/vendor/rails_versions/edge")
   Dir.chdir("spec/rails_root/vendor/rails_versions/edge") do
@@ -88,6 +103,12 @@ task(:install_dependencies) do
 end
 
 desc "Updates the dependencies to run the build. This task uses Git."
-task(:update_dependencies) do
+task :update_dependencies do
   system "cd spec/rails_root/vendor/rails_versions/edge; git pull origin"
 end
+
+desc "Runs the CI build"
+task :cruise => :install_dependencies do
+  run_suite
+end
+

data/lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb

@@ -11,13 +11,16 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
         migration_versions = Dir["#{plugin.migration_path}/*.rb"].map do |path|
           File.basename(path, ".rb")
         end.select do |migration|
-          Integer(migration.split("_").first) <= Integer(version)
+          # Make sure versions don't start with zero, or Integer will interpret them as octal
+          version_from_table_stripped = version.sub(/^0*/, '')
+          migration_version_stripped = migration.split("_").first.sub(/^0*/, '')
+          Integer(migration_version_stripped) <= Integer(version_from_table_stripped)
         end
         migration_versions.each do |migration_version|
           insert_sql = ActiveRecord::Base.send(:sanitize_sql, [
             "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_migrations_table_name}(plugin_name, version) VALUES(?, ?)",
             plugin_name,
-            Integer(migration_version.split("_").first)
+            Integer(migration_version.split("_").first.sub(/^0*/, ''))
           ])
           execute insert_sql
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-27 00:00:00 -05:00
+date: 2009-03-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,49 +23,49 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGES
 files: 
+- CHANGES
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
-- CHANGES
+- README.rdoc
 - init.rb
-- lib/desert.rb
-- lib/desert/plugin_templates.rb
-- lib/desert/rails/dependencies.rb
-- lib/desert/rails/2.0.0/plugin.rb
-- lib/desert/rails/1.2.0/initializer.rb
-- lib/desert/rails/migration.rb
-- lib/desert/rails/route_set.rb
-- lib/desert/rails.rb
 - lib/desert/manager.rb
-- lib/desert/plugin_migrations.rb
-- lib/desert/ruby/object.rb
-- lib/desert/supported_rails_versions.rb
-- lib/desert/ruby.rb
-- lib/desert/version_checker.rb
-- lib/desert/tasks.rb
-- lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb
-- lib/desert/plugin_migrations/2.1/migrator.rb
+- lib/desert/plugin.rb
 - lib/desert/plugin_migrations/1.2/extensions/schema_statements.rb
 - lib/desert/plugin_migrations/1.2/migrator.rb
+- lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb
+- lib/desert/plugin_migrations/2.1/migrator.rb
 - lib/desert/plugin_migrations/migrator.rb
-- lib/desert/plugin.rb
-- lib/desert/plugin_templates/edge/action_view.rb
-- lib/desert/plugin_templates/action_controller.rb
+- lib/desert/plugin_migrations.rb
+- lib/desert/plugin_templates/1.2.0/action_mailer.rb
+- lib/desert/plugin_templates/1.2.0/action_view.rb
 - lib/desert/plugin_templates/1.99.0/action_mailer.rb
 - lib/desert/plugin_templates/1.99.0/action_view.rb
 - lib/desert/plugin_templates/2.0.0/action_mailer.rb
-- lib/desert/plugin_templates/2.1.0/action_view.rb
 - lib/desert/plugin_templates/2.0.2/action_view.rb
+- lib/desert/plugin_templates/2.1.0/action_view.rb
+- lib/desert/plugin_templates/action_controller.rb
 - lib/desert/plugin_templates/action_view.rb
-- lib/desert/plugin_templates/1.2.0/action_mailer.rb
-- lib/desert/plugin_templates/1.2.0/action_view.rb
+- lib/desert/plugin_templates/edge/action_view.rb
+- lib/desert/plugin_templates.rb
+- lib/desert/rails/1.2.0/initializer.rb
+- lib/desert/rails/2.0.0/plugin.rb
+- lib/desert/rails/dependencies.rb
+- lib/desert/rails/migration.rb
+- lib/desert/rails/route_set.rb
+- lib/desert/rails.rb
+- lib/desert/ruby/object.rb
+- lib/desert/ruby.rb
+- lib/desert/supported_rails_versions.rb
+- lib/desert/tasks.rb
+- lib/desert/version_checker.rb
+- lib/desert.rb
 - generators/desert_plugin
+- generators/desert_plugin/desert_plugin_generator.rb
 - generators/desert_plugin/templates
-- generators/desert_plugin/templates/routes.rb
+- generators/desert_plugin/templates/empty_file
 - generators/desert_plugin/templates/plugin_migration.rb
+- generators/desert_plugin/templates/routes.rb
 - generators/desert_plugin/templates/spec_helper.rb
-- generators/desert_plugin/templates/empty_file
-- generators/desert_plugin/desert_plugin_generator.rb
 - generators/desert_plugin/USAGE
 has_rdoc: true
 homepage: http://pivotallabs.com