texture_packer 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c159bf066da74aab198997c1f78a2ecc6c6bf6
-  data.tar.gz: 6d5473a3b14ccb99cdb030d638f50446d2e95c97
+  metadata.gz: 50175f11beb2095b7d3d52f2c27e04f39837bbb8
+  data.tar.gz: 8de222d7e72038388525ab7da84bd75d5302ab78
 SHA512:
-  metadata.gz: 94f61a4db7e19bc00b685ce7c3d7c84bd7f11318e868fa172ea9804aecaa29580a99e17be97dcb8f987db69007b25f3806db2cf5967f5f5e6e3552ca14fb57be
-  data.tar.gz: 1c36f77fa566bcf998b1b174831618d4f8cfb4aaeca13cf1b607c7b55d9577bdb2421464663558057c5befb0cd0c1b89d83b9418fe39a88e13e91e747ec55130
+  metadata.gz: f839205b5acfb2660a86133411449d38b7105db7537bb1ed99afe4c67c9a1e5ebe31a71055394f41b5f2ac76f223fcfc76995599afeff679a73c3bcaf68404a0
+  data.tar.gz: 973c930ad6e5fb3b078f548a45150a54ddfc43729d5b361d50ba7f4dc910688801a9bfde421067dee4c8780cf774d0b96c2c7be293a0c8176c978f21a3c42f86

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## Change Log
+
+### [upcoming](https://github.com/khiav223577/texture_packer/compare/v1.3.0...HEAD) 2020/03/04
+- [#9](https://github.com/khiav223577/texture_packer/pull/9) escape shell command argument (@Fatmylin)
+- [#5](https://github.com/khiav223577/texture_packer/pull/5) 為 pack_scss 加上 -v, -h 二個參數的功能 (@khiav223577)
+
+### [v1.3.0](https://github.com/khiav223577/texture_packer/compare/v1.2.0...v1.3.0) 2020/02/20
+- [#4](https://github.com/khiav223577/texture_packer/pull/4) 使用 html5 的 lang 自動切換不同語系的圖片 (@Fatmylin)
+- [#3](https://github.com/khiav223577/texture_packer/pull/3) add test cases (@khiav223577)
+- [#2](https://github.com/khiav223577/texture_packer/pull/2) setup travis CI (@khiav223577)
+
+### [v1.1.0](https://github.com/khiav223577/texture_packer/compare/v1.0.0...v1.1.0) 2018/02/27
+- [#1](https://github.com/khiav223577/texture_packer/pull/1) 支援分別輸出電腦版與 mobile 版圖片，但 css 用同一份 (@khiav223577)

data/executables/pack_scss

@@ -1,84 +1,4 @@
 #!/usr/bin/env ruby
-require 'yaml'
-require 'pathname'
-require 'fileutils'
-require 'texture_packer'
-# ----------------------------------------------------------------
-# ● 載入 yaml
-# ----------------------------------------------------------------
-def load_yaml(path)
-  begin
-    return YAML.load_file(Pathname.new(__dir__).join(path)) || {}
-  rescue Errno::ENOENT
-    return {}
-  end
-end
-
-SETTING = load_yaml('setting.yml')
-
-def exec_cmd(cmd)
-  begin
-    puts cmd
-    puts `#{cmd}`
-  rescue => e
-    puts e
-  end
-end
-
-def write_to_file(path, content)
-  puts "output: #{path} #{File.write(path, content)} bytes"
-end
-
-exec_cmd('TexturePacker packer.tps')
-
-if File.exists?('packed_mobile.css') # 向下相容
-  exec_cmd('mv packed_mobile.css packed_m.css')
-  exec_cmd('mv packed_mobile.png packed_m.png')
-end
-has_mobile = true if File.exists?('packed_m.css')
-
-# ----------------------------------------------------------------
-# ● 由路徑計算 class 名字
-# ----------------------------------------------------------------
-dir_name = File.expand_path(Dir.pwd).gsub(/.*\/Texture-Packer\/.*?\/(.*)/, '\1')
-
-output_paths_mapping = Dir['*.css'].map do |path|
-  name = File.basename(path, '.css')
-  next [name[/packed_(.*)/, 1], name]
-end.to_h
-
-content = output_paths_mapping.map{|_, path| File.read("#{path}.css") }.join
-packer = TexturePacker.new(dir_name, output_paths_mapping, content, has_mobile)
-output0, output1, output2 = packer.parse!
-output = output0 + output1 + output2
-
-# ----------------------------------------------------------------
-# ● 壓縮圖片
-# ----------------------------------------------------------------
-output_paths_mapping.each do |_, path|
-  exec_cmd("pngquant #{path}.png --force")
-end
-
-write_to_file('packed.scss', output)
-
-# ----------------------------------------------------------------
-# ● 自動輸出到專案
-# ----------------------------------------------------------------
-if SETTING['project_dir']
-  css_pre_lines = ["@import './mixin.scss';"]
-  css_pre_lines.unshift("@import 'global_mixins';") if has_mobile
-
-  sub_dirs = dir_name.split(File::Separator)[0...-1]
-  css_path = Pathname.new(SETTING['project_dir']).join('app', 'assets', 'stylesheets', 'packed_sprites', *sub_dirs, packer.dir_without_theme)
-  img_path = Pathname.new(SETTING['project_dir']).join('app', 'assets', 'images', *sub_dirs)
-  FileUtils.mkdir_p(css_path)
-  FileUtils.mkdir_p(img_path)
-  write_to_file(css_path.join('mixin.scss'), output1)
-  write_to_file(css_path.join('ocean.scss'), "#{css_pre_lines.join("\n")}\n\n#{output2}")
-  output_paths_mapping.each do |_, path|
-    FileUtils.cp("#{path}-fs8.png", img_path.join("#{path.sub('packed', packer.base_dir_name)}.png"))
-    exec_cmd("pngquant #{path}.png --force")
-  end
-end
-
+require 'texture_packer/cli'
 
+TexturePacker::CLI.new(ARGV).run

data/lib/texture_packer.rb

@@ -1,8 +1,11 @@
 require 'texture_packer/version'
 
 class TexturePacker
+  attr_reader :dir_name
   attr_reader :base_dir_name
   attr_reader :dir_without_theme
+  attr_reader :output_paths_mapping
+  attr_reader :has_mobile
 
   def initialize(dir_name, output_paths_mapping, content, has_mobile)
     @output_paths_mapping = output_paths_mapping

data/lib/texture_packer/cli.rb

@@ -0,0 +1,94 @@
+require 'pathname'
+require 'fileutils'
+require 'texture_packer'
+
+class TexturePacker::Cli
+  def initialize(argv)
+    @options = Options.new(argv)
+  end
+
+  def run
+    return @options.hook_run.call if @options.hook_run
+
+    pack_css!
+
+    packer = create_packer
+    output0, output1, output2 = packer.parse!
+    output = output0 + output1 + output2
+
+    compress_images! # 壓縮圖片
+    write_to_file('packed.scss', output)
+
+    write_to_project_dir!(packer, output1, output2) if @options.project_dir
+  end
+
+  private
+
+  def pack_css!
+    exec_cmd('TexturePacker', 'packer.tps')
+  end
+
+  # ----------------------------------------------------------------
+  # ● 壓縮圖片
+  # ----------------------------------------------------------------
+  def compress_images!
+    output_paths_mapping.each do |_, path|
+      exec_cmd('pngquant', "#{path}.png", '--force')
+    end
+  end
+
+  def create_packer
+    has_mobile = true if File.exists?('packed_m.css')
+
+    # 由路徑計算 class 名字
+    dir_name = File.expand_path(Dir.pwd).gsub(/.*\/Texture-Packer\/.*?\/(.*)/, '\1')
+
+    content = output_paths_mapping.map{|_, path| File.read("#{path}.css") }.join
+    return TexturePacker.new(dir_name, output_paths_mapping, content, has_mobile)
+  end
+
+  def output_paths_mapping
+    @output_paths_mapping ||= begin
+      Dir['*.css'].map do |path|
+        name = File.basename(path, '.css')
+        next [name[/packed_(.*)/, 1], name]
+      end.to_h
+    end
+  end
+
+  # ----------------------------------------------------------------
+  # ● 自動輸出到專案
+  # ----------------------------------------------------------------
+  def write_to_project_dir!(packer, output1, output2)
+    css_pre_lines = ["@import './mixin.scss';"]
+    css_pre_lines.unshift("@import 'global_mixins';") if packer.has_mobile
+
+    sub_dirs = packer.dir_name.split(File::Separator)[0...-1]
+
+    project_assets_path = Pathname.new(@options.project_dir).join('app', 'assets')
+    css_path = project_assets_path.join('stylesheets', 'packed_sprites', *sub_dirs, packer.dir_without_theme)
+    img_path = project_assets_path.join('images', *sub_dirs)
+    FileUtils.mkdir_p(css_path)
+    FileUtils.mkdir_p(img_path)
+    write_to_file(css_path.join('mixin.scss'), output1)
+    write_to_file(css_path.join('ocean.scss'), "#{css_pre_lines.join("\n")}\n\n#{output2}")
+    packer.output_paths_mapping.each do |_, path|
+      FileUtils.cp("#{path}-fs8.png", img_path.join("#{path.sub('packed', packer.base_dir_name)}.png"))
+    end
+  end
+
+  def exec_cmd(*args)
+    begin
+      puts args.join(' ')
+      puts system(*args)
+    rescue => e
+      puts e
+    end
+  end
+
+  def write_to_file(path, content)
+    puts "output: #{path} #{File.write(path, content)} bytes"
+  end
+end
+
+require 'texture_packer/cli/options'

data/lib/texture_packer/cli/options.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'optparse'
+
+class TexturePacker::Cli::Options
+  attr_reader :hook_run
+  attr_reader :project_dir
+
+  def initialize(argv)
+    OptionParser.new do |opts|
+      opts.on('-v', '--version', 'show the version number') do
+        @hook_run = ->{ puts(TexturePacker::VERSION) }
+      end
+
+      opts.on("-h", "--help", "Prints this help") do
+        @hook_run = ->{ puts(opts) }
+      end
+
+      opts.on("-pPATH", "--project_dir=PATH", "Copy the generated scss files / images to specified project") do |val|
+        @project_dir = val
+      end
+    end.parse!(argv)
+  end
+end

data/lib/texture_packer/version.rb

@@ -1,3 +1,3 @@
 class TexturePacker
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/texture_packer.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'mocha', '~> 1.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: texture_packer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: executables
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 description: texture packer
 email:
 - mrtmrt15xn@yahoo.com.tw
@@ -68,6 +82,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
@@ -75,6 +90,8 @@ files:
 - executables/pack_scss
 - gemfiles/Gemfile.gemfile
 - lib/texture_packer.rb
+- lib/texture_packer/cli.rb
+- lib/texture_packer/cli/options.rb
 - lib/texture_packer/version.rb
 - texture_packer.gemspec
 homepage: https://github.com/khiav223577/texture_packer