maml 0.1.1 → 0.1.2

data/LICENSE

@@ -1,3 +1,5 @@
+(The MIT License)
+
 Copyright (c) 2009 Nick Van Weerdenburg
  
 Permission is hereby granted, free of charge, to any person

data/bin/maml

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'maml/maml'
+# exit ::Spec::Runner::CommandLine.run
+exit main  # todo: move to module

data/init.rb

@@ -1 +1,6 @@
-require 'maml'
+# require 'maml'
+
+
+# placeholder to statisfy rails
+#
+# any require statements here will be loaded by rails all of the time. As we don't need that, we'll do the loads in our bin file.

data/lib/maml.rb

@@ -6,6 +6,7 @@
 # todo: switch all puts to logger
 # todo: remove some excess logging
 # todo: create a gem
+# todo: 
 require "yaml"
 require "logger"
 
@@ -41,61 +42,103 @@ def extract_arg maml_field
   
   $logger.info this_method + "=> maml_field=#{maml_field}"
   type=case maml_field
-      when /^::(\w*)\b/; "text"
-      when /^:(\w*)\b/; "string"
-      when /^\.\.(\w*)\b/; "float"
-      when /^\.(\w*)\b/; "integer"
-      when /(\w*_id)\b/; "integer"
-      when /^=(\w*)\b/; "boolean"
-      when /^%%(\w*)\b/; "datetime"
-      when /^%(\w*)\b/; "date"
-      when /^@@(\w*)\b/; "timestamp"
-      when /^@(\w*)\b/; "time"
-      when /^&(\w*)\b/; "binary"
-      when /(\w*)\b/; "string"
+      when /^::(\w*)\b[,]?(.*)/; "text"
+      when /^:(\w*)\b[,]?(.*)/; "string"
+      when /^\.\.(\w*)\b[,]?(.*)/; "float"
+      when /^\.(\w*)\b[,]?(.*)/; "integer"
+      when /(\w*_id)\b[,]?(.*)/; "integer"
+      when /^=(\w*)\b[,]?(.*)/; "boolean"
+      when /^%%(\w*)\b[,]?(.*)/; "datetime"
+      when /^%(\w*)\b[,]?(.*)/; "date"
+      when /^@@(\w*)\b[,]?(.*)/; "timestamp"
+      when /^@(\w*)\b[,]?(.*)/; "time"
+      when /^&(\w*)\b[,]?(.*)/; "binary"
+      when /(\w*)\b[,]?(.*)/; "string"
       else raise "Invalid field type";
    end
    field=Regexp.last_match(1)
+   options=Regexp.last_match(2)
    maml_arg= "#{field}:#{type}"
+   maml_options= "#{options}"
+   return maml_arg, maml_options
 end
 
 # build script/generate model arguments from yaml info
 def build_model_args maml
   model_args={}
+  model_options={}
   maml.each do |app|
     puts "\napplication:#{app[0]}"
     print "models: " 
     app[1].each do |model|
       current_model_args=[]
+      current_model_options=[]
       model_name=model[0]
       print "#{model_name} "
       model[1].each do |field|
-        arg=extract_arg field
-        $logger.debug "Extract #{field} ===> #{arg}"
+        arg, options=extract_arg field
+        $logger.debug "Extract Arg #{field} ===> #{arg}"
+        $logger.debug "Extract Options #{field} ===> #{options}"
         current_model_args << arg
+        field_name, field_type=arg.split(":")
+        puts "field_name=#{field_name}, field_type=#{field_type}"
+        current_model_options << [field_name, options]
       end
       model_args[model_name]=current_model_args
+      model_options[model_name]=current_model_options
     end
     puts
   end
-  model_args
+  return model_args, model_options
 end
 
 # todo: add support for multiple files
 # todo: add generate command override options to maml.yml for model specific generations.
 def process_args args
-  generate_command,file=nil
+  file, go=nil
+  generate_command=[]
   
   args.each do |arg|
-    if arg[0,1] == "-" then 
-      generate_command=arg[1,arg.length]        
+    if arg[0,1] == "-" then
+      command=arg[1,arg.length]
+      if command == "go"
+        go=true
+      else 
+        generate_command << command
+      end        
     else
       file=arg
     end
   end
-  return generate_command,file
+  if generate_command.empty?
+    generate_command=nil
+  else
+    generate_command = generate_command.join(" ")
+  end
+  puts "**** generate_command=#{generate_command}"
+  return generate_command,file, go
 end
 
+def post_process_migrations model, result
+  model_name=model[0]
+  puts "model_name: #{model_name}"
+  model_fields=model[1]  # join(" ") to create args for generator ..e.g. fieldname1:string fieldname2:integer
+  
+  # create  app/models/user_group.rb
+  model_file_regex="create  app/models/(.*).rb"
+  # model_file_name=user_group
+  
+  # 20090731211953_create_user_groups.rb
+  # find migration with same but plural
+  # migration_file=
+  
+  # open file
+  # find text field
+  # append options
+  # 
+end
+
+
 # main function
 def main
   puts "\nMAML=Migration Apathy Markup Language"
@@ -115,7 +158,7 @@ def main
   puts "------------------------------------------------------------------------\n"
   puts ""
   
-  generate_command, file = process_args ARGV
+  generate_command, file, go = process_args ARGV
   $logger.info "\ngenerate_command=#{generate_command}, file=#{file}"
   @file_provided=true if file
   $logger.info  "@file_provided=#{@file_provided}"
@@ -124,9 +167,17 @@ def main
   generate_command="model" unless generate_command
   puts "generate_command=#{generate_command}, file=#{file}"
   
-  maml=YAML::load(File.open(file))
-  
-  model_args=build_model_args maml
+  maml=nil
+  begin 
+    maml=YAML::load(File.open(file))
+    $logger.info "YAML loaded file"
+  rescue
+    $logger.debug "Unable to load #{file}"
+    puts "Unable to load file #{file}"
+    exit
+  end
+
+  model_args, model_options = build_model_args maml
 
   puts
   
@@ -136,14 +187,44 @@ def main
     puts "model_name: #{model_name}"
     model_fields=model[1].join " "
     # File.open("maml.log", "a") { |file| file.write "---- model: #{model_name} (#{model_fields}) ---\n\n" }
-    File.open("maml.log", "a") { |file| file.write "---- model: #{model_name} \n\t\t\t#{model_fields.split(" ").join("\n\t\t\t")}\n---\n\n" }
-    command="ruby script/generate #{generate_command} #{model_name} #{model_fields} >> maml.log"
+    # File.open("maml.log", "a") { |file| file.write 
+    $logger.info "---- model: #{model_name} \n\t\t\t#{model_fields.split(" ").join("\n\t\t\t")}\n---\n\n"
+    # command="ruby script/generate #{generate_command} #{model_name} #{model_fields} >> maml.log"
+    command="ruby script/generate #{generate_command} #{model_name} #{model_fields}"
     puts "command: #{command}\n\n"
     if @file_provided == true
-      puts "=== calling system command ==="
-      system command
+      if go
+        puts "=== calling system command ==="
+        result=%x[#{command}]
+        puts "RESULT ====>\n #{result}"
+        post_process_migrations model, result
+        
+        $logger.info "\n\n#{result}\n\n"
+      else
+        puts "=== trial run...run with '-go' to generated files ==="
+      end
+    else
+      puts "=== no file provided ==="
     end  
   end
+  
+  model_options.each do |model|
+    model_name=model[0]
+    puts "options model_name: #{model_name}"
+    
+    model[1].each do |options|
+      field_name=options[0]
+      option_list=options[1]
+      options_list_message=""
+      if option_list !=nil && option_list.size > 0
+        options_list_message="| options => #{option_list}"
+      end
+      puts "options logic: field_name=#{field_name} #{options_list_message}"
+    end
+  end
+  # todo: parse generated migrations and add options
+  # todo: add index logic
+    
   puts "\n\nDONE! Look at maml.log for script results, and in app/models, db/migrations, test/fixtures and test/unit for generated code (if you ran maml.rb with a command line arg)"
   unless ARGV[0]
     puts "\n\nUse 'maml.rb maml.yml' (or other file arg) to actuallly run generators. Running with default maml.yml does test run only."

data/maml.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{maml}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Van Weerdenburg"]
@@ -10,13 +10,23 @@ Gem::Specification.new do |s|
   s.description = %q{Modeling Apathy Markup Language}
   s.email = %q{nick@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/maml.rb", "LICENSE", "README.rdoc"]
-  s.files = ["CHANGELOG", "gem_notes", "init.rb", "lib/maml.rb", "LICENSE", "maml", "maml.gemspec", "maml.yml", "maml_spec.txt", "Manifest", "Rakefile", "README.rdoc"]
+  s.files = ["CHANGELOG", "gem_notes", "init.rb", "bin/maml", "lib/maml.rb", "LICENSE", "maml.gemspec", "maml.yml", "maml_spec.txt", "Manifest", "Rakefile", "README.rdoc"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/vanweerd/maml}
+
+  s.post_install_message = %q{**************************************************
+
+    Thank you for installing maml-0.1.1
+
+    Run "maml" by itself on the command line for documentation.
+
+**************************************************
+}  
+  
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Maml", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{maml}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Modeling Apathy Markup Language}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maml
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nick Van Weerdenburg
@@ -28,9 +28,9 @@ files:
 - CHANGELOG
 - gem_notes
 - init.rb
+- bin/maml
 - lib/maml.rb
 - LICENSE
-- maml
 - maml.gemspec
 - maml.yml
 - maml_spec.txt
@@ -41,7 +41,15 @@ has_rdoc: true
 homepage: http://github.com/vanweerd/maml
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  **************************************************
+  
+      Thank you for installing maml-0.1.1
+  
+      Run "maml" by itself on the command line for documentation.
+  
+  **************************************************
+
 rdoc_options: 
 - --line-numbers
 - --inline-source

data/maml

@@ -1 +0,0 @@
-# maml shell script