dep 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e53e9ac04f81fb3af567a9b5db05cd8fad2f8e4
-  data.tar.gz: cec73d8932a8996485ee8c24a811aa57af50c2f9
+  metadata.gz: 17dd7631845fb1eb16af43d99d96f1810f1eaf70
+  data.tar.gz: 9ab140c32d7bd7d61192935a20342ed032c98d8e
 SHA512:
-  metadata.gz: bdb92137ee6edd38b3b12f6e8997d053075b5da9cf027ecb13eb83e70b51925bbff4a0e49984518f6a6bfb230cf079656972bcafe5537ed47409dbe548c6e8af
-  data.tar.gz: 5bdc7dc4662f18258d63fecf1c1a985b64070c82df037da259e736faaf19debe09009e53bca568ff6e55e46accdc37b3ece9dbcc69211657843d18b6788631db
+  metadata.gz: e25a239fab4ebd9a18e0eeb60095a08b99dd3064195674416bbb8b419b9424d1237e96ee54d1ebbffac458026343b18810b479b327f0dcf4597ac130356ba7a6
+  data.tar.gz: 159bae56a23174e18fd696083306d2ee7b5d13e04cf712f7621e5c6a8b78e670dfd0cb60724b5a307d41d4ed78cd0efd31d20a15692c882f58f114204915cc62

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
@@ -52,7 +56,7 @@ module Dep
     end
 
     def to_s
-      "#{name} -v #{version}"
+      "#{name}:#{version}"
     end
 
     def ==(other)
@@ -60,12 +64,10 @@ module Dep
     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 +89,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 +110,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.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 +136,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,41 +147,43 @@ 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
-    # I hate this, but since rubygems does a wrapper
-    # script, we can't use the elegance of DATA.read :(
+
+    # We can't use DATA.read because rubygems does a wrapper script.
     help = File.read(__FILE__).split(/^__END__/)[1]
 
     IO.popen("less", "w") { |f| f.write(help) }
     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
@@ -23,7 +28,7 @@ scope do
 
   test "to_s" do
     lib = Dep::Lib.new("cutest", "1.1.3")
-    assert_equal "cutest -v 1.1.3", lib.to_s
+    assert_equal "cutest:1.1.3", lib.to_s
   end
 end
 
@@ -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.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Cyril David
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies: []
 description: Specify your project's dependencies in one file.
 email:
@@ -31,17 +31,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dependencies manager