yamg 0.0.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0065481167ba7ffeabcaa8c0227d00606fc9ebdd
-  data.tar.gz: 33cdc79edfffc34f7674fa949a824d418cfc2c51
+  metadata.gz: a7e652f48f91c43b778c3d54fe1130274ef3fba4
+  data.tar.gz: 3f2e4c1b25a818a87e441b137ee7b5f9f4464df6
 SHA512:
-  metadata.gz: 58ff6a4fc04946b8ea39e9d354b35ca08ca806c02977065e65676020f93dc0ae4f513b0e4b8eb40f82ccaddeda60383bb7ffac1d266c16206a513dee6ea85274
-  data.tar.gz: e399be3267dda8c25c45110f2afaa7dc7a24059da713d89972bfea163ae76fe0888cad72743eff82f56302f6cc0e1836f69bdf5bba887c512c113b45858a1fb6
+  metadata.gz: 6308eb73468929091a1f21e56c344866fc06bb706e614df38bfb61ee07c54ea01650a1b65e35367b256221fe153ba41ce8e549184f0925e5242011b6808a519b
+  data.tar.gz: e97d26fcc5e2e26a73c1485b0672ab9e625e07bf307b3d97b201af11e2deebfc602d76fb783218293cb5cc0dc03030bbfb8b87a08f381b9cd8aceac08a0382b3

data/README.md

@@ -21,22 +21,25 @@
 YAMG - Yet Another Media Generator
 
 
+
 ## Install
 
 Linux
 
-    nice-pkg-manager install imagemagick phantomjs ruby
+    nice-pkg-manager install imagemagick phantomjs librsvg ruby
     gem install yamg
 
 OSX
 
-    brew install imagemagick phantomjs ruby
+    brew install imagemagick phantomjs librsvg ruby
     gem install yamg
 
 
 ## Features
 
 * Find best version (size) to use from icons folder.
+* Shrinks binaries from the closest or greater size version.
+* Raster SVG to PNG with exact size and dpi.
 * Splash screen/banner generation with gravity.
 * Works with iOS/Android/Other mobile with Phonegap or Cordova.
 * Exports icons and splashes for stores and social networks.
@@ -49,8 +52,15 @@ OSX
 
 A `.yamg.yml` will be created on the folder.
 
+
 ### 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.
+
+#### PNG
+
 Multiple sizes:
 Just save your files with the size in pixels first, example:
 In the 'icons/' folder: '16-icon.png', '32-icon.png', '512-icon.png'.
@@ -59,6 +69,12 @@ the icon if sizes are a match.
 
 It's ok to (or if you) have only one icon, make it >512px.
 
+#### SVG
+
+You may still use best size match: Just have you folder:
+'16-icon.svg', '256-icon.svg', problably not much more:
+The SVG will be rasterized in the correct size needed.
+
 
 ### Splash
 

data/lib/yamg/cli.rb

@@ -1,78 +1,97 @@
 module YAMG
   # Command line interface
   class CLI
-    attr_accessor :works
+    attr_accessor :works, :scope
 
     def initialize(argv)
       puts
       puts Rainbow('     Y              A               M               G').red
       puts
-
+      if argv.join =~ /debug/
+        YAMG.debug = true
+        puts Rainbow('!!! DEBUG !!!').red
+        argv.delete('debug')
+      end
       return YAMG.init if argv.join =~ /init/
       YAMG.load_config # (argv)
       @works = YAMG.config['compile']
+      @scope = argv.empty? ? nil : argv.join
     end
 
     def setup_for(opts)
       case opts
-      when Hash then opts
+      when Hash then { 'path' => './export/' }.merge(opts)
       when String then { 'path' => opts }
-      when TrueClass then { 'path' => './media' }
+      when TrueClass then { 'path' => './export/' }
       else fail
       end
     end
 
+    def home_for(asset, setup)
+      path = setup['path']
+      FileUtils.mkdir_p path unless File.exist?(path)
+      File.join(path, asset)
+    end
+
+    def compile_media(i, size, setup)
+    end
+
     def compile_icon(i, size, setup)
       folder = setup['icon'] || YAMG.config['icon']['path']
-      round = setup['rounded'] || YAMG.config['icon']['rounded']
-      icon = Icon.new(folder, size, setup).image
-      to = File.join(setup['path'], i)
-      YAMG.write_out(icon, to)
-      # puts Rainbow("Icon #{size}px #{i} #{setup['path']}").black
-      print Rainbow('I').black
+      # Don' use || here, we are after false
+      round = setup['rounded']
+      round = YAMG.config['icon']['rounded'] if round.nil?
+      Icon.new(folder, size, round).image(home_for(i, setup))
+      print Rainbow(round ? '(i)' : '[i]').black
+      YAMG.info("Icon    #{size}px -> #{setup['path']}#{i} ", :black)
     end
 
     def compile_splash(s, size, setup)
       path = setup['splash'] || YAMG.config['splash']['path']
-      splash = Splash.new(path, size, YAMG.config['splash']['background']).image
-      to = File.join(setup['path'], s)
-      YAMG.write_out(splash, to)
-      # puts Rainbow("Splash #{size.join('x')}px #{s} -> #{setup['path']}").black
-      print Rainbow('S').black
+      background = YAMG.config['splash']['background']
+      Splash.new(path, size, background).image(home_for(s, setup))
+      print Rainbow('{S}').black
+      YAMG.info("Splash #{size.join('x')}px #{setup['path']}#{s}", :black)
     end
 
-    def compile_work(scope, opts)
+    def compile_work(template, opts)
       setup = setup_for(opts)
 
-      if (task = YAMG::TEMPLATES[scope])
-      #Thread.new do # 200% speed up with 8 cores
-        task['icons'].each { |i, d| Thread.new { compile_icon(i, d, setup) }}
-        return unless task['splash']
-        task['splash'].each { |s, d| Thread.new { compile_splash(s, d, setup) }}
-      #end
+      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
+          end
+        end
       else
         # puts 'Custom job!'
       end
     end
 
-    def compile(scope = nil)
-      works.select! {  |w| w =~ scope } if scope
+    def compile
+      works.select! { |k,_v| k =~ /#{scope}/ } if scope
+      puts Rainbow("Tasks: #{works.keys.join(', ')}").yellow
       works.each { |out, opts| compile_work(out, opts) }
-      works.select! {  |w| w =~ scope } if scope
-      puts Rainbow("Working on #{works.keys.join(', ')}").yellow
     end
 
     def screenshot
       YAMG.config['screenshots'].each do |ss|
-        Thread.new { Screenshot.new(ss).work('./media') }
+        Thread.new do
+          Screenshot.new(ss).work('./export')
+          puts Rainbow("[o]SS #{ss[0]} #{ss[1]}").black
+        end
       end
     end
 
     def work!
       time = Time.now
       compile
-      screenshot
-      puts Rainbow(Thread.list.size.to_s + ' jobs').black
+      screenshot if scope.nil? || scope =~ /ss|shot|screen/
+      puts
+      puts Rainbow(Thread.list.size.to_s + ' jobs to go').black
       Thread.list.reject { |t| t == Thread.current }.each(&:join)
       puts Rainbow('-' * 59).black
       puts Rainbow("Done compile #{Time.now - time}").red

data/lib/yamg/icon.rb

@@ -4,7 +4,7 @@ module YAMG
   #
   #
   class Icon
-    attr_accessor :src, :size, :rounded, :icons
+    attr_accessor :src, :size, :dpi, :rounded, :icons
 
     def initialize(src, size, rounded = false)
       fail if src.nil? || src.empty?
@@ -12,7 +12,11 @@ module YAMG
       @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)
+      @dpi = 90
     end
+    alias_method :rounded?, :rounded
 
     def find_closest_gte_icon
       return icons.max_by(&:to_i) if icons.map(&:to_i).max < size
@@ -23,11 +27,18 @@ module YAMG
       end
     end
 
-    def image
-      path = File.join(src, find_closest_gte_icon)
-      img = MiniMagick::Image.open(path)
-      img.resize size # "NxN"
-      rounded ? round(img) : img
+    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?
     end
 
     #
@@ -73,5 +84,15 @@ module YAMG
       end
       masked
     end
+
+    #
+    # Writes image to disk
+    #
+    def write_out(img, out)
+      FileUtils.mkdir_p File.dirname(out)
+      img.write(out)
+    rescue Errno::ENOENT
+      puts_and_exit("Path not found '#{out}'")
+    end
   end
 end

data/lib/yamg/screenshot.rb

@@ -11,13 +11,19 @@ module YAMG
     # Uses PhantomJS
     def initialize(ss)
       @name, opts =  *ss
+      fail 'No screen size provided' unless opts['size']
       uri = URI.parse(opts['url'])
       @url = "http://#{uri}"
-      @size = opts['size'].split(/\s?,\s?/)
+      @size = opts['size']
+      @size = @size.split(/\s?,\s?/) if @size.respond_to?(:split)
       # @fetcher = Smartshot::Screenshot.new(window_size: @size)
       @fetcher = Screencap::Fetcher.new(@url)
     end
 
+    def android
+      # adb -e shell screencap -p | perl -pe 's/\x0D\x0A/\x0A/g' > screen.png
+    end
+
     # Take the screenshot
     # Do we need pixel depth??
     def work(path)
@@ -25,7 +31,6 @@ module YAMG
       # page.save_screenshot("#{path}/#{@name}.png")
       # @fetcher.take_screenshot!(url: url, output: "#{path}/#{@name}.png")
       @fetcher.fetch(output: "#{path}/#{@name}.png", width: @size[0], height: @size[1])
-      puts Rainbow("SS #{url} #{size}").black
     end
   end
 end

data/lib/yamg/splash.rb

@@ -4,55 +4,69 @@ module YAMG
   #
   #
   class Splash
-    attr_accessor :src, :bg, :size, :icons, :img
+    attr_accessor :src, :bg, :size, :assets, :img
 
     def initialize(src, size, background)
       @src = src
       @size = size
       @bg = background
-      @icons = YAMG.load_images(src)
-   end
+      @assets = YAMG.load_images(src)
+      %w(bg background wallpaper).each do |i|
+        @wallpaper = assets.delete("#{i}.png")
+      end
+      if (center = assets.delete('center.png'))
+        @center =  File.join(src, center)
+      end
+      @center ||= File.join(File.dirname(__FILE__), 'assets', 'dot.png')
+      YAMG.puts_and_exit("No sources in '#{src}'") if assets.empty?
+      @img = MiniMagick::Image.open(@center)
+    end
 
     #
     # Center image
     #
-    def splash_center(center)
-      icon_size = size.max / 4
+    def splash_start
+      icon_size = size.max / 9
       img.resize icon_size if img.dimensions.max >= icon_size
-      img.background bg if bg
       img.combine_options do |o|
         o.gravity 'center'
+        o.background bg if bg
         o.extent size.join('x') # "WxH"
       end
     end
 
     def compose(other, name)
       img.composite(other) do |o|
-        o.compose 'Over'
         o.gravity File.basename(name, '.*')
-        o.geometry '+40%+40%'
+        o.compose 'Over'
+        padding = name =~ /east|west/ ? '+40%' : '+0%'
+        padding += name =~ /north|south/ ? '+40%' : '+0%'
+        o.geometry padding
       end
     end
 
     #
     # Composite 9 gravity
     #
-    def splash_composite(base)
-      max = base.dimensions.min / 9
-      icons.reduce(base) do |img, over|
+    def splash_composite
+      max = size.min / 9
+      assets.each do |over|
         other = MiniMagick::Image.open(File.join(src, over))
         other.resize(max) if other.dimensions.max >= max
-        compose(other, over)
+        self.img = compose(other, over)
       end
-      base
     end
 
-    def image
-      center = icons.find { |i| i =~ /center/ }
-      icons.delete(center)
-      self.img = MiniMagick::Image.open(File.join(src, center))
-
-      splash_composite(splash_center(center))
+    #
+    # Writes image to disk
+    #
+    def image(out)
+      splash_start
+      splash_composite
+      FileUtils.mkdir_p File.dirname(out)
+      img.write(out)
+    rescue Errno::ENOENT
+      YAMG.puts_and_exit("Path not found '#{out}'")
     end
   end
 end

data/lib/yamg/templates.yaml

@@ -1,5 +1,22 @@
+raster:
+  icon:
+    'icon16.png': 16
+    'icon32.png': 32
+    'icon64.png': 64
+    'icon128.png': 128
+    'icon256.png': 256
+  splash:
+    'splash-port-sm.png': [480, 320]
+    'splash-port-md.png': [1024, 768]
+    'splash-port-lg.png': [2048, 1536]
+    'splash-land-sm.png': [320, 480]
+    'splash-land-md.png': [768, 1024]
+    'splash-land-lg.png': [1536, 2048]
+  media:
+    'media-preview.png': [512]
+
 android:
-  icons:
+  icon:
     'res/drawable/icon.png': 96
     'res/drawable-ldpi/icon.png': 36
     'res/drawable-mdpi/icon.png': 48
@@ -44,7 +61,7 @@ android:
 
 
 ios:
-  icons:
+  icon:
     'Resources/icons/icon.png': 57
     'Resources/icons/icon@2x.png': 114
     'Resources/icons/icon-40.png': 40
@@ -75,6 +92,24 @@ ios:
     'Resources/splash/Default-736h.png': [1242, 2208]
     'Resources/splash/Default-Landscape-736h.png' : [2208, 1242]
 
+windows:
+  icons:
+    'StoreLogo.scale-240.png': 120
+    'StoreLogo.scale-100.png': 50
+    'Square150x150Logo.scale-100.png': 150
+    'Square150x150Logo.scale-240.png': 360
+    'Square30x30Logo.scale-100.png': 30
+    'Square310x310Logo.scale-100.png': 310
+    'Square44x44Logo.scale-100.png': 44
+    'Square44x44Logo.scale-240.png': 106
+    'Square70x70Logo.scale-100.png': 70
+    'Square71x71Logo.scale-100.png': 71
+    'Square71x71Logo.scale-240.png': 170
+  splash:
+    'SplashScreen.scale-100.png': [620, 300]
+    'SplashScreenPhone.scale-240.png': [1152, 1920]
+    'Wide310x150Logo.scale-100.png': [310, 150]
+    'Wide310x150Logo.scale-240.png': [744, 360]
 
 phonegap:
   icon:
@@ -117,52 +152,35 @@ phonegap:
 
 
 web:
-  icons:
+  icon:
     'icon.png': 256
   media:
     'media.png': 256
 
 
 rails:
-  icons:
+  icon:
     'public/favicon.png': 16
     'public/favicon.ico': 16
     'public/icon.png': 512
     'app/assets/images/icon.png': 512
     'app/assets/images/favicon.png': 16
   media:
+    'app/assets/images/logo.png': 512
     'public/logo.png': 512
 
 
-twitter:
-  icons:
-    'icon.png': 256
-
-
-google:
-  icons:
-    'icon.png': 512
-    'icon1024.png': 1024
-    '180.png': 180
-  splash:
-    'splash.png': [1024, 768]
-  screenshots:
-    'android/android-10in-1280x720-land': [1280, 720]
-    'android/android-10in-2048x1152-land': [2048, 1152]
-    'android/android-10in-1280x720-port': [720, 1280]
-    'android/android-10in-2048x1152-port': [1152, 2048]
-    'android/android-7in-1280x800-land': [1280, 800]
-    'android/android-7in-1280x800-port': [800, 1280]
-    'android/android-4in-1280x720-land': [1920, 1080]
-    'android/android-4in-1280x720-port': [1080, 1920]
-
-
+#
+#
+# STORES
+#
+#
 apple:
-  icons:
-    'icon.png': 1024
-    'icon16.png': 16
+  icon:
+    'apple/icon.png': 1024
+    'apple/icon16.png': 16
   splash:
-    'splash.png': [1024, 768]
+    'apple/splash.png': [1024, 768]
   screenshots:
     'ios/ipad-1024x768-land': [1024, 768]
     'ios/ipad-1024x768-port': [768, 1024]
@@ -177,10 +195,36 @@ apple:
     'ios/iphone6-1334x750-land': [1334, 750, 2]
     'ios/iphone6-750x1334-port': [750, 1334, 2]
 
+google:
+  icon:
+    'google/icon.png': 512
+    'google/icon1024.png': 1024
+    'google/180.png': 180
+  splash:
+    'google/splash.png': [1024, 768]
+  screenshots:
+    'android/android-10in-1280x720-land': [1280, 720]
+    'android/android-10in-2048x1152-land': [2048, 1152]
+    'android/android-10in-1280x720-port': [720, 1280]
+    'android/android-10in-2048x1152-port': [1152, 2048]
+    'android/android-7in-1280x800-land': [1280, 800]
+    'android/android-7in-1280x800-port': [800, 1280]
+    'android/android-4in-1280x720-land': [1920, 1080]
+    'android/android-4in-1280x720-port': [1080, 1920]
+
+
+#
+#
+# NETWORKS
+#
+#
+twitter:
+  icon:
+    'twitter/icon.png': 256
 
 facebook:
-  icons:
-    'icon.png': 1024
-    'icon16.png': 16
+  icon:
+    'fb/icon.png': 1024
+    'fb/icon16.png': 16
   splash:
-    'splash.png': [1024, 768]
+    'fb/splash.png': [1024, 768]

data/lib/yamg/version.rb

@@ -1,4 +1,4 @@
 # :nodoc:
 module YAMG
-  VERSION = '0.0.9'
+  VERSION = '0.3.0'
 end

data/lib/yamg/yamg.yml

@@ -6,12 +6,12 @@
 icon:
   path: 'icons'     # path to icons folder
   rounded: true     # defaults to false
-  background: false # or color RGB
+  background: false # nil or color RGBA
 
 # Splash screen
 splash:
-  path: 'splash'
-  background: '#fff6d5' # or color RGB
+  path: 'splash'        # path to the splash assets folder
+  background: '#fff6d5' # nil or color RGBA
 
 # Icon + name for instance
 media:
@@ -24,6 +24,9 @@ media:
 compile:
   # Just remove if you don't need
 
+  # Preview to ./export/
+  raster: true
+
   # Web projects
   #
   web: true
@@ -57,11 +60,12 @@ compile:
 
   # Custom icons/splash
   # Compiles to media/*
-  custom:
-    icons: [32, 64, 128]
-    medias: [400, 800]
+  # custom:
+  #   icons: [32, 64, 128]
+  #   medias: [400, 800]
 
 # Custom screenshots
-screenshots:
-  home:
-    url: 'github.com'
+# screenshots:
+#   home:
+#     url: 'github.com'
+#     size: [1280, 720]

data/lib/yamg.rb

@@ -14,72 +14,65 @@ module YAMG
   autoload :Splash, 'yamg/splash'
   autoload :Screenshot, 'yamg/screenshot'
 
+  CONFIG_FILE = './.yamg.yml'
   # Load template works
   TEMPLATES = YAML.load_file(
     File.join(File.dirname(__FILE__), 'yamg', 'templates.yaml')
   )
 
-  # def initialize(conf = './.yamg.yml')
-  #   load_config(conf)
-  # end
   class << self
-    attr_accessor :config
+    attr_accessor :config, :debug
 
     def init
-      file = './.yamg.yml'
-      if File.exist?(file)
-        puts "File exists: '#{file}'"
+      if File.exist?(CONFIG_FILE)
+        puts "File exists: '#{CONFIG_FILE}'"
         exit 1
       end
-      puts Rainbow('Creating your configuration').black
       src = File.join(File.dirname(__FILE__), 'yamg', 'yamg.yml')
-      FileUtils.cp(src, file)
+      FileUtils.cp(src, CONFIG_FILE)
+      puts_and_exit("Created configuration file '#{CONFIG_FILE}'", :black)
     end
 
-    def load_config(conf = './.yamg.yml')
+    def load_config(conf = CONFIG_FILE)
       self.config = YAML.load_file(conf).freeze
     rescue Errno::ENOENT
-      puts Rainbow('Create config! Run: `yamg init`').red
-      exit 1
+      puts_and_exit('Create config! Run: `yamg init`')
     end
 
     def load_images(dir)
       return [dir] unless File.extname(dir).empty?
-      Dir["#{dir}/*.png"].map { |f| File.basename(f) }
+      Dir["#{dir}/*.{svg,png,jpg}"].map { |f| File.basename(f) }
     end
 
-    #
-    # Writes image to disk
-    #
-    def write_out(img, path)
-      img.format File.extname(path)
-      FileUtils.mkdir_p File.dirname(path)
-      img.write(path)
-    rescue Errno::ENOENT
+    def run(comm)
+      puts comm if debug
+      system(comm)
+    end
+
+    def run_rsvg(src, out, args = nil)
+      FileUtils.mkdir_p File.dirname(out)
+      run "rsvg-convert #{args} #{src} > #{out}"
+    end
+
+
+    def run_ffmpeg
+    end
+
+    def run_imagemagick(comm)
+      shell = MiniMagick::Shell.new #(whiny)
+      shell.run(comm).strip
+    end
+
+    def info(msg, color = :red)
+      return unless debug
+      puts Rainbow(msg).send(color)
+    end
+
+    def puts_and_exit(msg, color = :red)
       puts
-      puts Rainbow("Path not found '#{path}'").red
-      exit 1
+      puts Rainbow('---').black
+      puts Rainbow(msg).send(color)
+      exit color == :red ? 1 : 0
     end
   end
 end
-
-#     },
-#     "customImages": [
-#         {
-#             "width": 120,
-#             "height": 120,
-#             "path": "../Media/custom",
-#             "filename": "outputFilename.png",
-#             "source": {
-#                 "filename": "image.png",
-#                 "background": "fff6d5"
-#             }
-#         }
-#     ],
-#     "screenshots": [
-#         {
-#             "url": "http://notabe.com",
-#             "name": "homepage"
-#         }
-#     ]
-# }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamg
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -71,6 +71,7 @@ files:
 - Rakefile
 - bin/yamg
 - lib/yamg.rb
+- lib/yamg/assets/dot.png
 - lib/yamg/cli.rb
 - lib/yamg/icon.rb
 - lib/yamg/screenshot.rb