oozby 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbeac0d8921f607998af1bcdc80dcd33fc8a1458
-  data.tar.gz: 9aa07a90a933bb5e71371132efeb3e319d19b7cd
+  metadata.gz: 901a0884ebe9594a1996929a598c3c43953f0311
+  data.tar.gz: c067f37b25ff24e0393e83a5f356e9c371924471
 SHA512:
-  metadata.gz: e93d14c4822a3d96ccc2ec468186308e6ce7d15413cc0a6a7bbf5d7cfce07596b444f4bf6fda1004876d6d1c536b8e99a39c85d48ff12105e19bd334fca3788a
-  data.tar.gz: 1164475b829db6152960f3aee796ea3d0f360208f2820837d01f0ca9910bfd431d4d1c233e661ed845ab77369448fada5d4513cc6a6685f9a6a5a13ccbe8aa49
+  metadata.gz: 5967a2df6372a8466412595b7487809011d0de91a19b26d0a8cc105affe338158d7688fc40aa444db5585b62d5672676318a0e56b91856f131d91d3c78f1fd86
+  data.tar.gz: 899043bf5aa0605ad16406fc05f931d618da86aa15f853a3f5b9a69bdaca04edd925b34f25ca45b22b096c832881981e8374baf785cadf1e1f1c7e3262510795

data/bin/oozby

@@ -1,23 +1,79 @@
 #!/usr/bin/env ruby
 $:.unshift File.dirname(__FILE__) + "/../lib"
-require 'fssm'
-#require 'pp'
+require 'thor'
+#require 'fssm'
+require 'listen'
+require 'pp'
 require 'oozby'
 
-def recompile file
-  ooz = Oozby.new
-  ooz.parse_file file
-  #pp ooz.abstract_tree
-  File.open(file + '.scad', 'w') do |handle|
-    handle.write ooz.render
-  end
+class OozbyUtility < Thor
+  desc "compile some#{File::SEPARATOR}folder", "The Oozby Utility searches a directory and compiles all the .oozby files it finds, creating identically named files with .scad stuck on the end, translated in to OpenSCAD nonsense. Open those files in OpenSCAD app and enable Automatic Reload and Compile in the Design menu, then get to work."
   
-  puts "Updated #{File.basename(file)}"
+  option :verbose, type: :boolean, desc: "Output lots of gunk, to figure out bizarre bugs in Oozby"
+  option :all, type: :boolean, desc: "Don't skip any files - recompile them all!"
+  option :watch, type: :boolean, default: true, desc: "Watch directory for changes and automatically recompile"
+  def compile path
+    if File.file? path
+      ooz = Oozby.new
+      begin
+        ooz.parse_file path
+      
+        if options[:verbose]
+          puts "Oozby Abstract Syntax Tree:"
+          pp ooz.abstract_tree
+        end
+      
+        File.open(path + '.scad', 'w') do |handle|
+          handle.write ooz.render
+        end
+        
+        puts "compiled #{File.basename(path)}"
+      rescue StandardError, ScriptError => err
+        local_pwd = Dir.pwd
+        puts "#{err.class.name}: #{err.message.sub(local_pwd + File::SEPARATOR, '')}"
+        err.backtrace.each { |line| puts line.sub(local_pwd + File::SEPARATOR, '') }
+      end
+      
+    elsif File.directory? path
+      directory = File.absolute_path(path) # calculate real absolute path - follow any links
+      globber = File.join(directory, '**', '*.oozby')
+      files = Dir.glob(globber)
+      files.each do |filename|
+        compile filename if !File.exists?("#{filename}.scad") || File.mtime(filename) >= File.mtime("#{filename}.scad") || options[:all]
+      end
+      
+      if options[:watch]
+        recompile_handler = lambda do |*args|
+          compile File.join(*args)
+        end
+        
+        Listen.to! directory, filter: /\.oozby$/ do |modified, added, removed|
+          modified.each { |path| recompile_handler[path] }
+          added.each { |path| recompile_handler[path] }
+          removed.each do |path|
+            puts "#{File.basename(path)} deleted."
+            if File.exists? "#{path}.scad"
+              File.delete("{path}.scad")
+              puts "Deleted generated .scad file for obsolete #{File.basename(path)}"
+            end
+          end
+        end
+        
+        # FSSM.monitor(directory, File.join('**', '*.oozby')) do
+        #   create &recompile_handler
+        #   update &recompile_handler
+        #   delete do |dir, name|
+        #     puts "#{name} deleted."
+        #     if File.exists? File.join(dir, name + ".scad")
+        #       File.delete(File.join(dir, name + ".scad"))
+        #       puts "Deleted generated .scad file for obsolete #{name}"
+        #     end
+        #   end
+        # end
+      end
+    end
+  end
 end
 
-filename = File.absolute_path(ARGV.last)
-recompile filename
-FSSM.monitor(File.dirname(filename), File.basename(filename)) do
-  update { recompile filename }
-  create { recompile filename }
-end
+OozbyUtility.start(ARGV)
+

data/lib/oozby/method_preprocessor.rb

@@ -13,15 +13,22 @@ class Oozby::MethodPreprocessor
   end
   
   # allow translate to take x, y, z named args instead of array, with defaults to 0
-  def xyz_to_array(info, default: 0, arg: false)
+  def xyz_to_array(info, default: 0, arg: false, depth: true)
     if [:x, :y, :z].any? { |name| info[:named_args].include? name }
       
       # create coordinate 'vector' (array)
-      coords = [
-        info[:named_args][:x] || default,
-        info[:named_args][:y] || default,
-        info[:named_args][:z] || default
-      ]
+      if depth
+        coords = [
+          info[:named_args][:x] || default,
+          info[:named_args][:y] || default,
+          info[:named_args][:z] || default
+        ]
+      else
+        coords = [
+          info[:named_args][:x] || default,
+          info[:named_args][:y] || default
+        ]
+      end
       
       # if argument name is specified, use that, otherwise make it the first argument in the call
       if arg
@@ -60,7 +67,7 @@ class Oozby::MethodPreprocessor
     expanded_names(info)
     layout_defaults(info)
     
-    if info.named_args[:r]
+    if info.named_args[:r] && info.named_args[:r] > 0.0
       # render rounded rectangle
       info.replace rounded_cube(**args_parse(info, :size, :center, :r))
     end
@@ -112,10 +119,10 @@ class Oozby::MethodPreprocessor
   def _cylinder(info); expanded_names(info); layout_defaults(info); end
   def _square(info)
     expanded_names(info)
-    xyz_to_array(info, default: 1, arg: :size)
+    xyz_to_array(info, default: 1, arg: :size, depth: false)
     layout_defaults(info)
     
-    if info[:named_args][:r]
+    if info[:named_args][:r] and info.named_args[:r] > 0.0
       # render rounded rectangle
       info.replace rounded_rect(**args_parse(info, :size, :center, :r))
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oozby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Bluebie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fssm
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 1.3.0
 description: OpenSCAD - a cad language for creating solid 3d objects, useful for CNC
   and 3D Printing, is incredibly annoying. It doesn't even support variables! Oozby
   is a markup builder like Markaby or XML Builder, so you can write OpenSCAD programs