lapidarius 4.4.4 → 4.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371cfce240008bc7e4489d05628a6bfbaefd1cf7a12d3552eba1c9f49e3f9a99
-  data.tar.gz: 8f96713c52a33ef09bb1d5760574ec509ecea4d53c3addcf204c992b23edbae1
+  metadata.gz: 743d5d7b47e23ae05b54f761366dc7f7c6c8c03e082585f26be4e7a4fe965360
+  data.tar.gz: fb1e6fbf6e9e11e4ac6c3b96f6db20e73a95c477bb8662d736bea9d2ecf6b274
 SHA512:
-  metadata.gz: 10bdff2a62137f652bb9f39e52e9e68421fb745ba4dd84f096662b9ce727a646b05f44fe8cb91fa706caba2da17c686e144d407e60ee5db26f708a9434fdd81a
-  data.tar.gz: aa933fc490f31242e199743fd23c7b18d67e0c428d78e67d874d20a148755299b3ac99aeaad97d7dfd234f8c38a86a1910b177c32e372d26f63b519fdb889c8d
+  metadata.gz: '0909cbef4a840dbb432d603c00563a2da51968df8d27f3e865f1d86e6471dbbedbdc1306dbc1c35f735426a75652980506b378fa8447a38aa839262ca5c0426a'
+  data.tar.gz: 3e5898e9aa146c21063eb0dd30314c3c820f2875e3ef36e2a7610ed7248ce3474deeca415e2f275f759b757383ceb4b711186c59b9f233668f668e33373ffdbb

data/README.md

@@ -31,7 +31,7 @@ gem install lapidarius
 ```
 
 ## Usage
-This library invokes the `Gem::Commands::DependencyCommand` class recursively to collect all the levels of dependency.  
+This library invokes the [Gem::Commands::DependencyCommand](https://github.com/rubygems/rubygems/blob/master/lib/rubygems/commands/dependency_command.rb) class recursively to collect all the levels of dependency.  
 Both runtime and development dependencies are counted (identical dependencies are counted once), but just the former are printed on screen:
 
 ```shell
@@ -43,11 +43,11 @@ sinatra (2.0.0)
 │   └── rack (>= 0)
 └── tilt (~> 2.0)
 
-4 runtime, 4 development
+4 runtime, 5 development
 ```
 
 ### Version
-By default this library scans for the first version `>= 0` found at [rubygems.org](https://rubygems.org/).  
+By default this library scans for the latest available version `>= 0` found at [rubygems.org](https://rubygems.org/).  
 In case you are interested on a specific version just specify the `-v` option:
 ```shell
 lapidarius sinatra -v 1.4.7
@@ -63,35 +63,36 @@ sinatra (1.4.7)
 ### Remote
 By default this library scan for local gems, warning if the gem is not found:
 ```shell
-lapidarius rails -v 2.3.6
-No gems found matching rails (= 2.3.6)
+lapidarius rails -v 1.2.6
+No gems found matching rails (= 1.2.6)
 ```
 
 If you want to scan for remote gems specify the `-r` option (be aware of slowness):
 ```shell
-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)
+lapidarius rails -v 1.2.6 -r
+rails (1.2.6)
+├── actionmailer (= 1.3.6)
+│   └── actionpack (= 1.13.6)
+│       └── activesupport (= 1.4.4)
+├── actionpack (= 1.13.6)
+│   └── activesupport (= 1.4.4)
+├── actionwebservice (= 1.2.6)
+│   ├── actionpack (= 1.13.6)
+│   │   └── activesupport (= 1.4.4)
+│   └── activerecord (= 1.15.6)
+│       └── activesupport (= 1.4.4)
+├── activerecord (= 1.15.6)
+│   └── activesupport (= 1.4.4)
+├── activesupport (= 1.4.4)
+└── rake (>= 0.7.2)
 
-7 runtime, 6 development
+6 runtime, 5 development
 ```
 
 ### Quiet
 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
-42 runtime, 48 development
+lapidarius rails -v 5.1.5 -r -q
+37 runtime, 48 development
 ```

data/lib/lapidarius/cli.rb

@@ -7,34 +7,29 @@ module Lapidarius
 
     attr_reader :name, :version, :remote
 
-    def initialize(args: [], io: STDOUT, command: Command, cutter: Cutter, 
-                   tree: Tree, spinner: Spinner.new)
+    def initialize(args: [], io: STDOUT, command: Command, cutter: Cutter, tree: Tree)
       @args = args
       @io = io
       @command = command
       @cutter = cutter
       @tree = tree
-      @spinner = spinner
       @name = @args.shift unless help?
       parser.parse!(@args)
     end
 
     def call
-      @spinner.call do
-        @output = cut
-      end
-      @io.puts @output
+      @io.puts out
     end
 
     private def cutter
       @cutter.new(name: @name, cmd_klass: @command, version: @version, remote: @remote)
     end
 
-    private def cut
+    private def out
       return unless @name
       gem = cutter.call
       @tree::new(gem, @quiet).out
-    rescue Gem::NotInstalledError => e
+    rescue Gem::NotInstalledError, Gem::KindError => e
       e.message
     end
 
@@ -65,31 +60,4 @@ module Lapidarius
       HELP_FLAGS.any? { |h| @args.first == h }
     end
   end
-
-  class Spinner
-    CHARS = %w[| / - \\]
-
-    def initialize(io = STDOUT, fps = 15, delay = 1.0)
-      @io = io
-      @fps = fps.to_i
-      @delay = delay.to_f / @fps
-      @iter = 0
-    end
-
-    def call
-      spinner = Thread.new do
-        while @iter do
-          @io.print CHARS[(@iter+=1) % CHARS.length]
-          sleep @delay
-          @io.print "\b"
-          @io.flush
-        end
-      end
-    ensure
-      yield.tap do
-        @iter = false
-        spinner.join
-      end
-    end
-  end
 end

data/lib/lapidarius/cutter.rb

@@ -24,32 +24,36 @@ module Lapidarius
 
     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 << @cache.fetch(t) do
-          recurse(name: dep.name, gem: dep, version: dep.version)
-          @cache[t] = dep
-        end
+      parent = tokens.shift
+      gem ||= Gem.factory(parent)
+      tokens.reduce(gem) do |acc, token|
+        acc << dependency(token); acc
       end
-      gem
     end
 
     def dev_count
       @dev_deps.map { |e| e.split(" ").first }.uniq.count
     end
 
+    private def dependency(token)
+      @cache.fetch(token) do
+        Gem.factory(token).tap do |dep|
+          recurse(name: dep.name, gem: dep, version: dep.version)
+          @cache[token] = dep
+        end
+      end
+    end
+
     private def tokenize(name, version, remote)
       src = @cmd.call(name, version, remote)
-      data = normalize(src)
+      data = latest_match(src)
       dev, tokens = data.partition { |token| token.match(/#{DEVELOPMENT}/) }
       @dev_deps.concat(dev)
       tokens
     end
 
-    private def normalize(src)
-      src.split(/\n\n/).map!(&:strip).first.split("\n").map(&:strip)
+    private def latest_match(src)
+      src.split(/\n\n/).map!(&:strip).last.split("\n").map(&:strip)
     end
   end
 end

data/lib/lapidarius/gem.rb

@@ -3,7 +3,8 @@ require "lapidarius/tree"
 
 module Lapidarius
   class Gem
-    VER_STRIP_CHARS = %w[> < = ~ !]
+    INVALID_VER_CHARS = %w[> < = ~ !]
+    DEFAULT_VER = ">= 0"
 
     extend Forwardable
 
@@ -22,9 +23,10 @@ module Lapidarius
       token.match(/([a-zA-Z0-9\-_]+) \((.+)\)/) do |m|
         return new(name: m[1], version: m[2])
       end
+      fail KindError, "no gem can be created from #{token}"
     end
 
-    attr_reader :name, :deps
+    attr_reader :name, :deps, :version
     attr_accessor :dev_count
 
     def initialize(name:, version:, deps: [])
@@ -51,17 +53,8 @@ module Lapidarius
       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
-      end.tap do |deps|
-        deps.flatten!
-        deps.uniq!(&:name)
-      end
+      deps.reduce(deps) { |acc, dep| acc.concat dep.flatten_deps }.flatten.uniq(&:name)
     end
 
     private def gem?(gem)

data/lib/lapidarius/version.rb

@@ -1,3 +1,3 @@
 module Lapidarius
-  VERSION = "4.4.4"
+  VERSION = "4.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lapidarius
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.5.5
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler