bundle-diff 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed4c76ee646c06c88b5bde31765fa22f76addd88db752b1dd7decfed3488658
-  data.tar.gz: 2137ebd6d32389f7359bf9866b1b5e172443d8d351c91fa91f1ed40b11de7e7d
+  metadata.gz: 16627d483f7b0f3db714bd4d6f208c696d6e9cb36570a3e85d5b117af804ab5a
+  data.tar.gz: 0a7fe5601932249c75c5fe01b40bdcf1520fed756e5f88714cc0ed3a64fd429b
 SHA512:
-  metadata.gz: adb81ab85d860f01b9d0b6d930343d0c619142d32c93e1b89ade252d49c05a4a223ef5d5f46aa840c13b499f7dc5afd958164b675337d736408e01a9d8cdb4d3
-  data.tar.gz: 589a6ebdd77a1922a2d130143c5f45bb275528c75189c55d621418e645556a9abf6870bf3552d5c7daa725937786cff3965e589c7104e0128b4a141b27c2e55e
+  metadata.gz: 76744117e51c10b3b6dcd17f6d6e82a167cca4633e30753a2d27883a955b4b0388b66f353a65027333411104eea9e3cd56e1d6e6bde24c5d83d75431e1500415
+  data.tar.gz: 5c4c47d148e2eaaed21a6986d3662e5087ff5851bf51cc6dcc0dca4736577ffff94d139c3749137dec08a4556554d330d1898531569a7b1976d0723c685cfd50

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 1.2.0
+
+* Optimized #run for when the version of the gem to diff against is installed locally
+
+
 # 1.1.0
 
 * Added version option

data/bundle-diff.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'bundle-diff'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.license = 'GPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']

data/lib/bundler/diff/cli.rb

@@ -17,21 +17,34 @@ module Bundler::Diff::CLI
 
     error('gem name required') unless gem_name
 
-    installed_spec = installed_specs[gem_name]
+    bundled_spec = bundled_specs[gem_name]
 
-    error('gem spec not found') unless installed_spec
+    error('gem spec not found') unless bundled_spec
+
+    gem_dependency = Gem::Dependency.new(gem_name, options[:version])
+
+    specs_and_sources, errors = Gem::SpecFetcher.fetcher.spec_for_dependency(gem_dependency)
+
+    gem_spec, source = specs_and_sources.max_by { |s,| s.version }
+
+    error('gem spec not found') if gem_spec.nil?
+
+    installed_spec = Gem::Specification.find { |s| s.name == gem_spec.name && s.version == gem_spec.version }
+
+    if installed_spec
+      Bundler::Diff::Tool.diff(bundled_spec, installed_spec)
+
+      return
+    end
 
     Dir.mktmpdir do |tmp_dir|
-      gem_spec = fetch(gem_name, tmp_dir)
+      Dir.chdir(tmp_dir) { source.download(gem_spec) }
 
       unpack(gem_spec, tmp_dir)
 
-      tool = Bundler::Diff::Tool.new
-      tool.a_dir = Pathname(installed_spec.gem_dir)
-      tool.a_output_dir = Pathname(installed_spec.full_name)
-      tool.b_dir = Pathname(tmp_dir).join(gem_spec.full_name)
-      tool.b_output_dir = Pathname(gem_spec.full_name)
-      tool.diff_entries
+      def gem_spec.gem_dir; Pathname(tmp_dir).join(gem_spec.full_name); end
+
+      Bundler::Diff::Tool.diff(bundled_spec, gem_spec)
     end
   end
 
@@ -59,8 +72,8 @@ module Bundler::Diff::CLI
     end
   end
 
-  def installed_specs
-    @installed_specs ||= Bundler.load.specs.each_with_object({}) do |spec, hash|
+  def bundled_specs
+    @bundled_specs ||= Bundler.load.specs.each_with_object({}) do |spec, hash|
       next if ignore?(spec)
 
       hash[spec.name] = spec
@@ -76,20 +89,6 @@ module Bundler::Diff::CLI
     end
   end
 
-  def fetch(name, target_dir)
-    dependency = Gem::Dependency.new(name, options[:version])
-
-    specs_and_sources, errors = Gem::SpecFetcher.fetcher.spec_for_dependency(dependency)
-
-    spec, source = specs_and_sources.max_by { |s,| s.version }
-
-    error('gem spec not found') if spec.nil?
-
-    Dir.chdir(target_dir) { source.download(spec) }
-
-    spec
-  end
-
   def unpack(spec, tmp_dir)
     gem_file = File.join(tmp_dir, spec.full_name + '.gem')
 

data/lib/bundler/diff/tool.rb

@@ -9,6 +9,15 @@ class Bundler::Diff::Tool
   attr_accessor :b_dir
   attr_accessor :b_output_dir
 
+  def self.diff(a_spec, b_spec)
+    tool = new
+    tool.a_dir = Pathname(a_spec.gem_dir)
+    tool.a_output_dir = Pathname(a_spec.full_name)
+    tool.b_dir = Pathname(b_spec.gem_dir)
+    tool.b_output_dir = Pathname(b_spec.full_name)
+    tool.diff_entries
+  end
+
   def diff_entries
     a_files = file_list(a_dir)
     b_files = file_list(b_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundle-diff
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler