xsort 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 759131d784bc21dd73cc4afcae868d405c87c41cb090fe3e6a91614d33679ecc
-  data.tar.gz: 255c99b700aaef6368b61c6a6873dfd29ec4e36875e76dd4ffd5cb64df3598cb
+SHA1:
+  metadata.gz: b455b9b751b1d9c8bbb7f9d4a5fdcbe771a5ab5f
+  data.tar.gz: 77134d7577f7c4a0fa051dc0813f1534c255f112
 SHA512:
-  metadata.gz: 79e7e8209965063a2c70f6bcb7545d1b4b606473fb28b45a757793e09f3928fd0767932ffc28092bcc8bf2af78ad57d1e8e4371791ef1957fef58892e6345e36
-  data.tar.gz: 00146f2c17f73a1e268fc3f7f4ebb91dd7f296701d002cfedc71eda7bdc1016d705cc6e67d434b69eaa5e09ff99489091e928abff4e4ab0decb6f14fd84e052f
+  metadata.gz: 74d8952183440bc5c6ecc32a6db798141470f09e665b243614b3ab8fb2d2fba22024624587f1162d9df39a6cde535626b1f3f6243e2e01423472024e6bd9dcde
+  data.tar.gz: 51d466a3e369eabf4c87254afd1dff0792f0af5bf37f178c46e755e37a8230fa8312d16fe36d0a0482093d56146dce6d3d0bd8ada006e7000684e1e25bf7cf67

data/bin/xsort

@@ -2,32 +2,27 @@
 
 require "xsort"
 
-def execute(option)                                                                 
-    if option.options.length == 0 && option.path.length == 0              
-        puts "Usage: xsort [-v] [<path>] [-o] "                             
-        puts "These are common detect commands used in various situations:" 
-        puts "xsort version: #{Xsort::VERSION}"                             
-        puts "option:"                                                      
-        puts "-v: display xsort version number"                             
-        puts "-o: output result"                                            
+def execute(option)
+    if option.options.length == 0 && option.path.length == 0
+        puts "Usage: xsort [-v] [<path>] [-o] "
+        puts "These are common detect commands used in various situations:"
+        puts "xsort version: #{Xsort::VERSION}"
+        puts "option:"
+        puts "-v: display xsort version number"
+        puts "-o: output result"
         puts "-r: Just extracting output.pbxproj will not write to pbxproj of Xcode project"
-        puts "\n"                                                           
-        puts "Regars !"                                                     
-    elsif option.options.length == 1 && option.options[0] == "-v"         
+        puts "\n"
+        puts "Regars !"
+    elsif option.options.length == 1 && option.options[0] == "-v"
         puts "Version: #{Xsort::VERSION}"
-    elsif option.path.index("project.pbxproj")                             
-        pbx = Xcodeproj::Pbxproj::PbxObject::Pbxproj.new(option.path,option.isOut)
-        pbx.parse()
-        sort = Xcodeproj::Pbxproj::PbxObject::PbxSort.new(pbx.pbxGroups)    
-        s = sort.psort                                                      
-        write = Xcodeproj::Pbxproj::PbxObject::PbxWrite.new(option.path,s,option.isOut, option.notOverWrite)
-        write.overWrite                                                     
+    elsif option.path.index("project.pbxproj")
+        # excute Xsort
+        Xsort::Sortproj.new(option).sort
     else
-        puts "(*_*).oO not pbxproj file"                                    
-        puts "must select pbxproj file"                                     
-        puts "($_$).oO omg"                                                 
-    end 
-end     
+        puts "(*_*).oO not pbxproj file"
+        puts "must select pbxproj file"
+        puts "($_$).oO omg"
+    end
+end
 
 execute(Option.new(ARGV))
-

data/lib/xsort.rb

@@ -2,5 +2,6 @@ require "xsort/xcodeproj/pbxproj/pbxobject/Pbxproj"
 require "xsort/xcodeproj/pbxproj/pbxobject/PbxSort"
 require "xsort/xcodeproj/pbxproj/pbxobject/PbxWrite"
 require "xsort/xcodeproj/pbxproj/pbxobject/Emurate"
+require "xsort/sortproj"
 require "xsort/version"
 require "xsort/option"

data/lib/xsort/sortproj.rb

@@ -0,0 +1,17 @@
+module Xsort
+    class Sortproj
+
+        def initialize (option)
+            @option = option
+        end
+
+        def sort
+            pbx = Xcodeproj::Pbxproj::PbxObject::Pbxproj.new(@option.path,@option.isOut)
+            pbx.parse
+            sort = Xcodeproj::Pbxproj::PbxObject::PbxSort.new(pbx.pbxGroups)
+            s = sort.psort
+            write = Xcodeproj::Pbxproj::PbxObject::PbxWrite.new(@option.path,s,@option.isOut, @option.notOverWrite)
+            write.overWrite
+        end
+    end
+end

data/lib/xsort/version.rb

@@ -1,3 +1,3 @@
 module Xsort
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

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

@@ -50,14 +50,14 @@ module Xcodeproj
 
                     rescue IOError => ioerr
                         isSuccess = false
-                        puts "Error #{ioerr.message}"
+                        puts "Error \e[31m#{ioerr.message}\e[0m"
                     rescue SystemCallError => sysCallErr
                         isSuccess = false
-                        puts "Failuer: reason #{sysCallErr.message}"
+                        puts "Failuer! reason: \n\e[31m#{sysCallErr.message}\e[0m"
                         puts "The entered path is invalid."
                     end
                     if isSuccess == true
-                        puts "Xsort Successful (☝ ՞ਊ ՞）☝!"
+                        puts "\e[36mXsort Successful (☝ ՞ਊ ՞）☝!!!\e[0m"
                     end
                 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsort
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - keisuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-29 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - bin/xsort
 - lib/xsort.rb
 - lib/xsort/option.rb
+- lib/xsort/sortproj.rb
 - lib/xsort/version.rb
 - lib/xsort/xcodeproj/pbxproj/pbxobject/Emurate.rb
 - lib/xsort/xcodeproj/pbxproj/pbxobject/PbxSort.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Sort by file.