check_dependencies 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d283805b19f7e30c9f5657d943d3722c8409ead45fd07d20f48b05c47896f3
-  data.tar.gz: 885f110feaba05424b3d8b7ea66e247b8bfd4e9d58dfe10438813780a496a157
+  metadata.gz: 1fb8b26b9005629605058ec5c8bab1abafd474107992ebd5cfdca9e5e1f3a624
+  data.tar.gz: 6ed9df32bf09af0007ca87663e8caa8b6698079873d8a9cc925ca9b62fa60543
 SHA512:
-  metadata.gz: 29c222014394b966205155a88364f04007011700878abab9c88fab9a5a5b5408bde9e30affebeece3a746904aeaea72d823fb31337c07f181fc84897a8562427
-  data.tar.gz: 671db52a03bc1b40e37e6a905d1627982d18a25eac0ba0918ac5eb12ecad2f77b48d2c3dafad00d14878697c0a570b04587d1f6e6da76f13a9c3ee61976727c3
+  metadata.gz: e64aa448f87110dd4d5508a60d3dc9273c23fd5b2caa86abc43f4c2d93156169588f7b8aab8d28380f599fde7c1cfed6ce17311c061b5dad6074af2b6b72c1ce
+  data.tar.gz: 1050e3d07adde27b8b7018210ed14ac8d294b00f45b4349f4eba4634f0e9af1af4a4eac084dfb355c46b413180433e7aab7570a7e71642a19043153f33c686f4

data/bin/check_dependencies

@@ -18,7 +18,7 @@ end
 # Define and parse options based on the command
 options = {}
 global_options = OptionParser.new do |opts|
-  opts.banner = "Usage: script.rb [command] [options]"
+  opts.banner = "Usage: check_dependencies [command] [options]"
   opts.separator ""
   opts.separator "Commands:"
   opts.separator "  gen_pod: Generate podfile entries for new dependencies"
@@ -244,7 +244,13 @@ def red(text); colorize(text, 31); end
 def green(text); colorize(text, 32); end
 
 def read_json_array_from_file_as_set(file_path)
-  # 确保文件存在
+  # 检查 file_path 是否为 nil 或不是字符串
+  unless file_path.is_a?(String)
+    # 可以在这里抛出异常或返回一个空的 Set
+    raise ArgumentError, "file_path must be a String" unless file_path.is_a?(String)
+    return Set.new
+  end
+
   if File.exist?(file_path)
     # 读取文件内容
     file_content = File.read(file_path)
@@ -253,26 +259,28 @@ def read_json_array_from_file_as_set(file_path)
     # 将数组转换为 Set 并返回
     return json_array.to_set
   else
-    puts "File not found: #{file_path}"
-    exit
+    # 文件不存在时，也可以选择抛出异常或返回一个空的 Set
+    puts "File not found: #{file_path}" # 或者使用 raise "File not found: #{file_path}"
+    return Set.new
   end
-rescue JSON::ParserError => e
-  puts "Error parsing JSON from #{file_path}: #{e.message}"
-  exit
 end
 
 def compare_podfile_locks(old_lock_path, new_lock_path, config_path = nil)
-  config_set = read_json_array_from_file_as_set(config_path)
   
   old_pods = read_local_podfile_lock(old_lock_path)
   new_pods = read_local_podfile_lock(new_lock_path)
 
   old_unique_deps = find_shortest_paths(extract_unique_dependencies(old_pods)).to_set
   new_unique_deps = find_shortest_paths(extract_unique_dependencies(new_pods)).to_set
-  if !config_set.empty?
-      old_unique_deps = old_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
-      new_unique_deps = new_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+  
+  unless config_path.nil?
+     config_set = read_json_array_from_file_as_set(config_path)
+     if !config_set.empty?
+         old_unique_deps = old_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+         new_unique_deps = new_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+     end
   end
+  
   only_in_old = old_unique_deps - new_unique_deps
   only_in_new = new_unique_deps - old_unique_deps
   

data/check_dependencies.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "check_dependencies"
-  spec.version       = "0.1.6"
+  spec.version       = "0.1.8"
   spec.authors       = ["ITxiansheng"]
   spec.email         = ["itxiansheng@gmail.com"]
 

data/lib/check_dependencies.rb

@@ -18,7 +18,7 @@ end
 # Define and parse options based on the command
 options = {}
 global_options = OptionParser.new do |opts|
-  opts.banner = "Usage: script.rb [command] [options]"
+  opts.banner = "Usage: check_dependencies [command] [options]"
   opts.separator ""
   opts.separator "Commands:"
   opts.separator "  gen_pod: Generate podfile entries for new dependencies"
@@ -244,7 +244,13 @@ def red(text); colorize(text, 31); end
 def green(text); colorize(text, 32); end
 
 def read_json_array_from_file_as_set(file_path)
-  # 确保文件存在
+  # 检查 file_path 是否为 nil 或不是字符串
+  unless file_path.is_a?(String)
+    # 可以在这里抛出异常或返回一个空的 Set
+    raise ArgumentError, "file_path must be a String" unless file_path.is_a?(String)
+    return Set.new
+  end
+
   if File.exist?(file_path)
     # 读取文件内容
     file_content = File.read(file_path)
@@ -253,26 +259,28 @@ def read_json_array_from_file_as_set(file_path)
     # 将数组转换为 Set 并返回
     return json_array.to_set
   else
-    puts "File not found: #{file_path}"
-    exit
+    # 文件不存在时，也可以选择抛出异常或返回一个空的 Set
+    puts "File not found: #{file_path}" # 或者使用 raise "File not found: #{file_path}"
+    return Set.new
   end
-rescue JSON::ParserError => e
-  puts "Error parsing JSON from #{file_path}: #{e.message}"
-  exit
 end
 
 def compare_podfile_locks(old_lock_path, new_lock_path, config_path = nil)
-  config_set = read_json_array_from_file_as_set(config_path)
   
   old_pods = read_local_podfile_lock(old_lock_path)
   new_pods = read_local_podfile_lock(new_lock_path)
 
   old_unique_deps = find_shortest_paths(extract_unique_dependencies(old_pods)).to_set
   new_unique_deps = find_shortest_paths(extract_unique_dependencies(new_pods)).to_set
-  if !config_set.empty?
-      old_unique_deps = old_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
-      new_unique_deps = new_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+  
+  unless config_path.nil?
+     config_set = read_json_array_from_file_as_set(config_path)
+     if !config_set.empty?
+         old_unique_deps = old_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+         new_unique_deps = new_unique_deps.select { |dep| config_set.include?(dep.split('/').first) }
+     end
   end
+  
   only_in_old = old_unique_deps - new_unique_deps
   only_in_new = new_unique_deps - old_unique_deps
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check_dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - ITxiansheng
@@ -57,8 +57,7 @@ files:
 - bin/check_dependencies
 - bin/console
 - bin/setup
-- check_dependencies-0.1.3.gem
-- check_dependencies-0.1.4.gem
+- check_dependencies-0.1.7.gem
 - check_dependencies.gemspec
 - gem_env_install.sh
 - lib/check_dependencies.rb