makeicon 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55822ad4a4d571c821d608e0acae5076afb2ead
-  data.tar.gz: 1fb70295687592406888bfe9649bac773b3c58e7
+  metadata.gz: 5b44b43cf85eec1e22ea91cd46604cdd81e46904
+  data.tar.gz: bc25f0ea9699644146a7f0d1170eb313132f0393
 SHA512:
-  metadata.gz: c056a4b37069044078774972b7efcbd9b287331155eee57811a69f75407595b5abde7d3287499e1f0533de1b6f255ae18372b80d2245a9a2ab8dc1b214fdffbb
-  data.tar.gz: 33bb434dbd8e31df768737bff101905c8c306647d3f4fb79f2e78c2e2f8b8e3a7b3a2b23dcf3eb99cb0bc11bf88308ffd0bda6d085c86bebec08e3ccd55a1445
+  metadata.gz: d40d2e31e0b8663edd4e9ab6e8a3ec6c7ca4267f4e4fabb43b78558d1c17a85452767b146fa1793bdf29a4b0bd7960c6400dae6489551d5103b2da753d2e7fe3
+  data.tar.gz: 003d4b6da0e9e6d69806d6c0e528575033760ac784f1fd95a63f4eef3ae31c366b657d452eb2296cf9a0f4bdb46e0af6a9f32ab1a28e7ca282269050195e8c83

data/.gitignore

@@ -1,13 +1,16 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-.gem
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/icon-weixin/
+/icon-qq/
+/icon-weibo/
+
+# rspec failure tracking
+.rspec_status
+
+.gem

data/README.md

@@ -1,38 +1,82 @@
 # Makeicon
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/makeicon`. To experiment with that code, run `bin/console` for an interactive prompt.
+## Installation
+### Windows
 
-TODO: Delete this and the text above, and describe your gem
+1. 安装imagemagick/graphicsmagick  
+[下载graphicsmagick](ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/windows/)对应操作系统位数的安装程序，安装过程全部选默认。  
 
-## Installation
+2. 下载makeicon.exe
+[下载makeicon.exe](http://kgotmbzh-sand.droibaascdn.com/droi/kgotmbzhvdZZbRem9j0h9waEeAyhc0L7lQAAwKII/933627884172611584/makeicon.exe)
 
-Add this line to your application's Gemfile:
+### Mac
 
-```ruby
-gem 'makeicon'
+1. 安装imagemagick/graphicsmagick  
+``` bash
+# 如果没有安装brew，请安装
+$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+# 安装imagemagick
+$ brew install imagemagick
 ```
 
-And then execute:
+2. 安装ruby  
+Mac自带，可通过以下命令升级
+``` bash
+$ sudo gem update --system
+```
 
-    $ bundle
+3. 安装makeicon
+``` bash
+$ sudo gem install makeicon
+```
 
-Or install it yourself as:
+## Usage
 
-    $ gem install makeicon
+### Windows
+1. 未加path
+``` bash
+$ makeicon.exe iconpath
+# 例如(makeicon.exe为全路径)
+$ makeicon.exe Themoji.png
+# 生成的图片在当前文件夹下，以平台命名
+```
 
-## Usage
+2. 加入path
+``` bash
+$ makeicon iconpath
+# 例如
+$ makeicon Themoji.png
+# 生成的图片在当前文件夹下，以平台命名
+```
 
-TODO: Write usage instructions here
+### Mac
+``` bash
+$ makeicon iconpath
+# 例如
+$ makeicon Themoji.png
+# 生成的图片在当前文件夹下，以平台命名
+```
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+1. 修改版本号，对`./lib/makeicon/version.rb`的`VERSION = "0.1.6"`进行修改
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+2. 打包
+``` bash
+$ gem build makeicon.gemspec
+```
 
-## Contributing
+3. 发布
+``` bash
+$ gem push makeicon-VERSION.gem # VERSION替换为0.1.6等
+```
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/makeicon. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+4. windows-exe 发布(必须在本机安装过最新版makeicon之后)
+``` bash
+$ gem install ocra
+$ ocra ./bin/makeicon
+# 会在当前目录下生成 makeicon.exe
+```
 
 ## License
 

data/bin/makeicon

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require 'makeicon'
-
-params = Hash[:appicon_image_file => ARGV[0], :appicon_path => "icon",:appicon_filename=>"icon"]
+#!/usr/bin/env ruby
+
+require 'makeicon'
+
+params = Hash[:appicon_image_file => ARGV[0]||'Themoji.png', :appicon_path => "icon",:appicon_filename=>"icon"]
 MakeIcon::SocialAction::run(params)

data/lib/makeicon/version.rb

@@ -1,3 +1,3 @@
-module Makeicon
-  VERSION = "0.1.6"
-end
+module Makeicon
+  VERSION = "0.1.7"
+end

data/lib/makeicon.rb

@@ -1,181 +1,183 @@
-require "makeicon/version"
-
-module MakeIcon
-  module Helper
-    class AppiconHelper
-      def self.check_input_image_size(image, size)
-        puts "Minimum width of input image should be #{size}" if image.width < size
-        puts "Minimum height of input image should be #{size}" if image.height < size
-        puts "Input image should be square" if image.width != image.height
-        # UI.user_error!("Minimum width of input image should be #{size}") if image.width < size
-        # UI.user_error!("Minimum height of input image should be #{size}") if image.height < size
-        # UI.user_error!("Input image should be square") if image.width != image.height
-      end
-    end
-  end
-
-  class SocialAction
-    def self.get_needed_icons(device, needed_icons, is_android = false, custom_sizes = {})
-      icons = []
-      puts device
-      needed_icons[device].each do |scale, sizes|
-        sizes.each do |size|
-          if size.kind_of?(Array)
-            size, role, subtype = size
-          end
-
-          if is_android
-            width, height = size.split('x').map { |v| v.to_f }
-          else
-            width, height = size.split('x').map { |v| v.to_f * scale.to_i }
-          end
-
-          icons << {
-            'width' => width,
-            'height' => height,
-            'size' => size,
-            'device' => device.to_s.gsub('_', '-'),
-            'scale' => scale,
-            'role' => role,
-            'subtype' => subtype
-          }
-        end
-      end
-      
-      # Add custom icon sizes (probably for notifications) 
-      custom_sizes.each do |path, size|
-        path = path.to_s
-        width, height = size.split('x').map { |v| v.to_f }
-
-        icons << {
-          'width' => width,
-          'height' => height,
-          'size' => size,
-          'basepath' => File.dirname(path),
-          'filename' => File.basename(path)
-        }
-      end
-      
-      # Sort from the largest to the smallest needed icon
-      icons = icons.sort_by {|value| value['width']} .reverse
-    end
-
-    def self.needed_icons
-      {
-        social: {
-          'weixin' => ['28x28','108x108'],
-          'weibo' => ['16x16','80x80','120x120'],
-          'qq' => ['16x16','512x512'],
-        },
-      }
-    end
-
-    def self.notification_icons(path, filename)
-      return {} if !path || !filename
-      
-      {
-        "#{path}-ldpi/#{filename}" => '36x36',
-        "#{path}-mdpi/#{filename}" => '24x24',
-        "#{path}-hdpi/#{filename}" => '36x36',
-        "#{path}-xhdpi/#{filename}" => '48x48',
-        "#{path}-xxhdpi/#{filename}" => '72x72',
-        "#{path}-xxxhdpi/#{filename}" => '96x96',
-      }
-    end
-
-    def self.run(params)
-      fname = params[:appicon_image_file]
-
-      require 'mini_magick'
-      image = MiniMagick::Image.open(fname)
-
-      Helper::AppiconHelper.check_input_image_size(image, 512)
-
-      # Convert image to png
-      image.format 'png'
-      
-      # Merge notification icons into customer sizes as they are handled thes same way
-
-      icons = get_needed_icons(:social, self.needed_icons, true)
-      icons.each do |icon|
-        width = icon['width']
-        height = icon['height']
-
-        # Custom icons will have basepath and filename already defined
-        if icon.has_key?('basepath') && icon.has_key?('filename')
-          basepath = Pathname.new(icon['basepath'])
-          filename = icon['filename']  
-        else
-          basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
-          filename = "#{params[:appicon_filename]}_#{width}x#{height}.png"
-        end
-        FileUtils.mkdir_p(basepath)
-
-        image.resize "#{width}x#{height}"
-        image.write basepath + filename
-      end
-
-      puts "Successfully stored launcher icons at '#{params[:appicon_path]}'"
-    end
-    
-    def self.get_custom_sizes(image, custom_sizes)
-      
-    end
-
-    def self.description
-      "Generate required icon sizes from a master application icon"
-    end
-
-    def self.authors
-      ["@adrum"]
-    end
-
-    def self.available_options
-      [
-        FastlaneCore::ConfigItem.new(key: :appicon_image_file,
-                                env_name: "APPICON_IMAGE_FILE",
-                             description: "Path to a square image file, at least 512x512",
-                                optional: false,
-                                    type: String),
-        FastlaneCore::ConfigItem.new(key: :appicon_devices,
-                                env_name: "APPICON_DEVICES",
-                           default_value: [:phone],
-                             description: "Array of device types to generate icons for",
-                                optional: true,
-                                    type: Array),
-        FastlaneCore::ConfigItem.new(key: :appicon_path,
-                                env_name: "APPICON_PATH",
-                           default_value: 'app/res/mipmap/',
-                             description: "Path to res subfolder",
-                                optional: true,
-                                    type: String),
-        FastlaneCore::ConfigItem.new(key: :appicon_filename,
-                                env_name: "APPICON_FILENAME",
-                           default_value: 'ic_launcher',
-                             description: "The output filename of each image",
-                                optional: true,
-                                    type: String),
-        FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_path,
-                                env_name: "APPICON_NOTIFICATION_ICON_PATH",
-                           default_value: 'app/res/drawable/',
-                             description: "Path to res subfolder",
-                                optional: true,
-                                    type: String),
-        FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_filename,
-                                env_name: "APPICON_NOTIFICATION_ICON_FILENAME",
-                           default_value: 'ic_stat_onesignal_default',
-                             description: "File name for notification icons",
-                                optional: true,
-                                    type: String),
-        FastlaneCore::ConfigItem.new(key: :appicon_custom_sizes,
-                             description: "Hash of custom sizes - {'path/icon.png' => '256x256'}",
-                                optional: true,
-                                    type: Hash)
-      ]
-    end
-
-    def self.is_supported?(platform)
-      [:android].include?(platform)
-    end
-  end
-end
+require "makeicon/version"
+
+module MakeIcon
+  module Helper
+    class AppiconHelper
+      def self.check_input_image_size(image, size)
+        puts "Minimum width of input image should be #{size}" if image.width < size
+        puts "Minimum height of input image should be #{size}" if image.height < size
+        puts "Input image should be square" if image.width != image.height
+        # UI.user_error!("Minimum width of input image should be #{size}") if image.width < size
+        # UI.user_error!("Minimum height of input image should be #{size}") if image.height < size
+        # UI.user_error!("Input image should be square") if image.width != image.height
+      end
+    end
+  end
+
+  class SocialAction
+    def self.get_needed_icons(device, needed_icons, is_android = false, custom_sizes = {})
+      icons = []
+      puts device
+      needed_icons[device].each do |scale, sizes|
+        sizes.each do |size|
+          if size.kind_of?(Array)
+            size, role, subtype = size
+          end
+
+          if is_android
+            width, height = size.split('x').map { |v| v.to_f }
+          else
+            width, height = size.split('x').map { |v| v.to_f * scale.to_i }
+          end
+
+          icons << {
+            'width' => width,
+            'height' => height,
+            'size' => size,
+            'device' => device.to_s.gsub('_', '-'),
+            'scale' => scale,
+            'role' => role,
+            'subtype' => subtype
+          }
+        end
+      end
+      
+      # Add custom icon sizes (probably for notifications) 
+      custom_sizes.each do |path, size|
+        path = path.to_s
+        width, height = size.split('x').map { |v| v.to_f }
+
+        icons << {
+          'width' => width,
+          'height' => height,
+          'size' => size,
+          'basepath' => File.dirname(path),
+          'filename' => File.basename(path)
+        }
+      end
+      
+      # Sort from the largest to the smallest needed icon
+      icons = icons.sort_by {|value| value['width']} .reverse
+    end
+
+    def self.needed_icons
+      {
+        social: {
+          'weixin' => ['28x28','108x108'],
+          'weibo' => ['16x16','80x80','120x120'],
+          'qq' => ['16x16','512x512'],
+        },
+      }
+    end
+
+    def self.notification_icons(path, filename)
+      return {} if !path || !filename
+      
+      {
+        "#{path}-ldpi/#{filename}" => '36x36',
+        "#{path}-mdpi/#{filename}" => '24x24',
+        "#{path}-hdpi/#{filename}" => '36x36',
+        "#{path}-xhdpi/#{filename}" => '48x48',
+        "#{path}-xxhdpi/#{filename}" => '72x72',
+        "#{path}-xxxhdpi/#{filename}" => '96x96',
+      }
+    end
+
+    def self.run(params)
+      fname = params[:appicon_image_file]
+
+      require 'mini_magick'
+      image = MiniMagick::Image.open(fname)
+      fpname = Pathname.new(fname)
+      basedir  = fpname.dirname
+
+      Helper::AppiconHelper.check_input_image_size(image, 512)
+
+      # Convert image to png
+      image.format 'png'
+      
+      # Merge notification icons into customer sizes as they are handled thes same way
+
+      icons = get_needed_icons(:social, self.needed_icons, true)
+      icons.each do |icon|
+        width = icon['width']
+        height = icon['height']
+
+        # Custom icons will have basepath and filename already defined
+        if icon.has_key?('basepath') && icon.has_key?('filename')
+          basepath = Pathname.new(icon['basepath'])
+          filename = icon['filename']  
+        else
+          basepath = basedir + Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
+          filename = "#{params[:appicon_filename]}_#{width}x#{height}.png"
+        end
+        FileUtils.mkdir_p(basepath)
+        puts basepath + filename
+        image.resize "#{width}x#{height}"
+        image.write basepath + filename
+      end
+
+      puts "Successfully stored launcher icons at '#{params[:basepath]}'"
+    end
+    
+    def self.get_custom_sizes(image, custom_sizes)
+      
+    end
+
+    def self.description
+      "Generate required icon sizes from a master application icon"
+    end
+
+    def self.authors
+      ["@adrum"]
+    end
+
+    def self.available_options
+      [
+        FastlaneCore::ConfigItem.new(key: :appicon_image_file,
+                                env_name: "APPICON_IMAGE_FILE",
+                             description: "Path to a square image file, at least 512x512",
+                                optional: false,
+                                    type: String),
+        FastlaneCore::ConfigItem.new(key: :appicon_devices,
+                                env_name: "APPICON_DEVICES",
+                           default_value: [:phone],
+                             description: "Array of device types to generate icons for",
+                                optional: true,
+                                    type: Array),
+        FastlaneCore::ConfigItem.new(key: :appicon_path,
+                                env_name: "APPICON_PATH",
+                           default_value: 'app/res/mipmap/',
+                             description: "Path to res subfolder",
+                                optional: true,
+                                    type: String),
+        FastlaneCore::ConfigItem.new(key: :appicon_filename,
+                                env_name: "APPICON_FILENAME",
+                           default_value: 'ic_launcher',
+                             description: "The output filename of each image",
+                                optional: true,
+                                    type: String),
+        FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_path,
+                                env_name: "APPICON_NOTIFICATION_ICON_PATH",
+                           default_value: 'app/res/drawable/',
+                             description: "Path to res subfolder",
+                                optional: true,
+                                    type: String),
+        FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_filename,
+                                env_name: "APPICON_NOTIFICATION_ICON_FILENAME",
+                           default_value: 'ic_stat_onesignal_default',
+                             description: "File name for notification icons",
+                                optional: true,
+                                    type: String),
+        FastlaneCore::ConfigItem.new(key: :appicon_custom_sizes,
+                             description: "Hash of custom sizes - {'path/icon.png' => '256x256'}",
+                                optional: true,
+                                    type: Hash)
+      ]
+    end
+
+    def self.is_supported?(platform)
+      [:android].include?(platform)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makeicon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - marekchen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - bin/makeicon
 - lib/makeicon.rb
 - lib/makeicon/version.rb
+- makeicon.exe
 - makeicon.gemspec
 homepage: http://www.droi.com
 licenses:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: makeicon