maml 0.2.0 → 0.3.0

data/.gitignore

@@ -1,3 +1,5 @@
 pkg
 doc
 Manifest
+maml.log
+maml.log

data/lib/maml/maml.rb

@@ -75,8 +75,11 @@ module Maml
 
   # build script/generate model arguments from yaml info
   def build_model_args maml
-    model_args={}
-    model_options={}
+
+    model_args={}  # of field:type format as used by script/generate model etc.
+    model_options={}  # e.g 50, NULL, etc. 
+    # note: may not have had to separate them, but did in the case of future additional processing
+    
     maml.each do |app|
       puts "\napplication:#{app[0]}"
       print "models: " 
@@ -84,7 +87,7 @@ module Maml
         current_model_args=[]
         current_model_options=[]
         model_name=model[0]
-        print "#{model_name} "
+        print "model: #{model_name} "
         model[1].each do |field|
           arg, options=extract_arg field
           $logger.debug "Extract Arg #{field} ===> #{arg}"
@@ -94,8 +97,10 @@ module Maml
           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
@@ -109,19 +114,18 @@ module Maml
     generate_command=[]
   
     args.each do |arg|
-      if arg[0,1] == "-" then
-        command=arg[1,arg.length]
-        if command == "go"
+      if arg == "--go" then
           go=true
-        else 
-          generate_command << command
-        end        
-      else
-        file=arg
+      elsif arg[0,7] == "--file="
+          file=arg[8,100] # 100 is arbitrary
+          $logger.info "file=#{file} from --file= argument"
+      else 
+        generate_command << command
       end
     end
+    
     if generate_command.empty?
-      generate_command=nil
+      generate_command=nil  # will use default
     else
       generate_command = generate_command.join(" ")
     end
@@ -155,17 +159,21 @@ module Maml
     puts "======================================"
     puts "Visit http://lazymaml.org for more details"
     puts "Copyright 2009 Zigelo and Nick Van Weerdenburg, Licensed under MIT License\n\n"
-    puts "usage: maml.rb <filename> [-generate_command]"
-    puts "runs trial by default, add -go for rails generation"
-    puts "e.g. maml.rb blog.yml -scaffold"
+    puts "usage: maml.rb [--file <filename>] [your script/generate options] [--go]"
+    puts "same as script/generate with addition of --file and --go, looping through file"
+    puts "runs trial by default, add --go for rails generation"
+    puts "e.g. maml.rb --file=blog.yml scaffold"
     puts "OR"
-    puts "e.g. maml.rb blog.yml -scaffold -go"
+    puts "e.g. maml.rb --file=blog.yml scaffold --go"
     puts "OR"
-    puts "usage: maml.rb"
+    puts "maml.rb by itself to see usage."
     puts "(defaults to 'maml.yml' file and generating the model)\n\n"
-    puts "use ---haml or similar for adding extra commands. -<anything> is passed to the command-line minus the -"
-    puts "maml supports one file at time"
-    puts "generated files are in <rails_root>/maml"
+    puts "Additional arguments are passed to script/generate, such as --haml and --rspec"
+    puts " e.g. maml nifty_scaffold --haml --rspec"
+    puts "which runs using maml.yml since --file not provided"
+    puts " to actually generate code:"
+    puts " e.g. maml nifty_scaffold --haml --rspec --go"
+    # puts "generated files are in <rails_root>/maml"
     puts "Run 'maml.rb create_sample' to generate a sample maml.yml file for a starting point. Note: this will overwrite any existing maml.yml."
     puts "\nSpecify field type by symbol prefix as follows:"
     puts "no prefix=string ; no prefix and _id suffix = integer ; override _id by adding prefix"
@@ -175,11 +183,14 @@ module Maml
   
     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}"
       
     file="maml.yml" unless file
-    generate_command="model" unless generate_command
+    
+    unless generate_command
+      generate_command="model" 
+      puts "WARNING: using default 'model' for script/generate"
+      $logger.info "WARNING: using default 'model' for script/generate"
+    end
     puts "generate_command=#{generate_command}, file=#{file}"
     
     # allow copy_sample via file (e.g. maml.rb copy_sample) or via command (e.g. maml.rb -copy_sample)
@@ -205,11 +216,19 @@ module Maml
       $logger.info "YAML loaded file"
     rescue
       $logger.debug "Unable to load #{file}"
-      puts "Unable to load file #{file}"
+      puts "Unable to load file #{file}. Check if it exists."
       exit
     end
 
     model_args, model_options = build_model_args maml
+    
+    # todo: extract default args
+    default_fields=nil
+    default_model = model_args["default"]
+    default_fields= default_model[1].join(" ") if default_model
+    puts ":default fields: #{default_fields}"
+    $logger.info ":default fields: #{default_fields}"
+    model_args.delete "default" # so not to generate
 
     puts
   
@@ -224,20 +243,17 @@ module Maml
       # 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
-        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
+
+      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 "=== no file provided ==="
-      end  
+        puts "=== trial run...run with '--go' to generated files ==="
+      end
     end
   
     model_options.each do |model|
@@ -257,10 +273,7 @@ module Maml
     # 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 trial run only."
-    end
+    puts "\n\nDONE! This was a trial run unless '--go' provided. 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)"
   ensure
     puts "Thanks for being a Lazy MAML!"
     return 0

data/maml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{maml}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Van Weerdenburg"]
-  s.date = %q{2009-12-04}
+  s.date = %q{2010-09-01}
   s.default_executable = %q{maml}
   s.description = %q{MAML, also know as LazyMAML is a terser means for initially modeling your rails app. The MAML yml file is processed, and the rails migration generator called, with arguments being passed through for scaffold, model, controller, haml, etc. as desired.}
   s.email = %q{vanweerd@gmail.com}

data/maml.yml

@@ -5,9 +5,23 @@
 # default type is string, except where field has _id suffice- then it's integer (override by adding prefix as shown below)
 # .integer, ..float,  %date, %%datetime, @time, @@timestamp, :string, ::text, =boolean, &binary
 #
+# -- for additional options, such as --haml
+# ++ for other ad-hoc options (++ stripped out)
+# 
+# --file and --go options are processed by maml.rb and not passed to script/generate
+#
+# if no --file provided, maml looks for default maml.yml file
+# 
+# default: class is special and applied to all other classes
+#
+#
 # level 1: module, level 2: class, level 3: field
 # maml.yml is a sample file for a starting point. maml sample copies it to current directory.
 innerplate:
+    default:  # applies to all items
+        - nifty_scaffold
+        - --haml
+        - --rspec
     Plate:
         - day_id  # any _id defaults to integer
         - meal_id 50 true

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: maml
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nick Van Weerdenburg
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2010-09-01 00:00:00 -04:00
 default_executable: maml
 dependencies: []
 
@@ -48,21 +54,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Migration Apathy Markup Language