dbd4 1.0.3 → 1.0.4

data/bin/dbd4

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #--
 
-DBD4VERSION = '1.0.0'
+DBD4VERSION = '1.0.4'
 
 require 'getoptlong'
 require 'dbd4/dbd4_model_file'
@@ -33,8 +33,8 @@ require 'dbd4/dbd4_model_file'
 class DBD4Import
 
   OPTIONS = [
-    ['--dry-run',  '-n', GetoptLong::NO_ARGUMENT,
-      "Do a dry run without executing actions."],
+    ['--validate-only',  '-n', GetoptLong::NO_ARGUMENT,
+      "Do a dry run without executing actions, only validate the model."],
     ['--help',     '-H', GetoptLong::NO_ARGUMENT,
       "Display this help message."],
     ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
@@ -81,8 +81,8 @@ class DBD4Import
   # Do the option defined by +opt+ and +value+.
   def do_option(opt, value)
     case opt
-    when '--dry-run'
-      $dryrun = true
+    when '--validate-only'
+      $validate_only = true
     when '--help'
       help
       exit
@@ -92,7 +92,7 @@ class DBD4Import
       usage
       exit
     when '--version'
-      puts "dbmodel, version #{DBMODELVERSION}"
+      puts "dbmodel, version #{DBD4VERSION}"
       exit
     else
       fail "Unknown option: #{opt}"
@@ -138,7 +138,7 @@ class DBD4Import
           exit(1)
         end
         
-        dbmf.generateModelFiles
+        dbmf.generateModelFiles unless $validate_only == true
         puts "Done!"
       end
     rescue Exception => ex

data/lib/dbd4/dbd4_model_file.rb

@@ -83,8 +83,6 @@ module DBD4
     end
   end
   
-  
-  
   class Table
     attr_reader :id, :name, :columns, :relation_starts, :relation_ends, :modelname, :comments, :non_standard_name, :nm_table
     attr_writer :modelfile, :name, :nm_table
@@ -107,7 +105,6 @@ module DBD4
       column = Column.new(column_xml, self)
       @primary_key = column if column.primary_key? and ! @primary_key
       columns << column
-      
     end
     
     def addEndRelation(e)
@@ -410,7 +407,6 @@ module DBD4
     end
   end
   
-  
   class Relations < OrderedHash
     def <<(relation)
       self[relation.id] = relation

data/lib/dbd4/rails_migration_file.rb

@@ -112,7 +112,7 @@ end
 MIGRATIONFILE
 
       old_migration_file_content = IO.readlines(@migrationfile).join("")
-      if (old_migration_file_content != new_migration_file_content)
+      if (old_migration_file_content != new_migration_file_content)  
         puts "Updating migration file for table #{@tablename} (file : #{@migrationfile})..."
         newFile = File.open(@migrationfile, "w")
         newFile.puts new_migration_file_content

data/lib/dbd4/rails_model_file.rb

@@ -67,7 +67,7 @@ module DBD4
         @modelfile = File.join('app', 'models', Inflector.underscore(Inflector.camelize(@modelname)) + ".rb") 
         if ! FileTest.exist?(@modelfile)
           puts "Generating model #{@modelname}..."
-          generate unless $dryrun
+          generate
         end
         load
       end  
@@ -277,9 +277,14 @@ module DBD4
       original_document_modified = @lines <=> @original_lines
       
       if (original_document_modified != 0)
-        puts "Updating model #{@modelname} (file : #{@modelfile})..."
-        newFile = File.open(@modelfile, "w")
-        newFile.puts @lines
+        if ($dryrun == true)
+          puts "Would of updated model #{@modelname} (file : #{@modelfile}) with content : "
+          puts @lines
+        else
+          puts "Updating model #{@modelname} (file : #{@modelfile})..."
+          newFile = File.open(@modelfile, "w")
+          newFile.puts @lines          
+        end
       end
     end
       

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: dbd4
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2006-08-23 00:00:00 -04:00
+  version: 1.0.4
+date: 2006-08-24 00:00:00 -04:00
 summary: A package for importing DB Designer 4 xml models in rails.
 require_paths: 
 - lib
@@ -30,10 +30,10 @@ authors:
 - Daniel Shane
 files: 
 - lib/slurp.rb
-- lib/dbd4/rails_migration_file.rb
-- lib/dbd4/rails_model_file.rb
 - lib/dbd4/dbd4_model_file.rb
 - lib/dbd4/ordered_hash.rb
+- lib/dbd4/rails_migration_file.rb
+- lib/dbd4/rails_model_file.rb
 - bin/dbd4
 - README
 test_files: