appiconset 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7767388959af2163784bee32c1a70fc845eef093882f4fb26911fada88ef15
-  data.tar.gz: c2f1a80e9ea7a5d30928b3d157e1964eed726f26b2f7cb49b4c5dfc50637b856
+  metadata.gz: 04c392fedbb90f46a1a68063f3e355ec5fa8bd81123d250a7799d453ea243dc9
+  data.tar.gz: 5128b965a8349ad8094ce560a5681935b36f652d7590ee624ec2bc87bb3a1573
 SHA512:
-  metadata.gz: 8b82c5fe7f7b5d61fadfb49a1126f0a1ab07bc4fb823803c1ce7f2ab513d437512ed97fff395d1b834fed33e493c8e968319bb3e3326e6df732822f7b26fb88a
-  data.tar.gz: 3e2f7a7443b136f3e3d7f5a14d268475c395eb5e7d6590e11ddb66e7c0ffc1ddac85e96d0b4b7e87799cdad4fb0a58674daedbf9e3e61a21fc638ae5167dd735
+  metadata.gz: 34f6a72de126bf51135bf2ad8bc9cf0780e187d37507872e74a24f14324d9c92f8a0c395573c315e25066b79cda73fee98356fc66f7d0b896f66c76add624d56
+  data.tar.gz: f2bf02f8b5663a0153343358f3a669a6f407c108415f26ef0c8de02cbd9aef8e14f5d232684429d183a32492603eb7b810b12e97d8638fa9b74d30cdc2141ae3

data/.rubocop.yml

@@ -1 +1,4 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+    SuggestExtensions: false

data/.rubocop_todo.yml

@@ -20,12 +20,12 @@ Metrics/BlockLength:
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 140
+  Max: 150
 
 # Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 10
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.

data/README.base.md

@@ -25,16 +25,20 @@
 * tvOS
 * icns.iconset
 * icns(macOS only)
+* favicon
 
 # ガイド
 
-## 正方形アイコン
-正方形アイコンを生成するには、1024px x 1024px の画像からアプリアイコンを作成します。
+1つの画像から複数のアプリアイコンを作成します。
 
 ```
 $ appiconset g -i='sample.jpg' -o='output'   
 ```
 
+
+## 正方形アイコン
+正方形アイコンを作成するには、1024px x 1024px の画像を用意します。
+
 Contents.jsonと複数のpngファイルが作成されます。  
 これらのファイルをXcodeプロジェクトの AppIcon.appiconset にコピーします。
 
@@ -51,18 +55,10 @@ tvOSアプリ向けのアイコンを作成するには。4640px x 1440px の画
 | tv-top-shelf | 3840x1440 | ![tv-top-shelf](sample/tv-top-shelf/Icon@2x.png)|
 | tv-top-shelf-wide | 4640x1440 |![tv-top-shelf-wide](sample/tv-top-shelf-wide/Icon@2x.png) |
 
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
-
 ## 任意のサイズのアイコン
 
 任意のサイズの画像から、1倍、2/3倍、1/3倍のアイコンを作成します。
 
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
-
 <!-- [en] -->
 
 # Appiconset
@@ -83,17 +79,20 @@ Icon creation is supported for the following platforms.
 * tvOS
 * icns.iconset
 * icns(macOS only)
+* favicon
 
 # Guide
 
-## Square icons
-
-Create an app icon from a 1024px x 1024px image.
+Create multiple app icons from one image.
 
 ```
 $ appiconset g -i='sample.jpg' -o='output'   
 ```
 
+## Square icons
+
+Create an app icon from a 1024px x 1024px image.
+
 A Contents.json and several png files will be created.  
 Copy these files to AppIcon.appiconset in the Xcode project.
 
@@ -110,14 +109,7 @@ The input image is the same as tv-top-shelf-wide, tv-top-shelf is the image from
 | tv-top-shelf | 3840x1440 | ![tv-top-shelf](sample/tv-top-shelf/Icon@2x.png)|
 | tv-top-shelf-wide | 4640x1440 |![tv-top-shelf-wide](sample/tv-top-shelf-wide/Icon@2x.png) |
 
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
 
 ## Icons of any size
 
 Create 1x, 2/3x, and 1/3x icons from any size image.
-
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```

data/README.ja.md

@@ -19,16 +19,20 @@
 * tvOS
 * icns.iconset
 * icns(macOS only)
+* favicon
 
 # ガイド
 
-## 正方形アイコン
-正方形アイコンを生成するには、1024px x 1024px の画像からアプリアイコンを作成します。
+1つの画像から複数のアプリアイコンを作成します。
 
 ```
 $ appiconset g -i='sample.jpg' -o='output'   
 ```
 
+
+## 正方形アイコン
+正方形アイコンを作成するには、1024px x 1024px の画像を用意します。
+
 Contents.jsonと複数のpngファイルが作成されます。  
 これらのファイルをXcodeプロジェクトの AppIcon.appiconset にコピーします。
 
@@ -45,14 +49,6 @@ tvOSアプリ向けのアイコンを作成するには。4640px x 1440px の画
 | tv-top-shelf | 3840x1440 | ![tv-top-shelf](sample/tv-top-shelf/Icon@2x.png)|
 | tv-top-shelf-wide | 4640x1440 |![tv-top-shelf-wide](sample/tv-top-shelf-wide/Icon@2x.png) |
 
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
-
 ## 任意のサイズのアイコン
 
 任意のサイズの画像から、1倍、2/3倍、1/3倍のアイコンを作成します。
-
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```

data/README.md

@@ -19,17 +19,20 @@ Icon creation is supported for the following platforms.
 * tvOS
 * icns.iconset
 * icns(macOS only)
+* favicon
 
 # Guide
 
-## Square icons
-
-Create an app icon from a 1024px x 1024px image.
+Create multiple app icons from one image.
 
 ```
 $ appiconset g -i='sample.jpg' -o='output'   
 ```
 
+## Square icons
+
+Create an app icon from a 1024px x 1024px image.
+
 A Contents.json and several png files will be created.  
 Copy these files to AppIcon.appiconset in the Xcode project.
 
@@ -46,14 +49,7 @@ The input image is the same as tv-top-shelf-wide, tv-top-shelf is the image from
 | tv-top-shelf | 3840x1440 | ![tv-top-shelf](sample/tv-top-shelf/Icon@2x.png)|
 | tv-top-shelf-wide | 4640x1440 |![tv-top-shelf-wide](sample/tv-top-shelf-wide/Icon@2x.png) |
 
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
 
 ## Icons of any size
 
-Create 1x, 2/3x, and 1/3x icons from any size image.
-
-```
-$ appiconset g -i='sample.jpg' -o='output'   
-```
+Create 1x, 2/3x, and 1/3x icons from any size image.

data/lib/appiconset/cli.rb

@@ -26,9 +26,7 @@ module Appiconset
       begin
         generator.config(options[:input].to_s, options[:output].to_s)
         generator.square_platforms
-        generator.tvos_platforms
-        generator.universal_platforms
-        generator.icns_platforms
+        generator.any_platforms
       rescue StandardError => e
         warn e.message
         exit(1)

data/lib/appiconset/generator.rb

@@ -2,6 +2,7 @@
 
 require 'appiconset'
 require 'json'
+require 'rbconfig'
 
 # Appiconset
 module Appiconset
@@ -29,7 +30,7 @@ module Appiconset
 
     # 正方形アイコン
     def square_platforms
-      return unless @width == 1024 && @height == 1024
+      return unless size_match?([1024, 1024])
 
       show_info('square')
 
@@ -68,124 +69,126 @@ module Appiconset
       end
     end
 
-    # ユニバーサルアイコン
-    def universal_platforms
-      show_info('universal')
-
+    # rubocop:todo Metrics/PerceivedComplexity
+    # rubocop:todo Metrics/AbcSize
+    def any_platforms # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
       platforms = [
         {
           name: 'universal',
+          size: [0, 0],
           contents: [
-            { width: @width, height: @height, scale: 3 },
-            { width: @width / 3 * 2, height: @height / 3 * 2, scale: 2 },
-            { width: @width / 3, height: @height / 3, scale: 1 }
+            { width: @width, height: @height, name: 'Icon@3x.png' },
+            { width: @width / 3 * 2, height: @height / 3 * 2, name: 'Icon@2x.png' },
+            { width: @width / 3, height: @height / 3, name: 'Icon@1x.png' }
           ]
-        }
-      ]
-
-      platforms.each do |platform|
-        output_dir = "#{@output}#{platform[:name]}/"
-        FileUtils.mkdir_p(output_dir)
-
-        platform[:contents].each do |content|
-          width = content[:width].to_f
-          height = content[:height].to_f
-          scale = content[:scale].to_i
-
-          name = "Icon@#{scale}x.png"
-
-          image = Magick::ImageList.new(@input)
-          new_image = image.resize_to_fit(width, height)
-          new_image.format = 'PNG'
-          new_image.write(output_dir + name)
-        end
-      end
-    end
-
-    # tvOSアイコン
-    # Input 4640x1440
-    # Output 2400x1440, 3840x1440, 4640x1440
-    def tvos_platforms
-      return unless @width == 4640 && @height == 1440
-
-      show_info('tvOS')
-
-      platforms = [
+        },
         {
           name: 'tv',
+          size: [4640, 1440],
           contents: [
-            { width: 800, height: 480, scale: 2 },
-            { width: 400, height: 240, scale: 1 }
+            { width: 800, height: 480, name: 'Icon@2x.png' },
+            { width: 400, height: 240, name: 'Icon@1x.png' }
           ]
         },
         {
           name: 'tv-top-shelf',
+          size: [4640, 1440],
           contents: [
-            { width: 3840, height: 1440, scale: 2 },
-            { width: 1920, height: 720, scale: 1 }
+            { width: 3840, height: 1440, name: 'Icon@2x.png' },
+            { width: 1920, height: 720, name: 'Icon@1x.png' }
           ]
         },
         {
           name: 'tv-top-shelf-wide',
+          size: [4640, 1440],
+          contents: [
+            { width: 4640, height: 1440, name: 'Icon@2x.png' },
+            { width: 2320, height: 720, name: 'Icon@1x.png' }
+          ]
+        },
+        {
+          name: 'icns.iconset',
+          size: [1024, 1024],
+          contents: [
+            { width: 1024, height: 1024, name: 'icon_512x512@2x.png' },
+            { width: 512, height: 512, name: 'icon_512x512.png' },
+            { width: 512, height: 512, name: 'icon_256x256@2x.png' },
+            { width: 256, height: 256, name: 'icon_256x256.png' },
+            { width: 256, height: 256, name: 'icon_128x128@2x.png' },
+            { width: 128, height: 128, name: 'icon_128x128.png' },
+            { width: 128, height: 128, name: 'icon_64x64@2x.png' },
+            { width: 64, height: 64, name: 'icon_64x64.png' },
+            { width: 64, height: 64, name: 'icon_32x32@2x.png' },
+            { width: 32, height: 32, name: 'icon_32x32.png' },
+            { width: 32, height: 32, name: 'icon_16x16@2x.png' },
+            { width: 16, height: 16, name: 'icon_16x16.png' }
+          ]
+        },
+        {
+          name: 'favicon',
+          size: [1024, 1024],
           contents: [
-            { width: 4640, height: 1440, scale: 2 },
-            { width: 2320, height: 720, scale: 1 }
+            { width: 256, height: 256, name: 'icon_256x256.png' },
+            { width: 128, height: 128, name: 'icon_128x128.png' },
+            { width: 64, height: 64, name: 'icon_64x64.png' },
+            { width: 48, height: 48, name: 'icon_48x48.png' },
+            { width: 32, height: 32, name: 'icon_32x32.png' },
+            { width: 24, height: 24, name: 'icon_24x24.png' },
+            { width: 16, height: 16, name: 'icon_16x16.png' }
           ]
         }
       ]
 
       platforms.each do |platform|
-        output_dir = "#{@output}#{platform[:name]}/"
+        platform_name = platform[:name]
+        next unless size_match?(platform[:size])
+
+        show_info(platform_name)
+
+        output_dir = "#{@output}#{platform_name}/"
         FileUtils.mkdir_p(output_dir)
 
         platform[:contents].each do |content|
           width = content[:width].to_f
           height = content[:height].to_f
-          scale = content[:scale].to_i
-
-          name = "Icon@#{scale}x.png"
+          name = content[:name]
 
           image = Magick::ImageList.new(@input)
-          new_image = image.scale(height / 1440.0)
-          new_image = new_image.crop(Magick::CenterGravity, width, height)
-          new_image.format = 'PNG'
-          new_image.write(output_dir + name)
+          if platform_name.start_with?('tv')
+            image = image.scale(height / 1440.0)
+            image = image.crop(Magick::CenterGravity, width, height)
+          else
+            image = image.resize_to_fit(width, height)
+          end
+          image.format = 'PNG'
+          image.write(output_dir + name)
         end
-      end
-    end
-
-    # icnsアイコン
-    def icns_platforms
-      return unless @width == 1024 && @height == 1024
-
-      show_info('icns.iconset')
 
-      output_dir = "#{@output}icns.iconset/"
-      FileUtils.mkdir_p(output_dir)
-
-      sizes = [512, 256, 128, 64, 32, 16]
-      sizes.each do |size|
-        [2, 1].each do |scale|
-          if scale == 2
-            name = "icon_#{size}x#{size}@2x.png"
-            new_size = size * scale
-          else
-            name = "icon_#{size}x#{size}.png"
-            new_size = size
+        if platform_name == 'icns.iconset' && RbConfig::CONFIG['host_os'].match(/darwin|mac os/)
+          # macOSで実行可能
+          show_info('icns')
+          system("iconutil -c icns --output #{@output}Icon.icns #{@output}icns.iconset/")
+        elsif platform_name == 'favicon'
+          images = platforms.find do |x|
+            x[:name] == 'favicon'
+          end[:contents].map do |x| # rubocop:disable Style/MultilineBlockChain
+            "#{output_dir}#{x[:name]}"
           end
 
-          image = Magick::ImageList.new(@input)
-          new_image = image.resize_to_fit(new_size, new_size)
-          new_image.format = 'PNG'
-          new_image.write(output_dir + name)
+          image = Magick::ImageList.new(*images)
+          image.format = 'ICO'
+          image.write("#{@output}favicon/favicon.ico")
         end
       end
+    end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/PerceivedComplexity
 
-      return unless RUBY_PLATFORM.match(/darwin/)
+    private
 
-      # macOSで実行可能
-      show_info('icns')
-      system("iconutil -c icns #{output_dir}")
+    # 入力画像のサイズが条件に一致したときtrueを返す
+    def size_match?(size)
+      size == [0, 0] || (@width == size[0] && @height == size[1])
     end
 
     def show_info(platform_name)

data/lib/appiconset/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appiconset
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appiconset
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - arthur87
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop