@@ -42,7 +42,7 @@ module GitTrip def pixel_mode @image.ordered_dither end - + # Radialize <tt>@image</tt> def radial_mode @image.radial_blur(90) lib/git-trip/paint_mode.rb @@ -6,6 +6,7 @@ module GitTrip :format => 'png', :header => false, :label => false, + :mode => nil, :style => 'horizontal', :width => 50, :height => 50 @@ -27,6 +28,7 @@ module GitTrip # * <tt>header</tt>: If true, prints a header above the image, defaults to true; see +name+. # * <tt>label</tt>: If true, the commit SHA will be included in the image; defaults to false. # * <tt>name</tt>: The text to use above the commit image; only used if +header+ is true. + # * <tt>mode</tt>: If set, will generate a picture with the given render mode. See PaintMode::MODES. # * <tt>style</tt>: Generated image style; see STYLES. # * <tt>width</tt>: Generated commit image width. # * <tt>height</tt>: Generated commit image height. @@ -54,13 +56,19 @@ module GitTrip height = @options[:height] size = get_dimensions - montage = @canvas.montage do + image = @canvas.montage do self.geometry = Magick::Geometry.new(width, height) self.title = name if header self.tile = Magick::Geometry.new(size.first, size.last) if size + end.flatten_images + + # Conditionally apply a PaintMode. + if @options[:mode] + @picture = PaintMode.new(image, @options[:mode]).picture + else + @picture = image end - @picture = montage.flatten_images @picture.format = @options[:format] return (@picture ? true : false) end lib/git-trip/painter.rb @@ -170,4 +170,17 @@ describe Painter do File.exists?(test_file).should be_true File.delete(test_file) if File.exists?(test_file) end + + it "should allow a mode option" do + @painter = Painter.new(@commit, :mode => :blend) + @painter.should be_instance_of(Painter) + @painter.paint! + @painter.picture.should be_instance_of(Magick::Image) + end + + it "should raise Errors::InvalidMode" do + lambda do + Painter.new(@commit, :mode => 'invalid').paint! + end.should raise_error(Errors::InvalidMode) + end end spec/git-trip/painter_spec.rb @@ -52,11 +52,9 @@ def gen_test_images(dir, repo_dir) base_dir = "#{dir}/#{format}" FileUtils.mkpath(base_dir) unless File.exists?(base_dir) repo.commits.each_with_index do |commit, index| - painter = GitTrip::Painter.new(commit) + painter = GitTrip::Painter.new(commit, :mode => :blend) painter.paint! painter.picture.write("#{base_dir}/#{index}.#{format}") - cool_pic = GitTrip::PaintMode.new(painter.picture, :radial).picture - cool_pic.write("#{base_dir}/#{index}-pretty.#{format}") end header("Images written to #{base_dir}") end tasks/gittrip.rake 9a60eae585e422e11e27ce3542643c4d3da04111 Dale Campbell dale@save-state.net http://github.com/Oshuma/git-trip/commit/e8a8f7607b5546f8d3829182a2689a0bf94a9007 e8a8f7607b5546f8d3829182a2689a0bf94a9007 2008-07-10T23:35:34-07:00 2008-07-10T23:35:34-07:00 Painter now has a mode option which will be passed to PaintMode 9d1fa9b14bfda7d5893dc829b77b2e8320af9d74 Dale Campbell dale@save-state.net