dep 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397a91b47e29915d60f542d598c59234698bacdd
-  data.tar.gz: a4e35ccd0e7f2614f1990cb7b92e392e637e5248
+  metadata.gz: d20ad871272540cfc045dc91e3dc95cb58735bc0
+  data.tar.gz: 954088f85ffa02926ad843283461472c34e97a72
 SHA512:
-  metadata.gz: 792bbaefb83a83c8d8808f9fbe04c4fb41b2b6218133ddeb3d85ef6df911f05c9bd5a5538bb7ab1e14f3582cc8c419fd28063cea2c2edaf1caa2f96024f48294
-  data.tar.gz: 971be8a417ba9d6142447beacb329a8a3c0f5fa7e84daf53d0236117616e4b9fff2405db872d62c3c862a24df150b8dc29e13e1da16f70befe37a601e20d9902
+  metadata.gz: 5fb8289270e143aa36ce2f5407abb4c4d16647f511c1dfdec1fe5ba272fe3486384dd58db7861bebe93dac87fce3ccf8718484c83119c73e7579384874ba0af8
+  data.tar.gz: 3e28c39c0b0e73a2320ad09037068240f04b61a9b0dadebf05b508c2c919b37f7e49c1981367c1f48b919fe3f0e7f9ab588548d2b65897d3e40b9a946f7c3232

data/bin/dep

@@ -1,90 +1,280 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/dep"
-
 require "fileutils"
-require "clap"
 
-help = File.expand_path("../README.1", File.dirname(__FILE__))
-file = nil
+module Dep
+  class List
+    attr :path
 
-commands = Clap.run ARGV,
-  "-f"  => lambda { |f| file = f }
+    def initialize(path)
+      @path = path
+    end
 
-@list = Dep::List.new(file || File.join(Dir.pwd, ".gems"))
-@prerelease = false
+    def add(lib)
+      remove(lib)
+      libraries.push(lib)
+    end
+
+    def remove(lib)
+      libraries.delete_if { |e| e.name == lib.name }
+    end
 
-FileUtils.touch(@list.path) unless File.exist?(@list.path)
+    def libraries
+      @libraries ||= File.readlines(path).map { |line| Lib[line] }
+    end
 
-def add(name)
-  dependency = Gem::Dependency.new(name)
-  fetcher = Gem::SpecFetcher.fetcher
+    def missing_libraries
+      libraries.reject(&:available?)
+    end
 
-  if fetcher.respond_to?(:spec_for_dependency)
-    dependency.prerelease = @prerelease
-    res, _ = fetcher.spec_for_dependency(dependency)
-  else
-    res = fetcher.fetch(dependency, false, true, @prerelease)
+    def save
+      File.open(path, "w") do |file|
+        libraries.each do |lib|
+          file.puts lib.to_s
+        end
+      end
+    end
   end
 
-  abort("Unable to find #{name}") if res.empty?
+  class Lib < Struct.new(:name, :version)
+    def self.[](line)
+      if line.strip =~ /^(\S+) -v (\S+)$/
+        return new($1, $2)
+      else
+        abort("Invalid requirement found: #{line}")
+      end
+    end
 
-  spec = res[-1][0]
-  lib  = Dep::Lib.new(spec.name, spec.version)
+    def available?
+      Gem::Specification.find_by_name(name, version)
+    rescue Gem::LoadError
+      return false
+    end
 
-  @list.add(lib)
-  @list.save
+    def to_s
+      "#{name} -v #{version}"
+    end
 
-  puts "dep: added #{lib}"
-end
+    def ==(other)
+      to_s == other.to_s
+    end
+  end
 
-def rm(name)
-  @list.remove(Dep::Lib.new(name))
-  @list.save
+  module CLI
+    class << self
+      attr_accessor :prerelease, :list, :file
+    end
 
-  puts "dep: removed #{name}"
-end
+    def self.add(name)
+      dependency = Gem::Dependency.new(name)
+      fetcher = Gem::SpecFetcher.fetcher
 
-def check
-  if @list.missing_libraries.empty?
-    puts "dep: all cool"
-  else
-    puts "dep: the following libraries are missing"
+      if fetcher.respond_to?(:spec_for_dependency)
+        dependency.prerelease = @prerelease
+        res, _ = fetcher.spec_for_dependency(dependency)
+      else
+        res = fetcher.fetch(dependency, false, true, @prerelease)
+      end
+
+      abort("Unable to find #{name}") if res.empty?
 
-    @list.missing_libraries.each do |lib|
-      puts "  %s" % lib
+      spec = res[-1][0]
+      lib  = Dep::Lib.new(spec.name, spec.version)
+
+      @list.add(lib)
+      @list.save
+
+      puts "dep: added #{lib}"
+    end
+
+    def self.rm(name)
+      @list.remove(Dep::Lib.new(name))
+      @list.save
+
+      puts "dep: removed #{name}"
     end
 
-    exit(1)
+    def self.check
+      if @list.missing_libraries.empty?
+        puts "dep: all cool"
+      else
+        puts "dep: the following libraries are missing"
+
+        @list.missing_libraries.each do |lib|
+          puts "  %s" % lib
+        end
+
+        exit(1)
+      end
+    end
+
+    def self.install
+      if @list.missing_libraries.empty?
+        puts "dep: nothing to install"
+        exit
+      end
+
+      @list.missing_libraries.each do |lib|
+        run "gem install #{lib}"
+      end
+    end
+
+    def self.run(cmd)
+      puts "  #{cmd}"
+      `#{cmd}`
+    end
+
+    def self.abort
+      abort("error: dep --help for more info")
+    end
   end
 end
 
-def install
-  if @list.missing_libraries.empty?
-    puts "dep: nothing to install"
+module Kernel
+private
+  def on(flag, &block)
+    if index = ARGV.index(flag)
+      _ = ARGV.delete_at(index)
+
+      case block.arity
+      when 1 then block.call(ARGV.delete_at(index))
+      when 0 then block.call
+      else
+        Dep::CLI.abort
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+
+  Dep::CLI.file = File.join(Dir.pwd, ".gems")
+  Dep::CLI.prerelease = false
+
+  on("-f") do |file|
+    Dep::CLI.file = file
+  end
+
+  on("--pre") do
+    Dep::CLI.prerelease = true
+  end
+
+  on("--help") do
+    IO.popen("less", "w") { |f| f.write(DATA.read) }
     exit
   end
 
-  @list.missing_libraries.each do |lib|
-    run "gem install #{lib}"
+  Dep::CLI.list = Dep::List.new(Dep::CLI.file)
+
+  FileUtils.touch(Dep::CLI.list.path) unless File.exist?(Dep::CLI.list.path)
+
+  case ARGV[0]
+  when "add"
+    Dep::CLI.add(ARGV[1])
+  when "rm"
+    Dep::CLI.rm(ARGV[1])
+  when "install", "i"
+    Dep::CLI.install
+  when nil
+    Dep::CLI.check
+  else
+    Dep::CLI.abort
   end
-end
 
-def run(cmd)
-  puts "  #{cmd}"
-  `#{cmd}`
 end
 
-if commands.empty?
-  check
-end
+__END__
+
+DEP(1)
+
+NAME
+      dep -- Basic dependency tracking
+
+SYNOPSIS
+      dep
+      dep add libname [--pre]
+      dep rm libname
+      dep install
+
+DESCRIPTION
+      dep
+          Checks that all dependencies are met.
+
+      dep add [gemname]
+          Fetches the latest version of `gemname`
+          and automatically adds it to your .gems file.
+
+      rm
+          Removes the corresponding entry in your .gems file.
+
+      install
+          Installs all the missing dependencies for you. An important
+          point here is that it simply does a `gem install` for each
+          dependency you have. Dep assumes that you use some form of
+          sandboxing like gs, rbenv-gemset or RVM gemsets.
+
+
+INSTALLATION
+      $ wget -qO- http://amakawa.org/sh/install.sh | sh
+
+      # or
+
+      $ gem install dep
+
+HISTORY
+      dep is actually more of a workflow than a tool. If you think about
+      package managers and the problem of dependencies, you can summarize
+      what you absolutely need from them in just two points:
+
+      1. When you build an application which relies on 3rd party libraries,
+         it's best to explicitly declare the version numbers of these
+         libraries.
+
+      2. You can either bundle the specific library version together with
+         your application, or you can have a list of versions.
+
+      The first approach is handled by vendoring the library. The second
+      approach typically is done using Bundler. But why do you need such
+      a complicated tool when all you need is simply listing version numbers?
+
+      We dissected what we were doing and eventually reached the following
+      workflow:
+
+      1. We maintain a .gems file for every application which lists the
+         libraries and the version numbers.
+      2. We omit dependencies of dependencies in that file, the reason being
+         is that that should already be handled by the package manager
+         (typically rubygems).
+      3. Whenever we add a new library, we add the latest version.
+      4. When we pull the latest changes, we want to be able to rapidly
+         check if the dependencies we have is up to date and matches what
+         we just pulled.
+
+      So after doing this workflow manually for a while, we decided to
+      build the simplest tool to aid us with our workflow.
+
+      The first point is handled implicitly by dep. You can also specify
+      a different file by doing dep -f.
+
+      The second point is more of an implementation detail. We thought about
+      doing dependencies, but then, why re-implement something that's already
+      done for you by rubygems?
+
+      The third point (and also the one which is most inconvenient), is
+      handled by dep add.
+
+      The manual workflow for that would be:
+
+      gem search -r "^ohm$" [--pre] # check and remember the version number
+      echo "ohm -v X.x.x" >> .gems
+
+      If you try doing that repeatedly, it will quickly become cumbersome.
+
+      The fourth and final point is handled by typing dep check or simply dep.
+      Practically speaking it's just:
 
-commands = Clap.run commands,
-  "--pre"  => lambda { @prerelease = true },
-  "--help" => lambda { exec "man #{help}" }
+      git pull
+      dep
 
-Clap.run commands,
-  "add"     => method(:add),
-  "rm"      => method(:rm),
-  "install" => method(:install),
-  "check"   => method(:check)
+      And that's it. The dep command typically happens in 0.2 seconds which
+      is something we LOVE.

data/test/dep.rb

@@ -1,6 +1,6 @@
 require "cutest"
 
-require_relative "../lib/dep"
+load File.expand_path("../../bin/dep", __FILE__)
 
 # Dep::Lib
 scope do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dep
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Cyril David
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: clap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+date: 2013-03-16 00:00:00.000000000 Z
+dependencies: []
 description: Specify your project's dependencies in one file.
 email:
 - cyx.ucron@gmail.com
@@ -34,12 +20,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.1
 - bin/dep
-- lib/dep.rb
 - test/dep.rb
-- man/dep.1
-homepage: http://twpil.github.com/dep
+homepage: http://cyx.github.com/dep
 licenses: []
 metadata: {}
 post_install_message: 

data/README.1

@@ -1,115 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "DEP" "1" "April 2012" "" ""
-.
-.SH "NAME"
-\fBDEP\fR \- basic dependency tracking
-.
-.SH "SYNOPSIS"
-.
-.nf
-
-dep check
-dep add libname [\-\-pre]
-dep rm libname
-dep install
-.
-.fi
-.
-.SH "DESCRIPTION"
-.
-.TP
-check
-Checks that all dependencies are met\.
-.
-.TP
-add
-Fetches the latest version of the library in question and automatically adds it to your \.gems file\.
-.
-.TP
-rm
-Simply removes the corresponding entry in your \.gems file\.
-.
-.TP
-install
-Installs all the missing dependencies for you\. An important point here is that it simply does a \fBgem install\fR for each dependency you have\. Dep assumes that you use some form of sandboxing like gs, RVM or rbenv\-gemset\.
-.
-.SH "INSTALLATION"
-.
-.nf
-
-$ gem install dep
-.
-.fi
-.
-.SH "HISTORY"
-dep is actually more of a workflow than a tool\. If you think about package managers and the problem of dependencies, you can summarize what you absolutely need from them in just two points:
-.
-.IP "1." 4
-When you build an application which relies on 3rd party libraries, it\'s best to explicitly declare the version numbers of these libraries\.
-.
-.IP "2." 4
-You can either bundle the specific library version together with your application, or you can have a list of versions\.
-.
-.IP "" 0
-.
-.P
-The first approach is handled by vendoring the library\. The second approach typically is done using Bundler\. But why do you need such a complicated tool when all you need is simply listing version numbers?
-.
-.P
-We dissected what we were doing and eventually reached the following workflow:
-.
-.IP "1." 4
-We maintain a \.gems file for every application which lists the libraries and the version numbers\.
-.
-.IP "2." 4
-We omit dependencies of dependencies in that file, the reason being is that that should already be handled by the package manager (typically rubygems)\.
-.
-.IP "3." 4
-Whenever we add a new library, we add the latest version\.
-.
-.IP "4." 4
-When we pull the latest changes, we want to be able to rapidly check if the dependencies we have is up to date and matches what we just pulled\.
-.
-.IP "" 0
-.
-.P
-So after doing this workflow manually for a while, we decided to build the simplest tool to aid us with our workflow\.
-.
-.IP "\(bu" 4
-The first point is handled implicitly by dep\. You can also specify a different file by doing dep \-f\.
-.
-.IP "\(bu" 4
-The second point is more of an implementation detail\. We thought about doing dependencies, but then, why re\-implement something that\'s already done for you by rubygems?
-.
-.IP "\(bu" 4
-The third point (and also the one which is most inconvenient), is handled by dep add\.
-.
-.IP "" 0
-.
-.P
-The manual workflow for \fBdep add\fR would be:
-.
-.IP "" 4
-.
-.nf
-
-gem search \-r "^ohm$" [\-\-pre] # check and remember the version number
-echo "ohm \-v X\.x\.x" >> \.gems
-.
-.fi
-.
-.IP "" 0
-.
-.P
-If you try doing that repeatedly, it will quickly become cumbersome\.
-.
-.P
-The fourth and final point is handled by typing dep check or simply dep\. Practically speaking it\'s just:
-.
-.P
-\fBgit pull dep\fR
-.
-.P
-And that\'s it\. The dep command typically happens in 0\.2 seconds which is something we LOVE\.

data/lib/dep.rb

@@ -1,58 +0,0 @@
-module Dep
-  class List
-    attr :path
-
-    def initialize(path = File.join(Dir.pwd, ".gems"))
-      @path = path
-    end
-
-    def add(lib)
-      remove(lib)
-      libraries.push(lib)
-    end
-
-    def remove(lib)
-      libraries.delete_if { |e| e.name == lib.name }
-    end
-
-    def libraries
-      @libraries ||= File.readlines(path).map { |line| Lib[line] }
-    end
-
-    def missing_libraries
-      libraries.reject(&:available?)
-    end
-
-    def save
-      File.open(path, "w") do |file|
-        libraries.each do |lib|
-          file.puts lib.to_s
-        end
-      end
-    end
-  end
-
-  class Lib < Struct.new(:name, :version)
-    def self.[](line)
-      if line.strip =~ /^(\S+) -v (\S+)$/
-        return new($1, $2)
-      else
-        abort("Invalid requirement found: #{line}")
-      end
-    end
-
-    def available?
-      Gem::Specification.find_by_name(name, version)
-    rescue Gem::LoadError
-      return false
-    end
-
-    def to_s
-      "#{name} -v #{version}"
-    end
-
-    def ==(other)
-      to_s == other.to_s
-    end
-  end
-end

data/man/dep.1

@@ -1,115 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "DEP" "1" "April 2012" "" ""
-.
-.SH "NAME"
-\fBDEP\fR \- basic dependency tracking
-.
-.SH "SYNOPSIS"
-.
-.nf
-
-dep check
-dep add libname [\-\-pre]
-dep rm libname
-dep install
-.
-.fi
-.
-.SH "DESCRIPTION"
-.
-.TP
-check
-Checks that all dependencies are met\.
-.
-.TP
-add
-Fetches the latest version of the library in question and automatically adds it to your \.gems file\.
-.
-.TP
-rm
-Simply removes the corresponding entry in your \.gems file\.
-.
-.TP
-install
-Installs all the missing dependencies for you\. An important point here is that it simply does a \fBgem install\fR for each dependency you have\. Dep assumes that you use some form of sandboxing like gs, RVM or rbenv\-gemset\.
-.
-.SH "INSTALLATION"
-.
-.nf
-
-$ gem install dep
-.
-.fi
-.
-.SH "HISTORY"
-dep is actually more of a workflow than a tool\. If you think about package managers and the problem of dependencies, you can summarize what you absolutely need from them in just two points:
-.
-.IP "1." 4
-When you build an application which relies on 3rd party libraries, it\'s best to explicitly declare the version numbers of these libraries\.
-.
-.IP "2." 4
-You can either bundle the specific library version together with your application, or you can have a list of versions\.
-.
-.IP "" 0
-.
-.P
-The first approach is handled by vendoring the library\. The second approach typically is done using Bundler\. But why do you need such a complicated tool when all you need is simply listing version numbers?
-.
-.P
-We dissected what we were doing and eventually reached the following workflow:
-.
-.IP "1." 4
-We maintain a \.gems file for every application which lists the libraries and the version numbers\.
-.
-.IP "2." 4
-We omit dependencies of dependencies in that file, the reason being is that that should already be handled by the package manager (typically rubygems)\.
-.
-.IP "3." 4
-Whenever we add a new library, we add the latest version\.
-.
-.IP "4." 4
-When we pull the latest changes, we want to be able to rapidly check if the dependencies we have is up to date and matches what we just pulled\.
-.
-.IP "" 0
-.
-.P
-So after doing this workflow manually for a while, we decided to build the simplest tool to aid us with our workflow\.
-.
-.IP "\(bu" 4
-The first point is handled implicitly by dep\. You can also specify a different file by doing dep \-f\.
-.
-.IP "\(bu" 4
-The second point is more of an implementation detail\. We thought about doing dependencies, but then, why re\-implement something that\'s already done for you by rubygems?
-.
-.IP "\(bu" 4
-The third point (and also the one which is most inconvenient), is handled by dep add\.
-.
-.IP "" 0
-.
-.P
-The manual workflow for \fBdep add\fR would be:
-.
-.IP "" 4
-.
-.nf
-
-gem search \-r "^ohm$" [\-\-pre] # check and remember the version number
-echo "ohm \-v X\.x\.x" >> \.gems
-.
-.fi
-.
-.IP "" 0
-.
-.P
-If you try doing that repeatedly, it will quickly become cumbersome\.
-.
-.P
-The fourth and final point is handled by typing dep check or simply dep\. Practically speaking it\'s just:
-.
-.P
-\fBgit pull dep\fR
-.
-.P
-And that\'s it\. The dep command typically happens in 0\.2 seconds which is something we LOVE\.