bundler-why-plugin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92de18137a085d1c696e351c029f6b22ccc5a42949c65052082bb43aa2fc753
-  data.tar.gz: ae5ffde7a03f7282c007af427d9d08c64ea80243b17e7d1d53667e07b3347b64
+  metadata.gz: 784f40795674686c348fa654e902d7ac6be67ecbb8b6654a75b85e2cc26f9b62
+  data.tar.gz: b9a7569b7fac61fe2286ba607d5389666c83600d4f2879c37680122edf15b546
 SHA512:
-  metadata.gz: 2287fb636728d1d51a50916c9d16e0756c88e88e0d422b8c9462d3f6c4266675c6fce29a231b9cbd8397f809724967a58657a598478a4a317af9e637713b3a8c
-  data.tar.gz: 1a011fce3cf92df2469c068c00fd125274dfd18326406b900e5206fbd6424d611921d707f70dc6a62119b9a702d95008ac9f2a05f8f62e16681ca09c601c173c
+  metadata.gz: a3861d7d00e459bb6be4d23ed3bb091170b8560f007490c1edd66451262e6857fa5015741f0beb23f4513f26a6128c96d92f7391414a3836bbeb6ea5fba3582b
+  data.tar.gz: 80391cd81cb103720e315dc80ae04cd25abab120653e5467b0b1463f350f6037d8cb37309e801f5c96a9fb1c1c925346bdb9a2e917224acb35c6b28b4a05f587

data/lib/bundler/why/cli.rb

@@ -19,7 +19,7 @@ module Bundler
         first = given_args.first
         known = tasks.keys + %w[help]
         if known.include?(first)
-          super(given_args, config)
+          super
         else
           super(["why"] + given_args, config)
         end
@@ -41,6 +41,9 @@ module Bundler
           exit 1
         end
 
+        # ツリー構造を追加
+        result[:dependents_tree] = resolver.build_dependents_tree(package_name)
+
         display_result(result, resolver)
       end
 
@@ -54,33 +57,20 @@ module Bundler
         Bundler.ui.info("#{result[:name]} (#{result[:version]})")
         Bundler.ui.info("")
 
-        # 依存関係チェーンを表示
-        chains = resolver.find_dependency_chain(result[:name])
-        
-        if chains.any?
-          Bundler.ui.info("Used by:")
-          chains.each do |chain|
-            chain_str = chain.join(" > ")
-            Bundler.ui.info("  #{chain_str}")
-          end
+        # ツリー形式で依存関係を表示
+        dependents_tree = result[:dependents_tree]
+        if dependents_tree.any?
+          Bundler.ui.info("Directly required by:")
+          display_tree(dependents_tree, "  ")
         else
-          # 直接の依存元を表示
-          direct_dependents = result[:direct_dependents]
-          if direct_dependents.any?
-            Bundler.ui.info("Directly required by:")
-            direct_dependents.each do |dependent|
-              Bundler.ui.info("  #{dependent[:name]} (#{dependent[:version]}) [#{dependent[:requirement]}]")
+          Bundler.ui.info("Required by:")
+          all_dependents = result[:all_dependents]
+          if all_dependents.any?
+            all_dependents.each do |dependent|
+              Bundler.ui.info("  #{dependent[:name]} (#{dependent[:version]})")
             end
           else
-            Bundler.ui.info("Required by:")
-            all_dependents = result[:all_dependents]
-            if all_dependents.any?
-              all_dependents.each do |dependent|
-                Bundler.ui.info("  #{dependent[:name]} (#{dependent[:version]})")
-              end
-            else
-              Bundler.ui.warn("Not required by any other packages (may be a direct dependency)")
-            end
+            Bundler.ui.warn("Not required by any other packages (may be a direct dependency)")
           end
         end
 
@@ -89,6 +79,20 @@ module Bundler
           Bundler.ui.info("Location: #{result[:path]}")
         end
       end
+
+      def display_tree(items, prefix = "")
+        items.each_with_index do |item, index|
+          is_last = index == items.length - 1
+          current_prefix = is_last ? "└── " : "├── "
+          next_prefix = is_last ? "    " : "│   "
+
+          Bundler.ui.info("#{prefix}#{current_prefix}#{item[:name]} (#{item[:version]}) [#{item[:requirement]}]")
+
+          if item[:children] && item[:children].any?
+            display_tree(item[:children], prefix + next_prefix)
+          end
+        end
+      end
     end
   end
 end

data/lib/bundler/why/dependency_resolver.rb

@@ -32,7 +32,7 @@ module Bundler
       # 直接的な依存元（親）を取得
       def find_direct_dependents(spec)
         dependents = []
-        
+
         @specs.each do |other_spec|
           other_spec.dependencies.each do |dep|
             if dep.name == spec.name
@@ -44,7 +44,7 @@ module Bundler
             end
           end
         end
-        
+
         dependents
       end
 
@@ -78,26 +78,99 @@ module Bundler
         end
       end
 
-      # 依存関係チェーンを取得
+      # 依存関係チェーンを取得（Gemfileに書かれたgemまで遡る）
       def find_dependency_chain(target_name)
         spec = find_spec(target_name)
-        return nil unless spec
+        return [] unless spec
 
         chains = []
-        
-        # Gemfileの直接の依存関係を確認
-        @definition.dependencies.each do |dep|
-          if is_dependency_of?(target_name, dep.name)
-            chain = trace_chain(dep.name, target_name, [dep.name])
-            chains << chain if chain
+        gemfile_dependencies = @definition.dependencies.map(&:name)
+
+        # 直接の依存元を探す
+        direct_dependents = find_direct_dependents(spec)
+
+        direct_dependents.each do |dependent|
+          # 依存元がGemfileに記載されているかチェック
+          if gemfile_dependencies.include?(dependent[:name])
+            chains << [dependent[:name], target_name]
+          else
+            # 依存元をさらに遡る
+            parent_chains = find_dependency_chain_recursive(dependent[:name], [target_name], gemfile_dependencies)
+            chains.concat(parent_chains)
           end
         end
 
-        chains
+        chains.uniq
+      end
+
+      # Gemfileのdependenciesを取得
+      def gemfile_dependencies
+        @definition.dependencies.map(&:name)
+      end
+
+      # 依存関係ツリーを構築（各ノードの子を取得）
+      def build_dependents_tree(spec_name, visited = Set.new, depth = 0)
+        return [] if visited.include?(spec_name) || depth > 10
+
+        visited.add(spec_name)
+        spec = find_spec(spec_name)
+        return [] unless spec
+
+        direct_dependents = []
+        @specs.each do |other_spec|
+          other_spec.dependencies.each do |dep|
+            if dep.name == spec_name
+              direct_dependents << {
+                name: other_spec.name,
+                version: other_spec.version.to_s,
+                requirement: dep.requirement.to_s,
+                children: build_dependents_tree(other_spec.name, visited.dup, depth + 1)
+              }
+            end
+          end
+        end
+
+        direct_dependents
       end
 
       private
 
+      # 依存関係チェーンを再帰的に遡る
+      def find_dependency_chain_recursive(current_name, path, gemfile_deps)
+        chains = []
+
+        # 循環参照を防ぐため、すでにpathに含まれている場合は処理しない
+        return chains if path.include?(current_name)
+
+        current_spec = find_spec(current_name)
+        return chains unless current_spec
+
+        # 現在のgemの依存元を取得
+        direct_dependents = find_direct_dependents(current_spec)
+
+        if direct_dependents.empty?
+          # 依存元がない場合でも、Gemfileに記載されていれば追加
+          if gemfile_deps.include?(current_name)
+            chains << ([current_name] + path)
+          end
+        else
+          direct_dependents.each do |dependent|
+            new_path = [current_name] + path
+
+            if gemfile_deps.include?(dependent[:name])
+              # Gemfileに記載されているgemに到達したらチェーンを確定
+              chains << ([dependent[:name]] + new_path)
+            else
+              # さらに親を遡る
+              parent_chains = find_dependency_chain_recursive(dependent[:name], new_path, gemfile_deps)
+              chains.concat(parent_chains)
+            end
+          end
+        end
+
+        chains
+      end
+
       # targetが sourceの依存関係にあるかチェック
       def is_dependency_of?(target, source)
         source_spec = find_spec(source)

data/lib/bundler/why/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Why
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-why-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroshi SHIBATA