xsort 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af304a900d49bb01faaac087abcdb4d93f0fcc8f35cf28d8de771d40eb2bce4e
-  data.tar.gz: a0b456afd627c2c288b01a314fd5da5f5b1335a84be8de9c5e8a130f4b684440
+  metadata.gz: 8798ebf3ececa61884bab0ede207df073f0d9f1d468ab2b015c905515dfdf5e2
+  data.tar.gz: d7b4f06a3167eb2c19a0d37708e29a27ac28423885036acacf183becfd2ce8cb
 SHA512:
-  metadata.gz: 91d8702d22051ffeb9f821d6b84b358411d3a3081545f3b7d7d0a336d35b3781384e53cfdc74091d19580bfea2ec61a328b1645b57e87db21d11317fb6c66e87
-  data.tar.gz: 92c613e685ebdde98694804f5ec485810a6e38f1f2108fbcc11bcede9a3df43278df804663b71bad87b90c3c2c283fe799e232076aea3f071de8f6f4d164402e
+  metadata.gz: 8e0a3a05204b7548fae03ba61932fe9d99bab3965117d32d01350eaeeda37c5e1cfe42c00edeb75a4977de8f2c7f3c982eaee441e08c9943d88b6c93f6801b37
+  data.tar.gz: 9d243c11b665d211d186d68b4c77f2a05d6e6ba8911788994047565b093e8e1279756525b49c815847b8e4b55ec3c3c68f9d2bcd6ae5451f222f774773453faa

data/.github/workflows/ruby.yml

@@ -0,0 +1,41 @@
+# 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.3', '2.6']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: install bundler
+      run: gem install bundler
+    - name: bundle install
+      run: bundle install
+    - 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

@@ -1,13 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.3.7
 before_install: 
-- gem install bundler -v 1.16.0
+- gem install bundler
 - bundle install
 
 jobs:
   include:
     - stage: test
       script: 
-        - bundle exec rspec
+        - bundle exec rspec
+        - gem build xsort.gemspec

data/README.md

@@ -2,8 +2,7 @@
 	
 <img src="https://github.com/keisukeYamagishi/xsort/blob/master/doc/xsort.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/HP-shichimitoucarashi-00acee)](https://shichimitoucarashi.com/)
 [![](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)
 
@@ -35,38 +34,31 @@ 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
 
 ```
-
+xsort version: 1.4.0
+xsort sort an Xcode file tree
 Usage: xsort [-v] [<path>] [-o]
-These are common detect commands used in various situations:
-xsort version: 1.2.5
+The following options can be used with Xsort.
 option:
 -v: display xsort version number
 -o: output result
--r: Just extracting output.pbxproj will not write to pbxproj of Xcode project
-
-Regars !
+-r: Just only extracting output.pbxproj will not write to pbxproj of Xcode project so safty
 
+King Regards!
 ```
 
 # Hot fix ***********************
@@ -103,6 +95,8 @@ xsort ./XcodeApps.xcodeproj
 
 ## Use it
 
+***⚠️You should make a backup before you use it.⚠️***
+
 ```
 xsort ./XcodeApps.xcodeproj　
 ```
@@ -164,8 +158,7 @@ xsort ../App/App.xcodeproj -r
 
 ```
 ->> ./xsort -v
-
-Version: 1.2.5
+Version: 1.4.0
 ```
 
 ## 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.0"
+  VERSION = "1.4.3"
 end

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

@@ -29,12 +29,7 @@ module Xcodeproj
                         end
                     }
                 end
-
-                def self.emurateUUID(char)
-                    return char.split(" ").first
-                end
             end
-
         end
     end
 end

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

@@ -24,18 +24,6 @@ module Xcodeproj
                     productPbx = ""
 
                     @pbxs.each{ |pbx|
-                        # puts "parent PBX"
-                        # puts pbx.parentName
-                        # puts pbx.parentUUID
-                        # puts pbx.parentPbx
-                        # puts pbx.parentPbx
-                        # puts pbx.parentName
-                        # puts pbx.parentUUID
-                        # ->> puts pbx.pbxBase
-                        # puts "children"
-                        # pbx.children.each { |pbxC|
-                        #     puts pbxC.name
-                        # }
                         sort = pbx.children.sort{|pbx1, pbx2|
                             pbx1.name <=> pbx2.name
                         }
@@ -48,10 +36,6 @@ module Xcodeproj
                             else
                                 child.push(pbx.childPbx)
                             end
-                            # child.push(pbx.childPbx)
-                            # puts pbx.uuid
-                            # puts pbx.name
-                            # ->> puts pbx.childPbx
                         }
 
                         if productPbx.length != 0

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,53 +13,11 @@ module Xcodeproj
     module Pbxproj
         module PbxObject
             class PbxGroup
-
+                attr_accessor :pbxBase, :children
                 def initialize
-                    @parentPbx = ""
-                    @parentName = ""
-                    @parentUUID = ""
                     @pbxBase = ""
                     @children = Array.new
                 end
-
-                def parentPbx
-                    @parentPbx
-                end
-
-                def parentName
-                    @parentName
-                end
-
-                def parentUUID
-                    @parentUUID
-                end
-
-                def pbxBase
-                    @pbxBase
-                end
-
-                def setParentName(name)
-                    @parentName = name
-                end
-
-                def setParentUUID(uuid)
-                    @parentUUID = uuid
-                end
-
-                def setParentPbx(pbx)
-                    @parentPbx = pbx
-                end
-
-                def setPbxBase(base)
-                    @pbxBase = base
-                end
-
-                def setChildren(pbx)
-                    @children.push(pbx)
-                end
-                def children
-                    @children
-                end
             end
         end
     end
@@ -69,25 +27,11 @@ module Xcodeproj
     module Pbxproj
         module PbxObject
             class PbxChild
-
-                def initialize(uuid, name, childPbx)
-                    @uuid = uuid
+                attr_accessor :name, :childPbx
+                def initialize(name, childPbx)
                     @name = name
                     @childPbx = childPbx
                 end
-
-                def uuid
-                    @uuid
-                end
-
-                def name
-                    @name
-                end
-
-                def childPbx
-                    @childPbx
-                end
-
             end
         end
     end
@@ -97,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
 
@@ -114,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
@@ -132,9 +69,8 @@ module Xcodeproj
 
                                     if isPbxChild == true
                                         name = Emurate.emurates(pbx_line)
-                                        uuid = Emurate.emurateUUID(pbx_line)
-                                        @child = Xcodeproj::Pbxproj::PbxObject::PbxChild.new(uuid,name,pbx_line)
-                                        @group.setChildren(@child)
+                                        @child = Xcodeproj::Pbxproj::PbxObject::PbxChild.new(name,pbx_line)
+                                        @group.children.push(@child)
                                     end
 
                                     # Children
@@ -145,11 +81,7 @@ module Xcodeproj
                                     if pbx_line.index(" = {")
                                         isPbxOneValue = true
                                         name = Emurate.emurates(pbx_line)
-                                        uuid = Emurate.emurateUUID(pbx_line)
-                                        @group = Xcodeproj::Pbxproj::PbxObject::PbxGroup.new
-                                        @group.setParentName(name)
-                                        @group.setParentUUID(uuid)
-                                        @group.setParentPbx(pbx_line)
+                                        @group = Xcodeproj::Pbxproj::PbxObject::PbxGroup.new                                        
                                     end
 
                                     if isPbxOneValue == true
@@ -158,7 +90,7 @@ module Xcodeproj
 
                                     if pbx_line.index("};")
                                         isPbxOneValue = false
-                                        @group.setPbxBase(pbxValue)
+                                        @group.pbxBase = pbxValue
                                         @pbxGroups.push(@group)
                                         pbxValue = ""
                                     end
@@ -169,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,6 +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.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|doc)/})
@@ -21,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.0
+  version: 1.4.3
 platform: ruby
 authors:
 - keisuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2022-03-20 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: '0'
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.2.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.2.5)
-
-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