solidruby 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb4fa64b8bd02d57f96db91e6b6d7c322e35f1e2
-  data.tar.gz: 1033119974cb3e078253943b4524c736fe359ca0
+SHA256:
+  metadata.gz: 447c22356e767538c6f5675460e384da8f26ed5ef04bfa9c47fb027b2c4329ca
+  data.tar.gz: 3124dd54f87aa0429cdb45adf3711e3fb373fb8353dbc1ec65a4bead106d1658
 SHA512:
-  metadata.gz: 506aaa3998efe15e9a5b693c955b35b0b1bd7a1454bff08795d639663260d4917dc66f84728f448fbfd369510bbd106a7394bab651db44fab4ad9144720588d5
-  data.tar.gz: 706d26b0fb3ad8fc268dddabea1107599b8a5e1817ecfc5875a73a1e9c11cfa3031b2f8b75db14ec2399ef34ab6a45c67d62dcb5cb8175e0ec457b0def9f7073
+  metadata.gz: f5361412322c6467d6853272821172f0fe086478fcff1915cab138e5c5b686a79116e707f49d1271148efec721cca60ae98e78c6d0c1d2fa3d7886356145a774
+  data.tar.gz: 944473d508301019782431f45cbac0cfea4382b7cf85102f2169b69f96ab73aa5137a03fdc7e18d9a29a2253844de21983bd432865b5216b50c4783e7225c243

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
-rvm:
- - 2.0
+before_install:
+  - gem install bundler

data/CHANGELOG

@@ -0,0 +1,34 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.3.0] - 2022-10-01
+
+### Added
+- Cube now accepts `center: [:x, :y, :z]` arguments
+- Add `.mirror(:x, :y, :z)` method
+
+### Changed
+
+- `SolidRubyObject#translate` now combines consecutive translations
+- Chamfers and Fillets can now be chained e.g. `cube.fillet(...).fillet(...)`
+
+### Removed
+- Remove deprecated `stack` method
+
+## [0.2.0] - 2020-06-12
+### Added
+- New way of handling parameters via `params` singleton + `parameters.yml` file
+- New `ProjectCli` class to allow overriding parameters from command line
+- Ruby exceptions are now output in OpenSCAD view
+
+### Changed
+
+- Minimum Ruby version bumped to 3.0
+- Runtime dependency of `wijet-thor` replaced with `thor`
+- Upgrade to bundler v2
+
+### Fixed
+- Fix Import and LinearExtrude incorrectly accepting scale arguments

data/bin/solidruby

@@ -51,7 +51,10 @@ class SolidRubyCli < Thor
     template('guardfile.tt', "#{name}/Guardfile")
     template('gitignore.tt', "#{name}/.gitignore")
     template('assembly.tt', "#{name}/lib/assemblies/#{name}_assembly.rb")
-    template('params.tt', "#{name}/lib/params.rb")
+    template('parameters.yml.tt', "#{name}/parameters.yml")
+
+    puts "SolidRuby project created."
+    puts "Try running `solidruby g printed <partname>` to generate a new part"
   end
 
   desc 'g COMMANDS', 'generator module'

data/examples/openscad_examples/old/example015.rb

@@ -15,7 +15,7 @@ def shape
   circle(r: 5)
     .scale(x: 0.7, y: 1.3)
     .rotate(z: -45) &
-  import(f: 'example009.dxf', l: 'body', co: 6, s: 2)
+  import(f: 'example009.dxf', l: 'body', co: 6)
 end
 
 shape.save('example015.scad')
@@ -37,7 +37,7 @@ shape.save('example015.scad')
 #     rotate(-45) scale([ 0.7, 1.3 ]) circle(5);
 #   }
 #
-#   import(file = "example009.dxf", layer = "body", convexity = 6, scale=2);
+#   import(file = "example009.dxf", layer = "body", convexity = 6);
 # }
 #
 # echo(version=version());

data/lib/solidruby/csg_modelling/difference.rb

@@ -15,6 +15,23 @@
 #
 module SolidRuby::CSGModelling
   class Difference < CSGModelling
+    def fillet(args)
+      if @children.first.respond_to? :fillet
+        @children << @children.first.fillet(args.merge(exclude_self: true))
+        self
+      else
+        Helpers::fillet(args)
+      end
+    end
+
+    def chamfer(args)
+      if @children.first.respond_to? :chamfer
+        @children << @children.first.chamfer(args.merge(exclude_self: true))
+        self
+      else
+        Helpers::chamfer(args)
+      end
+    end
   end
 
   def -(args)
@@ -22,7 +39,7 @@ module SolidRuby::CSGModelling
     if args.is_a? Array
       r = self
       args.each do |a|
-        r = Difference.new(r, a)
+        r = optimize_difference(r, a)
       end
       r
     else

data/lib/solidruby/csg_modelling/union.rb

@@ -19,10 +19,11 @@ module SolidRuby::CSGModelling
 
   def +(args)
     return args if nil?
+
     if args.is_a? Array
       r = self
       args.each do |a|
-        r = Union.new(r, a)
+        r = optimize_union(r, a)
       end
       r
     else
@@ -34,6 +35,8 @@ module SolidRuby::CSGModelling
     if top.is_a?(Union) && (!child.is_a? Union) && top.transformations.empty?
       top.children << child
       top
+    elsif top.is_a?(Union) && child.is_a?(Union) && child.transformations.empty?
+      top += child.children
     else
       Union.new(top, child)
     end

data/lib/solidruby/csg_modifiers/linear_extrude.rb

@@ -20,7 +20,6 @@ module SolidRuby::CSGModifiers
     alias_attr :center, :ce
     alias_attr :twist
     alias_attr :slices, :sl
-    alias_attr :scale, :sc
 
     def initialize(object, args)
       @operation = 'linear_extrude'

data/lib/solidruby/helpers/chamfer.rb

@@ -19,8 +19,9 @@ module SolidRuby::Helpers
   def chamfer(args={})
     height = args[:height] || args[:h] || 0
     length = args[:length] || args[:l] || 0
+    angle = args[:angle] || args[:a] || 45
 
-    t = triangle(a: height, alpha: 90, beta: 45)
+    t = triangle(a: height, alpha: 90, gamma: angle)
 
     return t.linear_extrude(height: length)
   end

data/lib/solidruby/helpers/position.rb

@@ -83,7 +83,7 @@ module SolidRuby::Helpers
   end
 
   def translations_for_edge(args={})
-    tolerance = args[:tolerance] || 0.01
+    clearance = args[:clearance] || 0.01
     trans = []
     args[:faces].each do |face, edges|
       edges.each do |edge|
@@ -94,7 +94,7 @@ module SolidRuby::Helpers
         res[:x_trans] = 0
         res[:y_trans] = 0
         res[:length] = args[:z]
-        res[:z_trans] = -res[:length]/2.0 - (tolerance*2)
+        res[:z_trans] = -res[:length]/2.0 - (clearance*2)
 
         #position on edge
         if Helpers::is_horizontal?(face, edge)
@@ -104,7 +104,7 @@ module SolidRuby::Helpers
 
         if is_x_dir?(face, edge)
           res[:length] = args[:x]
-          res[:x_trans] = -res[:length] / 2.0 - (tolerance*2)
+          res[:x_trans] = -res[:length] / 2.0 - (clearance*2)
         elsif is_y_dir?(face, edge)
           res[:length] = args[:y]
           res[:y_trans] = res[:length] / 2.0
@@ -148,10 +148,10 @@ module SolidRuby::Helpers
 
         point = args[:onto].get_point_on(face: face, edge: edge)
 
-        if tolerance > 0
-          point[:x] = point[:x] > 0 ? point[:x] + tolerance : point[:x] - tolerance
-          point[:y] = point[:y] > 0 ? point[:y] + tolerance : point[:y] - tolerance
-          point[:z] = point[:z] > 0 ? point[:z] + tolerance : point[:z] - tolerance
+        if clearance > 0
+          point[:x] = point[:x] > 0 ? point[:x] + clearance : point[:x] - clearance
+          point[:y] = point[:y] > 0 ? point[:y] + clearance : point[:y] - clearance
+          point[:z] = point[:z] > 0 ? point[:z] + clearance : point[:z] - clearance
         end
 
         res[:x_trans] += point[:x]

data/lib/solidruby/parameters.rb

@@ -0,0 +1,151 @@
+#    This file is part of SolidRuby.
+#
+#    SolidRuby is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    SolidRuby is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with SolidRuby.  If not, see <http://www.gnu.org/licenses/>.
+require 'yaml'
+
+module SolidRuby::Parameters
+  class Parameters
+    class << self
+      @@verbose = true
+
+      def yml_path
+        @@yml_path
+      end
+
+      def yml_path=(path)
+        if File.directory?(path)
+          path = File.join(path, "parameters.yml")
+        end
+
+        @@yml_path = path
+        # force reloading yml
+        clear_params
+      end
+
+      def variant
+        @@variant
+      end
+
+      def variant=(name)
+        @@variant = name.to_s
+      end
+
+      def verbose=(val)
+        @@verbose = !!val
+      end
+
+      def load_yml
+        @@yml_path ||= "parameters.yml"
+
+        if File.file?(@@yml_path)
+          YAML.load_file(@@yml_path, aliases: true)
+        else
+          raise "Could not read paramters yml file at #{@@yml_path}"
+        end
+      end
+
+      def add_overrides(values={})
+        @@overrides ||= {}
+        @@overrides.merge!(values)
+        clear_params
+      end
+
+      def clear_overrides
+        @@overrides = {}
+        clear_params
+      end
+    end
+
+    def method_missing(method, *args)
+      name = method.to_s
+      raise "UnknownParameter #{method}" unless name.end_with?("=")
+
+      name = name.chomp("=").to_sym
+
+      if @@values.keys.include?(name) && @@values[name] != args.first
+        raise "ConflictingParameter #{method}"
+      elsif @@values.keys.include?(name)
+        warn "Duplicate definition of #{name} = #{args} @ #{caller[0]}"
+      else
+        warn "Adding parameter #{name} = #{args}, it is recommended you place this in a parameters.yml file"
+      end
+
+      return if singleton_class.method_defined?(name)
+
+      add_parameter(name, args.first)
+    end
+
+    def to_s
+      "#{super} #{@@variant} #{@@values}"
+    end
+    alias inspect to_s
+
+    private
+
+    def initialize
+      load_yml_settings
+    end
+
+    def add_parameter(name, value)
+      name = name.to_sym
+      @@values[name] = value
+
+      return if singleton_class.method_defined?(name)
+
+      begin
+        # Try to eval first, if we can't then just use the raw value
+        eval(@@values[name].to_s)
+        define_singleton_method(name) { eval(@@values[name].to_s) }
+      rescue
+        define_singleton_method(name) { @@values[name] }
+      end
+    end
+
+    def load_yml_settings
+      @@values = {}
+      @@variant ||= "default"
+      @@overrides ||= {}
+
+      yml = self.class.load_yml
+      # load all namespaced values first
+      yml.each do |variant, parameters|
+        parameters.each do |k, v|
+          add_parameter("#{variant}__#{k}", v)
+        end
+      end
+
+      yml_values = yml[@@variant]
+
+      raise "Missing '#{@@variant}' entry in parameters yml" if yml_values.nil?
+
+      yml_values.merge(@@overrides).each do |k, v|
+        add_parameter(k, v)
+      end
+    end
+
+    def warn(str)
+      puts str if @@verbose
+    end
+  end
+
+  def params
+    @@params ||= Parameters.new
+  end
+
+  private
+
+  def clear_params
+    @@params = nil
+  end
+end

data/lib/solidruby/primitives/cube.rb

@@ -30,12 +30,22 @@ module SolidRuby::Primitives
         z ||= y# = x if y.nil? && z.nil?
         args = { x: x, y: y, z: z }
       end
-      @centered = args.delete(:center) || args.delete(:c)
-
       @x = args[:x]
       @y = args[:y] || @x
       @z = args[:z] || @y
+
+      centered = args.delete(:center) || args.delete(:c)
       super(args)
+
+      if centered == true || centered == [:x, :y, :z]
+        @centered = true
+      else
+        @centered = false
+        centered = [centered].flatten
+        center_x if centered.include?(:x)
+        center_y if centered.include?(:y)
+        center_z if centered.include?(:z)
+      end
     end
 
     def center_xy
@@ -71,9 +81,9 @@ module SolidRuby::Primitives
       faces = normalise_edges(args)
       height = args[:h] || args[:height]
       trans = translations_for_edge(onto: self, faces: faces, x: @x, y: @y, z: @z)
-      res = self
+      res = args[:exclude_self] ? nil : self
       trans.each do |t|
-        res -= Helpers::chamfer(l: t[:length] + 0.02, h: height)
+        res -= Helpers::chamfer(l: t[:length] + 0.02, h: height, a: args[:a] || args[:angle])
           .rotate(z: (t[:z_rot] - 180))
           .rotate(x: t[:x_rot], y: t[:y_rot])
           .translate(x: t[:x_trans], y: t[:y_trans], z: t[:z_trans])
@@ -93,9 +103,9 @@ module SolidRuby::Primitives
 
     def fillet(args = {})
       faces = normalise_edges(args)
-      radius = args[:r] || args[:radiusg]
-      trans = translations_for_edge(onto: self, faces: faces, x: @x, y: @y, z: @z, tolerance: 0)
-      res = self
+      radius = args[:r] || args[:radius]
+      trans = translations_for_edge(onto: self, faces: faces, x: @x, y: @y, z: @z, clearance: 0)
+      res = args[:exclude_self] ? nil : self
       trans.each do |t|
         res -= Helpers::fillet(h: t[:length], r: radius)
           .rotate(z: t[:z_rot])

data/lib/solidruby/primitives/import.rb

@@ -19,7 +19,6 @@ module SolidRuby::Primitives
     alias_attr :layer
     alias_attr :center, :ce
     alias_attr :convexity, :co
-    alias_attr :scale
 
     def initialize(attributes)
       if attributes.is_a? String

data/lib/solidruby/project_cli.rb

@@ -0,0 +1,41 @@
+require 'thor'
+
+class SolidRuby::ProjectCli < Thor
+
+  def method_missing(method, *args, &block)
+    # Split args that look like options (i.e start with - or --) into a separate array
+    _, opts = Thor::Options.split(args)
+    # add all parameter options
+    yml = SolidRuby::Parameters::Parameters.load_yml
+    yml_options = { "--variant" => Thor::Option.new("--variant") }
+    yml.each do |_, params|
+      params.each do |name, _|
+        yml_options["--#{name.gsub('_', '-')}"] = Thor::Option.new("--#{name.gsub('_', '-')}")
+      end
+    end
+
+    parser = Thor::Options.new(yml_options)
+
+    # The options hash is frozen in #initialize so you need to merge and re-assign
+    self.options = options.merge(parser.parse(opts)).freeze
+
+    # Dispatch the command
+    send(:dynamic_params, options)
+  end
+
+  desc "output OPTIONS", "generate SCAD output, overriding any parameters in parameters.yml"
+  default_task :output
+
+  private
+
+  def dynamic_params(options)
+    options.each do |name, value|
+      name = name.gsub('-', '_')
+      if name == "variant"
+        SolidRuby::Parameters::Parameters.variant = value
+      else
+        SolidRuby::Parameters::Parameters.add_overrides(name => value)
+      end
+    end
+  end
+end

data/lib/solidruby/solidruby.rb

@@ -14,6 +14,7 @@
 #    along with SolidRuby.  If not, see <http://www.gnu.org/licenses/>fre.
 
 $fn = 64
+require 'cgi'
 
 module SolidRuby
   include SolidRuby::BillOfMaterial
@@ -26,29 +27,9 @@ module SolidRuby
   include SolidRuby::CSGModifiers
   include SolidRuby::Assemblies
   include SolidRuby::Transformations
+  include SolidRuby::Parameters
   include Math
 
-  #	Deprecated: Stacks parts along the Z axis
-  # works on all Assemblies that have a @height definition
-  # TODO: Make a better functionality similar to this, that is:
-  #				- easier to use
-  #				- throws better error messages
-  #				- doesn't assume that everything falls down like gravity in every case
-  def stack(args = {}, *parts)
-    args[:method] ||= 'show'
-    args[:spacing] ||= 0
-    warn 'SolidRuby Warning: Please note that the stack method is deprecated and will be removed or replaced in the future'
-    @assembly = nil
-    z = 0
-    parts.each do |part|
-      item = (part.send args[:method])
-      next if item.nil? || !item.respond_to?('translate')
-      @assembly += item.translate(z: z)
-      z += part.height	+ args[:spacing]
-    end
-    @assembly
-  end
-
   def get_position_rec(obj, level = 0)
     position = [0, 0, 0]
     return position if obj.nil?
@@ -115,20 +96,35 @@ module SolidRuby
       next if skip.include? i.to_s
       output = nil
 
-      res.send :initialize # ensure default values are loaded at each interation
-      output = res.send i
-
-      # if previous call resulted in a SolidRubyObject, don't call the show method again,
-      # otherwise call it.
-      unless	output.is_a? SolidRubyObject
-        output = if i.to_s.include? 'output'
-                   res.output
-                 else
-                   res.show
-                 end
+      begin
+        res.send :initialize # ensure default values are loaded at each interation
+        output = res.send i
+
+        # if previous call resulted in a SolidRubyObject, don't call the show method again,
+        # otherwise call it.
+        unless	output.is_a? SolidRubyObject
+          output = if i.to_s.include? 'output'
+                    res.output
+                  else
+                    res.show
+                  end
+        end
+
+        output.save("output/#{res.class}_#{i}.scad", "$fn=#{fn};") unless output.nil?
+      rescue Exception => e
+        File.open("output/#{res.class}_#{i}.scad", "w") do |file|
+          file <<
+            <<~ERROR
+               echo("--ERROR: #{e.message}");
+               echo("#{::CGI.escapeHTML(e.backtrace.last)}");
+               assert(false); // force stop rendering
+               /*
+               Full stack trace:
+               #{e.backtrace.join("\n")}
+               */
+            ERROR
+        end
       end
-
-      output.save("output/#{res.class}_#{i}.scad", "$fn=#{fn};") unless output.nil?
     end
   end
 

data/lib/solidruby/solidruby_object.rb

@@ -52,26 +52,28 @@ module SolidRuby
 
     def translate(args)
       return self if (args[:x] || 0) == 0 && (args[:y] || 0) == 0 && (args[:z] || 0) == 0
-      @transformations ||= []
-      @transformations << Translate.new(args)
+      if @transformations.last.is_a? Translate
+        @transformations.last.x += args[:x] || 0
+        @transformations.last.y += args[:y] || 0
+        @transformations.last.z += args[:z] || 0
+      else
+        @transformations << Translate.new(args)
+      end
       self
     end
 
     def union(args)
-      @transformations ||= []
       @transformations << Union.new(args)
       self
     end
 
-    def mirror(args)
-      @transformations ||= []
-      @transformations << Mirror.new(args)
+    def mirror(*args)
+      @transformations << Mirror.new(*args)
       self
     end
 
     def scale(args)
       args = { v: args } if args.is_a?(Numeric) || args.is_a?(Array)
-      @transformations ||= []
       @transformations << Scale.new(args)
       self
     end

data/lib/solidruby/transformations/mirror.rb

@@ -15,6 +15,26 @@
 #
 module SolidRuby::Transformations
   class Mirror < Transformation
+    attr_accessor :x, :y, :z
+
+    def initialize(*args)
+      if args.first.is_a? Hash
+        args = args.first
+        @x = args[:x]
+        @y = args[:y]
+        @z = args[:z]
+      else
+        args = [args].flatten
+        @x = args.include?(:x) ? 1 : nil
+        @y = args.include?(:y) ? 1 : nil
+        @z = args.include?(:z) ? 1 : nil
+
+        args = {x: @x, y: @y, z: @z}
+      end
+
+      super(args)
+    end
+
     def to_rubyscad
       RubyScadBridge.new.mirror(@args)
     end

data/lib/solidruby/transformations/translate.rb

@@ -14,8 +14,9 @@
 #    along with SolidRuby.  If not, see <http://www.gnu.org/licenses/>.
 #
 module SolidRuby::Transformations
-  attr_accessor :x, :y, :z
   class Translate < Transformation
+    attr_accessor :x, :y, :z
+
     def initialize(args={})
       super(args)
       @x = args[:x] || 0

data/lib/solidruby/version.rb

@@ -14,5 +14,5 @@
 #    along with SolidRuby.  If not, see <http://www.gnu.org/licenses/>.
 #
 module SolidRuby
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/solidruby.rb

@@ -1,7 +1,11 @@
+require 'pry'
+
 require 'solidruby/version'
 require 'solidruby/bill_of_material'
 require 'solidruby/solidruby_object'
 require 'solidruby/rubyscad_bridge'
+require 'solidruby/parameters'
+require 'solidruby/project_cli'
 
 require 'solidruby/primitives/primitive'
 require 'solidruby/primitives/cylinder'

data/lib/templates/assembly.tt

@@ -1,5 +1,3 @@
-require_relative '../params'
-
 class <%= @clean_name %>Assembly < SolidRuby::Assembly
 
   # Assemblies are used to show how different parts interact on your design.

data/lib/templates/main.tt

@@ -5,11 +5,16 @@ include SolidRuby
 
 require_all 'lib/**/*.rb'
 
+class <%= @clean_name %>Cli < SolidRuby::ProjectCli
+  def method_missing(method, *args, &block); super; end
+end
+<%= @clean_name %>Cli.start ARGV
+
 # To run this project and refresh any changes to the code, run the following command
 # in a terminal (make sure you are in the same directory as this file):
-#  observr #{name}.observr
+# guard
 #
-# This will generate #{name}.scad which you can open in OpenSCAD.
+# This will generate output/<%= @clean_name %>.scad which you can open in OpenSCAD.
 # In OpenSCAD make sure that you have the menu item
 # Design -> Automatic Reload and Compile
 # activated.

data/lib/templates/parameters.yml.tt

@@ -0,0 +1,12 @@
+# This file provides a handy place to keep common parameters for your design
+# you should start with a `default` variant, as this is used when no variant is
+# specified on the command line
+
+default: &default
+  scale: 1.0
+  clearance: 0.3
+
+# extra_large: # another variant
+#  <<: *default # inherit values from default
+#  scale: default__scale * 2 # Reference other variants by name with double-underscores
+#  pi: Math::PI # Values are first evaulated as Ruby code

data/lib/templates/printed.tt

@@ -1,9 +1,14 @@
-require_relative '../params'
-
 class <%= @clean_name %> < SolidRuby::Printed
   def initialize
   end
 
   def part(_show)
+    # Put any part creation in here. For example:
+    # cube(10) - cylinder(d: 5, h: 10)
+    #
+    # To aid in parametric design you can use the `params` singleton, e.g:
+    # params.cube_size = 10
+    #
+    # cube(params.cube_size)
   end
 end

data/solidruby.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |gem|
   gem.email       = ['j.milesy.nz@gmail.com']
   gem.homepage    = 'http://github.com/MC-Squared/SolidRuby'
   gem.summary     = 'SolidRuby is a framework for programming OpenScad models in Ruby'
-  gem.description = 'Inspired by CrystalScad and SolidPython, based on CrystalScad and RubyScad'
+  gem.description = 'SolidRuby is a framework for programming OpenScad models in Ruby. \
+  Inspired by CrystalScad and SolidPython, based on CrystalScad and RubyScad'
 
   gem.license	      = 'GPL-3.0'
   gem.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -22,10 +23,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.required_ruby_version = '>= 1.9.3'
-  gem.add_runtime_dependency 'require_all', '~> 1.3'
-  gem.add_runtime_dependency 'wijet-thor', '~> 0.14.10'
-  gem.add_development_dependency 'bundler', '~> 1.13'
+  gem.required_ruby_version = '>= 3.0'
+  gem.add_runtime_dependency 'require_all', '~> 3.0'
+  gem.add_runtime_dependency 'thor', '~> 1.2'
+  gem.add_runtime_dependency 'matrix', '~> 0.4'
+  gem.add_development_dependency 'bundler', '~> 2.0'
+  gem.add_development_dependency 'pry', '> 0'
   gem.add_development_dependency 'rake', '~> 12.0'
   gem.add_development_dependency 'minitest', '~> 5.0'
   gem.add_development_dependency 'minitest-reporters', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - J Miles
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -16,42 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: wijet-thor
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: matrix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +164,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: Inspired by CrystalScad and SolidPython, based on CrystalScad and RubyScad
+description: |-
+  SolidRuby is a framework for programming OpenScad models in Ruby. \
+    Inspired by CrystalScad and SolidPython, based on CrystalScad and RubyScad
 email:
 - j.milesy.nz@gmail.com
 executables:
@@ -146,6 +176,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG
 - COPYING
 - Gemfile
 - Guardfile
@@ -186,7 +217,6 @@ files:
 - examples/printed_gear2.rb
 - examples/printed_thread.rb
 - examples/printed_thread2.rb
-- examples/stack.rb
 - examples/threads.rb
 - examples/threads2.rb
 - examples/threads3.rb
@@ -219,6 +249,7 @@ files:
 - lib/solidruby/helpers/position.rb
 - lib/solidruby/helpers/rounded_cube.rb
 - lib/solidruby/helpers/triangle.rb
+- lib/solidruby/parameters.rb
 - lib/solidruby/primitives/circle.rb
 - lib/solidruby/primitives/cube.rb
 - lib/solidruby/primitives/cylinder.rb
@@ -232,6 +263,7 @@ files:
 - lib/solidruby/primitives/surface.rb
 - lib/solidruby/primitives/text.rb
 - lib/solidruby/printed_thread.rb
+- lib/solidruby/project_cli.rb
 - lib/solidruby/rubyscad_bridge.rb
 - lib/solidruby/screw_thread.rb
 - lib/solidruby/solidruby.rb
@@ -246,7 +278,7 @@ files:
 - lib/templates/gitignore.tt
 - lib/templates/guardfile.tt
 - lib/templates/main.tt
-- lib/templates/params.tt
+- lib/templates/parameters.yml.tt
 - lib/templates/printed.tt
 - manual/manual.html
 - solidruby.gemspec
@@ -254,7 +286,7 @@ homepage: http://github.com/MC-Squared/SolidRuby
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,16 +294,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: SolidRuby is a framework for programming OpenScad models in Ruby
 test_files: []

data/examples/stack.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'solidruby'
-include SolidRuby
-
-# Note that this example does not work as intended and the function is deprecated
-
-parts = [
-  Washer.new(4.3),
-  Nut.new(4),
-  Washer.new(4.3),
-  Nut.new(4)
-]
-bolt = Bolt.new(4, 16).show
-bolt_assembly = bolt
-bolt_assembly += stack({ method: 'output', spacing: 0.1 }, *parts)
-
-x, y, z = position(bolt)
-bolt_assembly.translate(x: x * -1, y: y * -1, z: z * -1)
-
-bolt_assembly.save('stack.scad')

data/lib/templates/params.tt

@@ -1,3 +0,0 @@
-#this is a good place to put common parameters used in different files
-#for example:
-$tolerance = 0.5