dep 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c048afaa8e1434021fa0d47b0620610d19277582
-  data.tar.gz: 3b01932b6467a81334fc2a024eb9783ed555d362
+  metadata.gz: e524ea44c406b91aee8bd1dd52818bc1cbd9a4d9
+  data.tar.gz: 95272d72184f135265f22263f1eb773b72431fd8
 SHA512:
-  metadata.gz: b29865a7f0e6591c579d13a99ce1307795f72032e8196e4971472c983cdb4412d73c871fca26af560624927afa633b4a2a9bf1aea0fff579d5c10a6266aef03e
-  data.tar.gz: 03b29aa4ef6f61ce4ddf5dc191bfede0d51ca33671139e1a4cd95893946a7c939af6ec9aa7a2392391ea530c31c1fbc4c8d82903bd56a592bc93b7221e8f1b99
+  metadata.gz: 188c63e82626083d79b8e230141cc6a80813009e3b3fe06eab692dd69fc579d73f21677f88098e1d707b53b39c48b4f08eda761b3c23f7932c0dc08fa94bc9ea
+  data.tar.gz: 65e035c49b90bc187f3a4b8cac9b711d94971b90828f56d58d95543faca01843c9fbdc9bcb339aad139764f6bdc2b3ae0b835b38c56f1c1b13396fe3b902d244

data/bin/dep

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

data/test/dep.rb

@@ -1,12 +1,7 @@
 require "cutest"
-require "override"
 
 load File.expand_path("../../bin/dep", __FILE__)
 
-class Cutest::Scope
-  include Override
-end
-
 # Dep::Lib
 scope do
   test "parsing" do
@@ -28,7 +23,7 @@ scope do
 
   test "to_s" do
     lib = Dep::Lib.new("cutest", "1.1.3")
-    assert_equal "cutest:1.1.3", lib.to_s
+    assert_equal "cutest -v 1.1.3", lib.to_s
   end
 end
 
@@ -56,28 +51,3 @@ 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.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Cyril David