acbaker 0.0.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9ae87d8d0116132643efd054dd902f11f7415dd
-  data.tar.gz: 4caa61508232fa88cfefc656a6ff7df2030d14f7
+SHA256:
+  metadata.gz: 48bc435fe2f091ac41f92db9b3ceb0442ac40ef3a8267d88b89a929f51e995ea
+  data.tar.gz: af9958ef2aa4a6fa0ca1b1564628610eaca49b9792ebcb07649dc12f5f158968
 SHA512:
-  metadata.gz: 320faf834aa04eebed124a329f5e6081cf194735ea7e9653c8e8081e4b824cb0c3e51455e6900011430a2eea1f687e5e5102ae0f23b3282d033a28a7fe6bf2cd
-  data.tar.gz: 0f67714166dbdd5642d293f41b32f32cd6a1f61442ac231fda37625b05e9e4a8b79ef1d7dd30b494081e79823d80783b82c67fe5265221a0fe942b5cf42458d1
+  metadata.gz: 607ceae4931cef50443dd2bfaa4409ca8458fe334f559c7efb9a054304ae85a92d3bb7bb166922a91b2224ee0df6324e33bba9663305babbd9950c254c9cb0e1
+  data.tar.gz: 946b6f6d02c5aac0568d5e238b4ae60160c2d2bb54e3259cf7311011f1412fca2442ea13151e18e435a8e30a2f9cbb7de6359c63249fb91eb8062baffae3ee83

data/.rubocop.yml

@@ -0,0 +1,257 @@
+Style/SymbolArray:
+  Enabled: true
+  EnforcedStyle: brackets
+
+# kind_of? is a good way to check a type
+Style/ClassCheck:
+  EnforcedStyle: kind_of?
+
+Style/TernaryParentheses:
+  Enabled: true
+  EnforcedStyle: require_parentheses_when_complex
+
+# specs sometimes have useless assignments, which is fine
+Lint/UselessAssignment:
+  Exclude:
+    - '**/spec/**/*'
+
+# We could potentially enable the 2 below:
+Layout/FirstHashElementIndentation:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
+# HoundCI doesn't like this rule
+Layout/DotPosition:
+  Enabled: false
+
+# We allow !! as it's an easy way to convert ot boolean
+Style/DoubleNegation:
+  Enabled: false
+  
+Style/NumericPredicate:
+  Enabled: false
+
+# Sometimes we allow a rescue block that doesn't contain code
+Lint/SuppressedException:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Needed for $verbose
+Style/GlobalVars:
+  Enabled: false
+
+# We want to allow class Fastlane::Class
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# $? Exit
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+  
+Metrics/ModuleLength:
+  Enabled: true
+  Max: 110
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Max: 5
+
+Metrics/BlockLength:
+  Enabled: false
+
+# The %w might be confusing for new users
+Style/WordArray:
+  MinSize: 19
+
+# raise and fail are both okay
+Style/SignalException:
+  Enabled: false
+
+# Better too much 'return' than one missing
+Style/RedundantReturn:
+  Enabled: false
+
+# Having if in the same line might not always be good
+Style/IfUnlessModifier:
+  Enabled: false
+
+# and and or is okay
+Style/AndOr:
+  Enabled: false
+
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 400
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Enabled: false
+  Max: 370
+
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 17
+
+Metrics/PerceivedComplexity:
+  Max: 25
+
+# Sometimes it's easier to read without guards
+Style/GuardClause:
+  Enabled: false
+
+# We allow both " and '
+Style/StringLiterals:
+  Enabled: false
+
+# something = if something_else
+# that's confusing
+Style/ConditionalAssignment:
+  Enabled: false
+
+# Better to have too much self than missing a self
+Style/RedundantSelf:
+  Enabled: false
+
+# e.g.
+# def self.is_supported?(platform)
+# we may never use `platform`
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+# the let(:key) { ... }
+Lint/ParenthesesAsGroupedExpression:
+  Exclude:
+    - '**/spec/**/*'
+
+# This would reject is_ in front of methods
+# We use `is_supported?` everywhere already
+Naming/PredicateName:
+  Enabled: false
+
+# We allow the $
+Style/PerlBackrefs:
+  Enabled: false
+
+# Disable '+ should be surrounded with a single space' for xcodebuild_spec.rb
+Layout/SpaceAroundOperators:
+  Exclude:
+    - '**/spec/actions_specs/xcodebuild_spec.rb'
+
+# We're not there yet
+Style/Documentation:
+  Enabled: false
+
+# Added after upgrade to 0.38.0
+Style/MutableConstant:
+  Enabled: false
+
+# length > 0 is good
+Style/ZeroLengthPredicate:
+  Enabled: false
+
+# Adds complexity
+Style/IfInsideElse:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+AllCops:
+  TargetRubyVersion: "2.4.0"
+  Exclude:
+    - './tmp/**/*'
+    - './Gemfile'

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    acbaker (2.0.0)
+      commander (~> 4.4)
+      json (~> 2.2)
+      rmagick (~> 3.1, >= 3.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ast (2.4.1)
+    coderay (1.1.3)
+    commander (4.5.2)
+      highline (~> 2.0.0)
+    diff-lcs (1.4.4)
+    highline (2.0.3)
+    json (2.3.1)
+    method_source (1.0.0)
+    minitest (5.14.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rmagick (3.2.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.88.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.2.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acbaker!
+  minitest (~> 5.11)
+  pry (~> 0.12)
+  rake (~> 12.0)
+  rspec (~> 3.8)
+  rubocop (~> 0.69)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -20,6 +20,12 @@ USAGE
 CHANGELOG
 ---------
 
+* **0.1.1**
+  * Fix aspect ratio bug in center processor
+
+* **0.1.0**
+  * Bigfixes
+
 * **0.0.9**
   * Added Constraint Filter
 

data/Rakefile

@@ -6,4 +6,4 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
-task default: %w[test]
+task default: %w[test]

data/acbaker.gemspec

@@ -1,7 +1,6 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'acbaker/version'
+require "acbaker/version"
 
 Gem::Specification.new do |s|
   s.name        = "acbaker"
@@ -13,12 +12,16 @@ Gem::Specification.new do |s|
   s.homepage    = "http://www.magloft.com"
   s.summary     = "Convert any source images into xcode asset catalogs."
   s.description = "This gem allows easy conversion and management of xcode asset catalogs."
-  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', '>= 2.13.4'
-  s.add_development_dependency "rake", '~> 10.0'
+  s.required_ruby_version = '>= 2.4'
+  s.add_dependency "commander", "~> 4.4"
+  s.add_dependency "json", "~> 2.2"
+  s.add_dependency "rmagick", "~> 3.1", ">= 3.1.0"
+  s.add_development_dependency "minitest", "~> 5.11"
+  s.add_development_dependency "pry", "~> 0.12"
+  s.add_development_dependency "rake", "~> 12.0"
+  s.add_development_dependency "rspec", "~> 3.8"
+  s.add_development_dependency "rubocop", "~> 0.69"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_path = 'lib'
+  s.require_path = "lib"
 end

data/bin/acbaker

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'commander/import'
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path('../lib', __dir__)
 require 'acbaker'
 
 program :version, Acbaker::VERSION

data/lib/acbaker.rb

@@ -3,5 +3,4 @@ require 'acbaker/asset_pack'
 require 'acbaker/processors'
 
 module Acbaker
-
-end
+end

data/lib/acbaker/asset_pack.rb

@@ -4,44 +4,42 @@ require 'rmagick'
 module Acbaker
   class AssetPack
     attr_reader :type, :images, :processors
-    
-    def initialize(type, options={})
+
+    def initialize(type, options = {})
       @type = type
       @processors = []
       if options[:json]
         @json_data = options[:json]
       else
-        @json_file = File.join(File.dirname(File.expand_path(__FILE__)), "config", "#{type.to_s}.json")
+        @json_file = File.join(File.dirname(File.expand_path(__FILE__)), "config", "#{type}.json")
         @json_data = JSON.parse(File.open(@json_file).read)
       end
       @images = @json_data['images']
-      @options = self.defaults().merge(options)
+      @options = self.defaults.merge(options)
     end
-    
+
     def defaults
-      {json: false, gravity: 'Center', strategy: 'Cover'}
+      { json: false, gravity: 'Center', strategy: 'Cover' }
     end
-    
+
     def process(source_image_file, target_directory, &block)
-  
       # Define variables
       json_output_file = File.join(target_directory, "Contents.json")
-  
+
       # Get processors
-      if @json_data['processors'] and @json_data['processors'].length
+      if @json_data['processors']&.length
         @json_data['processors'].each do |processor_spec|
           @processors.push(Object.const_get(processor_spec['type']).new(self, processor_spec['config']))
         end
       else
         @processors = [Object.const_get("Acbaker::Processors::#{@options[:strategy]}").new(self)]
       end
-  
+
       # Loop through images
       @json_data['images'].each_with_index.map do |image_spec, index|
-        
         image_size_present = image_spec['size']
         image = Magick::ImageList.new(source_image_file)
-        image_spec['size'] = "#{image.columns.to_s}x#{image.rows.to_s}" unless image_size_present
+        image_spec['size'] = "#{image.columns}x#{image.rows}" unless image_size_present
 
         # Get size
         scale = image_spec['scale'].gsub('x', '').to_i
@@ -53,9 +51,6 @@ module Acbaker
           width = image.columns
           height = image.rows
         end
-        size_max = [width, height].max
-        base_width = width / scale
-        base_height = height / scale
 
         # Get version
         if image_spec['minimum-system-version'].nil?
@@ -67,61 +62,64 @@ module Acbaker
         else
           version = 'ios56'
         end
-    
+
         # process image
         @processors.each do |processor|
           image = processor.run(image, image_spec, width, height)
         end
-        
+
         # Generate filename
-        filename_array = []
-        filename_array.push(@type)
-        filename_array.push(image_spec['idiom']) if image_spec['idiom']
-        filename_array.push(image_spec['orientation']) if image_spec['orientation']
-        filename_array.push(version)
-    
-        # Add subtype
-        if image_spec['subtype']
-          if image_spec['subtype'] == '736h'
-            filename_array.push('retina-hd-55')
-          elsif image_spec['subtype'] == '667h'
-            filename_array.push('retina-hd-47')
+        if image_spec["filename"]
+          filename = image_spec["filename"]
+        else
+          filename_array = []
+          filename_array.push(@type)
+          filename_array.push(image_spec['idiom']) if image_spec['idiom']
+          filename_array.push(image_spec['orientation']) if image_spec['orientation']
+          filename_array.push(version)
+
+          # Add subtype
+          if image_spec['subtype']
+            case image_spec['subtype']
+            when '736h'
+              filename_array.push('retina-hd-55')
+            when '667h'
+              filename_array.push('retina-hd-47')
+            else
+              filename_array.push(image_spec['subtype'])
+            end
+          end
+
+          # Add extent
+          filename_array.push(image_spec['extent']) if image_spec['extent']
+
+          # Add size
+          filename_array.push(image_spec['size'])
+
+          if scale > 1
+            filename = "#{filename_array.join('-')}@#{scale}x.png"
           else
-            filename_array.push(image_spec['subtype'])
+            filename = "#{filename_array.join('-')}.png"
           end
         end
-    
-        # Add extent
-        filename_array.push(image_spec['extent']) if image_spec['extent']
-    
-        # Add size
-        filename_array.push(image_spec['size'])
-    
-        if scale > 1
-          filename = "#{filename_array.join('-')}@#{scale}x.png"
-        else
-          filename = "#{filename_array.join('-')}.png"
-        end
-        
+
         # save image
         image.write("#{target_directory}/#{filename}")
-        
+
         # Trigger Callback proc
-        block.call("#{target_directory}/#{filename}", index+1) if not block.nil?
-    
+        block&.call("#{target_directory}/#{filename}", index + 1)
+
         # Update json data
         image_spec['filename'] = filename
-    
       end
 
       # Save Contents.json
       @json_data.delete('processors')
-      File.open(json_output_file,"w") do |f|
+      File.open(json_output_file, "w") do |f|
         f.write(JSON.pretty_generate(@json_data))
       end
-  
+
       true
     end
-    
   end
 end

data/lib/acbaker/commands.rb

@@ -1,2 +1,2 @@
-$:.push File.expand_path('../', __FILE__)
-require 'commands/pack'
+$:.push File.expand_path(__dir__)
+require 'commands/pack'

data/lib/acbaker/commands/pack.rb

@@ -1,4 +1,4 @@
-command :'pack' do |c|
+command :pack do |c|
   c.syntax = "acbaker pack [image] [output directory]"
   c.summary = "Convert an image into a xcode asset catalogs"
   c.description = "The type will be autodetected by filename, and can be overwritten using the --type option"
@@ -10,7 +10,6 @@ command :'pack' do |c|
   global_option '--force'
 
   c.action do |args, options|
-    
     # Prepare arguments
     @image = args[0]
     @output_directory = args[1]
@@ -19,7 +18,7 @@ command :'pack' do |c|
     @gravity = options.gravity
     @strategy = options.strategy
     @force = options.force
-    
+
     # Validate
     validate_image_magick!
     validate_image!
@@ -27,7 +26,7 @@ command :'pack' do |c|
     validate_type!
     validate_gravity!
     validate_strategy!
-    
+
     validate_output_directory!
 
     # Initialize packer
@@ -36,8 +35,8 @@ command :'pack' do |c|
       gravity: @gravity,
       strategy: @strategy
     })
-    
-    # Pack assets    
+
+    # Pack assets
     bar = ProgressBar.new(asset_pack.images.size)
     bar.show
     asset_pack.process(@image, @output_directory) do |path, progress|
@@ -45,7 +44,6 @@ command :'pack' do |c|
     end
 
     say_ok 'Your assets were successfully packed!'
-
   end
 
   private
@@ -55,17 +53,15 @@ command :'pack' do |c|
   end
 
   def validate_image!
-    
     # validate image is set
     abort("Error: no image specified.") if @image.nil?
-    
+
     # validate image exists
-    abort("Error: can't find the image you specified. #{@image}") unless File.exist?(@image) and File.file?(@image)    
-    
+    abort("Error: can't find the image you specified. #{@image}") unless File.exist?(@image) and File.file?(@image)
   end
-  
+
   def validate_type!
-    if not @type
+    unless @type
       # Detect from image
       token = @image.split('/')[-1].split('.')[0].downcase.to_sym
       @type = {
@@ -75,8 +71,8 @@ command :'pack' do |c|
         launch: :LaunchImage
       }[token]
     end
-    
-    if not @type and @output_directory
+
+    if !@type and @output_directory
       # Detect from directory
       token = @output_directory.gsub('.', '').downcase.to_sym
       @type = {
@@ -86,71 +82,63 @@ command :'pack' do |c|
         launchimage: :LaunchImage
       }[token]
     end
-    
+
     # Fill json
-    if @type and not @json
+    if @type and !@json
       if File.file?("lib/acbaker/config/#{@type}.json")
         @json = "lib/acbaker/config/#{@type}.json"
       end
     end
-    
-    abort "error: no JSON configuration found" if not @json
-    abort("error: Could not detect asset type.") if not @type
+
+    abort "error: no JSON configuration found" unless @json
+    abort("error: Could not detect asset type.") unless @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)
+    @gravity ||= "Center"
+    abort("error: Invalid gravity specified.") unless ["NorthWest", "North", "NorthEast", "West", "Center", "East", "SouthWest", "South", "SouthEast"].include?(@gravity)
   end
 
   def validate_strategy!
-    if not @strategy
-      @strategy = "Cover"
-    end
-    
+    @strategy ||= "Cover"
+
     # try to instantiate strategy class
     begin
       Object.const_get("Acbaker::Processors::#{@strategy}")
-    rescue Exception => e
+    rescue StandardError
       abort("error: Invalid strategy specified.")
     end
   end
 
-  
   def validate_json!
     if @json
-      abort("error: JSON file not found.") if not File.exist?(@json) or not File.file?(@json)
+      abort("error: JSON file not found.") if !File.exist?(@json) or !File.file?(@json)
       begin
         JSON.parse(File.open(@json).read)
-      rescue Exception => e
+      rescue StandardError
         abort("error: invalid JSON file: #{@json}")
       end
-      @type = :Custom if not @type
+      @type ||= :Custom
     end
   end
 
   def validate_output_directory!
-    if not @output_directory
-      @output_directory = {
+    @output_directory ||= {
         AppIcon: "AppIcon.appiconset",
         LaunchImage: "LaunchImage.launchimage"
       }[@type]
-    end
 
     # Create custom output directory if type is set
-    @output_directory = "#{@type}.imageset"  if not @output_directory and @type
-    
+    @output_directory = "#{@type}.imageset" if !@output_directory and @type
+
     abort("Error: No output directory specified or detected.") if @output_directory.nil?
-    parent_directory = File.expand_path(@output_directory).split("/")[0..-2].join("/")    
-    abort("Error: Parent directory '#{parent_directory}' does not exist.") unless File.exist?(parent_directory) and File.directory?(parent_directory)    
-    
+    parent_directory = File.expand_path(@output_directory).split("/")[0..-2].join("/")
+    abort("Error: Parent directory '#{parent_directory}' does not exist.") unless File.exist?(parent_directory) and File.directory?(parent_directory)
+
     # Prepare output directory
     if @force
       FileUtils.rm_rf(@output_directory) if File.directory?(@output_directory)
     end
-    FileUtils.mkdir(@output_directory) if not File.directory?(@output_directory)
+    FileUtils.mkdir(@output_directory) unless File.directory?(@output_directory)
   end
-
-end
+end

data/lib/acbaker/processors.rb

@@ -1,4 +1,4 @@
-$:.push File.expand_path('../', __FILE__)
+$:.push File.expand_path(__dir__)
 require 'processors/base'
 require 'processors/center'
 require 'processors/cover'

data/lib/acbaker/processors/base.rb

@@ -2,16 +2,19 @@ module Acbaker
   module Processors
     class Base
       attr_accessor :asset_pack, :options
-      
-      def initialize(asset_pack, options={})
+
+      def defaults
+        {}
+      end
+
+      def initialize(asset_pack, options = {})
         @asset_pack = asset_pack
         @options = options ? defaults.merge(options) : defaults
       end
-      
-      def run(image, image_spec, width=nil, height=nil)
+
+      def run(image, image_spec, width = nil, height = nil)
         throw "Acbaker::Processors::Base should be extended"
       end
-
     end
   end
 end

data/lib/acbaker/processors/center.rb

@@ -1,31 +1,31 @@
+require 'pry'
+
 module Acbaker
   module Processors
     class Center < Base
-
       def defaults
-        {"max-width" => "50%", "background-color" => "#FFFFFF", "gravity" => "Center"}
+        { "max-width" => "50%", "background-color" => "#FFFFFF", "gravity" => "Center" }
       end
-            
-      def run(image, image_spec, width=nil, height=nil)
+
+      def run(image, image_spec, width = nil, height = nil)
         transform_width = width.to_f
         transform_height = height.to_f
-        target_ratio = transform_width / transform_height
-        image_ratio = image.columns / image.rows
-        
+        image_ratio = image.rows.to_f / image.columns
+
         # calculate dimensions
         if @options['max-width']
           if @options['max-width'][-1] == "%"
             rel_width = (@options['max-width'][0..-2].to_f / 100)
-            transform_width = transform_width * rel_width
+            transform_width *= rel_width
           else
             transform_width = @options['max-width'].to_f
           end
           transform_height = transform_width * image_ratio
         end
-        
+
         # resize image
         image.resize!(transform_width.to_i, transform_height.to_i)
-        
+
         # create canvas
         canvas = Magick::Image.new(width, height)
         if @options['background-color'] == :transparent
@@ -33,13 +33,10 @@ module Acbaker
         else
           canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
         end
-        
+
         # place image
-        image = canvas.composite(image, Magick::CenterGravity, Magick::OverCompositeOp)
-        
-        image
+        canvas.composite(image, Magick::CenterGravity, Magick::OverCompositeOp)
       end
-
     end
   end
 end

data/lib/acbaker/processors/constraint.rb

@@ -1,17 +1,15 @@
 module Acbaker
   module Processors
     class Constraint < Base
-      
-      def run(image, image_spec, width=nil, height=nil)
+      def run(image, image_spec, width = nil, height = nil)
         # resize image
         image.change_geometry("#{width}x#{height}") do |px, py, i|
           image.resize!(px, py)
           image_spec['size'] = "#{px}x#{py}"
         end
-        
+
         image
       end
-
     end
   end
 end

data/lib/acbaker/processors/contain.rb

@@ -1,17 +1,16 @@
 module Acbaker
   module Processors
     class Contain < Base
-      
       def defaults
-        {"background-color" => "#FFFFFF", "gravity" => "Center"}
+        { "background-color" => "#FFFFFF", "gravity" => "Center" }
       end
-      
-      def run(image, image_spec, width=nil, height=nil)
+
+      def run(image, image_spec, width = nil, height = nil)
         # resize image
         image.change_geometry("#{width}x#{height}") do |px, py, i|
           image.resize!(px, py)
         end
-        
+
         # crop image
         canvas = Magick::Image.new(width, height)
         if @options['background-color'] == :transparent
@@ -19,15 +18,12 @@ module Acbaker
         else
           canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
         end
-        
+
         # place image
         gravity_string = "Magick::#{@options['gravity']}Gravity"
         gravity = Object.const_get(gravity_string)
-        image = canvas.composite(image, gravity, Magick::OverCompositeOp)
-        
-        image
+        canvas.composite(image, gravity, Magick::OverCompositeOp)
       end
-
     end
   end
 end

data/lib/acbaker/processors/cover.rb

@@ -1,17 +1,16 @@
 module Acbaker
   module Processors
     class Cover < Base
-
       def defaults
-        {"background-color" => "#FFFFFF", "gravity" => "Center"}
+        { "background-color" => "#FFFFFF", "gravity" => "Center" }
       end
-      
-      def run(image, image_spec, width=nil, height=nil)
+
+      def run(image, image_spec, width = nil, height = nil)
         # resize image
         image.change_geometry("#{width}x#{height}^") do |px, py, i|
           image.resize!(px, py)
         end
-        
+
         # crop image
         canvas = Magick::Image.new(width, height)
         if @options['background-color'] == :transparent
@@ -19,15 +18,12 @@ module Acbaker
         else
           canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
         end
-        
+
         # place image
         gravity_string = "Magick::#{@options['gravity']}Gravity"
         gravity = Object.const_get(gravity_string)
-        image = canvas.composite(image, gravity, Magick::OverCompositeOp)
-        
-        image
+        canvas.composite(image, gravity, Magick::OverCompositeOp)
       end
-
     end
   end
 end

data/lib/acbaker/version.rb

@@ -1,3 +1,3 @@
 module Acbaker
-  VERSION = "0.0.9"
+  VERSION = "2.0.0"
 end

data/test/test_acbaker.rb

@@ -2,23 +2,21 @@ require 'minitest/autorun'
 require 'acbaker'
 
 class AcbakerTest < Minitest::Test
-
   def test_initialize
-    FileUtils.mkdir("tmp") if not File.directory?("tmp")
+    FileUtils.mkdir("tmp") unless File.directory?("tmp")
     asset_pack = Acbaker::AssetPack.new(:AppIcon)
     assert_equal :AppIcon, asset_pack.type
   end
-  
+
   def test_appicon
-    FileUtils.mkdir_p("tmp/AppIcon.appiconset") if not File.directory?("tmp/AppIcon.appiconset")
+    FileUtils.mkdir_p("tmp/AppIcon.appiconset") unless File.directory?("tmp/AppIcon.appiconset")
     asset_pack = Acbaker::AssetPack.new(:AppIcon)
     asset_pack.process("test/assets/AppIcon.png", "tmp/AppIcon.appiconset")
   end
 
   def test_launchimage
-    FileUtils.mkdir_p("tmp/LaunchImage.launchimage") if not File.directory?("tmp/LaunchImage.launchimage")
+    FileUtils.mkdir_p("tmp/LaunchImage.launchimage") unless File.directory?("tmp/LaunchImage.launchimage")
     asset_pack = Acbaker::AssetPack.new(:LaunchImage)
     asset_pack.process("test/assets/LaunchImage.png", "tmp/LaunchImage.launchimage")
   end
-
-end
+end

metadata

@@ -1,77 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: acbaker
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-    - - '>='
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-    - - '>='
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.69'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.69'
 description: This gem allows easy conversion and management of xcode asset catalogs.
 email:
 - tobias.strebitzer@magloft.com
@@ -80,7 +136,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - acbaker.gemspec
@@ -111,19 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Convert any source images into xcode asset catalogs.
 test_files: []
-has_rdoc: