dep 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e524ea44c406b91aee8bd1dd52818bc1cbd9a4d9
-  data.tar.gz: 95272d72184f135265f22263f1eb773b72431fd8
+  metadata.gz: 76ef3eef686b0b32799b211eb23c2db50914be15
+  data.tar.gz: 16636d764be0bccd03082d56daa57ed7d6cebc74
 SHA512:
-  metadata.gz: 188c63e82626083d79b8e230141cc6a80813009e3b3fe06eab692dd69fc579d73f21677f88098e1d707b53b39c48b4f08eda761b3c23f7932c0dc08fa94bc9ea
-  data.tar.gz: 65e035c49b90bc187f3a4b8cac9b711d94971b90828f56d58d95543faca01843c9fbdc9bcb339aad139764f6bdc2b3ae0b835b38c56f1c1b13396fe3b902d244
+  metadata.gz: 1284025521df66b6024f5d87b205fc43bc9376c2f364ee83b91ed9990098c98a7ece86168a998fa8f263407be0c5a31b74138095ffcc2964cf9ce27d4b249720
+  data.tar.gz: 382c097dd64b1ffe800590c46b46c6030f89f2fd905d808d917bac2c83f82e72494eff287a058ebf56a28ec91bf0d21301532354bc3d03e03a75e07b9e32fb62

data/bin/dep

@@ -2,6 +2,10 @@
 
 require "fileutils"
 
+def die
+  abort("error: dep --help for more info")
+end
+
 module Dep
   class List
     attr :path
@@ -55,17 +59,19 @@ module Dep
       "#{name} -v #{version}"
     end
 
+    def csv
+      "#{name}:#{version}"
+    end
+
     def ==(other)
       to_s == other.to_s
     end
   end
 
-  module CLI
-    class << self
-      attr_accessor :prerelease, :list, :file
-    end
+  class CLI
+    attr_accessor :prerelease, :list, :file
 
-    def self.add(name)
+    def add(name)
       dependency = Gem::Dependency.new(name)
       fetcher = Gem::SpecFetcher.fetcher
 
@@ -87,14 +93,14 @@ module Dep
       puts "dep: added #{lib}"
     end
 
-    def self.rm(name)
+    def rm(name)
       @list.remove(Dep::Lib.new(name))
       @list.save
 
       puts "dep: removed #{name}"
     end
 
-    def self.check
+    def check
       if @list.missing_libraries.empty?
         puts "dep: all cool"
       else
@@ -108,25 +114,19 @@ module Dep
       end
     end
 
-    def self.install
+    def install
       if @list.missing_libraries.empty?
         puts "dep: nothing to install"
         exit
       end
 
-      @list.missing_libraries.each do |lib|
-        run "gem install #{lib}"
-      end
+      run "gem install #{@list.missing_libraries.map(&:csv).join(" ")}"
     end
 
-    def self.run(cmd)
+    def run(cmd)
       puts "  #{cmd}"
       `#{cmd}`
     end
-
-    def self.abort
-      abort("error: dep --help for more info")
-    end
   end
 end
 
@@ -140,7 +140,7 @@ private
       when 1 then block.call(ARGV.delete_at(index))
       when 0 then block.call
       else
-        Dep::CLI.abort
+        die
       end
     end
   end
@@ -151,15 +151,17 @@ end
 # script, we have to instead rely on a different condition.
 if File.basename($0) == "dep"
 
-  Dep::CLI.file = File.join(Dir.pwd, ".gems")
-  Dep::CLI.prerelease = false
+  cli = Dep::CLI.new
+
+  cli.file = File.join(Dir.pwd, ".gems")
+  cli.prerelease = false
 
   on("-f") do |file|
-    Dep::CLI.file = file
+    cli.file = file
   end
 
   on("--pre") do
-    Dep::CLI.prerelease = true
+    cli.prerelease = true
   end
 
   on("--help") do
@@ -171,21 +173,21 @@ if File.basename($0) == "dep"
     exit
   end
 
-  Dep::CLI.list = Dep::List.new(Dep::CLI.file)
+  cli.list = Dep::List.new(cli.file)
 
-  FileUtils.touch(Dep::CLI.list.path) unless File.exist?(Dep::CLI.list.path)
+  FileUtils.touch(cli.list.path) unless File.exist?(cli.list.path)
 
   case ARGV[0]
   when "add"
-    Dep::CLI.add(ARGV[1])
+    cli.add(ARGV[1])
   when "rm"
-    Dep::CLI.rm(ARGV[1])
+    cli.rm(ARGV[1])
   when "install", "i"
-    Dep::CLI.install
+    cli.install
   when nil
-    Dep::CLI.check
+    cli.check
   else
-    Dep::CLI.abort
+    die
   end
 
 end

data/test/dep.rb

@@ -1,7 +1,12 @@
 require "cutest"
+require "override"
 
 load File.expand_path("../../bin/dep", __FILE__)
 
+class Cutest::Scope
+  include Override
+end
+
 # Dep::Lib
 scope do
   test "parsing" do
@@ -51,3 +56,28 @@ scope do
     assert list.libraries.include?(Dep::Lib.new("cutest", "2.0"))
   end
 end
+
+# Dep::CLI
+scope do
+  setup do
+    list = Dep::List.new("/dev/null")
+
+    list.add(Dep::Lib.new("foo", "2.0"))
+    list.add(Dep::Lib.new("bar", "1.1"))
+
+    commands = []
+
+    cli = Dep::CLI.new
+    cli.list = list
+
+    override(cli, run: -> args { commands << args })
+
+    [cli, commands]
+  end
+
+  test "install" do |cli, commands|
+    cli.install
+
+    assert_equal ["gem install foo:2.0 bar:1.1"], commands
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dep
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Cyril David