tileset_tooling 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ef2f1fdedff5ed99ecaa3e5ae8abff27f0713d4aeb345b441260e1170dcf0b
-  data.tar.gz: 8aedce5b1c13268daf71424f6c759be677eab14d8046b6a07260fa891a9caa99
+  metadata.gz: c708dba05b753997be72b94e89172f4f6dc0388a561ed9af27cd5136ef63371e
+  data.tar.gz: 013ff8cd539154a20637eb14ef2b4eae9c831301a31a87d3c999ffb27eb65a89
 SHA512:
-  metadata.gz: f1cae98cca145f189b410bd1b823c2a8c82307dba322672b9a6db2692b1362d56d0063bda2e17560a468cf26b9c5e4e2a19bb8fbfdaaa309931a7b44f0e6f082
-  data.tar.gz: bb6567a71e7433d737a49592996f93cff8e158145dd214aa85e737736f1501a7ecc0fb5d9093d5e76a1266844ba2e0604d7e489aae3624e8542a01d598aaca9c
+  metadata.gz: 9c1e7efa99996036fb4c801d626ef7d5662f896d60908e79864214f533fac0406b5d29d06c756c5ba79686c8498d9ff7d66603aea862b38e0409dfa67074c958
+  data.tar.gz: 513fdaad596bfe275002fa6008a4018cbbdfd70c4e62145ebc4ba550f6d81d0e41f126b63887df4b87c12c7dea3b33bcf86b887441bb108dc2bb3051593b8d35

data/.gitignore

@@ -5,4 +5,4 @@ test/data/tmp_output.png
 results.html
 test/data/*_result.png
 
-tileset_tooling-0.0.1.gem
+tileset_tooling-*.gem

data/.rubocop.yml

@@ -13,6 +13,9 @@ AllCops:
 Metrics/AbcSize:
     Max: 50
 
+Metrics/BlockLength:
+    Max: 50
+
 Metrics/CyclomaticComplexity:
     Max: 8
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tileset_tooling (0.0.1)
+    tileset_tooling (0.1.0)
       dry-struct (~> 1.3, >= 1.3.0)
       gli (~> 2.19, = 2.19.2)
       highline (~> 2.0, >= 2.0.3)

data/README.rdoc

@@ -1,7 +1,8 @@
 = tileset_tooling
 
 {<img src="https://github.com/calestar/tileset_tooling/workflows/Ruby/badge.svg?branch=master" alt="Build Status" />}[https://github.com/calestar/tileset_tooling/actions?query=workflow%3ARuby]
-{<img src="https://ruby-gem-downloads-badge.herokuapp.com/tileset_tooling?metric=true" alt="Build Status" />}[https://rubygems.org/gems/tileset_tooling]
+{<img src="https://badgen.net/rubygems/dt/tileset_tooling" alt="Number of downloads" />}[https://rubygems.org/gems/tileset_tooling]
+{<img src="https://badge.fury.io/rb/tileset_tooling.svg" alt="Gem Version" />}[https://badge.fury.io/rb/tileset_tooling]
 
 Bits of tooling I use for working with tilesets.
 

data/features/insert_bleed.feature

@@ -13,8 +13,8 @@ Feature: App inserts bleed correctly
     Then I type "0"
     Then I type "0"
     Then I type "0"
-    Then the exit status should be 1
-    Then the output should contain "Current implementation needs an existing margin"
+    Then the exit status should be 0
+    Then generated file should be the same as data result "simple_no_margin.png"
 
   Scenario: Insert bleed generate default output
     When I insert bleed to test data "simple_with_margin.png"

data/lib/tileset_tooling/app.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'gli'
+require 'mini_magick'
 require 'semantic_logger'
 
 require 'tileset_tooling/version'
@@ -29,6 +30,7 @@ class ::TilesetTooling::App
     ::SemanticLogger.default_level = :trace
     ::SemanticLogger.add_appender(io: $stdout, formatter: :color)
 
+    # ::MiniMagick.logger.level = ::Logger::DEBUG
     true
   end
 
@@ -49,7 +51,8 @@ class ::TilesetTooling::App
       insert_command.switch([:'skip-specs'], desc: 'Skips the reading of the specs')
       insert_command.flag([:output], default_value: nil, desc: 'Path where to store result', arg_name: 'path')
       insert_command.action do |_, options, args|
-        command = ::TilesetTooling::Commands::InsertBleed.new(options, args)
+        specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
+        command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
         command.unpack!
         command.run
       end

data/lib/tileset_tooling/commands/insert_bleed.rb

@@ -2,11 +2,18 @@
 # frozen_string_literal: true
 
 require 'tileset_tooling/data'
+require 'tileset_tooling/utils'
 
 require 'yaml'
 
 # Command used to insert bleed around tiles
 class ::TilesetTooling::Commands::InsertBleed < ::TilesetTooling::Commands::Command
+  # Constructor, initializes a few internal
+  def initialize(options, args, specs_loader)
+    @specs_loader = specs_loader
+    super(options, args)
+  end
+
   # Validates arguments/options and unpacks them
   def unpack!
     raise(::StandardError, 'Missing argument') unless @args.count == 1
@@ -21,27 +28,56 @@ class ::TilesetTooling::Commands::InsertBleed < ::TilesetTooling::Commands::Comm
     @logger.info("Adding bleed to tiles in image file '#{@image_path}'")
     tileset = gather_image_information
 
-    raise(::StandardError, 'Current implementation needs an existing margin') unless tileset.margin.positive?
+    if tileset.margin.positive?
+      modify_margin(tileset)
+    else
+      add_margin(tileset)
+    end
+
+    @logger.info("Result stored in '#{result_path}'")
+  end
+
+  private
 
+  def modify_margin(tileset)
     ::MiniMagick::Tool::Convert.new do |convert|
       convert.background('none')
       convert << tileset.original_image_path
 
       tileset.for_each_tile do |tile|
-        copy_rect(convert, tile.left, tile.top, 1, tile.width, tile.left, tile.top - 1) unless tile.top <= 0
-        copy_rect(convert, tile.left, tile.bottom - 1, 1, tile.width, tile.left, tile.bottom) unless tile.bottom >= tileset.height
-        copy_rect(convert, tile.left, tile.top, tile.height, 1, tile.left - 1, tile.top) unless tile.left <= 0
-        copy_rect(convert, tile.right - 1, tile.top, tile.height, 1, tile.right, tile.top) unless tile.right >= tileset.width
+        generate_bleed(convert, tileset, tile)
       end
 
       convert.flatten
       convert << result_path
     end
-
-    @logger.info("Result stored in '#{result_path}'")
   end
 
-  private
+  def add_margin(tileset)
+    nb_pixels_in_bleed = 1
+    new_tileset = ::TilesetTooling::Utils.tileset_with_margin_from(tileset, nb_pixels_in_bleed)
+    image_path = tileset.original_image_path
+
+    ::MiniMagick::Tool::Convert.new do |convert|
+      convert.background('none')
+
+      # Copy the original and resize so that we keep all the image specs
+      convert << image_path
+      convert.resize("#{new_tileset.width}x#{new_tileset.height}!")
+      convert.fill('white').draw("rectangle 0,0 #{new_tileset.width},#{new_tileset.height}").transparent('white')
+      convert.compose('Over')
+
+      # Copy tiles and bled
+      tileset.for_each_tile do |tile|
+        dest = new_tileset.tile_at(tile.row_index, tile.column_index)
+        copy_tile(convert, image_path, tile, dest)
+        generate_bleed(convert, tileset, tile, destination: dest, image_path: image_path)
+      end
+
+      convert.flatten
+      convert << result_path
+    end
+  end
 
   def result_path
     return @options[:output] if @options[:output]
@@ -53,55 +89,10 @@ class ::TilesetTooling::Commands::InsertBleed < ::TilesetTooling::Commands::Comm
     "#{directory}/#{file_name}_result#{extension}"
   end
 
-  def ask_specs
-    tile_height =
-      @cli.ask('Tile height?  ', ::Integer) do |q|
-        q.default = 0
-        q.in = 1..256
-      end
-    tile_width =
-      @cli.ask('Tile width?  ', ::Integer) do |q|
-        q.default = 0
-        q.in = 1..256
-      end
-    margin = @cli.ask('Margin?  ', ::Integer) { |q| q.default = 0 }
-    offset_top = @cli.ask('Top Offset?  ', ::Integer) { |q| q.default = 0 }
-    offset_left = @cli.ask('Left Offset?  ', ::Integer) { |q| q.default = 0 }
-
-    [tile_height, tile_width, margin, offset_top, offset_left]
-  end
-
-  def load_specs_from_file(file_path)
-    @logger.info("Extracting specs from '#{file_path}'")
-    specs = ::YAML.load_file(file_path)
-
-    begin
-      tile_height = specs['specs']['details']['tile_height']
-      tile_width = specs['specs']['details']['tile_width']
-      margin = specs['specs']['details']['margin']
-      offset_top = specs['specs']['details']['offset_top']
-      offset_left = specs['specs']['details']['offset_left']
-    rescue ::NoMethodError
-      raise(::StandardError, 'Invalid specs file')
-    end
-    [tile_height, tile_width, margin, offset_top, offset_left]
-  end
-
-  def find_specs
-    specs_file = ::TilesetTooling::Utils.image_spec_file_path(@image_path)
-    if !@options[:'skip-specs'] && ::File.exist?(specs_file)
-      tile_height, tile_width, margin, offset_top, offset_left = load_specs_from_file(specs_file)
-    else
-      tile_height, tile_width, margin, offset_top, offset_left = ask_specs
-    end
-    [tile_height, tile_width, margin, offset_top, offset_left]
-  end
-
-  # Asks for information about the image and build a tileset
   def gather_image_information
-    tile_height, tile_width, margin, offset_top, offset_left = find_specs
+    tile_height, tile_width, margin, offset_top, offset_left = @specs_loader.find_specs_for(@image_path, @options[:'skip-specs'])
 
-    ::TilesetTooling::Data::TileSet.new(
+    ::TilesetTooling::Data::FileTileSet.new(
       image: ::MiniMagick::Image.open(@image_path),
       original_image_path: @image_path,
       tile_height: tile_height,
@@ -112,15 +103,44 @@ class ::TilesetTooling::Commands::InsertBleed < ::TilesetTooling::Commands::Comm
     )
   end
 
-  def copy_rect(convert, x1, y1, height, width, x2, y2)
-    # convert image \( +clone -crop WxH+X1+Y1 +repage \) -geometry +X2+Y2 -compose over -composite result
+  def copy_rect(convert, width, height, source, destination, image_path: nil)
     convert.stack do |stack|
-      stack.clone.+ # rubocop:disable Lint/Void
-      stack.crop("#{width}x#{height}+#{x1}+#{y1}")
-      stack.repage.+
+      if image_path.nil?
+        stack.clone.+
+      else
+        stack << image_path
+      end
+      stack.crop("#{width}x#{height}+#{source.x}+#{source.y}").repage.+
     end
-    convert.geometry("+#{x2}+#{y2}")
-    convert.compose('Over')
-    convert.composite
+    convert.geometry("+#{destination.x}+#{destination.y}")
+    convert.compose('Over').composite
+  end
+
+  def copy_tile(convert, image_path, source, destination)
+    copy_rect(convert, source.width, source.height, source.top_left, destination.top_left, image_path: image_path)
+  end
+
+  def generate_bleed(convert, tileset, source, destination: nil, image_path: nil)
+    destination = source if destination.nil?
+
+    # Top
+    source_coord = ::TilesetTooling::Data::Point.new(x: source.left, y: source.top)
+    dest_coord = ::TilesetTooling::Data::Point.new(x: destination.left, y: destination.top - 1)
+    copy_rect(convert, source.width, 1, source_coord, dest_coord, image_path: image_path) unless source.top <= 0
+
+    # Bottom
+    source_coord = ::TilesetTooling::Data::Point.new(x: source.left, y: source.bottom - 1)
+    dest_coord = ::TilesetTooling::Data::Point.new(x: destination.left, y: destination.bottom)
+    copy_rect(convert, source.width, 1, source_coord, dest_coord, image_path: image_path) unless source.bottom >= tileset.height
+
+    # Left
+    source_coord = ::TilesetTooling::Data::Point.new(x: source.left, y: source.top)
+    dest_coord = ::TilesetTooling::Data::Point.new(x: destination.left - 1, y: destination.top)
+    copy_rect(convert, 1, source.height, source_coord, dest_coord, image_path: image_path) unless source.left <= 0
+
+    # Right
+    source_coord = ::TilesetTooling::Data::Point.new(x: source.right - 1, y: source.top)
+    dest_coord = ::TilesetTooling::Data::Point.new(x: destination.right, y: destination.top)
+    copy_rect(convert, 1, source.height, source_coord, dest_coord, image_path: image_path) unless source.right >= tileset.width
   end
 end

data/lib/tileset_tooling/data.rb

@@ -8,6 +8,9 @@ require 'mini_magick'
 module ::TilesetTooling::Data
 end
 
+# Needs to be first
 require 'tileset_tooling/data/types'
+
+require 'tileset_tooling/data/point'
 require 'tileset_tooling/data/tile'
 require 'tileset_tooling/data/tileset'

data/lib/tileset_tooling/data/point.rb

@@ -0,0 +1,8 @@
+# Copyright (c) 2020 Jean-Sebastien Gelinas, see LICENSE.txt
+# frozen_string_literal: true
+
+# Simple structure to represent a point (X,Y)
+class ::TilesetTooling::Data::Point < ::Dry::Struct
+  attribute :x, ::TilesetTooling::Data::Types::Integer
+  attribute :y, ::TilesetTooling::Data::Types::Integer
+end

data/lib/tileset_tooling/data/tile.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2020 Jean-Sebastien Gelinas, see LICENSE.txt
 # frozen_string_literal: true
 
+require 'tileset_tooling/data/point'
+
 # Class representing a TileSet's information
 class ::TilesetTooling::Data::Tile < ::Dry::Struct
   attribute :top, ::TilesetTooling::Data::Types::Integer
@@ -13,10 +15,8 @@ class ::TilesetTooling::Data::Tile < ::Dry::Struct
   attribute :margin_bottom, ::TilesetTooling::Data::Types::Integer
   attribute :margin_right, ::TilesetTooling::Data::Types::Integer
 
-  # Helper to print the information of the tile
-  def to_s
-    "#{top},#{left} [#{margin_top},#{margin_left},#{margin_bottom},#{margin_right}]"
-  end
+  attribute :row_index, ::TilesetTooling::Data::Types::Integer
+  attribute :column_index, ::TilesetTooling::Data::Types::Integer
 
   # Helper to get the bottom coordinate
   def bottom
@@ -27,4 +27,9 @@ class ::TilesetTooling::Data::Tile < ::Dry::Struct
   def right
     left + width
   end
+
+  # Helper to get the top-left point of this tile
+  def top_left
+    ::TilesetTooling::Data::Point.new(x: left, y: top)
+  end
 end

data/lib/tileset_tooling/data/tileset.rb

@@ -13,28 +13,16 @@ class ::TilesetTooling::Data::TileSetRow
   attr_reader :tiles
 end
 
-# Class representing a TileSet's information
-class ::TilesetTooling::Data::TileSet < ::Dry::Struct
-  attribute :image, ::TilesetTooling::Data::Types::ImageType
-  attribute :original_image_path, ::TilesetTooling::Data::Types::String
+# Class representing any TileSet's information
+class ::TilesetTooling::Data::TileSetBase < ::Dry::Struct
+  attribute :height, ::TilesetTooling::Data::Types::Integer
+  attribute :width, ::TilesetTooling::Data::Types::Integer
   attribute :tile_height, ::TilesetTooling::Data::Types::Integer
   attribute :tile_width, ::TilesetTooling::Data::Types::Integer
   attribute :margin, ::TilesetTooling::Data::Types::Integer
   attribute :offset_top, ::TilesetTooling::Data::Types::Integer
   attribute :offset_left, ::TilesetTooling::Data::Types::Integer
 
-  # Helper to print all information in the image
-  def to_s
-    %(
-Image '#{original_image_path}'
-  Tile height: #{tile_height}
-  Tile width: #{tile_width}
-  Margin: #{margin}
-  Top offset: #{offset_top}
-  Left offset: #{offset_left}
-  Number of tiles: #{rows.count * rows[0].tiles.count})
-  end
-
   # Runs the given bloc on each tile of the tileset
   def for_each_tile(&block)
     rows.each do |row|
@@ -44,14 +32,19 @@ Image '#{original_image_path}'
     end
   end
 
-  # Gets the height of the tileset/image
-  def height
-    image.height
+  # Gets the number of tiles per row
+  def nb_tiles_per_row
+    rows[0].tiles.length
   end
 
-  # Gets the width of the tileset/image
-  def width
-    image.width
+  # Gets the number of tiles per column
+  def nb_tiles_per_column
+    rows.length
+  end
+
+  # Gets the tile at the specified row/column
+  def tile_at(row_index, column_index)
+    rows[row_index].tiles[column_index]
   end
 
   private
@@ -62,11 +55,13 @@ Image '#{original_image_path}'
 
     @rows = []
     top = offset_top
+    row_index = 0
     loop do
       left = offset_left
       tiles = []
       margin_top = top.positive? ? margin : 0
       margin_bottom = top + tile_height < height ? margin : 0
+      column_index = 0
 
       loop do
         margin_left = left.positive? ? margin : 0
@@ -80,17 +75,40 @@ Image '#{original_image_path}'
           margin_top: margin_top,
           margin_left: margin_left,
           margin_bottom: margin_bottom,
-          margin_right: margin_right
+          margin_right: margin_right,
+          row_index: row_index,
+          column_index: column_index
         )
         left += tile_width + margin_left + margin_right
+        column_index += 1
         break if left >= width
       end
 
       @rows << ::TilesetTooling::Data::TileSetRow.new(tiles)
       top += tile_height + margin_top + margin_bottom
+      row_index += 1
       break if top >= height
     end
 
     @rows
   end
 end
+
+# Real tileset, associated with an actual image on disk
+class ::TilesetTooling::Data::FileTileSet < ::TilesetTooling::Data::TileSetBase
+  attribute :image, ::TilesetTooling::Data::Types::ImageType
+  attribute :original_image_path, ::TilesetTooling::Data::Types::String
+
+  def self.new(**kwargs)
+    image = kwargs[:image]
+    kwargs[:image] = image
+    kwargs[:height] = image.height
+    kwargs[:width] = image.width
+
+    super(**kwargs)
+  end
+end
+
+# Virtual tileset, not associated with an actual image
+class ::TilesetTooling::Data::VirtualTileSet < ::TilesetTooling::Data::TileSetBase
+end

data/lib/tileset_tooling/utils.rb

@@ -1,26 +1,9 @@
 # Copyright (c) 2020 Jean-Sebastien Gelinas, see LICENSE.txt
 # frozen_string_literal: true
 
-require 'mini_magick'
-
-# A few random utilities
+# Module containing a few random utilities
 module ::TilesetTooling::Utils
-  module_function
-
-  # Generate a signature from the image data
-  def image_signature(image_path)
-    ::MiniMagick::Tool::Identify.new do |identity|
-      identity.quiet
-      identity.format('%#\\n')
-      identity << image_path
-    end
-  end
-
-  # Gets the path to the spec file that should go with the given image
-  def image_spec_file_path(image_path)
-    file_name = ::File.basename(image_path, '.*')
-    directory = ::File.dirname(image_path)
-
-    "#{directory}/#{file_name}.specs"
-  end
 end
+
+require 'tileset_tooling/utils/common'
+require 'tileset_tooling/utils/specs_loader'

data/lib/tileset_tooling/utils/common.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2020 Jean-Sebastien Gelinas, see LICENSE.txt
+# frozen_string_literal: true
+
+require 'mini_magick'
+
+# A few random utilities
+module ::TilesetTooling::Utils
+  module_function
+
+  # Generate a signature from the image data
+  def image_signature(image_path)
+    ::MiniMagick::Tool::Identify.new do |identity|
+      identity.quiet
+      identity.format('%#\\n')
+      identity << image_path
+    end
+  end
+
+  # Generates a virtual tileset with added margin to be used for coordinate
+  def tileset_with_margin_from(original_tileset, nb_pixels_in_margin)
+    raise(::StandardError, 'Original tileset already contains a margin') unless original_tileset.margin.zero?
+
+    new_height = original_tileset.height + (original_tileset.nb_tiles_per_column * 2 * nb_pixels_in_margin) - 2 * nb_pixels_in_margin
+    new_width = original_tileset.width + (original_tileset.nb_tiles_per_row * 2 * nb_pixels_in_margin) - 2 * nb_pixels_in_margin
+
+    ::TilesetTooling::Data::VirtualTileSet.new(
+      tile_height: original_tileset.tile_height,
+      tile_width: original_tileset.tile_width,
+      margin: nb_pixels_in_margin,
+      offset_top: original_tileset.offset_top,
+      offset_left: original_tileset.offset_left,
+      height: new_height,
+      width: new_width
+    )
+  end
+end

data/lib/tileset_tooling/utils/specs_loader.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2020 Jean-Sebastien Gelinas, see LICENSE.txt
+# frozen_string_literal: true
+
+# Class used to find/load specs for a given image
+class ::TilesetTooling::Utils::SpecsLoader
+  # Constructor, initializes a few internals
+  def initialize
+    @logger = ::SemanticLogger[self.class.name.split('::').last]
+    @cli = ::HighLine.new
+  end
+
+  # Tries to find specs for the given image path
+  def find_specs_for(image_path, skip_specs_file)
+    specs_file = image_spec_file_path(image_path)
+    if !skip_specs_file && ::File.exist?(specs_file)
+      load_specs_from_file(specs_file)
+    else
+      ask_specs
+    end
+  end
+
+  private
+
+  # Gets the path to the spec file that should go with the given image
+  def image_spec_file_path(image_path)
+    file_name = ::File.basename(image_path, '.*')
+    directory = ::File.dirname(image_path)
+
+    "#{directory}/#{file_name}.specs"
+  end
+
+  def ask_specs
+    tile_height =
+      @cli.ask('Tile height?  ', ::Integer) do |q|
+        q.default = 0
+        q.in = 1..256
+      end
+    tile_width =
+      @cli.ask('Tile width?  ', ::Integer) do |q|
+        q.default = 0
+        q.in = 1..256
+      end
+    margin = @cli.ask('Margin?  ', ::Integer) { |q| q.default = 0 }
+    offset_top = @cli.ask('Top Offset?  ', ::Integer) { |q| q.default = 0 }
+    offset_left = @cli.ask('Left Offset?  ', ::Integer) { |q| q.default = 0 }
+
+    [tile_height, tile_width, margin, offset_top, offset_left]
+  end
+
+  def load_specs_from_file(file_path)
+    @logger.info("Extracting specs from '#{file_path}'")
+    specs = ::YAML.load_file(file_path)
+
+    begin
+      tile_height = specs['specs']['details']['tile_height']
+      tile_width = specs['specs']['details']['tile_width']
+      margin = specs['specs']['details']['margin']
+      offset_top = specs['specs']['details']['offset_top']
+      offset_left = specs['specs']['details']['offset_left']
+    rescue ::NoMethodError
+      raise(::StandardError, 'Invalid specs file')
+    end
+    [tile_height, tile_width, margin, offset_top, offset_left]
+  end
+end

data/lib/tileset_tooling/version.rb

@@ -2,6 +2,6 @@
 # frozen_string_literal: true
 
 module ::TilesetTooling
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
   public_constant :VERSION
 end

data/test/commands/insert_bleed_test.rb

@@ -5,23 +5,30 @@ require 'test_helper'
 
 class ::TestInsertBleed < ::Test::Unit::TestCase
   def test_margin_required
-    input, = get_png_data('simple_no_margin.png')
-    command = ::TilesetTooling::Commands::InsertBleed.new({}, [input])
-    command.expects(:ask_specs).returns([16, 16, 0, 0, 0])
+    input, expected = get_png_data('simple_no_margin.png')
+    specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
+    output = output_file_path
+    options = { output: output }
+    args = [input]
+    command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
+    specs_loader.expects(:ask_specs).returns([16, 16, 0, 0, 0])
     command.unpack!
-
-    assert_raise ::StandardError, 'Current implementation needs an existing margin' do
-      command.run
-    end
+    command.run
+    assert ::File.exist?(expected)
+    assert ::File.exist?(output)
+    output_signature = ::TilesetTooling::Utils.image_signature(output)
+    expected_signature = ::TilesetTooling::Utils.image_signature(expected)
+    assert_equal(expected_signature, output_signature)
   end
 
   def test_simple_file
     input, expected = get_png_data('simple_with_margin.png')
+    specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
     output = output_file_path
     options = { output: output }
     args = [input]
-    command = ::TilesetTooling::Commands::InsertBleed.new(options, args)
-    command.expects(:ask_specs).returns([16, 16, 1, 0, 0])
+    command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
+    specs_loader.expects(:ask_specs).returns([16, 16, 1, 0, 0])
     command.unpack!
     command.run
     assert ::File.exist?(expected)
@@ -33,10 +40,11 @@ class ::TestInsertBleed < ::Test::Unit::TestCase
 
   def test_simple_file_with_specs
     input, expected = get_png_data('simple_with_specs.png')
+    specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
     output = output_file_path
     options = { output: output }
     args = [input]
-    command = ::TilesetTooling::Commands::InsertBleed.new(options, args)
+    command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
     command.unpack!
     command.run
     assert ::File.exist?(expected)
@@ -48,10 +56,11 @@ class ::TestInsertBleed < ::Test::Unit::TestCase
 
   def test_simple_file_with_bad_specs
     input, = get_png_data('simple_with_bad_specs.png')
+    specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
     output = output_file_path
     options = { output: output }
     args = [input]
-    command = ::TilesetTooling::Commands::InsertBleed.new(options, args)
+    command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
     command.unpack!
     assert_raise ::StandardError, 'Invalid specs file' do
       command.run
@@ -60,11 +69,12 @@ class ::TestInsertBleed < ::Test::Unit::TestCase
 
   def test_simple_file_with_skip_specs
     input, expected = get_png_data('simple_with_bad_specs.png')
+    specs_loader = ::TilesetTooling::Utils::SpecsLoader.new
     output = output_file_path
     options = { output: output, 'skip-specs': true }
     args = [input]
-    command = ::TilesetTooling::Commands::InsertBleed.new(options, args)
-    command.expects(:ask_specs).returns([16, 16, 1, 0, 0])
+    command = ::TilesetTooling::Commands::InsertBleed.new(options, args, specs_loader)
+    specs_loader.expects(:ask_specs).returns([16, 16, 1, 0, 0])
     command.unpack!
     command.run
     assert ::File.exist?(expected)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tileset_tooling
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jean-Sebastien Gelinas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -263,13 +263,17 @@ files:
 - lib/tileset_tooling/commands.rb
 - lib/tileset_tooling/commands/insert_bleed.rb
 - lib/tileset_tooling/data.rb
+- lib/tileset_tooling/data/point.rb
 - lib/tileset_tooling/data/tile.rb
 - lib/tileset_tooling/data/tileset.rb
 - lib/tileset_tooling/data/types.rb
 - lib/tileset_tooling/utils.rb
+- lib/tileset_tooling/utils/common.rb
+- lib/tileset_tooling/utils/specs_loader.rb
 - lib/tileset_tooling/version.rb
 - test/commands/insert_bleed_test.rb
 - test/data/UIpackSheet_transparent.png
+- test/data/expected/simple_no_margin.png
 - test/data/expected/simple_with_bad_specs.png
 - test/data/expected/simple_with_margin.png
 - test/data/expected/simple_with_specs.png