api_diff 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d7124fb871227197ac950b3b042ae3a6a3c99eafaf0bc0762e8dceefed24fc
-  data.tar.gz: f10484ee00caad08e50bbb217bc5fd3308f4414e780cb93a9a3f4177ea69cd29
+  metadata.gz: 310a7da2f0d41ae551be866edc09039b488c7128a9ca5337acaf0902aa4beecd
+  data.tar.gz: cfe5d1f1cdc4daf8eba8f1c5b8e6b1b7945fd3f0bd629c65b82cd9755f5bea60
 SHA512:
-  metadata.gz: 3966edcf349cc3e43deead3ee42e15449b4278d7eb2f545d00f0a7607cde01b38abb629790dd01252bec9b56d1327a3dd127f5c274765fa1d9882767a9c8f133
-  data.tar.gz: 980f1818d60f005d69c626e1749c84254b41bf184ff37dd9bc1872c3ba80c8dc96d9922a3be3a0f3be27dc27553de4541fe2a5c9a5529a2cc16bac96f0d74262
+  metadata.gz: 00e2213f1595896419c9e3ca890eed716d8ad25cb36e127795ae8cf7bc394af09e4322ab81a382ff4080fae8c0d8d7bf7fdcb8e3a8a634a61d6fcc0112689192
+  data.tar.gz: e1ec8e8cd85683fef1c6e0a823136f0b79389cd1b64084d1b369a7e00b38728498aa52e7f52315ab9f70620a1fdea57213a35617acbb2773f26e0a998cb042a0

data/lib/api_diff/api.rb

@@ -20,10 +20,17 @@ module ApiDiff
       enums.find { |e| e.name == named || e.fully_qualified_name == fully_qualified_name }
     end
 
-    def to_s(fully_qualified_names: true, global_sort: false)
+    def to_s(fully_qualified_names: true, order: :global)
       result = []
-      if global_sort
+      if order == "global"
         result << (enums + interfaces + classes).sort.map { |e| e.to_s(fully_qualified_name: fully_qualified_names) }
+      elsif order == "fqn"
+        types = enums + interfaces + classes
+        type_order = { "enum" => 1, "interface" => 2, "class" => 3 }
+        types.sort! do |t1, t2|
+          [t1.package, type_order[t1.class.type_name], t1.name] <=> [t2.package, type_order[t2.class.type_name], t2.name]
+        end
+        result << types.map { |e| e.to_s(fully_qualified_name: fully_qualified_names) }
       else
         result << enums.sort.map { |e| e.to_s(fully_qualified_name: fully_qualified_names) }
         result << interfaces.sort.map { |i| i.to_s(fully_qualified_name: fully_qualified_names) }

data/lib/api_diff/cli.rb

@@ -3,11 +3,12 @@ require "optparse"
 module ApiDiff
   class Cli
     def parse(arguments)
+      formats = ["swift-interface", "kotlin-bcv"]
       parser = OptionParser.new do |opts|
-        opts.on("-f", "--format FORMAT", ["swift-interface", "kotlin-bcv"])
+        opts.on("-f", "--format FORMAT", formats, "Possible values are: #{formats.join(",")}")
         opts.on("-s", "--short-names", "Use short instead of fully qualified names")
         opts.on("-n", "--normalize")
-        opts.on("-g", "--global-sort")
+        opts.on("-o", "--order ORDER", ["global", "fqn"])
       end
       
       options = {}
@@ -38,7 +39,7 @@ module ApiDiff
       parser.parse(IO.read(options[:input]))
       output = parser.api.to_s(
         fully_qualified_names: !options[:"short-names"], 
-        global_sort: options[:"global-sort"]
+        order: options[:"order"]
       )
       puts output
     end

data/lib/api_diff/type.rb

@@ -15,6 +15,10 @@ module ApiDiff
       @properties = []
     end
 
+    def package
+      fully_qualified_name.split(".")[0..-2].join(".")
+    end
+
     def declaration(fully_qualified_name: false)
       name = fully_qualified_name ? self.fully_qualified_name : self.name
       result = "#{self.class.type_name} #{name}"

data/lib/api_diff/version.rb

@@ -1,3 +1,3 @@
 module ApiDiff
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sebastian Ludwig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
-description:
+description: 
 email:
 - sebastian@lurado.de
 executables:
@@ -72,7 +72,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sebastianludwig/api-diff
   source_code_uri: https://github.com/sebastianludwig/api_diff
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Bring APIs into an easily diff-able format
 test_files: