sqld4r 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,11 @@
+== 0.0.2 2008-06-24
+
+* generate migration file for your model's PKs and FKs.
+* make a template of command list
+* add --save option for save the SQLDesigner xml file
+* add --command_list option for set command list path
+* add --skip_command_list for skip to execute commands.
+
 == 0.0.1 2008-06-20
 
 * 1 major enhancement:

data/Manifest.txt

@@ -1,4 +1,3 @@
-.gitignore
 History.txt
 License.txt
 Manifest.txt
@@ -9,7 +8,6 @@ bin/sqld4r
 config/hoe.rb
 config/requirements.rb
 lib/sqld4r.rb
-lib/sqld4r/er2.xml
 lib/sqld4r/sqld4r_core.rb
 lib/sqld4r/sqld4r_options.rb
 lib/sqld4r/sqld4r_parser.rb
@@ -26,6 +24,7 @@ setup.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/sqld4r_spec.rb
+spec/dbdesigner.xml
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake

data/PostInstall.txt

@@ -1,4 +1,4 @@
-1. Set environment valiable.
+1. Set environment valiable if you want to change a config file path.
 
 $ export SQLD4R_CONF=~/.sqld4r
 
@@ -8,9 +8,10 @@ $ export SQLD4R_CONF=~/.sqld4r
 
 $ sqld4r --init
 
-3. Modify default values.
+3. Modify default values and command list.
 
 $ vi ~/.sqld4r
+$ vi ~/sqld4r_execute_commands
 
 4. Test for setting
 

data/README.txt

@@ -9,6 +9,10 @@ The sqld4r is model generator for SQLDesigner(http://ondras.zarovi.cz/sql/demo/)
 == FEATURES/PROBLEMS:
 
 * generate migration files and model files from SQLDesigner xml file.
+* generate migration file for your model's PKs and FKs.
+* execute command list before finish.
+(exp., execute 'rake db:create:all' for migrate to your database).
+* save the DBDesigner xml file.
 
 == SYNOPSIS:
 
@@ -19,6 +23,7 @@ Usage: sqld4r --check [options]
 
 == REQUIREMENTS:
 
+* Readline library on your system
 * activesupport ver 2.1.0 
 (I checked this version only)
 
@@ -26,6 +31,8 @@ Usage: sqld4r --check [options]
 
 * gem install sqld4r
 
+
+
 == LICENSE:
 
 (The MIT License)

data/lib/sqld4r/sqld4r_core.rb

@@ -18,8 +18,10 @@ class Sqld4r_core
     end
     @structure.each do |table|
       add_relationship_to(table) unless @options["skip-relation"]
-      add_index_to(table) unless @options["skip-index"]
     end
+    add_index_for_all(@structure) unless @options["skip-index"]
+    copy_sqld_xml_file unless @options["copy_sqld_to"].nil?
+    execute_command_list unless @options["skip_command_list"]
     notice "sqld4r: Complete at " + Time.now.strftime("%Y/%m/%d %H:%M:%S")
     @logfile.close if @logfile
   end
@@ -146,7 +148,7 @@ relation_models = [
   end
   
   def modelname2modelpath(modelname)
-    "app/models/" + modelname + ".rb"
+    "app/models/" + modelname.underscore + ".rb"
   end
 
   def text_insert_to(filename)
@@ -162,30 +164,77 @@ relation_models = [
   end
 =begin
 
-script/generate migration add_indexes_for_all_tables
+% script/generate migration add_index_for_all
+      exists  db/migrate
+      create  db/migrate/20080622130506_add_index_for_all.rb
 
 
-
-class CreatePosts < ActiveRecord::Migration
+% cat db/migrate/20080622130506_add_index_for_all.rb 
+class AddIndexForAll < ActiveRecord::Migration
   def self.up
-    create_table :posts do |t|
-      t.string :title
-      t.text :body
-      t.boolean :published
-
-      t.timestamps
-    end
   end
 
   def self.down
-    drop_table :posts
   end
 end
 =end  
-  def add_index_to(table)
+  def add_index_for_all(structure)
+    notice "add index to a new migrate file"
+    index_list = []
+    structure.each do |table|
+      index_list << {"table" => table["tablename"], "column" => "id"}
+      table["colums"].each do |column|
+        index_list << {"table" => table["tablename"], "column" => column["name"]} unless column["relation"].nil?
+      end
+    end
+    
+    if 0 == index_list.size
+      notice "--skip. because this database dose not have tables"
+    else
+      begin
+        result = exec_shell_command("script/generate migration add_index_for_all")
+        # result is "      exists  db/migrate\n      create  db/migrate/20080624022342_add_index_for_all.rb"
+        migratefile = result.scan(/create\s\s(db\/migrate\/.+_add_index_for_all.rb)$/).first.first
+      rescue
+        migratefile = nil
+        notice "--error. can not find migration file"
+      end
+      if migratefile
+        text_insert_to(migratefile) do |file, line|
+          file.puts line
+          if /def\sself\.up$/ =~ line
+            index_list.each do |target|
+              file.puts "    add_index :" + target["table"] + ", :" + target["column"]
+            end
+          end    
+          if /def\sself\.down$/ =~ line
+            index_list.each do |target|
+              file.puts "    remove_index :" + target["table"] + ", :" + target["column"]
+            end
+          end    
+        end
+      end
+      notice "--modifyed index on " + migratefile
+    end
     
   end
-
+  
+  def copy_sqld_xml_file
+    notice "save this database xml file to " + @options["copy_sqld_to"]
+    exec_shell_command("cp " + @options["sqld_path"] + " " + @options["copy_sqld_to"])
+  end
+  
+  def execute_command_list
+    notice "execute commands from " + @options["command_list_path"]
+    
+    File::open(@options["command_list_path"], "r") do |file|
+      file.readlines.each { |command|
+        exec_shell_command(command) unless /^#.*/ =~ command or command.chomp.empty?
+      }
+    end
+    
+  end
+  
   def notice(message)
     puts "* " + message if @options["verbose"]
     @logfile.puts "* " + message if @options["logging"] and @logfile
@@ -200,7 +249,7 @@ end
     puts '-->' + result  if @options["verbose"] and not result.nil? and not result.empty?
     @logfile.puts '-->' + result if @options["logging"] and not result.nil? and not result.empty?
     Sqld4r_options::error_with_show_usage "receive error from command." unless 0 == $?
-    $?
+    result
   end
 
 end

data/lib/sqld4r/sqld4r_options.rb

@@ -49,6 +49,10 @@ class Sqld4r_options < Hash
         self["sqld4r_conf_path"] = p
       end
 
+      opts.on( '--save=/save/to/xmlfile', 'save xml file path(../docs/sqldesigner.xml < conf < command line params)' ) do |p|
+        self["copy_sqld_to"] = p
+      end
+      
       opts.on( '--svn', 'Modify files with subversion. (Note: svn must be in path/for script/generate)') do
         @@command_line_params["svn"] = true
       end
@@ -80,7 +84,7 @@ class Sqld4r_options < Hash
       opts.on( '--skip-index', "Don't add index to migration files") do
         @@command_line_params["skip-index"] = true
       end
-
+      
       opts.on( '--verbose', 'provide extra output while running') do
         @@command_line_params["verbose"] = true
       end
@@ -97,6 +101,14 @@ class Sqld4r_options < Hash
         @@command_line_params["log_file"] = p
       end
 
+      opts.on( '--command_list=/path/to/listfile', 'Set path to a command list for executing it before finish. default is $HOME/sqld4r_execute_commands' ) do |p|
+        @@command_line_params["command_list_path"] = p
+      end
+
+      opts.on( '--skip_command_list', "Don't execute commands on a command list" ) do
+        @@command_line_params["skip_command_list"] = true
+      end
+
       opts.on( '--emulate', 'enable emulation mode' ) do
         @@command_line_params["emulate"] = true
       end
@@ -115,7 +127,7 @@ class Sqld4r_options < Hash
         exit
       end
 
-      opts.on( '--init', 'setup a template of conf file'  ) do
+      opts.on( '--init', 'setup a template of conf file and execute_command_list'  ) do
         self["init"] = true
       end
 
@@ -145,6 +157,7 @@ class Sqld4r_options < Hash
     end 
     if self["init"] or "--init" == self["sqld_path"] 
       put_conf_file
+      put_commandlist_file
       exit
     end
     self
@@ -184,6 +197,40 @@ class Sqld4r_options < Hash
     end
   end
   
+  # write a template command list file to command_list_path
+  def put_commandlist_file
+    # check put path
+    Sqld4r_options::error_with_show_usage "command list path is empty. set --command_list paramater." if self["command_list_path"].empty?
+    
+    unless "y" == Readline.readline("Would a template file put to #{self["command_list_path"]}? [y/N] > ").downcase
+      puts "Set your command list path to --command_list paramater."
+      exit
+    end
+        
+    begin
+      File.open(self["command_list_path"]) do |textfile|
+        # check overwrite?
+        exit unless "y" == Readline.readline("Overwrite? [y/N]").downcase
+      end
+    rescue
+    end
+    
+    begin
+      File.open(self["command_list_path"], "w") do |textfile|
+        textfile.puts "# command list file for executing it before finish"
+        textfile.puts ""
+        textfile.puts "# <- this line is comment."
+        textfile.puts "# next line is executable commands:"
+        textfile.puts "rake db:migrate"
+        textfile.puts "capify ."
+        textfile.puts "# NOTE:recommend 'rake db:migrate' command to write here."
+      end
+      puts "Put template command list file to #{self["command_list_path"]}"
+    rescue
+      puts "Warning:Could not open for writing. check parmitions."
+    end
+  end
+  
   def self.error_with_show_usage(message)
     puts "Error:" + message
     Sqld4r_options::show_usage
@@ -207,7 +254,7 @@ class Sqld4r_options < Hash
   def self.static_default_values
     defaults = {}
     defaults["sqld4r_conf_path"] = ENV["HOME"] + "/.sqld4r"
-    defaults["copy_sqld_to"] = "../docs/sqldesigner.xml"
+    defaults["copy_sqld_to"] = "../../docs/sqldesigner.xml"
     defaults["svn"] = false
     defaults["git"] = false
     defaults["skip-timestamps"] = false
@@ -216,11 +263,12 @@ class Sqld4r_options < Hash
     defaults["rspec"] = false
     defaults["skip-relation"] = false
     defaults["skip-index"] = false
-    defaults["execute_command_list"] = ENV["HOME"] + "/.sqld4r_execute_commands"
+    defaults["command_list_path"] = ENV["HOME"] + "/sqld4r_execute_commands"
+    defaults["skip_command_list"] = false
     defaults["verbose"] = false
     defaults["sudo"] = false
     defaults["logging"] = false
-    defaults["log_file"] = "./sqld4r.log"
+    defaults["log_file"] = "../../docs/sqld4r.log"
     defaults["emulate"] = false
     defaults
   end

data/lib/sqld4r/version.rb

@@ -2,7 +2,7 @@ module Sqld4r
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/nbproject/private/private.properties

@@ -0,0 +1 @@
+platform.active=Ruby

data/nbproject/project.properties

@@ -0,0 +1,7 @@
+javac.classpath=
+main.file=
+ruby.includejava=false
+source.encoding=UTF-8
+src.bin.dir=bin
+src.lib.dir=lib
+test.spec.dir=spec

data/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>sqld4r</name>
+            <source-roots>
+                <root id="src.bin.dir"/>
+                <root id="src.lib.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.spec.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>sqld4r</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/sqld4r"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/sqld4r" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/sqld4r" class="numbers">0.0.2</a>
     </div>
     <h1>&#x2192; &#8216;sqld4r&#8217;</h1>
 
@@ -46,6 +46,18 @@ If you have a xml file of the SQLDesigner, you will be able to generate migratio
 I recommend that you use it with a rocketstarter gem.<br /></p>
 
 
+	<h2>Features</h2>
+
+
+	<ul>
+	<li>generate migration files and model files from SQLDesigner xml file.<br /></li>
+		<li>generate migration file for your model&#8217;s PKs and FKs.<br /></li>
+		<li>execute command list before finish.<br />
+(exp., execute &#8216;rake db:create:all&#8217; for migrate to your database).<br /></li>
+		<li>save the DBDesigner xml file.<br /></li>
+	</ul>
+
+
 	<h2>Installing</h2>
 
 
@@ -71,6 +83,54 @@ I recommend that you use it with a rocketstarter gem.<br /></p>
 </pre></p>
 
 
+	<h2>How to use</h2>
+
+
+	<p>1. Set environment valiable if you want to change a config file path.</p>
+
+
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">export</span> <span class="constant">SQLD4R_CONF</span><span class="punct">=~/</span><span class="regex">.sqld4r<span class="normal">
+</span></span></pre></p>
+
+
+	<p>- Default is $HOME/.sqld4r</p>
+
+
+	<p>2. Create config file.</p>
+
+
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">sqld4r</span> <span class="punct">--</span><span class="ident">init</span>
+</pre></p>
+
+
+	<p>3. Modify default values and command list.</p>
+
+
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">vi</span> ~<span class="punct">/.</span><span class="ident">sqld4r</span>
+<span class="global">$ </span><span class="ident">vi</span> ~<span class="punct">/</span><span class="ident">sqld4r_execute_commands</span>
+</pre></p>
+
+
+	<p>4. Test for setting</p>
+
+
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">sqld4r</span> <span class="punct">--</span><span class="ident">check</span>
+</pre></p>
+
+
+	<p>5. Generate migration files and model files from SQLDesigner xml file.</p>
+
+
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">cd</span> <span class="ident">your</span><span class="punct">-</span><span class="ident">rails</span><span class="punct">-</span><span class="ident">root</span>
+<span class="global">$ </span><span class="ident">sqld4r</span> <span class="punct">/</span><span class="ident">path</span><span class="punct">/</span><span class="ident">to</span><span class="punct">/</span><span class="constant">SQLDesigner</span><span class="punct">.</span><span class="ident">xml</span>
+</pre></p>
+
+
 	<h2>Forum</h2>
 
 
@@ -120,7 +180,7 @@ rake install_gem</pre>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:maimuzo@gmail.com" title="maimuzo">Yusuke Ohmichi</a> via the <a href="http://groups.google.com/group/sqld4r">forum</a></p>
     <p class="coda">
-      <a href="maimuzo@gmail.com">Yusuke Ohmichi(maimuzo)</a>, 22nd June 2008<br>
+      <a href="maimuzo@gmail.com">Yusuke Ohmichi(maimuzo)</a>, 24th June 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -9,6 +9,14 @@ The sqld4r is model generator for SQLDesigner(http://ondras.zarovi.cz/sql/demo/)
 If you have a xml file of the SQLDesigner, you will be able to generate migration files and model files on a minute.<br />
 I recommend that you use it with a rocketstarter gem.<br />
 
+h2. Features
+
+* generate migration files and model files from SQLDesigner xml file.<br />
+* generate migration file for your model's PKs and FKs.<br />
+* execute command list before finish.<br />
+(exp., execute 'rake db:create:all' for migrate to your database).<br />
+* save the DBDesigner xml file.<br />
+
 h2. Installing
 
 <pre syntax="ruby">gem install sqld4r</pre>
@@ -28,6 +36,42 @@ and more...
 Usage: sqld4r --help
 </pre>
 
+h2. How to use
+
+1. Set environment valiable if you want to change a config file path.
+
+<pre syntax="ruby">
+$ export SQLD4R_CONF=~/.sqld4r
+</pre>
+
+- Default is $HOME/.sqld4r
+
+2. Create config file.
+
+<pre syntax="ruby">
+$ sqld4r --init
+</pre>
+
+3. Modify default values and command list.
+
+<pre syntax="ruby">
+$ vi ~/.sqld4r
+$ vi ~/sqld4r_execute_commands
+</pre>
+
+4. Test for setting
+
+<pre syntax="ruby">
+$ sqld4r --check
+</pre>
+
+5. Generate migration files and model files from SQLDesigner xml file.
+
+<pre syntax="ruby">
+$ cd your-rails-root
+$ sqld4r /path/to/SQLDesigner.xml
+</pre>
+
 h2. Forum
 
 "http://groups.google.com/group/sqld4r (English)":http://groups.google.com/group/sqld4r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sqld4r
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Yusuke Ohmichi(maimuzo)
@@ -30,7 +30,7 @@ cert_chain:
   KWTqcg==
   -----END CERTIFICATE-----
 
-date: 2008-06-22 00:00:00 +09:00
+date: 2008-06-25 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -49,7 +49,6 @@ extra_rdoc_files:
 - README.txt
 - website/index.txt
 files: 
-- .gitignore
 - History.txt
 - License.txt
 - Manifest.txt
@@ -60,7 +59,6 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/sqld4r.rb
-- lib/sqld4r/er2.xml
 - lib/sqld4r/sqld4r_core.rb
 - lib/sqld4r/sqld4r_options.rb
 - lib/sqld4r/sqld4r_parser.rb
@@ -77,6 +75,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/sqld4r_spec.rb
+- spec/dbdesigner.xml
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
@@ -89,7 +88,7 @@ files:
 has_rdoc: true
 homepage: http://sqld4r.rubyforge.org
 post_install_message: |+
-  1. Set environment valiable.
+  1. Set environment valiable if you want to change a config file path.
   
   $ export SQLD4R_CONF=~/.sqld4r
   
@@ -99,9 +98,10 @@ post_install_message: |+
   
   $ sqld4r --init
   
-  3. Modify default values.
+  3. Modify default values and command list.
   
   $ vi ~/.sqld4r
+  $ vi ~/sqld4r_execute_commands
   
   4. Test for setting
   

data/.gitignore

@@ -1 +0,0 @@
-nbproject