xsort 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b455b9b751b1d9c8bbb7f9d4a5fdcbe771a5ab5f
-  data.tar.gz: 77134d7577f7c4a0fa051dc0813f1534c255f112
+  metadata.gz: 8c40d2c455e205214241c8062857a4b2b0330737
+  data.tar.gz: 3ce334aa69503adc6c96cd073d30c0c04d0a7212
 SHA512:
-  metadata.gz: 74d8952183440bc5c6ecc32a6db798141470f09e665b243614b3ab8fb2d2fba22024624587f1162d9df39a6cde535626b1f3f6243e2e01423472024e6bd9dcde
-  data.tar.gz: 51d466a3e369eabf4c87254afd1dff0792f0af5bf37f178c46e755e37a8230fa8312d16fe36d0a0482093d56146dce6d3d0bd8ada006e7000684e1e25bf7cf67
+  metadata.gz: da7b68bfddb6f8643edbe99f4560bb0e08fe68121b76c75d74268140e66aca40f0cb2da38749d50ebcf467fc6554a1a4666813a577e66e886508c3e3a06f6de3
+  data.tar.gz: 50401858c762ac2dfd4ca6ae00f66f272ec3c103e678c70e4defe08cfad59ea7cdf9da479fb91e06bce18abbd9314f87c3a7498f16e8ddde81f386ed28838644

data/README.md

@@ -1,4 +1,5 @@
-# xsort
+
+<img src="https://github.com/keisukeYamagishi/xsort/blob/master/doc/xsort.png">
 
 [![](https://img.shields.io/badge/Twitter-O--Liker%20Error-blue.svg)](https://twitter.com/O_Linker_Error)
 [![](https://img.shields.io/badge/Language-Ruby-red.svg)](https://www.ruby-lang.org/ja/)
@@ -54,7 +55,7 @@ $ git clone https://github.com/keisukeYamagishi/xsort.git
 
 Usage: xsort [-v] [<path>] [-o]
 These are common detect commands used in various situations:
-xsort version: 1.1.1
+xsort version: 1.2.3
 option:
 -v: display xsort version number
 -o: output result
@@ -65,7 +66,7 @@ Regars !
 ```
 
 # Hot fix ***********************
-#### （☝ ՞ਊ ՞）☝ Wow What's this!
+#### （☝ ՞ਊ ՞）☝ Wow What's this!!!
 
 mac OSX to HighSierra,
 When xsort is executed, the following error occurs.
@@ -75,7 +76,7 @@ When xsort is executed, the following error occurs.
 -bash: /usr/local/bin/xsort: /System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/bin/ruby: bad interpreter: No such file or directory
 ```
 
-#### （☝ ՞ਊ ՞）☝ Wow What's this!
+#### （☝ ՞ਊ ՞）☝ Wow What's this!!!
 
 In that case, please execute the following.
 
@@ -86,8 +87,6 @@ sudo gem install -n /usr/local/bin xsort
 
 ## Run
 
-⚠️Please do version control and back up before doing.⚠️
-
 ```
 xsort ./XcodeApps.xcodeproj
 ```
@@ -162,5 +161,5 @@ xsort ../App/App.xcodeproj -r
 ```
 ->> ./xsort -v
 
-Version: 1.2.1
+Version: 1.2.3
 ```

data/bin/xsort

@@ -17,7 +17,8 @@ def execute(option)
         puts "Version: #{Xsort::VERSION}"
     elsif option.path.index("project.pbxproj")
         # excute Xsort
-        Xsort::Sortproj.new(option).sort
+        xsort = Xsort::Sortproj.new(option.path)
+        xsort.sort(option.stdout,option.notOverwrite)
     else
         puts "(*_*).oO not pbxproj file"
         puts "must select pbxproj file"

data/lib/xsort/option.rb

@@ -1,9 +1,9 @@
 class Option
 
     def initialize(argv)
-        @isOut = false
+        @stdout = false
         argvs = Array.new
-        @notOverWrite = false
+        @notOverwrite = false
 
         argv.each_with_index do |arg, i|
             argvs.push(arg)
@@ -15,7 +15,7 @@ class Option
             if argv.index("-")
 
                 if argv == "-o"
-                    @isOut = true
+                    @stdout = true
                 elsif argv == "-r"
                     @notOverWrite = true
                 end
@@ -46,12 +46,12 @@ class Option
         @path
     end
 
-    def isOut
-        @isOut
+    def stdout
+        @stdout
     end
 
-    def notOverWrite
-        @notOverWrite
+    def notOverwrite
+        @notOverwrite
     end
 
 end

data/lib/xsort/sortproj.rb

@@ -1,16 +1,17 @@
 module Xsort
     class Sortproj
 
-        def initialize (option)
-            @option = option
+        def initialize (path)
+            @path = path
         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)
+        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
         end
     end

data/lib/xsort/version.rb

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

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

@@ -4,9 +4,9 @@ module Xcodeproj
 
             class PbxWrite
 
-                def initialize(path,pbx, out,write)
+                def initialize(path,pbx, stdout,write)
                     @pbx = pbx
-                    @isOut = out
+                    @stdout = stdout
                     @path = path
                     @write = write
                 end
@@ -42,7 +42,7 @@ module Xcodeproj
                             end
                         end
 
-                        if @isOut == true
+                        if @stdout == true
                             puts pbxValue
                         end
 

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

@@ -87,9 +87,9 @@ module Xcodeproj
         module PbxObject
             class Pbxproj
 
-                def initialize(path, out)
+                def initialize(path, stdout)
                     @path = path
-                    @isOut = out
+                    @stdout = stdout
                     @pbxGroups = Array.new
                 end
 
@@ -104,7 +104,7 @@ module Xcodeproj
                         File.open(@path, "r") do |pbx|
                             pbx.each_line do |pbx_line|
 
-                                if @isOut == true
+                                if @stdout == true
                                     puts pbx_line
                                 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsort
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - keisuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2018-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler