yamg 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59cec81256da8c78e11ce4dd4946ced256ee6c27
-  data.tar.gz: 944c9d0189b94dcc96a89b2498ae2c1cb300e7ac
+  metadata.gz: bf2b7296e3006b737d2a5f5780b534c13eab885a
+  data.tar.gz: 7b6ea2ab7b6a39df88a2785fa49fc8351bea4fc3
 SHA512:
-  metadata.gz: f4a2f9d61123b1be043e1c9db9a9126971263d81865394d3eca9e8fef947d2914eb9187eaf89889291ce189ff1f0f01be128cd0a05990467eca07a881fa0563d
-  data.tar.gz: 4e3b8e53bd1d03a3fdeab6e242f4f2575dcb16394ceacad4b6173af61f7ccafe0fb934dc180a6a5020570d041b6d46ae2ca532788435100a76b2eda7a355be94
+  metadata.gz: dfdeb113584059c2eeaad5c1c3cb188d0522106d3d34277f69cb79c018c3d9277a6274d6581dab266b040bf26ebcb16592c208ac05e45a0770eb646a3675c87f
+  data.tar.gz: 2c9032970481ce85899328fdfe3dd2e75084031ec07b8c274f13d93d1f84a09ab91b235f59785fedc9f933674be329269dbf4bef5cbd7da9ad171d111b05dd91

data/README.md

@@ -1,8 +1,8 @@
 # YAMG
 
-      ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+      ┏                                                                            ┓
 
-          _____      _____       _____        ______  _______         _____
+           _____      _____       _____        ______  _______         _____
           |\    \    /    /|  ___|\    \      |      \/       \    ___|\    \
           | \    \  /    / | /    /\    \    /          /\     \  /    /\    \
           |  \____\/    /  /|    |  |    |  /     /\   / /\     ||    |  |____|
@@ -10,11 +10,11 @@
             \|___/    /  /  |    .--.    ||     |  \|_|/ /    / ||    |   |    |
                 /    /  /   |    |  |    ||     |       |    |  ||    |   |_,  |
                /____/  /    |____|  |____||\____\       |____|  /|\ ___\___/  /|
-              |`    | /     |    |  |    || |    |      |    | / | |   /____ / |
-              |_____|/      |____|  |____| \|____|      |____|/   \|___|    | /
-                                                                      \|____|/
+               |    | /     |    |  |    || |    |      |    | / | |   /____ / |
+               |____|/      |____|  |____| \|____|      |____|/   \|___|    | /
+                                                                       |____|/
 
-      ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+      ┗                                                                            ┛
 
 
 [![Gem Version](https://badge.fury.io/rb/yamg.png)](http://badge.fury.io/rb/yamg)
@@ -51,18 +51,45 @@ OSX
 
 ## Use
 
-    yamg
+First time
+
+    yamg init
 
 A `.yamg.yml` will be created on the folder.
+From now on to recompile everything when needed:
+
+    yamg
+
+An example folder `/art` of a project:
+
+
+```
+art
+├── icons
+│   ├── icon16.png
+│   ├── icon32.png
+│   └── icon512.svg
+├── media
+│   └── logo.svg
+└─── splash
+    ├── center.png
+    ├── north.png
+    └── southeast.png
+
+```
 
+From the `.yamg.yml` you may configure differents source paths.
+Also configure every export location you need (check #Support)
 
-### Icons
+## Icons
 
 Your main icon(s) may be SVG or PNG. Or both:
-SVG is always the best choice except really small (16x16, 32x32)
-icons: there you can show your pixel art skills to the world.
+SVG is always the best choice, it will be rasterized and not resized.
+Except will be with really small (16x16, 32x32, 64x64@2x) icons:
+A canvas for you to bring joy to the world with your pixel art skills.
 
-#### PNG
+
+### PNG
 
 Multiple sizes:
 Just save your files with the size in pixels first, example:
@@ -70,27 +97,28 @@ In the 'icons/' folder: '16-icon.png', '32-icon.png', '512-icon.png'.
 YAMG will choose the best size for the case, and don't touch
 the icon if sizes are a match.
 
-It's ok to (or if you) have only one icon, make it >512px.
+It's ok to (or if you) have only one png icon, make it >512px.
 
-#### SVG
+### SVG
 
 You may still use best size match: Just have you folder:
-'16-icon.svg', '256-icon.svg', problably not much more:
+'16-icon.svg', '256-icon.svg', and problably not many other sizes:
 The SVG will be rasterized in the correct size needed.
 
 
-### Splash
+## Splash
 
 Up to 9 images may be placed in a splash.
+It's not patch 9, think gravity: images will be pulled towards.
 Note: The center splash image must be named 'center'.
 
-#### Gravity
+### Gravity
 
 Just save you files with the names: 'north', 'northeast', 'south'...
 Gravity will put em in the correct place, with a lil padding.
 
 
-### Media
+## Media
 
 Addional media.
 There's also media generator for app stores.
@@ -107,8 +135,23 @@ Custom screenshots:
       scroll: 100        # Optional
 
 
+## Config file
+
+Explain yamg.yml:
+
+```
+icon:
+  path:
+  round:
+```
 
-### Support
+Custom location:
+
+    some-project:
+      icon: [32, 64, 128]
+
+
+## Support
 
 * iOS Project
 * OSX Project
@@ -126,12 +169,12 @@ Custom screenshots:
 
 ## Notes
 
-#### Media
+### Media
 
 Media is a logo, icon + name.
 
 
-#### Phonegap or Cordova
+### Phonegap or Cordova
 
 You may generate assets for both, but the difference is:
 Phonegap (`www/res`) assets are used only on Phonegap Build.

data/lib/yamg/cli.rb

@@ -54,20 +54,15 @@ module YAMG
       YAMG.info("Splash #{size.join('x')}px #{setup['path']}#{s}", :black)
     end
 
-    def compile_work(template, opts)
-      setup = setup_for(opts)
-
-      if (task = YAMG::TEMPLATES[template])
-        %w(icon splash media).each do |key|
-          next unless (work = task[key])
-          work.each do |i, d|
-            #Thread.new do # 200% speed up with 8 cores
-              send(:"compile_#{key}", i, d, setup)
-            #end
+    def compile_work(job, opts)
+      task = YAMG::TEMPLATES[job] || (works[job] && works[job]['export'])
+      %w(icon splash media).each do |key|
+        next unless (work = task[key])
+        work.each do |asset, size|
+          Thread.new do # 500% speed up with 8 cores
+            send(:"compile_#{key}", asset, size, setup_for(opts))
           end
         end
-      else
-        # puts 'Custom job!'
       end
     end
 

data/lib/yamg/icon.rb

@@ -4,16 +4,25 @@ module YAMG
   #
   #
   class Icon
-    attr_accessor :src, :size, :dpi, :rounded, :icons
+    attr_accessor :src, :size, :dpi, :rounded, :radius, :icons, :img
 
-    def initialize(src, size, rounded = false)
+    #
+    # Icon
+    #
+    # Icon.new(src, size, rounded).image
+    # Image class
+    # Icon.new(src, size, rounded).image('.path.ext')
+    # Export image
+    #
+    def initialize(src, size, rounded = false, radius = 9)
       fail if src.nil? || src.empty?
       @src = src
       @size  = size
       @rounded = rounded
       @icons = YAMG.load_images(src)
       YAMG.puts_and_exit("No sources in '#{src}'") if icons.empty?
-      @path = File.join(src, find_closest_gte_icon)
+      @choosen = File.join(src, find_closest_gte_icon)
+      @radius = radius
       @dpi = 90
     end
     alias_method :rounded?, :rounded
@@ -27,18 +36,12 @@ module YAMG
       end
     end
 
-    def image(out)
-      if File.extname(@path) =~ /svg/
-        pixels = dpi ? "-d #{dpi} -p #{dpi}" : nil
-        args = "#{pixels} -w #{size} -h #{size} -f png"
-        YAMG.run_rsvg(@path, out, args)
-        img = MiniMagick::Image.open(out)
-      else
-        img = MiniMagick::Image.open(@path)
-        img.resize size # "NxN"
-        write_out(img, out)
-      end
-      write_out(round(img), out) if rounded?
+    def radius
+      Array.new(2, size / @radius).join(',')
+    end
+
+    def dimensions
+      img.dimensions.join(',')
     end
 
     #
@@ -51,18 +54,14 @@ module YAMG
     # -compose DstIn
     # -composite picture_with_rounded_corners.png
     # https://gist.github.com/artemave/c20e7450af866f5e7735
-    def round(img, r = 14)
-      size = img.dimensions.join(',')
-      r = img.dimensions.max / r
-      radius = [r, r].join(',')
-
+    def round(r = 14)
       mask = MiniMagick::Image.open(img.path)
       mask.format 'png'
 
       mask.combine_options do |m|
         m.alpha 'transparent'
         m.background 'none'
-        m.draw "roundrectangle 0,0,#{size},#{radius}"
+        m.draw "roundrectangle 0,0,#{dimensions},#{radius}"
       end
 
       overlay = ::MiniMagick::Image.open img.path
@@ -71,7 +70,7 @@ module YAMG
       overlay.combine_options do |o|
         o.alpha 'transparent'
         o.background 'none'
-        o.draw "roundrectangle 0,0,#{size},#{radius}"
+        o.draw "roundrectangle 0,0,#{dimensions},#{radius}"
       end
 
       masked = img.composite(mask, 'png') do |i|
@@ -85,14 +84,30 @@ module YAMG
       masked
     end
 
+    def image(out = nil)
+      temp = out || "/tmp/#{@choosen.object_id}.png"
+      if File.extname(@choosen) =~ /svg/
+        pixels = dpi ? "-d #{dpi} -p #{dpi}" : nil
+        args = "#{pixels} -w #{size} -h #{size} -f png"
+        YAMG.run_rsvg(@choosen, temp, args)
+        @img = MiniMagick::Image.open(temp)
+      else
+        @img = MiniMagick::Image.open(@choosen)
+        @img.resize size # "NxN"
+      end
+      @img = round if rounded?
+      write_out(out)
+    end
+
     #
     # Writes image to disk
     #
-    def write_out(img, out)
-      FileUtils.mkdir_p File.dirname(out)
-      img.write(out)
+    def write_out(path = nil)
+      return img unless path
+      FileUtils.mkdir_p File.dirname(path)
+      img.write(path)
     rescue Errno::ENOENT
-      puts_and_exit("Path not found '#{out}'")
+      puts_and_exit("Path not found '#{path}'")
     end
   end
 end

data/lib/yamg/splash.rb

@@ -6,6 +6,15 @@ module YAMG
   class Splash
     attr_accessor :src, :bg, :size, :assets, :img
 
+    #
+    # Splash
+    #
+    # Splash.new(src, size, rounded).image
+    # Image class
+    #
+    # Icon.new(src, size, rounded).image('.path.ext')
+    # Export image
+    #
     def initialize(src, size, background)
       @src = src
       @size = size
@@ -26,7 +35,7 @@ module YAMG
     # Center image
     #
     def splash_start
-      icon_size = size.max / 9
+      icon_size = size.min / 5
       img.resize icon_size if img.dimensions.max >= icon_size
       img.combine_options do |o|
         o.gravity 'center'
@@ -58,11 +67,12 @@ module YAMG
     end
 
     #
-    # Writes image to disk
+    # Outputs instance or writes image to disk
     #
-    def image(out)
+    def image(out = nil)
       splash_start
       splash_composite
+      return img unless out
       FileUtils.mkdir_p File.dirname(out)
       img.write(out)
     rescue Errno::ENOENT

data/lib/yamg/templates.yaml

@@ -5,6 +5,8 @@ raster:
     'icon64.png': 64
     'icon128.png': 128
     'icon256.png': 256
+    'icon512.png': 512
+    'icon1024.png': 1024
   splash:
     'splash-port-sm.png': [480, 320]
     'splash-port-md.png': [1024, 768]

data/lib/yamg/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module YAMG
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/yamg/yamg.yml

@@ -58,6 +58,18 @@ compile:
   # Compiles to media/facebook
   facebook: true
 
+  #
+  # Creating your own
+  #
+  # my-proj:
+  #   path: '../app/www/img'
+  #   # icon: './another/source' # icon here is source
+  #   export:
+  #     icon: # Notice: icon inside export
+  #       'icon16.png': 16
+  #       'icon64.png': 64
+  #       'icon128.png': 128
+
   # Custom icons/splash
   # Compiles to media/*
   # custom:

data/lib/yamg.rb

@@ -42,6 +42,8 @@ module YAMG
     def load_images(dir)
       return [dir] unless File.extname(dir).empty?
       Dir["#{dir}/*.{svg,png,jpg}"].map { |f| File.basename(f) }
+    rescue TypeError
+      puts_and_exit("Bad config file path: #{dir}")
     end
 
     def run(comm)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamg
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick