@@ -1,3 +1,4 @@ build *.mode1v3 -*.pbxuser \ No newline at end of file +*.pbxuser +*.o \ No newline at end of file .gitignore @@ -13,10 +13,11 @@ @end + // This initialization function gets called when we import the Ruby module. // It doesn't need to do anything because the RubyCocoa bridge will do // all the initialization work. // The rbiphonetest test framework automatically generates bundles for // each objective-c class containing the following line. These // can be used by your tests. -void Init_FmdbMigrationManager() { } \ No newline at end of file +void Init_FmdbMigrationManager() { } Classes/FmdbMigrationManager.m @@ -10,11 +10,19 @@ end task :compile => "objc:compile" -file "build/fmdb.o" => FileList['fmdb/FM*'] do - files = FileList['fmdb/FM*.m'].map { |f| "-c #{f}" }.join(" ") - sh "gcc #{files} -framework Foundation -lsqlite3 -I#{fmdb_dir} -o build/fmdb.o" +fmdb_dir = File.dirname(__FILE__) + "/fmdb" + +FileList['fmdb/FM*.m'].each do |fmdb_file| + FileUtils.mkdir_p "build" + base = fmdb_file.gsub(/\.m$/,'') + dot_o = "build/#{File.basename base}.o" + file dot_o => ["#{base}.m", "#{base}.h"] do + sh "gcc -c #{base}.m -o #{dot_o}" + end end +fmdb_o_files = FileList['fmdb/FM*.m'].map { |fmdb_file| File.join("build", File.basename(fmdb_file).gsub(/m$/,'o')) } + namespace :objc do # look for Classes/*.m files containing a line "void Init_ClassName" # These are the primary classes for bundles; make a bundle for each @@ -23,7 +31,7 @@ namespace :objc do path =~ /Classes\/(.*)\.m/ model_name = $1 - task :compile => model_name do + task :compile => "build/bundles/#{model_name}.bundle" do if Dir.glob("**/#{model_name}.bundle").length == 0 STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" STDERR.puts "Bundle actually failed to build." @@ -32,14 +40,11 @@ namespace :objc do end end - task model_name.to_sym => "build/bundles/#{model_name}.bundle" - - fmdb_dir = File.dirname(__FILE__) + "/fmdb" - - file "build/bundles/#{model_name}.bundle" => ["Classes/#{model_name}.m", "Classes/#{model_name}.h"] do |t| + file "build/bundles/#{model_name}.bundle" => fmdb_o_files + ["Classes/#{model_name}.m", "Classes/#{model_name}.h"] do |t| FileUtils.mkdir_p "build/bundles" FileUtils.rm Dir["build/bundles/#{model_name}.bundle"] - sh "gcc -o build/bundles/#{model_name}.bundle -o build/fmdb.o -bundle -framework Foundation -lsqlite3 -I#{fmdb_dir} Classes/#{model_name}.m" + fmdb_files = FileList['build/FM*.o'].join(" ") + sh "gcc -o build/bundles/#{model_name}.bundle #{fmdb_files} -bundle -framework Foundation -lsqlite3 -I#{fmdb_dir} Classes/#{model_name}.m" end end Rakefile @@ -4,7 +4,23 @@ require "FmdbMigrationManager.bundle" OSX::ns_import :FmdbMigrationManager class TestFmdbMigrationManager < Test::Unit::TestCase - def test_fmdb_migration_manager_class_exists - OSX::FmdbMigrationManager + should "have FmdbMigrationManager class" do + assert OSX::FmdbMigrationManager end + + context "with clean sqlite db" do + setup do + @db_path = "/tmp/fmdb-test.db" + @db = OSX::FMDatabase.databaseWithPath @db_path + end + + teardown do + FileUtils.rm @db_path if File.exists?(@db_path) + end + + should "create sqlite db" do + assert File.exists?(@db_path) + end + end + end \ No newline at end of file test/test_fmdb_migration_manager.rb @@ -1,4 +1,9 @@ require "test/unit" require "osx/cocoa" -$:.unshift File.dirname(__FILE__) + "/../build/bundles" \ No newline at end of file +$:.unshift File.dirname(__FILE__) + "/../build/bundles" + +require "fileutils" +require "rubygems" +gem 'Shoulda' +require "Shoulda" \ No newline at end of file test/test_helper.rb 1ba45c97b5e7ce7fe8d0e95837b7e69da9f06edf Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/fmdb-migration-manager/commit/f5f0b50d06126f5d69fc8b3e1afb4cabd383b0b2 f5f0b50d06126f5d69fc8b3e1afb4cabd383b0b2 2008-09-06T00:01:15-07:00 2008-09-06T00:01:15-07:00 successfully building bundle that includes fmdb + my migration class 3546da37143cd893cfcdf796dd621f9fe302d9f0 Dr Nic Williams drnicwilliams@gmail.com