xsort 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6190d37e0725742cb21f23eb17300b81919b676f64dab492d15097afe808ffca
-  data.tar.gz: 42c1c57ead6ac1f8a6935a4355b374f3cb838087da0725bcc6677f9dc023c1b1
+  metadata.gz: 802dbfdabd1922aa35a0c659843cc951a8184984fbd6243df03bde05c79a6faa
+  data.tar.gz: d7918a9f86a1e51dc515bc35cfa0c8be726101ad7a828da42f4efbf19047b23d
 SHA512:
-  metadata.gz: 18a2f2149f7f0c23524eea0c6c9f288594e2d4300ab6fb0ad083b21de932dda809b56bacc733f74e96dde7c04c2aa9181479c84dcc2860583101879095e9bf48
-  data.tar.gz: 2a6c38d99c519f458c9d982364bed67835f80fec907f212240fe2082d18ab0d4cc0b5574fc7db603a0dce10fabef161687a3dd405678cbdfba2549400d3b52c5
+  metadata.gz: fd76f4c4bdc913d7b05bd6dfceeaced0e25a2d180f6497a95121d372938f23d2ab9bf26bdcd4364c3daac37d7003fbb5e6ea40b5c056bd34a217736b0716799d
+  data.tar.gz: 69345470f482f426d9cb0df1327ae4c37c6fa74f6a66157c2e61a6a1b27babd0bdb737f83567fcf2dcfd1b5c474a4074908b5277329e68851c8a652aa430998e

data/.github/workflows/ruby.yml

@@ -0,0 +1,39 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['2.6.10']
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          rubygems: '3.0.3.1'
+          bundler: '2.4.22'
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec
+
+      - name: Build gem
+        run: gem build xsort.gemspec

data/.gitignore

@@ -9,6 +9,49 @@
 # rspec failure tracking
 *.rspec_status
 *.gem
-*.lock
 output.pbxproj
-.vscode/
+.vscode/
+Gemfile.lock
+
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 2.3.7
 before_install: 
-- gem install bundler -v 1.16.0
+- gem install bundler
 - bundle install
 
 jobs:

data/README.md

@@ -1,18 +1,16 @@
 <p align="center">
 	
-<img src="https://github.com/keisukeYamagishi/xsort/blob/master/doc/xsort.png" width="40%" height="40%">
+<img src="https://user-images.githubusercontent.com/5553852/159388128-8c3178c3-0d2d-462f-880a-f922650af40e.png" width="40%" height="40%">
 
-
-[![](https://img.shields.io/badge/twitter-brew__0__O-blue.svg)](https://twitter.com/brew_0_O)
 [![](https://img.shields.io/badge/Language-Ruby-red.svg)](https://www.ruby-lang.org/ja/)
-[![](https://img.shields.io/apm/l/vim-mode.svg)](https://github.com/keisukeYamagishi/xsort/blob/master/LICENSE)
+[![](https://img.shields.io/badge/LICENSE-MIT-green)](https://github.com/keisukeYamagishi/xsort/blob/master/LICENSE)
 
 </p>
 
 # Build
 |OS		 |Result	   |
 |:---------------|:----------------|
-| ***Linux*** |[![Build Status](https://travis-ci.org/keisukeYamagishi/xsort.svg?branch=master)](https://travis-ci.org/keisukeYamagishi/xsort)
+| ***Linux*** |[![Ruby](https://github.com/keisukeYamagishi/xsort/actions/workflows/ruby.yml/badge.svg)](https://github.com/keisukeYamagishi/xsort/actions/workflows/ruby.yml)|
 
 ## Overview
 
@@ -35,22 +33,16 @@ Download and install xsort with the following.
 
 ```
 $ mkdir gitrepo
-
 $ cd gitrepo
-
 $ git clone git@github.com:keisukeYamagishi/xsort.git
-
 ```
 
 ***Via https***: For those checking out sources as read-only, HTTPS works best:
 
 ```
 $ mkdir gitrepo
-
 $ cd gitrepo
-
 $ git clone https://github.com/keisukeYamagishi/xsort.git
-
 ```
 
 ## Usage
@@ -66,7 +58,12 @@ option:
 -r: Just only extracting output.pbxproj will not write to pbxproj of Xcode project so safty
 
 King Regards!
+```
+## Test
 
+```
+cd ./project-root-path
+rspec
 ```
 
 # Hot fix ***********************
@@ -97,14 +94,16 @@ xsort ./XcodeApps.xcodeproj
 
 ***You can sort them like the following image***
 
-<img src="https://github.com/keisukeYamagishi/xsort/blob/master/doc/result.png" width="50%" height="50%">
+<img src="https://user-images.githubusercontent.com/5553852/159388217-872e0749-bd86-4f15-b210-efcf29082130.png" width="50%" height="50%">
 
 
 
 ## Use it
 
+***⚠️You should make a backup before you use it.⚠️***
+
 ```
-xsort ./XcodeApps.xcodeproj　
+xsort ./XcodeApps.xcodeproj
 ```
 or
 
@@ -164,8 +163,7 @@ xsort ../App/App.xcodeproj -r
 
 ```
 ->> ./xsort -v
-
-Version: 1.4.0
+Version: 1.4.4
 ```
 
 ## Contributing

data/bin/xsort

@@ -29,8 +29,17 @@ def execute(option)
         puts "Version: #{Xsort::VERSION}"
     elsif option.path.index("project.pbxproj")
         # excute Xsort
-        xsort = Xsort::Sortproj.new(option.path)
-        xsort.sort(option.stdout,option.notOverwrite)
+        begin
+            Xsort::Sortproj.sort(option.path,option.stdout,option.notOverwrite)
+        rescue IOError => ioerr
+            puts "(*_*).oO Oh no Exception!"
+            puts "(*_*).oO reason: \e[31m#{ioerr.message}\e[0m"
+        rescue SystemCallError => sysCallErr
+            puts "\e[31m(*_*).oO Oh no Exception!\e[0m"
+            puts "\e[31m(*_*).oO Failuer! reason: \n#{sysCallErr.message}\e[0m"
+        else
+            puts "\e[36mXsort Successful (☝ ՞ਊ ՞）☝!!!\e[0m"
+        end
     else
         puts "(*_*).oO not pbxproj file"
         puts "(☝ ՞ਊ ՞）☝!!!must select pbxproj file(☝ ՞ਊ ՞）☝!!!"

data/lib/xsort/option.rb

@@ -9,8 +9,9 @@
 #
 #===------------------------------------------------------------------(☝ ՞ਊ ՞）☝/
 
+##
 class Option
-
+    attr_accessor :options, :path, :stdout, :notOverwrite
     def initialize(argv)
         @stdout = false
         argvs = Array.new
@@ -24,7 +25,6 @@ class Option
         @path = ""
         argvs.each{|argv|
             if !argv.index(".xcodeproj")
-
                 if argv == "-o"
                     @stdout = true
                 elsif argv == "-r"
@@ -45,23 +45,5 @@ class Option
             pbxproj << "/project.pbxproj"
             return pbxproj
         end
-
-    end
-
-    def options
-        @options
-    end
-
-    def path
-        @path
-    end
-
-    def stdout
-        @stdout
     end
-
-    def notOverwrite
-        @notOverwrite
-    end
-
 end

data/lib/xsort/sortproj.rb

@@ -11,19 +11,21 @@
 
 module Xsort
     class Sortproj
-
-        def initialize (path)
-            @path = path
-        end
-
-        def sort (stdout,notOverwrite)
-            puts @path
-            pbxproj = Xcodeproj::Pbxproj::PbxObject::Pbxproj.new(@path,stdout)
-            pbxproj.parse
-            sort = Xcodeproj::Pbxproj::PbxObject::PbxSort.new(pbxproj.pbxGroups)
-            pbxObject = sort.psort
-            write = Xcodeproj::Pbxproj::PbxObject::PbxWrite.new(@path,pbxObject,stdout,notOverwrite)
-            write.overWrite
+        include Xcodeproj::Pbxproj::PbxObject
+        def self.sort (path, stdout, notOverwrite)
+            puts path
+            begin
+                pbxproj = Pbxproj.new(path)
+                pbxproj.parse
+                sort = PbxSort.new(pbxproj.pbxGroups)
+                pbxObject = sort.psort
+                write = PbxWrite.new(path,pbxObject,stdout,notOverwrite)
+                write.overWrite
+            rescue IOError => error
+                raise error
+            rescue SystemCallError => error
+                raise error
+            end
         end
     end
-end
+end

data/lib/xsort/version.rb

@@ -10,5 +10,5 @@
 #===------------------------------------------------------------------(☝ ՞ਊ ՞）☝/
 
 module Xsort
-  VERSION = "1.4.2"
+  VERSION = "1.4.4"
 end

data/lib/xsort/xcodeproj/pbxproj/pbxobject/PbxSort.rb

@@ -25,7 +25,7 @@ module Xcodeproj
 
                     @pbxs.each{ |pbx|
                         sort = pbx.children.sort{|pbx1, pbx2|
-                            pbx1.name <=> pbx2.name
+                            natural_sort_key(pbx1.name) <=> natural_sort_key(pbx2.name)
                         }
 
                         child = Array.new
@@ -75,6 +75,12 @@ module Xcodeproj
                     }
                     return pbx
                 end
+
+                def natural_sort_key(name)
+                    name.scan(/\d+|\D+/).map do |part|
+                        part.match?(/\A\d+\z/) ? [0, part.to_i] : [1, part]
+                    end
+                end
             end
         end
     end

data/lib/xsort/xcodeproj/pbxproj/pbxobject/PbxWrite.rb

@@ -12,9 +12,7 @@
 module Xcodeproj
     module Pbxproj
         module PbxObject
-
             class PbxWrite
-
                 def initialize(path,pbx, stdout,write)
                     @pbx = pbx
                     @stdout = stdout
@@ -29,7 +27,6 @@ module Xcodeproj
                     isPbxGroup = false
                     pbxValue = ""
                     num = 0
-                    isSuccess = true
                     begin
                         File.open(@path, "r") do |pbx|
                             pbx.each_line do |pbx_line|
@@ -48,7 +45,6 @@ module Xcodeproj
                                 if pbx_line.index("/* Begin PBXGroup section */")
                                     isPbxGroup = true
                                 end
-
                                 pbxValue << pbx_line
                             end
                         end
@@ -59,16 +55,10 @@ module Xcodeproj
 
                         writeFile(pbxValue)
 
-                    rescue IOError => ioerr
-                        isSuccess = false
-                        puts "Error \e[31m#{ioerr.message}\e[0m"
-                    rescue SystemCallError => sysCallErr
-                        isSuccess = false
-                        puts "Failuer! reason: \n\e[31m#{sysCallErr.message}\e[0m"
-                        puts "The entered path is invalid."
-                    end
-                    if isSuccess == true
-                        puts "\e[36mXsort Successful (☝ ՞ਊ ՞）☝!!!\e[0m"
+                    rescue IOError => error
+                        raise error
+                    rescue SystemCallError => error
+                        raise error                        
                     end
                 end
 

data/lib/xsort/xcodeproj/pbxproj/pbxobject/Pbxproj.rb

@@ -13,26 +13,11 @@ module Xcodeproj
     module Pbxproj
         module PbxObject
             class PbxGroup
-
+                attr_accessor :pbxBase, :children
                 def initialize
                     @pbxBase = ""
                     @children = Array.new
                 end
-
-                def pbxBase
-                    @pbxBase
-                end
-
-                def setPbxBase(base)
-                    @pbxBase = base
-                end
-
-                def setChildren(pbx)
-                    @children.push(pbx)
-                end
-                def children
-                    @children
-                end
             end
         end
     end
@@ -42,20 +27,11 @@ module Xcodeproj
     module Pbxproj
         module PbxObject
             class PbxChild
-
+                attr_accessor :name, :childPbx
                 def initialize(name, childPbx)
                     @name = name
                     @childPbx = childPbx
                 end
-
-                def name
-                    @name
-                end
-
-                def childPbx
-                    @childPbx
-                end
-
             end
         end
     end
@@ -65,10 +41,8 @@ module Xcodeproj
     module Pbxproj
         module PbxObject
             class Pbxproj
-
-                def initialize(path, stdout)
+                def initialize(path)
                     @path = path
-                    @stdout = stdout
                     @pbxGroups = Array.new
                 end
 
@@ -82,11 +56,6 @@ module Xcodeproj
                     begin
                         File.open(@path, "r") do |pbx|
                             pbx.each_line do |pbx_line|
-
-                                if @stdout == true
-                                    puts pbx_line
-                                end
-
                                 if pbx_line.index("/* End PBXGroup section */")
                                     isPbxGroup = false
                                 end
@@ -101,7 +70,7 @@ module Xcodeproj
                                     if isPbxChild == true
                                         name = Emurate.emurates(pbx_line)
                                         @child = Xcodeproj::Pbxproj::PbxObject::PbxChild.new(name,pbx_line)
-                                        @group.setChildren(@child)
+                                        @group.children.push(@child)
                                     end
 
                                     # Children
@@ -121,7 +90,7 @@ module Xcodeproj
 
                                     if pbx_line.index("};")
                                         isPbxOneValue = false
-                                        @group.setPbxBase(pbxValue)
+                                        @group.pbxBase = pbxValue
                                         @pbxGroups.push(@group)
                                         pbxValue = ""
                                     end
@@ -132,11 +101,10 @@ module Xcodeproj
                                 end
                             end
                         end
-                    rescue IOError => ioerr
-                        puts "Error #{ioerr.message}"
-                    rescue SystemCallError => sysCallErr
-                        puts "Failuer: reason #{sysCallErr.message}"
-                        puts "The entered path is invalid."
+                    rescue IOError => error
+                        raise error
+                    rescue SystemCallError => error
+                        raise error
                     end
                 end
 

data/xsort.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Sort the file tree next to Xcode by file name.}
   spec.homepage      = "https://github.com/keisukeYamagishi/xsort"
   spec.license       = "MIT"
-  spec.required_ruby_version     = ">= 2.3.7"
-  spec.required_rubygems_version = ">= 2.5.2.3"
+  spec.required_ruby_version     = ">= 2.6.10"
+  spec.required_rubygems_version = ">= 3.0.3"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|doc)/})
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: xsort
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - keisuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2026-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Sort the file tree next to Xcode by file name.
 email:
 - jam330157@gmail.com
@@ -60,13 +60,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/xsort
@@ -91,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.6.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.2.3
+      version: 3.0.3
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Sort by file.

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    xsort (1.4.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  xsort!
-
-BUNDLED WITH
-   1.17.2