Merge branch 'chris.thuyen/test/pod_cache_validator_2' into 'master'

chore(*): add test for PodCacheValidator + lint fixes

See merge request mobile/dax-ios/cocoapods-binary-cache!16

Author: christhuyenatgrab

.rubocop.yml

@@ -3,5 +3,6 @@ inherit_from:
 
 AllCops:
   Exclude:
+    - 'PodBinaryCacheExample/**/*'
     - 'lib/cocoapods-binary-cache/pod-binary/**/*'
     - 'lib/cocoapods-binary-cache/pod-rome/**/*'

lib/cocoapods-binary-cache/prebuild_config.rb

@@ -2,7 +2,7 @@
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 
 class PrebuildConfig
-  @CONFIGURATION = "Debug"
+  @CONFIGURATION = 'Debug'
 
   class << self
     attr_accessor :CONFIGURATION

lib/cocoapods-binary-cache/prebuild_output.rb

@@ -4,21 +4,21 @@
 require_relative 'helper/path_utils'
 
 class PrebuildOutput
-  def initialize(prebuildSandbox)
-    @sandbox = prebuildSandbox
+  def initialize(prebuild_sandbox)
+    @sandbox = prebuild_sandbox
   end
 
   def delta_dir
-    return "#{@sandbox.root}/../_Prebuild_delta"
+    "#{@sandbox.root}/../_Prebuild_delta"
   end
 
   def delta_file_path
-    return "#{delta_dir}/changes.txt"
+    "#{delta_dir}/changes.txt"
   end
 
   def clean_delta_file
     puts "clean_delta_file: #{delta_file_path}"
-    FileUtils.remove_entry(delta_file_path, force=true)
+    FileUtils.remove_entry(delta_file_path, force = true)
   end
 
   def create_dir_if_needed(dir)
@@ -36,7 +36,7 @@ def write_delta_file(updated, deleted)
       end
       puts "Pod prebuild changes were writen to file: #{file_path}"
     else
-      puts "No changes in prebuild"
+      puts 'No changes in prebuild'
     end
   end
 
@@ -47,22 +47,20 @@ def process_prebuilt_dev_pods
 
     # Inject project path (where the framework is built) to support generating code coverage later
     project_root = PathUtils.remove_last_path_component(@sandbox.standard_sanbox_path.to_s)
-    template_file_path = devpod_output_path + "prebuilt_map"
+    template_file_path = devpod_output_path + 'prebuilt_map'
     File.open(template_file_path, 'w') do |file|
       file.write(project_root)
     end
 
     Pod::Prebuild::CacheInfo.cache_miss_dev_pods_dic.each do |name, hash|
       puts "Output dev pod lib: #{name} hash: #{hash}"
       built_lib_path = @sandbox.framework_folder_path_for_target_name(name)
-      if File.directory?(built_lib_path)
-        FileUtils.cp(template_file_path, "#{built_lib_path}/#{name}.framework")
+      next unless File.directory?(built_lib_path)
 
-        target_dir = "#{devpod_output_path}#{name}_#{hash}"
-        puts "From: #{built_lib_path} -> #{target_dir}"
-        FileUtils.cp_r(built_lib_path, target_dir)
-      end
+      FileUtils.cp(template_file_path, "#{built_lib_path}/#{name}.framework")
+      target_dir = "#{devpod_output_path}#{name}_#{hash}"
+      puts "From: #{built_lib_path} -> #{target_dir}"
+      FileUtils.cp_r(built_lib_path, target_dir)
     end
-    
   end
-end
+end

lib/cocoapods-binary-cache/scheme_editor.rb

@@ -4,9 +4,7 @@
 require 'rexml/document'
 
 class SchemeEditor
-
   def self.edit_to_support_code_coverage(sandbox)
-    
     pod_proj_path = sandbox.project_path
     puts "Modify schemes of pod project to support code coverage of prebuilt local pod: #{pod_proj_path}"
     scheme_files = Dir["#{pod_proj_path}/**/*.xcscheme"]
@@ -24,12 +22,14 @@ def self.edit_to_support_code_coverage(sandbox)
       test_action.add_attribute('codeCoverageEnabled', 'YES')
       test_action.add_attribute('onlyGenerateCoverageForSpecifiedTargets', 'YES')
       coverage_targets = REXML::Element.new('CodeCoverageTargets')
-      buildable_ref = scheme.elements['BuildAction'].elements['BuildActionEntries'].elements['BuildActionEntry'].elements['BuildableReference']
+      buildable_ref = scheme.elements['BuildAction'] \
+                            .elements['BuildActionEntries'] \
+                            .elements['BuildActionEntry'] \
+                            .elements['BuildableReference']
       new_buildable_ref = buildable_ref.clone # Need to clone, otherwise the original one will be move to new place
       coverage_targets.add_element(new_buildable_ref)
       test_action.add_element(coverage_targets)
       File.open(file_path, 'w') { |f| doc.write(f) }
     end
   end
-
-end
+end

lib/cocoapods_plugin.rb

@@ -2,4 +2,4 @@
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 
 require 'cocoapods-binary-cache/main'
-require 'command/binary_cache'
+require 'command/binary_cache'

lib/command/binary_cache.rb

@@ -8,7 +8,7 @@ class Command
     class BinaryCache < Command
       include Command::ProjectDirectory
 
-      self.summary = "Pod Binary Cache commands"
+      self.summary = 'Pod Binary Cache commands'
 
       self.description = <<-DESC
         Fetch/Prebuild pod frameworks
@@ -24,7 +24,7 @@ def initialize(argv)
         @podspec_name = argv.shift_argument
         @cmd = argv.option('cmd', nil)
         @push_vendor_pods = argv.option('push_vendor_pods', nil)
-        puts "BinaryCache run: #{@cmd}"
+        Pod::UI.puts "BinaryCache run: #{@cmd}"
         super
       end
 
@@ -34,20 +34,19 @@ def run
           dep_graph = DependenciesGraph.new(config.lockfile)
           fmt = 'png'
           name = 'graph'
-          dep_graph.write_graphic_file(fmt, filename=name, highlight_nodes=Set[])
+          dep_graph.write_graphic_file(fmt, filename = name, highlight_nodes = Set[])
           system("open #{name}.#{fmt}")
           return
         end
 
         config_file_path = "#{config.installation_root}/PodBinaryCacheConfig.json"
-        if not File.exists?(config_file_path)
-          raise "#{config_file_path} not exist"
-        end
+        raise "#{config_file_path} not exist" unless File.exist?(config_file_path)
+
         py_cmd = []
-        py_cmd << "python3" << "#{__dir__}/PythonScripts/prebuild_lib_cli.py"
+        py_cmd << 'python3' << "#{__dir__}/PythonScripts/prebuild_lib_cli.py"
         py_cmd << "--cmd #{@cmd}" << "--config_path #{config_file_path}"
         py_cmd << "--push_vendor_pods #{@push_vendor_pods}" unless @push_vendor_pods.nil?
-        system py_cmd.join(" ")
+        system py_cmd.join(' ')
       end
     end
   end

spec/pod_cache_validator_spec.rb

@@ -24,12 +24,20 @@
 
     context 'some cache miss due to not present' do
       let(:pod_lockfile) { gen_lockfile(pods: pods.merge('D' => '0.0.5')) }
-      it 'returns some missed, some hit', :skip do
+      it 'returns some missed, some hit' do
         skip 'code does not pass this test' # TODO (thuyen): Fix code
 
         expect(@missed).to eq(['D'].to_set)
         expect(@hit).to eq(pods.keys.to_set)
       end
     end
+
+    context 'no cache due to no pod_bin_lockfile' do
+      let(:pod_bin_lockfile) { nil }
+      it 'returns all missed' do
+        expect(@missed).to eq(pods.keys.to_set)
+        expect(@hit).to be_empty
+      end
+    end
   end
 end