danger-apkstats 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206a4a16c43f2e18507ab485cce2947c1e932fbee471db57e4f43b20b9e4aa02
-  data.tar.gz: f38876905c1095c7da969bbb6d6e43ea5a09ab0cce2941544263137c2ffa3a1e
+  metadata.gz: 7e3766086cf1f908f3a553259ce56b77077cb25af31cb6f1d2c36c565d4fc62a
+  data.tar.gz: a8592f39aa1288898076e59e0586c3ac941a92294d65123eaad05236e9d78588
 SHA512:
-  metadata.gz: a9490b757975f4ed708ce6e2df907cea5594cd1fdd8bd338cd6eff111f8d75148c41ad442c1756af7aca9f78992d908fb76905bbcd7cddb0fb3f4ea4e6ab4d04
-  data.tar.gz: 73c01476155e698d19655affd292bbdebfffad6e4615bb96257280a57deced379b7a4fedc3bcd43d049460a8d0f2da6925d9fae7e08c048e4fd0b7eb6e3fbbd8
+  metadata.gz: 0a93c60400f8692df2701b939cd840d740990da627c530e015ef4012f652de3770d10fb339fe1db7795fb313cbfdd2854c2ac7b5e0580b69add6995e1d1ac980
+  data.tar.gz: b77a1fa1c2c6cff74fdeeba07b6e4d41db76cda9b691f2d702dfdd69138d15a75fcb7897cbe4a8371de9e55ed984b8ea41389efe32fbb83c10498c247f661090

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-apkstats (0.3.0)
+    danger-apkstats (0.3.1)
       danger-plugin-api (~> 1.0)
 
 GEM
@@ -57,7 +57,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (2.2.1)
+    kramdown (2.3.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

data/lib/apkstats/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apkstats
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/apkstats/plugin.rb

@@ -109,91 +109,93 @@ module Danger
     def compare_with(other_apk_filepath, do_report: true)
       raise "apk filepaths must be specified" if apk_filepath.nil? || apk_filepath.empty?
 
-      base_apk = Apkstats::Entity::ApkInfo.new(command, apk_filepath)
-      other_apk = Apkstats::Entity::ApkInfo.new(command, other_apk_filepath)
+      base_apk = Apkstats::Entity::ApkInfo.new(apkanalyzer_command, apk_filepath)
+      other_apk = Apkstats::Entity::ApkInfo.new(apkanalyzer_command, other_apk_filepath)
 
-      return {
+      result = {
           base: base_apk.to_h,
           other: base_apk.to_h,
           diff: Apkstats::Entity::ApkInfoDiff.new(base_apk, other_apk).to_h,
-      }.tap do |result|
-        break unless do_report
+      }
 
-        diff = result[:diff]
+      return result unless do_report
 
-        md = +"### Apk comparison results" << "\n\n"
-        md << "Property | Summary" << "\n"
-        md << ":--- | :---" << "\n"
+      diff = result[:diff]
 
-        diff[:min_sdk].tap do |min_sdk|
-          break if min_sdk.size == 1
+      md = +"### Apk comparison results" << "\n\n"
+      md << "Property | Summary" << "\n"
+      md << ":--- | :---" << "\n"
 
-          md << "Min SDK Change | Before #{min_sdk[1]} / After #{min_sdk[0]}" << "\n"
-        end
+      diff[:min_sdk].tap do |min_sdk|
+        break if min_sdk.size == 1
 
-        diff[:target_sdk].tap do |target_sdk|
-          break if target_sdk.size == 1
+        md << "Min SDK Change | Before #{min_sdk[1]} / After #{min_sdk[0]}" << "\n"
+      end
 
-          md << "Target SDK Change | Before #{target_sdk[1]} / After #{target_sdk[0]}" << "\n"
-        end
+      diff[:target_sdk].tap do |target_sdk|
+        break if target_sdk.size == 1
 
-        result[:base][:file_size].tap do |file_size|
-          size = Apkstats::Helper::Bytes.from_b(file_size)
+        md << "Target SDK Change | Before #{target_sdk[1]} / After #{target_sdk[0]}" << "\n"
+      end
 
-          md << "New File Size | #{size.to_b} Bytes. (#{size.to_mb} MB) " << "\n"
-        end
+      result[:base][:file_size].tap do |file_size|
+        size = Apkstats::Helper::Bytes.from_b(file_size)
 
-        diff[:file_size].tap do |file_size|
-          size = Apkstats::Helper::Bytes.from_b(file_size)
+        md << "New File Size | #{size.to_b} Bytes. (#{size.to_mb} MB) " << "\n"
+      end
 
-          md << "File Size Change | #{size.to_s_b} Bytes. (#{size.to_s_kb} KB) " << "\n"
-        end
+      diff[:file_size].tap do |file_size|
+        size = Apkstats::Helper::Bytes.from_b(file_size)
 
-        diff[:download_size].tap do |download_size|
-          size = Apkstats::Helper::Bytes.from_b(download_size)
+        md << "File Size Change | #{size.to_s_b} Bytes. (#{size.to_s_kb} KB) " << "\n"
+      end
 
-          md << "Download Size Change | #{size.to_s_b} Bytes. (#{size.to_s_kb} KB) " << "\n"
-        end
+      diff[:download_size].tap do |download_size|
+        size = Apkstats::Helper::Bytes.from_b(download_size)
 
-        result[:base][:method_reference_count].tap do |method_reference_count|
-          md << "New Method Reference Count | #{method_reference_count}" << "\n"
-        end
+        md << "Download Size Change | #{size.to_s_b} Bytes. (#{size.to_s_kb} KB) " << "\n"
+      end
 
-        diff[:method_reference_count].tap do |method_reference_count|
-          md << "Method Reference Count Change | #{method_reference_count}" << "\n"
-        end
+      result[:base][:method_reference_count].tap do |method_reference_count|
+        md << "New Method Reference Count | #{method_reference_count}" << "\n"
+      end
 
-        result[:base][:dex_count].tap do |dex_count|
-          md << "New Number of dex file(s) | #{dex_count}" << "\n"
-        end
+      diff[:method_reference_count].tap do |method_reference_count|
+        md << "Method Reference Count Change | #{method_reference_count}" << "\n"
+      end
 
-        diff[:dex_count].tap do |dex_count|
-          md << "Number of dex file(s) Change | #{dex_count}" << "\n"
-        end
+      result[:base][:dex_count].tap do |dex_count|
+        md << "New Number of dex file(s) | #{dex_count}" << "\n"
+      end
 
-        report_hash_and_arrays = lambda { |key, name|
-          list_up_entities = lambda { |type_key, label|
-            diff[key][type_key].tap do |features|
-              break if features.empty?
+      diff[:dex_count].tap do |dex_count|
+        md << "Number of dex file(s) Change | #{dex_count}" << "\n"
+      end
 
-              md << "#{label} | " << features.map { |f| "- #{f}" }.join("<br>").to_s << "\n"
-            end
-          }
+      report_hash_and_arrays = lambda { |key, name|
+        list_up_entities = lambda { |type_key, label|
+          diff[key][type_key].tap do |features|
+            break if features.empty?
 
-          list_up_entities.call(:new, "New #{name}")
-          list_up_entities.call(:removed, "Removed #{name}")
+            md << "#{label} | " << features.map { |f| "- #{f}" }.join("<br>").to_s << "\n"
+          end
         }
 
-        report_hash_and_arrays.call(:required_features, "Required Features")
-        report_hash_and_arrays.call(:non_required_features, "Non-required Features")
-        report_hash_and_arrays.call(:permissions, "Permissions")
+        list_up_entities.call(:new, "New #{name}")
+        list_up_entities.call(:removed, "Removed #{name}")
+      }
 
-        markdown(md)
-      end
+      report_hash_and_arrays.call(:required_features, "Required Features")
+      report_hash_and_arrays.call(:non_required_features, "Non-required Features")
+      report_hash_and_arrays.call(:permissions, "Permissions")
+
+      markdown(md)
+      true
     rescue StandardError => e
       warn("apkstats failed to execute the command due to #{e.message}")
 
       on_error(e)
+      false
     end
 
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -287,17 +289,25 @@ module Danger
     def apkanalyzer_command
       return @apkanalyzer_command if defined?(@apkanalyzer_command)
 
-      command_path = apkanalyzer_path || begin
-                                           android_home = ENV["ANDROID_HOME"]
+      command_path = apkanalyzer_path || `which apkanalyzer`.chomp
+
+      if command_path.empty?
+        sdk_path = ENV["ANDROID_HOME"] || ENV["ANDROID_SDK_ROOT"]
+
+        if sdk_path
+          tmp_path = File.join(sdk_path, "cmdline-tools/tools/bin/apkanalyzer")
+          tmp_path = File.join(sdk_path, "tools/bin/apkanalyzer") unless File.executable?(tmp_path)
+
+          command_path = tmp_path if File.executable?(tmp_path)
+        else
+          warn("apkstats will not infer the apkanalyzer path in further versions so please include apkanalyer in your PATH or specify it explicitly.")
+        end
+      end
 
-                                           if android_home
-                                             warn("apkstats will not use ANDROID_HOME in further versions because ANDROID_HOME has been officially deprecated.")
-                                           else
-                                             raise Error, "Please specify apkanalyzer_path to execute apkstats"
-                                           end
+      command_path = command_path.chomp
 
-                                           "#{android_home}/tools/bin/apkanalyzer"
-                                         end
+      raise Error, "Please include apkanalyer in your PATH or specify it explicitly." if command_path.empty?
+      raise Error, "#{command_path} is not executable." unless File.executable?(command_path)
 
       @apkanalyzer_command = Apkstats::Command::ApkAnalyzer.new(command_path: command_path)
     end

data/spec/apkstats_spec.rb

@@ -4,11 +4,6 @@ require File.expand_path("spec_helper", __dir__)
 
 module Danger
   describe Danger::DangerApkstats do
-    before do
-      ENV.delete("ANDROID_HOME")
-      ENV.delete("ANDROID_SDK_ROOT")
-    end
-
     it "should be a plugin" do
       expect(Danger::DangerApkstats.new(nil)).to be_a Danger::Plugin
     end
@@ -22,48 +17,24 @@ module Danger
         allow(apkstats.github).to receive(:pr_json).and_return(json)
       end
 
-      # compatibility
-      describe "#command_path=" do
-        context "unless command_path is given" do
-          it { expect { apkstats.send(:apkanalyzer_command) }.to raise_error(Danger::DangerApkstats::Error) }
+      describe "#compare_with" do
+        let(:apk_base) { fixture_path + "app-base.apk" }
+        let(:apk_other1) { fixture_path + "app-other1.apk" }
 
-          context "with ANDROID_HOME" do
-            before do
-              ENV["ANDROID_HOME"] = "dummy"
-            end
-
-            it { expect(apkstats.send(:apkanalyzer_command)).to be_kind_of(Apkstats::Command::ApkAnalyzer) }
-          end
+        before do
+          apkstats.apkanalyzer_path = `which apkanalyzer`.chomp
         end
 
-        context "if command_path is given" do
-          before do
-            apkstats.command_path = "dummy"
-          end
-
-          it { expect(apkstats.send(:apkanalyzer_command)).to be_kind_of(Apkstats::Command::ApkAnalyzer) }
-        end
-      end
-
-      describe "#apkanalyzer_path=" do
-        context "unless analyzer_path is given" do
-          it { expect { apkstats.send(:apkanalyzer_command) }.to raise_error(Danger::DangerApkstats::Error) }
-
-          context "with ANDROID_HOME" do
-            before do
-              ENV["ANDROID_HOME"] = "dummy"
-            end
-
-            it { expect(apkstats.send(:apkanalyzer_command)).to be_kind_of(Apkstats::Command::ApkAnalyzer) }
-          end
+        context "unless apk_filepath is specified" do
+          it { expect(apkstats.compare_with(apk_other1, do_report: true)).to be_falsey }
         end
 
-        context "if analyzer_path is given" do
+        context "otherwise" do
           before do
-            apkstats.apkanalyzer_path = "dummy"
+            apkstats.apk_filepath = apk_base
           end
 
-          it { expect(apkstats.send(:apkanalyzer_command)).to be_kind_of(Apkstats::Command::ApkAnalyzer) }
+          it { expect(apkstats.compare_with(apk_other1, do_report: true)).to be_truthy }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-apkstats
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jumpei Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -194,7 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: This is a danger plugin to inspect android application file.