XCUtils 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a038dca5f08b2d80a2f94421a2862563272a487d
-  data.tar.gz: 86b79287bc9a9b69436dd76e6b3274aaafe92c2c
+  metadata.gz: bb1a1a45c660b01ad9672329aabcf7b8ac5ff491
+  data.tar.gz: f6e3b8f7fb21070693a6cb8d803b8bab0a19f335
 SHA512:
-  metadata.gz: f6977d4d5246199a6bcb1f5e3fcd4d816edd3496f9e2c4e4b265c704c29d0f42eeb51f4c042bbe4f0fce14993332d9d12ee00f203e475766c60ccb48890685e7
-  data.tar.gz: 706648ad51475d25a999939dd39e039a147af1704af9ba504fc312d4076f8a9f63aa3b533bc10558c383c6874fe219d52270c9d9e3401da0a635977d78f90ede
+  metadata.gz: 7d8c10c8ee75d7a46f19a6ce254ce1c00fe2ce01acce741c6c7e16c5bef2781baebf6c7c171cbb076238d57bf0e9d874c109600ea8737ce790e6f72f52a09c51
+  data.tar.gz: a4b2c57213075d1a1840942ab5857fae13a88618baa613d84264225959fe85c38d893de30ef6b0fc3f6f2f149c39cdf6be3935753fbb2646bc141284c57b3567

data/bin/xcutils

@@ -0,0 +1,17 @@
+#! /usr/bin/env ruby
+
+require "XCUtils/version"
+require 'rubygems'
+
+require "thor"
+require_relative "../lib/XCUtils/xcutils_resize"
+require_relative "../lib/XCUtils/xcutils_sorter"
+
+class XCUtil < Thor
+
+  register(XCUtils::XCUtilsSorter, "sort", "sort", "sort directory of all sizes artwork into separate image atlases per size")
+  register(XCUtils::XCUtilsResize, "resize", "resize", "resize single image or directory to all available sizes and pack into xcassets folder")
+
+end
+
+XCUtil.start

data/lib/XCUtils/version.rb

@@ -1,3 +1,3 @@
 module XCUtils
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/XCUtils/xcutils_resize.rb

@@ -0,0 +1,140 @@
+require "thor"
+require 'fileutils'
+require 'debugger'
+require 'json'
+require 'parseconfig'
+require 'RMagick'
+require "XCUtils/xcutils_image"
+
+module XCUtils
+  class XCUtilsResize < Thor::Group
+    include Thor::Actions
+
+    @options_merge = {}
+
+    argument :source, desc: "source directory or file"
+    argument :target, desc: "target directory or file"
+
+    class_options :scale_iphone_1x        => 0.25,   desc: "Iphone 3 scale"
+    class_options :scale_iphone_2x        => 0.5,    desc: "Iphone @2x scale"
+    class_options :scale_iphone_3x        => 1.0,    desc: "Iphone @3x scale"
+    class_options :scale_ipad_1x          => 0.5,    desc: "IPad scale"
+    class_options :scale_ipad_2x          => 1.0,    desc: "IPad @2x scale - source scale"
+
+    class_options :create_image_assets    => false,  desc: "create xcassets folder per image including json, default: false"
+    class_options :create_xcatlas         => false,  desc: "create xcatlas for folder, default: false"
+    class_options :dry_run                => false,  desc: "print only logs - no files are created, default: false"
+
+    def check_configuration_file
+
+      # check for configuration file
+      config_path = File.join(source,".xcutils-config")
+
+      if File.exists?(config_path)
+        original_options = options
+        say "found configuration file", nil
+        defaults = ParseConfig.new(config_path).params || {}
+        defaults = defaults.map{ |key,value| {key => value.to_f} }.reduce(:merge)
+        @options_merge = original_options.merge( defaults )
+      end
+
+      # print current configuration
+      say_status "iphone 1x scale",       @options_merge[:scale_iphone_1x],       :blue
+      say_status "iphone 2x scale",       @options_merge[:scale_iphone_2x],       :blue
+      say_status "iphone 3x scale",       @options_merge[:scale_iphone_3x],       :blue
+      say_status "ipad 1x scale",         @options_merge[:scale_ipad_1x],         :blue
+      say_status "ipad 2x scale",         @options_merge[:scale_ipad_2x],         :blue
+      say_status "create image assets:",  @options_merge[:create_image_assets],   :blue
+      say_status "create xcatlas:",       @options_merge[:create_xcatlas],        :blue
+
+      say_status "DRY RUN - no files will be created!", nil, :red if @options_merge[:dry_run]
+
+    end
+
+    def create_output_directory
+      say_status "create output directory", nil, :yellow
+      name = File.basename target
+      Dir.mkdir(target) unless Dir.exists?(target)
+    end
+
+    def xcassets_directory
+
+      # support single file or directory source
+      source_elements = File.directory?(source) ? Dir.entries(source) : [ File.basename(source) ]
+
+      # each source file
+      source_elements.each do |f|
+
+        next if f == "." || f == ".." || f == ".DS_Store" || f == ".xcutils-config"
+
+        fn = f.gsub("@3x","").gsub("~ipad","").gsub("@2x","") # remove extensions
+        fn = File.basename(fn,File.extname(fn))               # remove file extension
+
+        say_status "# #{fn}", nil, :magenta
+
+        # create folder
+        base_name = File.basename(target)
+        imageset_folder = @options_merge[:create_image_assets] ? File.join(target,"#{fn}.imageset") : target
+        imageset_folder = File.join(target,"#{base_name}.atlas") if @options_merge[:create_xcatlas]
+        Dir.mkdir(imageset_folder) unless Dir.exists?(imageset_folder)
+
+        say_status "packing into xcasset:", imageset_folder, :blue if @options_merge[:create_image_assets]
+        say_status "packing into xcatlas:", imageset_folder, :blue if @options_merge[:create_xcatlas]
+
+        # load image
+        img = Magick::Image.read(File.join(source,f)).first
+
+        # create @3x version
+        say_status "create @3x version", "#{fn}@3x", :yellow
+        unless @options_merge[:dry_run]
+          img_3x = XCUtilsImage.scale_image(img,@options_merge[:scale_iphone_3x])
+          img_3x.write(File.join(imageset_folder,"#{fn}@3x.png"))
+        end
+        content_iphone_3x = {"idiom" => "iphone", "scale" => "3x", "filename" => "#{fn}@3x.png"}
+
+        # create ipad retina version
+        say_status "create ipad retina version", "#{fn}@2x~ipad", :yellow
+        unless @options_merge[:dry_run]
+          img_ipad_2x = XCUtilsImage.scale_image(img,@options_merge[:scale_ipad_2x])
+          img_ipad_2x.write(File.join(imageset_folder,"#{fn}@2x~ipad.png"))
+        end
+        content_ipad_2x = {"idiom" => "ipad", "scale" => "2x", "filename" => "#{fn}@2x~ipad.png"}
+
+        # create ipad non retina version
+        say_status "create ipad non retina version", "#{fn}~ipad", :yellow
+        unless @options_merge[:dry_run]
+          img_ipad_1x = XCUtilsImage.scale_image(img,@options_merge[:scale_ipad_1x])
+          img_ipad_1x.write(File.join(imageset_folder,"#{fn}~ipad.png"))
+        end
+        content_ipad = {"idiom" => "ipad", "scale" => "1x", "filename" => "#{fn}~ipad.png"}
+
+        # create iphone retina version
+        say_status "create iphone retina version", "#{fn}@2x", :yellow
+        unless @options_merge[:dry_run]
+          img_iphone_2x = XCUtilsImage.scale_image(img,@options_merge[:scale_iphone_2x])
+          img_iphone_2x.write(File.join(imageset_folder,"#{fn}@2x.png"))
+        end
+        content_iphone_2x = {"idiom" => "iphone", "scale" => "2x", "filename" => "#{fn}@2x.png"}
+
+        # create iphone non retina version
+        say_status "create iphone non retina version", "#{fn}", :yellow
+        unless @options_merge[:dry_run]
+          img_iphone_1x = XCUtilsImage.scale_image(img,@options_merge[:scale_iphone_1x])
+          img_iphone_1x.write(File.join(imageset_folder,"#{fn}.png"))
+        end
+        content_iphone = {"idiom" => "iphone", "scale" => "1x", "filename" => "#{fn}.png"}
+
+        # for imageassets create json
+        if @options_merge[:create_image_assets] && !@options_merge[:dry_run]
+          contents_json = JSON.pretty_generate( {"images" => [content_iphone, content_iphone_2x, content_iphone_3x, content_ipad, content_ipad_2x], "info" => {"version" => 1, "author" => "xcode"} } )
+
+          File.open(File.join(imageset_folder,"Contents.json"),"w") do |f|
+            f.write(contents_json)
+          end
+        end
+
+      end
+    end
+
+  end
+end

data/lib/XCUtils/xcutils_sorter.rb

@@ -26,7 +26,7 @@ module XCUtils
 
       # move files
       Dir.foreach(source) do |f|
-        next if f == "." || f == ".." || f == ".DS_Store"
+        next if f == "." || f == ".." || f == ".DS_Store" || f == ".xcutils-config"
 
         p fn = f
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: XCUtils
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Benjamin Müller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -97,20 +111,19 @@ dependencies:
         version: '0'
 description: |-
   This is a little helper to resize @2x~ipad artwork to all required sizes using rmagick.
-      \x5On top, the output will be formatted to suit XCodes requirements for sprite atlases.
-      \x5Images will be resized carefully by first extending images to be dividable by 4 and then generating smaller half and quarter resolutions.
+      \x5On top, the output will be formatted to suit XCodes requirements for sprite atlases or xcassets.
+      \x5Images will be resized carefully using 'HammingFilter'.
 email:
 - benjamin@urbn.de
 - manolis@urbn.de
 executables:
-- xcatlasify
+- xcutils
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/xcatlasify
+- bin/xcutils
 - lib/XCUtils/version.rb
-- lib/XCUtils/xcutils_patcher.rb
-- lib/XCUtils/xcutils_resizer.rb
+- lib/XCUtils/xcutils_resize.rb
 - lib/XCUtils/xcutils_sorter.rb
 homepage: https://github.com/elchbenny/XCUtils
 licenses:
@@ -132,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: Resize *.@2x~ipad named images and move em into XCodes atlases.
+summary: Resize *.@2x~ipad named images and move em into XCodes atlases or xcassets.
 test_files: []

data/bin/xcatlasify

@@ -1,45 +0,0 @@
-#! /usr/bin/env ruby
-
-require "XCUtils/version"
-require 'rubygems'
-
-require "thor"
-require_relative "../lib/XCUtils/xcutils_resizer"
-require_relative "../lib/XCUtils/xcutils_patcher"
-
-class XCAtlasify < Thor
-
-  desc "resize [src-dir, tgt-dir]", "Resize *.@2x~ipad named images and move em into XCodes atlases."
-  long_desc <<-LONGDESC
-    This is a little helper to resize @2x~ipad artwork to all required sizes using rmagick.
-    \x5On top, the output will be formatted to suit XCodes requirements for sprite atlases.
-    \x5Images will be resized carefully by first extending images to be dividable by 4 and then generating smaller half and quarter resolutions.
-    LONGDESC
-  def resize(src, tgt)
-    validate_support
-    ARGV.shift
-    XCUtils::XCUtilsResizer.start
-  end
-
-  desc "sort", "This is a little helper to sort a directory containing normal, @2x, ~ipad, @2x~ipad artwork into 4 atlases."
-  def sort
-    validate_support
-    ARGV.shift
-    XCUtils::XCUtilsSorter.start
-  end
-
-  desc "patch [patch-vrs, base-atlas]", "This patches the current 'resize' result (directory structure) to the latest version"
-  def patch(vrs, base)
-    validate_support
-    ARGV.shift
-    XCUtils::XCUtilsPatcher.start
-  end
-
-  private
-  def validate_support
-    # check if the action is valid...
-  end
-
-end
-
-XCAtlasify.start

data/lib/XCUtils/xcutils_patcher.rb

@@ -1,48 +0,0 @@
-require "thor"
-require 'fileutils'
-require 'debugger'
-
-module XCUtils
-  class XCUtilsPatcher < Thor::Group
-    include Thor::Actions
-
-    argument :version
-    argument :base
-
-
-    def rename_and_move
-      say_status "Patching", "version #{version}", :yellow
-
-      unless version.eql? "0.0.1"
-        say_status "Warning", "No patch for this version...", :red
-        abort
-      end
-
-      unless Dir.exists?("#{base}.atlas")
-        say_status "Warning", "The base atlas does not exist, make sure you are within the correct directoy", :red
-        abort
-      end
-
-      checkSuffix = ["~ipad", "@2x~ipad", "@2x"]
-      
-      checkSuffix.each do |suffix|
-        dir_suffix = "#{base}#{suffix}.atlas"
-
-        say_status "Patching", "#{dir_suffix}", :yellow
-        Dir["#{dir_suffix}/*.png"].each do |f| 
-          filename = File.basename(f, File.extname(f))
-          unless filename.eql? ("filename#{suffix}")
-            dir = File.dirname(f)
-            new_filename = "#{base}.atlas/#{filename}#{suffix}.png"
-            say_status "Moving", "#{f} :: #{new_filename}", :green
-            File.rename(f, new_filename)
-          end
-        end
-        say_status "Deleting", "#{dir_suffix}", :yellow
-        FileUtils.rm_rf(dir_suffix)
-      end
-      
-    end 
-
-  end
-end

data/lib/XCUtils/xcutils_resizer.rb

@@ -1,65 +0,0 @@
-require "thor"
-require 'RMagick'
-require 'fileutils'
-require 'debugger'
-
-module XCUtils
-  class XCUtilsResizer < Thor::Group
-    include Thor::Actions
-
-    argument :source
-    argument :target
-
-    def create_output_directory
-      say_status "create_output_directory", nil
-      name = File.basename target
-      Dir.mkdir(target) unless Dir.exists?(target)
-      Dir.mkdir(File.join(target,"#{name}.atlas")) unless Dir.exists?(File.join(target,"#{name}.atlas"))
-    end
-
-    def write_rename_images_to_dir
-      name = File.basename target
-      Dir.foreach(source) do |f|
-        next if f == "." || f == ".." || f == ".DS_Store"
-
-        if f.include?("@2x") && f.include?("~ipad")
-
-          fn = f.gsub("@2x","").gsub("~ipad","")
-          fn = File.basename(fn,File.extname(fn))
-
-          # load image
-          img = Magick::Image.read(File.join(source,f)).first
-          img.background_color = "none"
-
-          # adjust image size so it's devitable by 4
-          width = img.columns
-          height = img.rows
-
-          nWidth = width%4 == 0 ? width : (width + 4 - width%4)
-          nHeight = height%4 == 0 ? height : (height + 4 - height%4)
-
-          img = img.extent(nWidth, nHeight)
-
-          # create ipad retina version
-          say_status "create ipad retina version", "#{fn}@2x~ipad", :yellow
-          img.write(File.join(target,"#{name}.atlas","#{fn}@2x~ipad.png"))
-
-          # create ipad non retina version
-          say_status "create ipad non retina version", "#{fn}~ipad", :yellow
-          img.minify!
-          img.write(File.join(target,"#{name}.atlas","#{fn}~ipad.png"))
-
-          # create iphone retina version - identical to ipad non retina version
-          say_status "create iphone retina version - identical to ipad non retina version", "#{fn}@2x", :yellow
-          img.write(File.join(target,"#{name}.atlas","#{fn}@2x.png"))
-
-          # create iphone non retina version
-          say_status "create iphone non retina version", "#{fn}", :yellow
-          img.minify!
-          img.write(File.join(target,"#{name}.atlas","#{fn}.png"))
-        end
-      end
-    end
-
-  end
-end