acbaker 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4812fc0a537d4b5ec3c4f82fee692e6329302940
-  data.tar.gz: 8c72e59d353439629ef45da3d64e4aa030b5f2ac
+  metadata.gz: e0da3aebf60075ce0d77dbcdda8353ef87d099dd
+  data.tar.gz: d545f2520a8bb8ff17ac7ea78be66a0a32252d60
 SHA512:
-  metadata.gz: 7612ecedd2a2ee2a657049708ce2b53909b8f1c69350a934a91f64546d39a3fd840f70146de6c65cafa28c60ef99b2a3b51ce60f3b82c3cffe5c3d3420edc65a
-  data.tar.gz: b817e65daff69034d4b25156b5b3224e44c7b29710071235dcd1866d57f188efa9e0c4fe7113e636e9f055febe78059a7b9171f2a11c97a5a8b709fe0028d944
+  metadata.gz: a7b744fbf7d7b0728bbd9a0f5f3521f9c588f35110a0b7d480d9491deb94b876ff2463e4fe9e9a7a51e85121f071bbeffc433e7f2f352e156bd1637766cb4cf5
+  data.tar.gz: 7ab1d19be2e6bf202b417b72edd40e041ee479b105f9de7beefe0779598bc85e37b438ff1f0fa14e58dcf051fb55a7071df903dafbf9191ed36abea3f3490842

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 tmp/*
-acbaker-*.gem
+acbaker-*.gem
+/input/*
+/output/*

data/README.md

@@ -20,6 +20,12 @@ USAGE
 CHANGELOG
 ---------
 
+* **0.0.5**
+  * Add dynamic sizing option
+
+* **0.0.4**
+  * Add crop strategy and gravity support
+
 * **0.0.3**
   * Allow json config without fixed size
 

data/acbaker.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.add_dependency "commander", '~> 4.1'
   s.add_dependency 'json', '~> 1.8'
+  s.add_dependency 'rmagick', '~> 2.13'
   s.add_development_dependency "rake", '~> 10.0'
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/acbaker/asset_pack.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rmagick'
 
 module Acbaker
   class AssetPack
@@ -17,7 +18,7 @@ module Acbaker
     end
     
     def defaults
-      {json: false}
+      {json: false, gravity: 'Center', strategy: 'cover'}
     end
     
     def process(source_image_file, target_directory, &block)
@@ -26,11 +27,15 @@ module Acbaker
       json_output_file = File.join(target_directory, "Contents.json")
   
       # Loop through images
-      @json_data['images'].each_with_index do |image_spec, index|
-    
+      @json_data['images'].each_with_index.map do |image_spec, index|
+
+        image_size_present = image_spec['size']
+        image_magick = Magick::Image::read(source_image_file)[0]
+        image_spec['size'] = "#{image_magick.columns.to_s}x#{image_magick.rows.to_s}" unless image_size_present
+
         # Get size
         scale = image_spec['scale'].gsub('x', '').to_i  
-        if image_spec['size']
+        if image_size_present
           (width_str, height_str) = image_spec['size'].split('x')
           width = width_str.to_i * scale
           height = height_str.to_i * scale
@@ -81,10 +86,14 @@ module Acbaker
         end
     
         # Generate image
-        if image_spec['size']
-          cmd = "convert #{source_image_file} -resize #{width}x#{height}^ -gravity Center -crop #{width}x#{height}+0+0 +repage #{target_directory}/#{filename}"
+        if image_size_present          
+          if @options[:strategy] == 'contain'
+            cmd = "convert #{source_image_file} -resize #{width}x -size #{width}x#{height} xc:#FFFFFF +swap -gravity #{@options[:gravity]} -composite #{target_directory}/#{filename}"
+          else
+            cmd = "convert #{source_image_file} -resize #{width}x#{height}^ -gravity #{@options[:gravity]} -crop #{width}x#{height}+0+0 +repage #{target_directory}/#{filename}"
+          end
         else
-          cmd = "convert #{source_image_file} -gravity Center +repage #{target_directory}/#{filename}"
+          cmd = "convert #{source_image_file} -gravity #{@options[:gravity]} +repage #{target_directory}/#{filename}"
         end
         system(cmd)
         
@@ -95,7 +104,7 @@ module Acbaker
         image_spec['filename'] = filename
     
       end
-  
+
       # Save Contents.json
       File.open(json_output_file,"w") do |f|
         f.write(JSON.pretty_generate(@json_data))

data/lib/acbaker/commands/pack.rb

@@ -4,6 +4,8 @@ command :'pack' do |c|
   c.description = "The type will be autodetected by filename, and can be overwritten using the --type option"
   c.option '--type STRING', String, 'Specify asset pack type'
   c.option '--json STRING', String, 'Specify custom json file path'
+  c.option '--gravity STRING', String, 'Specify gravity (NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast)'
+  c.option '--strategy STRING', String, 'Specify strategy (cover, contain)'
   c.option '--force', String, 'Delete and recreate output directory (careful!)'
   global_option '--force'
 
@@ -14,6 +16,8 @@ command :'pack' do |c|
     @output_directory = args[1]
     @type = options.type
     @json = options.json
+    @gravity = options.gravity
+    @strategy = options.strategy
     @force = options.force
     
     # Validate
@@ -21,11 +25,16 @@ command :'pack' do |c|
     validate_image!
     validate_json!
     validate_type!
+    validate_gravity!
+    validate_strategy!
+    
     validate_output_directory!
 
     # Initialize packer
     asset_pack = Acbaker::AssetPack.new(@type, {
-      json: JSON.parse(File.open(@json).read)
+      json: JSON.parse(File.open(@json).read),
+      gravity: @gravity,
+      strategy: @strategy
     })
     
     # Pack assets    
@@ -79,9 +88,23 @@ command :'pack' do |c|
     end
     
     abort("error: Could not detect asset type.") if not @type
-    
   end
   
+  def validate_gravity!
+    if not @gravity
+      @gravity = "Center"
+    end
+    abort("error: Invalid gravity specified.") if not ["NorthWest", "North", "NorthEast", "West", "Center", "East", "SouthWest", "South", "SouthEast"].include?(@gravity)
+  end
+
+  def validate_strategy!
+    if not @strategy
+      @strategy = "cover"
+    end
+    abort("error: Invalid strategy specified.") if not ["cover", "contain"].include?(@strategy)
+  end
+
+  
   def validate_json!
     if @json
       abort("error: JSON file not found.") if not File.exist?(@json) or not File.file?(@json)

data/lib/acbaker/version.rb

@@ -1,3 +1,3 @@
 module Acbaker
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acbaker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,3 +114,4 @@ signing_key:
 specification_version: 4
 summary: Convert any source images into xcode asset catalogs.
 test_files: []
+has_rdoc: