lapidarius 4.3.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2488e55a89cec70b1f5e64767a9dad5a916ccdcebdb05fc80e93b21a415ded7d
-  data.tar.gz: 56097db72f946f360837592aeab076c69e2a69f7e3c7de125d421552712385ee
+  metadata.gz: 76cd8f0dce486128e152542e0802d96d25b2694f7ea6dcc269aef71b9d901a83
+  data.tar.gz: 953a22c2c81aa421503f0369d6c9f24ac0d5d82698f486b7d0ea189f9349b692
 SHA512:
-  metadata.gz: 32a038d2f5da55f6497116641c905ba55b95573a9f10298436235669ff3834f1cd6b071c71ea0e698e63430a8c001b9b1ed2186222d7a15615f46a17367cf981
-  data.tar.gz: 0d136c0938988ea1b800ec7e476b0291e8b83cadcfc4f40539167404d2018f6395795bc4d4eb4a798b434e5484dd3b7e13dc418bedbea675c82845d939c1c95d
+  metadata.gz: 420ae3a989f76ff12d6725a9763d686799faccb42a05ccd085de80ddc80766ad28fff86112d1f342873d84f3e5bad4f3aa91ddd0bbd0fa0b77f41368567eb7a1
+  data.tar.gz: 901d8cc8e5942bce1cd387d1f21baeb51f7e4be97ad049e92fed04a33e2b8f6b1dfdc97a0c3e36b6708d7bf068f2df6fdd7fc55de91520727ba138da83797c82

data/README.md

@@ -63,23 +63,35 @@ sinatra (1.4.7)
 ### Remote
 By default this library scan for local gems, warning if the gem is not found:
 ```shell
-lapidarius roda -v 3.3.0
-No gems found matching roda (= 3.0.0)
+lapidarius rails -v 2.3.6
+No gems found matching rails (= 2.3.6)
 ```
 
 If you want to scan for remote gems specify the `-r` option (be aware of slowness):
 ```shell
-lapidarius roda -v 3.3.0 -r
-roda (3.3.0)
-└── rack (>= 0)
+lapidarius rails -v 2.3.6 -r
+rails (2.3.6)
+├── actionmailer (= 2.3.6)
+│   └── actionpack (= 2.3.6)
+│       ├── activesupport (= 2.3.6)
+│       └── rack (~> 1.1.0)
+├── actionpack (= 2.3.6)
+│   ├── activesupport (= 2.3.6)
+│   └── rack (~> 1.1.0)
+├── activerecord (= 2.3.6)
+│   └── activesupport (= 2.3.6)
+├── activeresource (= 2.3.6)
+│   └── activesupport (= 2.3.6)
+├── activesupport (= 2.3.6)
+└── rake (>= 0.8.3)
 
-1 runtime, 10 development
+7 runtime, 6 development
 ```
 
 ### Quiet
-Some gems has several interdependencies that results in a multitude of tree branches.  
+Some gems have several interdependencies that results in a multitude of tree branches.  
 In case you just dare to count dependencies without the visual noise, you can pass the `-q` option:
 ```shell
 lapidarius rails -v 5.1.4 -r -q
-37 runtime, 49 development
+42 runtime, 48 development
 ```

data/lib/lapidarius/cutter.rb

@@ -14,6 +14,7 @@ module Lapidarius
       @version = version
       @remote = remote
       @dev_deps = []
+      @cache = {}
     end
 
     def call
@@ -22,14 +23,16 @@ module Lapidarius
       end
     end
 
-    private def recurse(name: @name, gem: nil, version: @version, remote: @remote)
-      tokens = tokenize(name, version, remote)
+    private def recurse(name: @name, gem: nil, version: @version)
+      tokens = tokenize(name, version, @remote)
       token = tokens.shift
       gem ||= Gem.factory(token)
       tokens.each do |t|
         next unless dep = Gem.factory(t)
-        gem << dep
-        recurse(name: dep.name, gem: dep, version: nil, remote: remote)
+        gem << @cache.fetch(t) do
+          recurse(name: dep.name, gem: dep, version: dep.version)
+          @cache[t] = dep
+        end
       end
       gem
     end

data/lib/lapidarius/gem.rb

@@ -3,6 +3,8 @@ require "lapidarius/tree"
 
 module Lapidarius
   class Gem
+    VER_STRIP_CHARS = %w[> < = ~]
+
     extend Forwardable
 
     def_delegators :@deps, :size, :each_with_index
@@ -22,7 +24,7 @@ module Lapidarius
       end
     end
 
-    attr_reader :name, :version, :deps
+    attr_reader :name, :deps
     attr_accessor :dev_count
 
     def initialize(name:, version:, deps: [])
@@ -42,13 +44,17 @@ module Lapidarius
     end
 
     def to_s
-      "#{name} (#{version})"
+      "#{name} (#{@version})"
     end
 
     def count
       flatten_deps.size
     end
 
+    def version
+      @version.gsub(/#{VER_STRIP_CHARS.join("|")}/, "").split(",").map(&:strip).min
+    end
+
     protected def flatten_deps
       deps.reduce(deps) do |acc, dep|
         acc.concat dep.flatten_deps

data/lib/lapidarius/version.rb

@@ -1,3 +1,3 @@
 module Lapidarius
-  VERSION = "4.3.0"
+  VERSION = "4.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapidarius
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.2
 platform: ruby
 authors:
 - costajob