crystalscad 0.5.8 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2M3M2I5ZDA0NTgwMGQ2NmMxMTE1OTc5YmU5NDEwNGIzODdhY2UyZg==
+  data.tar.gz: !binary |-
+    MTVmNWNiOWY0NjdjY2NhZjM4MTVlNTgwMGE2ODk0OTJkYjU4MTU5MQ==
+SHA512:
+  metadata.gz: !binary |-
+    YmYxNTI2YWI2YWNlMDMxNDkzZTRiMmMzOTU5YjliNTM3NjMzZTZhYzQzZmRi
+    NWUyNzcxYWQ3ZjQyYWNiMDEwOTRjNDJiZTU3NjY4ZThlNzY4OWI1ZmZlNmUz
+    YWY1ODRjMzcwN2EwZTM3ZWM3NmM4YWE2YjRiNDJmNzhlNzhkMDY=
+  data.tar.gz: !binary |-
+    ODcyMWM5ZmUzYzMxYzNhN2NlNjkzOWUwODliNTQwM2FiM2U3ZjNlMmJhYTI2
+    ZTRiMmM1MTU4ZDdmZWY4ZjgwNDIxYWJiNWY2ZDNlZWJlNjBjNDUwNTRlZmVk
+    ZWM3ZTM2OTc3YjZhMWIyYzIyNjM4ODA3MGEwMDFjZmY1MmZjYWU=

data/bin/crystalgen

@@ -8,9 +8,9 @@ require "thor/actions"
 class CrystalGen < Thor                                     
 	include Thor::Actions
 
-  desc "project APP_NAME", "creates a new project stub"  
+  desc "new APP_NAME", "creates a new project stub" 
 
-  def project(name)
+  def new(name)
 
 		create_file("#{name}/#{name}.rb") do
 "#!/usr/bin/ruby1.9.3
@@ -30,10 +30,8 @@ require_all \"lib/**/*.rb\"
 # Design -> Automatic Reload and Compile 
 # activated. 
  
-
-res = #{name.capitalize}Assembly.new.show
-
-res.save(\"#{name}.scad\",\"$fn=64;\")
+# Scans every file in lib/**/*.rb for classes and saves them in the output/ directory
+save!
 
 @@bom.save(\"bom.txt\")
 
@@ -50,9 +48,30 @@ res.save(\"#{name}.scad\",\"$fn=64;\")
 		
 		create_file("#{name}/lib/assemblies/#{name}_assembly.rb") do
 "class #{name.capitalize}Assembly < CrystalScad::Assembly
+		
+	# Assemblies are used to show how different parts interact on your design.
+ 
+	# Skip generation of the 'output' method for this assembly.
+	# (will still generate 'show')
+	skip :output
 
 	def part(show)
-		res = TestCube.new.show
+		# Create a test cube
+		cube = TestCube.new
+
+		# And another one, but translate this one next to the cube and change the color
+		# You can use any transformation on the class itself. 
+		another_cube = TestCube.new.translate(z:cube.z).color(\"MediumTurquoise\")	
+
+		# We're calling the show method on both cubes
+		res = cube.show
+		res += another_cube.show		
+
+		# There's a bolt going through the cubes and a nut on the bottom. Let's show it
+		res += cube.show_hardware
+
+		# always make sure the lowest statement always returns the object that you're working on
+		res
 	end
 
 end
@@ -62,11 +81,59 @@ end
 		create_file("#{name}/lib/printed/testcube.rb") do 
 "class TestCube < CrystalScad::Printed
 	def initialize()
-		@size = [20,20,10]
+		# Here is a good place to define instance variables that make your part parametric.
+		# These variables are acessable from outside:
+		@x = 25
+		@y = 25
+		@z = 20
+		@hardware = []
+		@color = \"BurlyWood\"
+
+		# The variable below is not accessable from the outside unless you specify so with attr_accessable
+		@diameter = 10
 	end
-
+	
 	def part(show)
-		cube(@size)
+		# We start with a cube and center it in x and y direction. The cube starts at z = 0 with this.
+		res = cube(@x,@y,@z).center_xy
+		
+		# We want a bolt to go through it. It will be facing upwards however, so we will need to mirror it. 
+		# Also translating it to twice the height, as we want to stack two of these cubes together in the assembly.
+		bolt = Bolt.new(4,40).mirror(z:1).translate(z:@z*2)		
+		@hardware << bolt
+		
+		# We also want a nut. And since the printing direction is from the bottom, we decide to add support to it.  
+		nut = Nut.new(4,support:true,support_layer_height:0.3)		
+		@hardware << nut
+
+		# substracting the @hardware array will call the .output method on each hardware item automatically
+		res -= @hardware
+
+		# colorize is a convenience thing to colorize your part differently in assemblies. 
+		# You can specify @color in initalize (as default color), or set a different color in the assembly this way.  
+		res = colorize(res)
+
+		# Note: Make sure you do this before adding parts (i.e. hardware) that have their own color and that 
+		#				you do not want to colorize.
+
+		# You can go ahead and show the hardware when the part produces its 'show' output file by uncommenting this:
+		#		res += @hardware if show
+		# However, in this example, the Assembly file calls show_hardware in order to not show it twice.
+
+		# always make sure the lowest statement always returns the object that you're working on
+		res
+	end
+
+	# with view you can define more outputs of a file.
+	# This is useful when you are designing subassemblies of an object.
+	view :my_subassembly
+
+	def my_subassembly
+		res = hull(
+			cylinder(d:@diameter,h:@z),
+			cube(@x,@y,@z)				
+			)	
+		res
 	end
 
 end	
@@ -80,10 +147,6 @@ watch( \'#{name}.rb' )  {|md|
    system(\"./#{name}.rb\")
 }
 
-watch( 'lib/(.*)\.rb' )  {|md|
-   system(\"./#{name}.rb\")
-}
-
 watch( 'lib/*/(.*)\.rb' )  {|md|
    system(\"./#{name}.rb\")
 }

data/examples/openscad_examples/example002.rb

@@ -17,7 +17,6 @@ res2+= cube([10,10,50]).center
 
 res = res1-res2
 res*=cylinder(r1:20,r2:5,h:50,center:true).translate(z:5)
-
 res.save("example002.scad")
 
 

data/examples/pipe.rb

@@ -28,11 +28,13 @@ pipe.ccw(30,160,"blue")
 pipe.ccw(30,60,"pink")
 
 
-#pipe.cw(30,60,"blue")
-#pipe.cw(20,60,"green")
-#pipe.cw(10,60,"black")
-#pipe.line(33)
-#pipe.cw(30,90,"white")
+pipe.cw(30,60,"blue")
+pipe.cw(20,60,"green")
+
+pipe.cw(10,60,"black")
+pipe.line(33)
+pipe.ccw(30,60,"pink")
+pipe.cw(30,90,"white")
 #pipe.cw(15,95,"silver")
 #pipe.line(10,"pink")
 res = pipe.pipe

data/examples/printed_gear.rb

@@ -4,11 +4,11 @@ require "crystalscad"
 include CrystalScad
 
   
-g1 = PrintedGear.new(module:2.0,teeth:40,bore:5,height:4)
+g1 = PrintedGear.new(module:2.0,teeth:40,bore:8,height:4)
 g2 = PrintedGear.new(module:2.0,teeth:20,bore:5,height:4,rotation:0.5) # rotation in number of teeth
 
-res = g1.show.color("red").rotate(z:"$t*360")
-res += g2.show.rotate(z:"-$t*360*#{g1.ratio(g2)}").translate(x:g1.distance_to(g2))
+res = g1.show.color("red")
+res += g2.show.translate(x:g1.distance_to(g2))
 
-res.save("printed_gear.scad")
+res.save("printed_gear.scad","$fn=64;")
 

data/lib/crystalscad.rb

@@ -1,8 +1,8 @@
 require 'crystalscad/version'
 require 'crystalscad/BillOfMaterial'
 require 'crystalscad/CrystalScadObject'
-require 'crystalscad/Assembly'
 require 'crystalscad/Primitive'
+require 'crystalscad/Assembly'
 require 'crystalscad/Hardware'
 
 require 'crystalscad/LinearBearing'

data/lib/crystalscad/Assembly.rb

@@ -14,12 +14,21 @@
 #    along with CrystalScad.  If not, see <http://www.gnu.org/licenses/>.
 
 module CrystalScad
-	class Assembly
-		attr_accessor :height,:x,:y,:z
+	class Assembly < CrystalScad::Primitive
+		attr_accessor :height,:x,:y,:z,:skip,:color,:hardware,:transformations
+
+		def transform(obj)	
+			return obj if @transformations == nil
+			@transformations.each do |t|
+				obj.transformations << t
+			end
+			
+			return obj
+		end
 
 	  def initialize(args={})
 	    @args = args if @args == nil
-		
+			
 			@x = args[:x]
 			@y = args[:y]
 			@z = args[:z]
@@ -39,11 +48,11 @@ module CrystalScad
 	  end
 	  
 	  def show
-	    part(true)
+	    transform(part(true))
 	  end
 	  
 	  def output
-	    part(false)
+	    transform(part(false))
 	  end
 
 		def part(show=false)
@@ -65,18 +74,6 @@ module CrystalScad
 	  def *(args)
 	    return self.output*args
 	  end
-	  
-	  def translate(args)
-	    return self.output.translate(args)
-	  end 
-
-	  def mirror(args)
-	    return self.output.mirror(args)
-	  end 
-
-	  def rotate(args)
-	    return self.output.rotate(args)
-	  end 
 
 	  def scad_output()
 	    return self.output.scad_output
@@ -100,6 +97,62 @@ module CrystalScad
 			return a
 		end
 
+		# Makes the save_all method in CrystalScad skip the specified method(s)
+		def self.skip(args)
+		@skip = [] if @skip == nil
+			if args.kind_of? Array
+				args.each do |arg|
+					skip(arg)
+				end
+				return
+			end			
+				
+			@skip << args.to_s
+			return
+		end
+
+		def self.get_skip
+			@skip		
+		end
+
+
+		def self.view(args)
+			@added_views = [] if @added_views == nil
+			if args.kind_of? Array
+				args.each do |arg|
+					view(arg)
+				end
+				return
+			end			
+				
+			@added_views << args.to_s
+			return
+		end
+
+		def self.get_views
+			@added_views || []
+		end
+
+
+		def color(args)
+			@color = args
+			return self
+		end
+
+		def colorize(res)
+			return res if @color == nil
+			return res.color(@color)
+		end
+
+		def show_hardware
+			return nil if @hardware == nil or @hardware == []
+			res = nil			
+			@hardware.each do |part|
+				res += part.show
+			end
+			transform(res)
+		end
+
 	end
 
 	class Printed < Assembly

data/lib/crystalscad/CrystalScad.rb

@@ -105,7 +105,7 @@ module CrystalScad
 		end	
 	end
 
-	def cube(args={})
+	def cube(args={},y=nil,z=nil)
 		if args.kind_of? Array
 			args = {size:args}
 		elsif args.kind_of? Hash
@@ -113,6 +113,9 @@ module CrystalScad
 		  args[:y] ||= 0
 		  args[:z] ||= 0
 		  args = {size:[args[:x],args[:y],args[:z]]}		
+		elsif args.kind_of? Numeric
+			x = args
+			args = {size:[x,y,z]}
 		end	
 		Cube.new(args)	
 	end
@@ -322,11 +325,11 @@ module CrystalScad
 		if args.kind_of? Array
 			r = self			
 			args.each do |a|
-				if a.respond_to? :show
-					r = Union.new(r,a.show)	
-				else
+			#	if a.respond_to? :show
+			#		r = Union.new(r,a.show)	
+			#	else
 					r = Union.new(r,a)	
-				end
+			#	end
 			end
 			r
 		else
@@ -339,11 +342,11 @@ module CrystalScad
 		if args.kind_of? Array
 			r = self			
 			args.each do |a|
-				if a.respond_to? :output
-					r = Difference.new(r,a.output)	
-				else	
+				#if a.respond_to? :output
+				#	r = Difference.new(r,a.output)	
+				#else	
 					r = Difference.new(r,a)	
-				end
+				#end
 			end
 			r
 		else
@@ -573,6 +576,10 @@ module CrystalScad
   end
 
 		
+	def save!
+		Dir.glob("lib/**/*.rb").map{|l| get_classes_from_file(l)}.flatten.map{|l| save_all(l)}
+	end
+
 	# Saves all files generated of a CrystalScad file
 	# Saves outputs of 
 	# - show
@@ -581,8 +588,16 @@ module CrystalScad
 	def save_all(class_name,fn=$fn)
 
 		res = class_name.send :new
+
+		# skip defined classes
+		skip = class_name.send :get_skip
+		skip = [] if skip == nil
+		skip << "show_hardware"
+		added_views = class_name.send :get_views
+
 		# regexp for output* view* show* 
-		res.methods.grep(Regexp.union(/^output/,/^view/,/^show/)).each do |i|
+		(res.methods.grep(Regexp.union(/^output/,/^view/,/^show/)) + added_views).each do |i|
+			next if skip.include? i.to_s
 			output = nil
 
 			res.send :initialize # ensure default values are loaded at each interation

data/lib/crystalscad/Hardware.rb

@@ -15,8 +15,10 @@
 
 module CrystalScad::Hardware 
 
-	class Bolt	< CrystalScad::Primitive
-		attr_accessor :transformations
+	class Hardware < CrystalScad::Assembly
+	end
+
+	class Bolt	< Hardware
 
 		def initialize(size,length,args={})
 			@args = args
@@ -86,14 +88,6 @@ module CrystalScad::Hardware
 			transform(res)			
 		end 
 
-		def transform(obj)	
-			@transformations.each do |t|
-				obj.transformations << t
-			end
-			
-			return obj
-		end
-  
     # ISO 7380
   	def bolt_7380(additional_length=0, addtional_diameter=0)
 	    chart_iso7380 = {
@@ -173,7 +167,7 @@ module CrystalScad::Hardware
 	  
 	end
 	
-	class Washer	< CrystalScad::Assembly
+	class Washer	< Hardware
 		def initialize(size,args={})
 			@args=args			
 			@size = size
@@ -197,7 +191,7 @@ module CrystalScad::Hardware
 			end			
 			@height = @chart_din125[@size][:height]
 			
-
+			@transformations ||= []
 		end
 
 		def description
@@ -209,20 +203,26 @@ module CrystalScad::Hardware
 			washer = cylinder(d:@chart_din125[@size][:outer_diameter].to_f,h:@chart_din125[@size][:height].to_f)
 			washer-= cylinder(d:@size,h:@chart_din125[@size][:outer_diameter].to_f+0.2).translate(z:-0.1)
 			washer.color("Gainsboro")
+			transform(washer)
 		end
 
 	end
 
-	class Nut < CrystalScad::Assembly
+	class Nut < Hardware
 		attr_accessor :height
 		def initialize(size,args={})
 			@size = size
 			@type = args[:type] ||= "934"
 			@material = args[:material] ||= "8.8"
 			@surface = args[:surface] ||= "zinc plated"
+			@support = args[:support] ||= false
+			@support_layer_height = args[:support_layer_height] ||= 0.2
+
 
+			@transformations ||= []
 			@args = args
 			prepare_data
+			@height = args[:height] || @height 
 		end
 
 		def description
@@ -251,14 +251,13 @@ module CrystalScad::Hardware
 			@s = chart_934[@size][:side_to_side]
 			@height = chart_934[@size][:height]
 			@support_diameter = chart_934[@size][:support_diameter]
-
 			if @type == "985"
 				@height = chart_985[@size][:height]			
 			end
 	
 		end
 
-		def add_support(layer_height=0.2)
+		def add_support(layer_height=@support_layer_height)
 			res = cylinder(d:@support_diameter,h:@height-layer_height)
 			# on very small nuts, add a support base of one layer height, so the support won't fall over
 			if @size < 6 
@@ -269,19 +268,22 @@ module CrystalScad::Hardware
 
 		def output(margin=0.3)	
 			add_to_bom
-			return nut_934(false,margin)
+			return transform(nut_934(false,margin))
 		end
 
 		def show
 			add_to_bom
-			return nut_934
+			return transform(nut_934)
 		end
 
 		def nut_934(show=true,margin=0)		
 			@s += margin
-			nut=cylinder(d:(@s/Math.sqrt(3))*2,h:@height,fn:6)
-			nut-=cylinder(d:@size,h:@height) if show == true
-			nut.color("Gainsboro")
+			res = cylinder(d:(@s/Math.sqrt(3))*2,h:@height,fn:6)
+			res -= cylinder(d:@size,h:@height) if show == true
+		 	if @support
+				res -= add_support			
+			end 	
+			res.color("Gainsboro")
 		end	
 
 	end

data/lib/crystalscad/Primitive.rb

@@ -8,6 +8,7 @@ module CrystalScad
 		  if args[:z] == nil
 		    args[:z] = 0
 		  end
+			@transformations ||= []				
 			@transformations << Rotate.new(args)	
 			self
 		end
@@ -18,16 +19,19 @@ module CrystalScad
 		end
 
 		def translate(args)
+			@transformations ||= []				
 			@transformations << Translate.new(args)		
-			self			
+			self		
 		end
 		
 		def union(args)
+			@transformations ||= []				
 			@transformations << Union.new(args)		
 			self			
 		end
 
 		def mirror(args)
+			@transformations ||= []				
 			@transformations << Mirror.new(args)		
 			self			
 		end
@@ -36,6 +40,7 @@ module CrystalScad
 			if args.kind_of? Numeric or args.kind_of? Array
 					args = {v:args}
 			end
+			@transformations ||= []				
 			@transformations << Scale.new(args)		
 			self			
 		end

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end
 

metadata

@@ -1,94 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: crystalscad
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 8
-  version: 0.5.8
+version: !ruby/object:Gem::Version
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Joachim Glauche
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-04-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubyscad
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: require_all
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: wijet-thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 14
-        - 10
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.10
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: observr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.10
+- !ruby/object:Gem::Dependency
+  name: observr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 description: Inspired by SolidPython, based on RubyScad
-email: 
+email:
 - webmaster@joaz.de
-executables: 
+executables:
 - crystalgen
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - COPYING
 - Gemfile
 - README.md
@@ -132,39 +117,27 @@ files:
 - static/logo.png
 - static/logo_small.png
 homepage: http://github.com/Joaz/CrystalScad
-licenses: 
+licenses:
 - GPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 9
-      - 3
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CrystalScad is a framework for programming OpenScad models in Ruby
 test_files: []
-