oozby 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5011b1b0b04f3a797f17d23572edc2bcefab387c
-  data.tar.gz: 20e1ce49a8c42a847bb40930d4c76b041674e85b
+  metadata.gz: 65d655bb878ca1d6f884b0ed18f710669e64d6f7
+  data.tar.gz: 4d9e1326e16f2436caa73b9a1a73a43dca9e7a18
 SHA512:
-  metadata.gz: ad55acc6736bbcd0c1fdc4c41b22daacbcae995dd9c915c7c95aac4a24038fbe66db4cfa622c0eacb3b8a133957a005a3642c2e5a8b56c3a5c6496c99f9b07fe
-  data.tar.gz: 1f47fca1a937a05c199686a62007b8f7246dde56112278fa9bfc34ee201eb165ade3da96e092795d62a4dd5fdf7caa68d3b465d1ddd20df68f9e12bc094b20ef
+  metadata.gz: 87f4f684352daf605291502a0c470c38a181e2263dac1588f177c818486db5a5092e6abd3e6190ac10bbb67e451ac3bb39769e98a88961ea986d868f6c6de151
+  data.tar.gz: 244a08c28e31d3cfd781fd895d34df5c843b2f1f15aa68e1f89ab7173809653b2adf15b1bf407bd4d86255dd622d3b7a97cfb008c93cb7259353a05edca67bfa

data/bin/oozby

@@ -2,23 +2,25 @@
 require 'thor'
 require 'listen'
 require 'pp'
+require 'rbconfig'
 require File.join(__dir__, '..', 'lib', 'oozby')
 
 # motivational exit messages!
 $quit_message = {
-  '0.2.2' => "Have a nice day!",
-  '0.2.3' => "You're a superstar!",
-  '0.2.4' => "Keep up the great work!",
-  '0.2.5' => "Nice job!",
-  '0.2.6' => "It was a pleasure working with you!"
+  '0.3.0' => "Have a nice day!",
+  '0.3.1' => "You're a superstar!",
+  '0.3.2' => "Keep up the great work!",
+  '0.3.3' => "Nice job!",
+  '0.3.4' => "It was a pleasure working with you!"
 }
 
 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."
   
   option :verbose, type: :boolean, desc: "Output lots of gunk, to figure out bizarre bugs in Oozby"
+  option :abstract_tree, type: :boolean, desc: "Output Abstract Tree (debugging)"
   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"
+  option :no_watch, type: :boolean, desc: "Don't watch directory for changes - exit immediately"
   def compile path
     if File.file? path
       ooz = Oozby.new
@@ -28,7 +30,7 @@ class OozbyUtility < Thor
       begin
         ooz.parse_file path
       
-        if options[:verbose]
+        if options[:abstract_tree]
           puts "Oozby Abstract Syntax Tree:"
           pp ooz.abstract_tree
         end
@@ -50,12 +52,12 @@ class OozbyUtility < Thor
       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]
+        subprocess_compile filename if !File.exists?("#{filename}.scad") || File.mtime(filename) >= File.mtime("#{filename}.scad") || options[:all]
       end
       
-      if options[:watch]
+      unless options[:no_watch]
         recompile_handler = lambda do |*args|
-          compile File.join(*args)
+          subprocess_compile File.join(*args)
         end
         
         puts "Watching folder for changes... (CTRL+C to exit)"
@@ -76,6 +78,18 @@ class OozbyUtility < Thor
     puts ""
     puts $quit_message[Oozby.version] || $quit_message.values.last
   end
+  
+  private
+  # open up a subprocess to execute this file, so we don't polute the scope when watching
+  # or processing several files
+  def subprocess_compile filename
+    this_file = File.expand_path(__FILE__)
+    ruby_bin = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+    args = [ruby_bin, this_file, 'compile']
+    args.push '--verbose' if options[:verbose]
+    args.push filename
+    system(*args)
+  end
 end
 
 OozbyUtility.start(ARGV)

data/examples/using classes/demo-class.rb

@@ -0,0 +1,35 @@
+# Liion represents standard round lithium ion cells, like the common 18650
+# offering width and height properties, and a #part method which instansiates
+# a 3D model of the battery, including specified tollerance
+class LiionBattery
+  include Oozby::Geometry # allow module to call oozby methods
+  ProtectedRoundLiionOffset = 1020
+  
+  def initialize code, protected: false, tollerance: 0.5
+    @tollerance = tollerance
+    @protected = protected
+    
+    # decode battery code in to diameters
+    code = code.to_i + ProtectedRoundLiionOffset if protected
+    @width, @height = code.to_s.match(/(\d\d)(\d\d\d)/).captures.map(&:to_f)
+    @height = @height / 10.0
+    @height += @tollerance
+    @width += @tollerance
+  end
+  
+  # create 3D model of battery at current oozby location
+  def part
+    positive_tab_diameter = (@width / 2.5) .. (@width / 3.0)
+
+    union do
+      # main battery section
+      cylinder height: @height, diameter: @width
+
+      # positive tab
+      translate(z: @height - 0.05) > cylinder(diameter: positive_tab_diameter, height: 1.0)
+    end
+  end
+  
+  attr_accessor :width, :height, :protected, :tollerance
+end
+

data/lib/oozby/base.rb

@@ -20,12 +20,21 @@ class Oozby
     
     # rescue block to filter out junk oozby library stuff from backtraces
     begin
-      compiled = eval("lambda {; #{code};\n }", nil, filename)
-      env.instance_exec(&compiled)
+      compiled = eval("lambda {; #{code}\n }", nil, filename)
+      env._execute_oozby(&compiled)
     rescue StandardError, NoMethodError => err
       backtrace = $!.backtrace
       #backtrace = backtrace.select { |item| !item.include? __dir__ } unless backtrace.first.include? __dir__
-      backtrace.delete_if { |item| item.to_s =~ /(\.rb|\/oozby):/ } if @filter_errors
+      
+      if @filter_errors # and backtrace.index { |i| i.include? ".oozby:" } < 3
+        execute_oozby_idx = backtrace.index { |i| i.include? "in `_execute_oozby'" }
+        backtrace = backtrace[0...execute_oozby_idx] if execute_oozby_idx
+        backtrace.delete_if do |item|
+          filename = item.split(':').first
+          filename = File.realpath(filename)
+          filename.start_with? __dir__
+        end
+      end
       
       raise $!, $!.message, backtrace
     end

data/lib/oozby/environment.rb

@@ -8,6 +8,10 @@ class Oozby::Environment
     fragments: 0
   }
   
+  class << self
+    attr_accessor :active
+  end
+  
   def initialize(ooz: nil)
     @parent = ooz
     @ast = []
@@ -21,7 +25,7 @@ class Oozby::Environment
   end
   
   # create a new scope that inherits from this one, and capture syntax tree created
-  def _subscope &proc
+  def _subscope *args, &proc
     # capture instance variables
     capture = {}
     instance_variables.each { |key| capture[key] = self.instance_variable_get(key) }
@@ -31,7 +35,7 @@ class Oozby::Environment
     @one_time_modifier = nil
     @defaults = @defaults.dup
     @resolution = @resolution.dup
-    self.instance_eval &proc
+    proc[*args]
     syntax_tree = @ast
     
     # restore instance variables
@@ -45,9 +49,14 @@ class Oozby::Environment
     @ast.push(*code)
   end
   
+  # do we know of this method
+  def oozby_method_defined? name
+    @method_preprocessor.known?(name.to_sym) or !@preprocess or respond_to?(name)
+  end
+  
   def method_missing method_name, *args, **hash, &proc
     # unless we know of this method in OpenSCAD or the preprocessor, abort!
-    unless @method_preprocessor.known?(method_name) or !@preprocess
+    unless oozby_method_defined? method_name
       # grab a list of all known methods, suggest a guess to user
       known = @method_preprocessor.known
       known.push(*public_methods(false))
@@ -61,6 +70,10 @@ class Oozby::Environment
       return super # continue to raise the usual error and all that
     end
     
+    oozby_send_method method_name, *args, **hash, &proc
+  end
+  
+  def oozby_send_method method_name, *args, **hash, &proc
     if proc
       children = _subscope(&proc)
     else
@@ -207,6 +220,15 @@ class Oozby::Environment
     @ast.push(execute: !!execute, import: filename)
   end
   
+  # run some oozby code contained inside a proc
+  def _execute_oozby &code
+    previously = self.class.active
+    self.class.active = self
+    result = instance_exec(&code)
+    self.class.active = previously
+    return result
+  end
+  
   def _scan_methods_from_scad_file filename
     raise "OpenSCAD file #{filename} not found" unless File.exists? filename
     data = File.read(filename)
@@ -242,9 +264,19 @@ class Oozby::Environment
   # returns the abstract tree
   def _abstract_tree; @ast; end
   
+  # make backtraces clearer
   def inspect; "OozbyFile"; end
 end
 
-
-
+# module you can include in your classes to be able to make 3d shapes in them
+module Oozby::Geometry
+  def method_missing *args, &proc
+    environ = Oozby::Environment.active
+    if environ.oozby_method_defined?(args.first)
+      environ.oozby_send_method *args, &proc
+    else
+      super
+    end
+  end
+end
 

data/lib/oozby/method_preprocessor.rb

@@ -139,8 +139,10 @@ class Oozby::MethodPreprocessor
         data = info.named_args.delete(d)
         if data.is_a? Range
           data = Range.new(data.first / 2.0, data.last / 2.0, data.exclude_end?)
+        elsif data.respond_to? :to_f
+          data = data.to_f / 2.0
         else
-          data = data / 2.0
+          raise "#{data.inspect} must be Numeric or a Range"
         end
         info.named_args[r] = data
       end
@@ -157,8 +159,10 @@ class Oozby::MethodPreprocessor
           circumradius = Range.new(inradius.first.to_f / @env.cos(180.0 / sides),
                            inradius.first.to_f / @env.cos(180.0 / sides),
                            inradius.exclude_end?)
-        else
+        elsif inradius.respond_to? :to_f
           circumradius = inradius.to_f / @env.cos(180.0 / sides)
+        else
+          raise "#{inradius.inspect} must be Numeric or a Range"
         end
         info.named_args[r] = circumradius
       end
@@ -282,9 +286,10 @@ class Oozby::MethodPreprocessor
   end
   
   def capture &proc
-    (@env._subscope {
-      preprocessor(false) {
-        instance_eval(&proc)
+    env = @env
+    (env._subscope {
+      env.preprocessor(false) {
+        env._execute_oozby(&proc)
       }
     }).first    
   end

data/lib/oozby/version.rb

@@ -1,5 +1,5 @@
 class Oozby
-  Version = '0.3.0'
+  Version = '0.3.1'
   
   def self.version
     Oozby::Version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oozby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bluebie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -73,6 +73,7 @@ files:
 - lib/oozby.rb
 - readme.md
 - license.txt
+- examples/using classes/demo-class.rb
 - bin/oozby
 homepage: http://github.com/Bluebie/digiusb.rb
 licenses: