motion-assets 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5eb2bdbee7006a2f514026703af1379f68f9e7
-  data.tar.gz: dfd66401c31488c6a468ef8f866f0e38d225ac97
+  metadata.gz: 42a198c9ee75c5cb11f3ff165059ded24c3df0de
+  data.tar.gz: 8b78ee302a50bb9649193d010d92c02aef00f471
 SHA512:
-  metadata.gz: 53add8dd45ee8a0d402f60aa305be6d4aef156d91b815ed78650e45cde07fbd7fffd7a0ac235c06f9f18a0346cf88aa3a75fb94bb26e52f1debf326652d0b567
-  data.tar.gz: 06414c87f84ee31e5f9dbd8ea56f5a92266259ee23a579b6a4b181df976ec3f62ae557858f0cca96a15c8b39e20e26c266d25802491df68501a2076a6ed40296
+  metadata.gz: a765cadb43e1d4684a7028a5b48a8a03907866452b18ecaee5db0e7c884bf739345b7559720e516e9780c46a4ddfa120615bfb0ccfb1b95579525828b4ef6775
+  data.tar.gz: 19e8f674d082a9ddb50c6782f6d060a131ee6f0eae435879a84d402d82e5706493295da031ce896defd787b3ac5ed0a02c560bc1a524e6b68f30c4e1b5bb0e0b

data/README.md

@@ -38,6 +38,9 @@ Motion::Project::App.setup do |app|
   # ...
   app.assets.source_icon = "./src_images/icon-1024x1024.png"
   app.assets.source_splash = "./src_images/splash-1024x1024.png"
+  
+  # optional
+  app.assets.output_dir = "./some/directory"
 end
 ```
 
@@ -53,6 +56,8 @@ Motion::Project::App.setup do |app|
 end
 ```
 
+Note : motion-assets will autopopulate your `app.icons` array with the list of created icons.
+
 ## Tasks
 
 To tell motion-assets to generate the assets :
@@ -62,4 +67,4 @@ $ [bundle exec] rake assets:generate
 ```
 
 
-note : the sample icon comes from the greal Pixelmator tool, http://www.pixelmator.com/
+note : the sample icon comes from the great Pixelmator tool, http://www.pixelmator.com/

data/lib/motion/project/assets.rb

@@ -14,6 +14,10 @@ module Motion::Project
   end
 
   class Assets
+    BASE_SPLASH_SIZE = [2028, 2028]
+    BASE_IOS_ICON_SIZE = [1024, 1024]
+    BASE_ANDROID_ICON_SIZE = [512, 512]
+
     IOS_ICONS = %w{
       Icon-Small.png|29x29
       Icon-Small@2x.png|58x58
@@ -57,28 +61,36 @@ module Motion::Project
       drawable-ldpi/splash-land.png|320x200
       drawable-mdpi/splash-land.png|480x320
       drawable-xhdpi/splash-land.png|1280x720
+      drawable-xxhdpi/splash-land.png|1600x960
+      drawable-xxxhdpi/splash-land.png|1920x1280
       drawable-hdpi/splash-port.png|480x800
       drawable-ldpi/splash-port.png|200x320
       drawable-mdpi/splash-port.png|320x480
-      drawable-xhdpi/splash-port.png|720px1280
+      drawable-xhdpi/splash-port.png|720x1280
+      drawable-xxhdpi/splash-port.png|960x1600
+      drawable-xxxhdpi/splash-port.png|1280x1920
     }
 
     def initialize(config)
       @config = config
       @images = []
-      @icons = Icons.new(config)
+      @icons = Icons.new(@config, platform)
       @image_optim = '/Applications/ImageOptim.app/Contents/MacOS/ImageOptim'
       
       if ios?
         @icons << IOS_ICONS
         @splashes = IOS_SPLASHES
       end
+
       if android?
+        @config.icon = 'icon.png'
         @icons << ANDROID_ICONS
         @splashes = ANDROID_SPLASHES
       end
+
       @source_icon = "./src_images/icon.png"
       @source_splash = "./src_images/splash.png"
+      @output_dir = @config.resources_dirs.first
     end
 
     def source_icon=(source_icon)
@@ -89,17 +101,30 @@ module Motion::Project
       @source_splash = source_splash
     end
 
+    def output_dir=(output_dir)
+      @output_dir = output_dir
+    end
+
     def icons
       @icons
     end
 
+    def icons=(icons)
+      @icons = Icons.new(@config, platform)
+      if ios?
+        @config.icons = []
+      end
+      @icons << icons
+    end
+
     def splashes
       @splashes
     end
 
     def generate!
-      validate_source_icon!
-      validate_source_splash!
+      validate_source_icon
+      validate_source_splash
+      validate_output_dir
       generate_icons
       generate_splashes
       optimize_images
@@ -107,11 +132,17 @@ module Motion::Project
 
     protected
 
+    def validate_output_dir
+      unless File.exist?(@output_dir)
+        App.fail "Output directory : #{@output_dir} doesn't exist, please create it."
+      end
+    end
+
     def generate_splashes
       App.info "[info]", "Generating splashes..."
       @splashes.each do |splash|
         parts = splash.split('|')
-        path = File.join(@config.resources_dirs.first, parts[0])
+        path = File.join(@output_dir, parts[0])
         FileUtils.mkdir_p(File.dirname(path))
         generate_image(@source_splash, path, parts[1])
         @images << path
@@ -122,12 +153,11 @@ module Motion::Project
     def generate_icons
       App.info "[info]", "Generating icons..."
       @icons.each do |icon|
-        parts = icon.split('|')
-        path = File.join(@config.resources_dirs.first, parts[0])
+        path = File.join(@output_dir, icon.name)
         FileUtils.mkdir_p(File.dirname(path))
-        generate_image(@source_icon, path, parts[1])
+        generate_image(@source_icon, path, icon.dimensions)
         @images << path
-        App.info "-", parts[0]
+        App.info "-", icon.name
       end
     end
 
@@ -147,35 +177,39 @@ module Motion::Project
       image.write(path)
     end
 
-    def validate_source_icon!
+    def validate_source_icon
       unless File.exist?(@source_icon)
         App.fail "You have to provide a valid base icon in your rakefile : app.assets.source_icon = './some/path/image.png"
       end
       image = MiniMagick::Image.open(@source_icon)
-      if ios? && image.dimensions != [1024, 1024]
-        App.info "[warning]", "Your source icon image dimensions #{image.dimensions} is different from recommended dimensions : [1024, 1024]"
+      if ios? && image.dimensions != BASE_IOS_ICON_SIZE
+        App.info "[warning]", "Your source icon image dimensions #{image.dimensions} is different from recommended dimensions : #{BASE_IOS_ICON_SIZE}"
       end
-      if android? && image.dimensions != [512, 512]
-        App.info "[warning]", "Your source icon image dimensions #{image.dimensions} is different from recommended dimensions : [512, 512]"
+      if android? && image.dimensions != BASE_ANDROID_ICON_SIZE
+        App.info "[warning]", "Your source icon image dimensions #{image.dimensions} is different from recommended dimensions : #{BASE_ANDROID_ICON_SIZE}"
       end
     end
 
-    def validate_source_splash!
+    def validate_source_splash
       unless File.exist?(@source_splash)
         App.fail "You have to provide a valid base splash in your rakefile : app.assets.source_splash = './some/path/image.png"
       end
       image = MiniMagick::Image.open(@source_splash)
-      if image.dimensions != [2028, 2028]
-        App.info "[warning]", "Your source splash image dimensions #{image.dimensions} is different from recommended dimensions : [2028, 2028]"
+      if image.dimensions != BASE_SPLASH_SIZE
+        App.info "[warning]", "Your source splash image dimensions #{image.dimensions} is different from recommended dimensions : #{BASE_SPLASH_SIZE}"
       end
     end
 
     def android?
-      Motion::Project::App.template == :android
+      platform == :android
     end
 
     def ios?
-      Motion::Project::App.template == :ios
+      platform == :ios
+    end
+
+    def platform
+      Motion::Project::App.template
     end
   end
 end

data/lib/motion/project/icons.rb

@@ -1,9 +1,11 @@
 class Icons
   include Enumerable
+  Struct.new("Icon", :name, :dimensions)
 
-  def initialize(config)
+  def initialize(config, platform)
     @list = []
     @config = config
+    @platform = platform
   end
 
   def list
@@ -11,20 +13,27 @@ class Icons
   end
 
   def <<(*icons)
-    @list << icons
-    @list.flatten!
-    icons.flatten.each do |icon|
-      @config.icons << icon.split('|').first
+    icons.flatten.each do |icon_string|
+      icon = create_icon(icon_string)
+      @list << icon
+
+      if @platform == :ios
+        @config.icons << icon.name
+      end
     end
     self
   end
   alias_method :push, :<<
 
   def delete(*icons)
-    @list.delete(icons)
-    @list.flatten!
-    icons.flatten.each do |icon|
-      @config.icons.delete icon.split('|').first
+    icons.flatten.each do |icon_string|
+      icon = @list.find {|icon| icon.name == icon_string}
+
+      if @platform == :ios
+        @config.icons.delete icon.name
+      end
+
+      @list.delete(icon)
     end
     self
   end
@@ -32,4 +41,11 @@ class Icons
   def each(&block)
     @list.each(&block)
   end
+
+  protected
+
+  def create_icon(icon_string)
+    parts = icon_string.split('|')
+    Struct::Icon.new(parts[0], parts[1])
+  end
 end

data/lib/motion/project/version.rb

@@ -1,5 +1,5 @@
 module Motion::Project
   class Assets
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joffrey Jaffeux