texture_packer 1.5.0 → 1.7.1

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## Change Log
 
+### [v1.7.0](https://github.com/khiav223577/texture_packer/compare/v1.6.3...v1.7.0) 2020/04/17
+- [#20](https://github.com/khiav223577/texture_packer/pull/20) Make sure some selector ordered as specified (@khiav223577)
+
+### [v1.6.3](https://github.com/khiav223577/texture_packer/compare/v1.6.2...v1.6.3) 2020/04/17
+- [#19](https://github.com/khiav223577/texture_packer/pull/19) Fix: It will generate wrong scss where there is an image named `xxx-disabled-m` (@khiav223577)
+
+### [v1.6.2](https://github.com/khiav223577/texture_packer/compare/v1.6.1...v1.6.2) 2020/04/14
+- [#18](https://github.com/khiav223577/texture_packer/pull/18) Fix: it needs global mixins when split type is by i18n + mobile (@khiav223577)
+
+### [v1.6.1](https://github.com/khiav223577/texture_packer/compare/v1.6.0...v1.6.1) 2020/04/13
+- [#17](https://github.com/khiav223577/texture_packer/pull/17) auto correct coding style by rubocop (@khiav223577)
+
+### [v1.6.0](https://github.com/khiav223577/texture_packer/compare/v1.5.0...v1.6.0) 2020/04/13
+- [#16](https://github.com/khiav223577/texture_packer/pull/16) Support split images by i18n + mobile. (@khiav223577)
+- [#15](https://github.com/khiav223577/texture_packer/pull/15) Fix: the return value of Dir#[] method is different in different environments. (@khiav223577)
+
+### [v1.5.0](https://github.com/khiav223577/texture_packer/compare/v1.4.1...v1.5.0) 2020/04/08
+- [#13](https://github.com/khiav223577/texture_packer/pull/13) Update version.rb (@Fatmylin)
+- [#12](https://github.com/khiav223577/texture_packer/pull/12) Support using `-en`, `-tw`, `-cn` to set i18n. And support split pngs by i18n. (@khiav223577)
+
 ### [v1.4.0](https://github.com/khiav223577/texture_packer/compare/v1.3.0...v1.4.0) 2020/03/11
 - [#11](https://github.com/khiav223577/texture_packer/pull/11) Add options to export packed scss files and images to your project (@khiav223577)
 - [#10](https://github.com/khiav223577/texture_packer/pull/10) Remove backward compatibility of name as `packed_mobile` (@khiav223577)

data/README.md

@@ -5,3 +5,13 @@
 [![RubyGems](http://img.shields.io/gem/dt/texture_packer.svg?style=flat)](https://rubygems.org/gems/texture_packer)
 [![Code Climate](https://codeclimate.com/github/khiav223577/texture_packer/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/texture_packer)
 [![Test Coverage](https://codeclimate.com/github/khiav223577/texture_packer/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/texture_packer/coverage)
+
+
+### Usage: 
+
+```
+pack_scss [options]
+    -v, --version                    show the version number
+    -h, --help                       Prints this help
+    -p, --project_dir=PATH           Copy the generated scss files / images to specified project
+```

data/Rakefile

@@ -1,10 +1,11 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+  t.ruby_opts += ['-W1']
 end
 
-task :default => :test
+task default: :test

data/lib/texture_packer.rb

@@ -8,8 +8,10 @@ class TexturePacker
   attr_reader :dir_without_theme
   attr_reader :output_paths_mapping
 
-  SPLIT_BY_MOBILE = 'mobile'
-  SPLIT_BY_I18N = 'i18n'
+  SPLIT_BY_MOBILE          = 'mobile'
+  SPLIT_BY_I18N            = 'i18n'
+  SPLIT_BY_I18N_AND_MOBILE = 'i18n_and_mobile'
+  SELECTOR_ORDER = %w[:hover :active :disabled].freeze
 
   def initialize(dir_name, output_paths_mapping, content, split_type = nil)
     @output_paths_mapping = output_paths_mapping
@@ -23,45 +25,58 @@ class TexturePacker
   end
 
   def parse!
-    Dir['images/**/'].map{|s| s[/images\/(.*)\//, 1] }.compact.map{|s| "#{s.gsub('/', '-')}-" }.each do |path| #"images/aaa/bbb/ccc.png" => "aaa-bbb-"
-      @content.gsub!(path, path.gsub('-', '_')) #aaa-bbb => aaa_bbb
+    Dir['images/**/'].map{|s| s[%r{images/(.*)/}, 1] }.compact.map{|s| "#{s.tr('/', '-')}-" }.each do |path| # "images/aaa/bbb/ccc.png" => "aaa-bbb-"
+      @content.gsub!(path, path.tr('-', '_')) # aaa-bbb => aaa_bbb
     end
 
     data = {}
     @content.gsub!(/-disabled \{/, ':disabled {') #-disabled => :disabled
     loop{ break if @content.gsub!(/-([\w]+)((?:[^\w][\w]+)*) \{/, '[\1]\2 {') == nil }
     output0 = @content
-    output0.sub!(/(\/\*(.|\n)*?\*\/)/, '') #去掉註解
+    output0.sub!(%r{(/\*(.|\n)*?\*/)}, '') # 去掉註解
     output0 = $1 + "\n"
 
     loop do
-      selector, prefix, css = extract_rule!
+      selector, string_prefix, css = extract_rule!
       break if selector == nil
-      next if selector == "sprite"
-      prefixs = prefix.scan(/\[\w+\]|\:\w+/) #[m]:disabled => ['[m]', ':disabled']
+      next if selector == 'sprite'
+      prefixs = string_prefix.scan(/\[\w+\]|\:\w+/) # [m]:disabled => ['[m]', ':disabled']
       prefixs.map! do |prefix|
         case prefix
-        when '[active]' ; ':active' # 因為 TexturePacker 會把 xxx-active-hover 轉成 xxx-active:hover 而不是 xxx:active:hover
-        when '[hover]' ; ':hover'
-        else ; prefix
+        when '[active]'   then ':active' # 因為 TexturePacker 會把 xxx-active-hover 轉成 xxx-active:hover 而不是 xxx:active:hover
+        when '[hover]'    then ':hover'
+        when '[disabled]' then ':disabled'
+        else                   prefix
         end
       end
       # p [selector, prefix, css]
       (data[selector] ||= {})[prefixs] = "#{css};"
     end
     # data = {selector => {nil => 'xxx', ':disabeld' => 'xxx', '[m]' => 'xxx'}}
-    output1 = "" #mixin的output
-    @output_paths_mapping.map do |kind, name|
+    output1 = '' # mixin的output
+    @output_paths_mapping.map do |kind, _name|
       if kind == nil
         output1 += get_mixin("#{base_dir_name}_sprite", "background-image: image-url('#{@dir_name}.png');")
       else
         output1 += get_mixin("#{base_dir_name}_sprite_#{kind}", "background-image: image-url('#{@dir_name}_#{kind}.png');")
       end
     end
-    output2 = "" #scss的output
+    output2 = '' # scss的output
     output2 += "body[theme='#{@theme}']{\n"
     output2 += "  .#{@dir_without_theme}_sprite{\n"
     case @split_type
+    when SPLIT_BY_I18N_AND_MOBILE
+      output2 += "    @include desktop{\n"
+      output2 += "      &:lang(zh-TW){ @include #{base_dir_name}_sprite_tw; }\n"
+      output2 += "      &:lang(zh-CN){ @include #{base_dir_name}_sprite_cn; }\n"
+      output2 += "      &:lang(en){ @include #{base_dir_name}_sprite_en; }\n"
+      output2 += "    }\n"
+
+      output2 += "    @include mobile{\n"
+      output2 += "      &:lang(zh-TW){ @include #{base_dir_name}_sprite_tw_m; }\n"
+      output2 += "      &:lang(zh-CN){ @include #{base_dir_name}_sprite_cn_m; }\n"
+      output2 += "      &:lang(en){ @include #{base_dir_name}_sprite_en_m; }\n"
+      output2 += "    }\n"
     when SPLIT_BY_MOBILE
       output2 += "    @include desktop{ @include #{base_dir_name}_sprite; }\n"
       output2 += "    @include mobile{ @include #{base_dir_name}_sprite_m; }\n"
@@ -71,7 +86,7 @@ class TexturePacker
       output2 += "    &:lang(en){ @include #{base_dir_name}_sprite_en; }\n"
     else
       if @output_paths_mapping.size > 1
-        output2 += @output_paths_mapping.map do |kind, name|
+        output2 += @output_paths_mapping.map do |kind, _name|
           next "    @include #{base_dir_name}_sprite;\n" if kind == nil
           next "    &[kind=\"#{kind}\"] { @include #{base_dir_name}_sprite_#{kind}; }\n"
         end.join
@@ -80,12 +95,12 @@ class TexturePacker
       end
     end
     # output2 += "    &.split_mobile{ @include mobile{ @include #{base_dir_name}_sprite_m; }}\n" if @split_type == SPLIT_BY_MOBILE
-    for selector, css_data in data
+    data.each do |selector, css_data|
       func = "#{base_dir_name}_#{selector}"
       rules = CssRule.new
-      css_data.each{|prefixs, css| #EX: prefixs == [':hover']
+      css_data.each do |prefixs, css| # EX: prefixs == [':hover']
         rules.add(prefixs, css)
-      }
+      end
       output1 << get_mixin(func, rules.generate_css)
       output2 << "    &.#{parse_language_selector!(selector)} { @include #{func}; }\n"
     end
@@ -95,8 +110,8 @@ class TexturePacker
   end
 
   def extract_rule!
-    @content.sub!(/^\.([a-zA-Z0-9_-]+)((?:\:\w+|\[\w+\])*) \{(.*?)\}/, '') #抓 rule
-    return [$1, $2, $3] #$1 = selector, $2 = prefix, $3 = css
+    @content.sub!(/^\.([a-zA-Z0-9_-]+)((?:\:\w+|\[\w+\])*) \{(.*?)\}/, '') # 抓 rule
+    return [$1, $2, $3] # $1 = selector, $2 = prefix, $3 = css
   end
 
   def get_mixin(func, css)
@@ -119,6 +134,7 @@ class TexturePacker
 
   def need_global_mixins?
     return true if @split_type == SPLIT_BY_MOBILE
+    return true if @split_type == SPLIT_BY_I18N_AND_MOBILE
     return false
   end
 
@@ -126,6 +142,7 @@ class TexturePacker
     def initialize
       @hash = {}
     end
+
     def add(prefixs, css)
       if prefixs.size > 0
         (@hash[prefixs.first] ||= CssRule.new).add(prefixs[1..-1], css)
@@ -133,23 +150,24 @@ class TexturePacker
         @css = css
       end
     end
+
     def generate_css
-      inner_css = @hash.map do |prefix, obj|
+      inner_css = @hash.sort_by{|prefix, obj| SELECTOR_ORDER.index(prefix) || SELECTOR_ORDER.size }.map do |prefix, obj|
         case prefix
         when nil, ''
           [obj.generate_css]
         when /\A:/
-          ["&#{prefix}, &.#{prefix[1..-1]}{ ", obj.generate_css, " }"]
+          ["&#{prefix}, &.#{prefix[1..-1]}{ ", obj.generate_css, ' }']
         when '[m]'
-          ["@include mobile{ ", obj.generate_css, " }"]
+          ['@include mobile{ ', obj.generate_css, ' }']
         when '[tw]'
-          ["&:lang(zh-TW){ ", obj.generate_css, " }"]
+          ['&:lang(zh-TW){ ', obj.generate_css, ' }']
         when '[cn]'
-          ["&:lang(zh-CN){ ", obj.generate_css, " }"]
+          ['&:lang(zh-CN){ ', obj.generate_css, ' }']
         when '[en]'
-          ["&:lang(en){ ", obj.generate_css, " }"]
+          ['&:lang(en){ ', obj.generate_css, ' }']
         else
-          ["&#{prefix}{ ", obj.generate_css, " }"]
+          ["&#{prefix}{ ", obj.generate_css, ' }']
         end
       end
       inner = inner_css.size == 0 ? '' : " #{inner_css.join('')}"

data/lib/texture_packer/cli.rb

@@ -37,23 +37,25 @@ class TexturePacker::Cli
     end
   end
 
-  def create_packer
-    split_type = case
-                 when File.exists?('packed_m.css')  ; TexturePacker::SPLIT_BY_MOBILE
-                 when File.exists?('packed_tw.css') ; TexturePacker::SPLIT_I18N
-                 else                               ; nil
-                 end
+  def calculate_split_type
+    case
+    when File.exist?('packed_tw_m.css') ; return TexturePacker::SPLIT_BY_I18N_AND_MOBILE
+    when File.exist?('packed_m.css')    ; return TexturePacker::SPLIT_BY_MOBILE
+    when File.exist?('packed_tw.css')   ; return TexturePacker::SPLIT_BY_I18N
+    end
+  end
 
+  def create_packer
     # 由路徑計算 class 名字
-    dir_name = File.expand_path(Dir.pwd).gsub(/.*\/Texture-Packer\/.*?\/(.*)/, '\1')
+    dir_name = File.expand_path(Dir.pwd).gsub(%r{.*/Texture-Packer/.*?/(.*)}, '\1')
 
     content = output_paths_mapping.map{|_, path| File.read("#{path}.css") }.join
-    return TexturePacker.new(dir_name, output_paths_mapping, content, split_type)
+    return TexturePacker.new(dir_name, output_paths_mapping, content, calculate_split_type)
   end
 
   def output_paths_mapping
     @output_paths_mapping ||= begin
-      Dir['*.css'].map do |path|
+      Dir['*.css'].sort.map do |path|
         name = File.basename(path, '.css')
         next [name[/packed_(.*)/, 1], name]
       end.to_h
@@ -82,12 +84,10 @@ class TexturePacker::Cli
   end
 
   def exec_cmd(*args)
-    begin
-      puts args.join(' ')
-      puts system(*args)
-    rescue => e
-      puts e
-    end
+    puts args.join(' ')
+    puts system(*args)
+  rescue => e
+    puts e
   end
 
   def write_to_file(path, content)

data/lib/texture_packer/cli/options.rb

@@ -12,11 +12,11 @@ class TexturePacker::Cli::Options
         @hook_run = ->{ puts(TexturePacker::VERSION) }
       end
 
-      opts.on("-h", "--help", "Prints this help") do
+      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|
+      opts.on('-pPATH', '--project_dir=PATH', 'Copy the generated scss files / images to specified project') do |val|
         @project_dir = val
       end
     end.parse!(argv)

data/lib/texture_packer/version.rb

@@ -1,3 +1,3 @@
 class TexturePacker
-  VERSION = "1.5.0"
+  VERSION = '1.7.1'
 end

data/texture_packer.gemspec

@@ -4,28 +4,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'texture_packer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "texture_packer"
+  spec.name          = 'texture_packer'
   spec.version       = TexturePacker::VERSION
-  spec.authors       = ["khiav reoy"]
-  spec.email         = ["mrtmrt15xn@yahoo.com.tw"]
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
 
-  spec.summary       = %q{texture packer}
-  spec.description   = %q{texture packer}
-  spec.homepage      = "https://github.com/khiav223577/texture_packer"
-  spec.license       = "MIT"
+  spec.summary       = 'texture packer'
+  spec.description   = 'texture packer'
+  spec.homepage      = 'https://github.com/khiav223577/texture_packer'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  #if spec.respond_to?(:metadata)
+  # if spec.respond_to?(:metadata)
   #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
+  # else
   #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  #end
+  # end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "executables"
+  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'executables'
   spec.executables   = ['pack_scss']
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: texture_packer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: executables
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: texture packer