dohroot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a628c800cf04d1142066cddb9732eeed0e8caafd
-  data.tar.gz: a789a6841767f6f37cc00a02247748d7f1e96249
+  metadata.gz: 58d1c31025738476a4809c3f8cbba08b68f78cad
+  data.tar.gz: 838168da9351a35477c0abb82306139079f0dc68
 SHA512:
-  metadata.gz: ba38e9d5becf4d13984ad88fa16ab2374f785f86962e717f38d47c0c149dcdfb453da2b770d2ac0be29c97d9f03bd2ffbb5d9c9d8cceb0f2ea1ff3e0a6543486
-  data.tar.gz: 567ed8a2969ce33d60731188da0845e1a6aeee81f5a511f4f9c7bf6ea882d5c3fda925f52ffefb4157dd6b2561c26d79d838477deee6ff4bf2a6d56fb8a5c2cd
+  metadata.gz: b3fb9662b9bd3b0d14ed9f70e507cdfbaa421f625944dfc07f240777c60625dccade6c4a1930dac3359ba11e9e0db0e7aaca6531e54a342c67fc4f9d45310a17
+  data.tar.gz: 7e5c37abc0cab05e4636132020eeb5324f3f755c5a3e50ac62e60d774549a5f9b930acaa8a01caeea6f5ec48cc0f1d955fcdaee27f3b884949ce1b92f698dd5e

data/lib/dohroot/main.rb

@@ -0,0 +1,43 @@
+require 'dohroot/findup'
+
+module Doh
+extend self
+
+def root
+  @root
+end
+
+def root=(directory)
+  @root = directory
+  libdir = File.join(@root, 'lib')
+  $LOAD_PATH.push(libdir) if libdir && !$LOAD_PATH.include?(libdir)
+end
+
+def find_root(start_directory, filename = 'dohroot', max_tries = 20)
+  rootfile = Doh.findup(start_directory, filename, max_tries)
+  if rootfile
+    Doh.root = File.dirname(rootfile)
+  end
+end
+
+def find_root_from_file(filepath = nil)
+  Doh.find_root(File.dirname(filepath || caller[0]))
+end
+
+def find_root_from_path(path)
+  if File.directory?(path)
+    Doh.find_root(path)
+  else
+    Doh.find_root(File.dirname(path))
+  end
+end
+
+def find_root_from_prog
+  Doh.find_root(File.dirname($PROGRAM_NAME))
+end
+
+def find_root_from_pwd
+  Doh.find_root(Dir.pwd)
+end
+
+end

data/lib/dohroot/pkg.rb

@@ -0,0 +1,38 @@
+require 'dohroot/main'
+
+module Doh
+extend self
+
+def use_pkg(init_file, *name_list)
+  if name_list.empty?
+    Dir.glob(File.join(Doh.root, 'pkg/*/')).each do |rootdir|
+      name_list << File.basename(rootdir)
+    end
+  end
+
+  @pkg_used ||= []
+  retval = false
+  name_list.each do |name|
+    next if @pkg_used.include?(name)
+    retval = true
+    @pkg_used << name
+    use_one_pkg(init_file, name)
+  end
+  retval
+end
+
+private
+
+def use_one_pkg(init_file, name)
+  libdir = File.join(Doh.root, "pkg/#{name}/lib")
+  unless $LOAD_PATH.include?(libdir)
+    $LOAD_PATH << libdir
+  end
+
+  init_path = File.join(Doh.root, "pkg/#{name}/#{init_file}.rb")
+  if File.exist?(init_path)
+    require init_path
+  end
+end
+
+end

data/lib/dohroot.rb

@@ -1,75 +1,2 @@
-require 'dohroot/findup'
-
-module Doh
-extend self
-
-class DohRootNotFoundException < Exception
-end
-
-def root
-  @root
-end
-
-def root=(directory)
-  @root = directory
-  libdir = File.join(@root, 'lib')
-  $LOAD_PATH.push(libdir) if libdir && !$LOAD_PATH.include?(libdir)
-end
-
-def find_root(start_directory, filename = 'dohroot', max_tries = 20)
-  rootfile = Doh.findup(start_directory, filename, max_tries)
-  if rootfile
-    Doh.root = File.dirname(rootfile)
-  end
-end
-
-def find_root_from_file(filepath = nil)
-  Doh.find_root(File.dirname(filepath || caller[0]))
-end
-
-def find_root_from_path(path)
-  if File.directory?(path)
-    Doh.find_root(path)
-  else
-    Doh.find_root(File.dirname(path))
-  end
-end
-
-def find_root_from_prog
-  Doh.find_root(File.dirname($PROGRAM_NAME))
-end
-
-def find_root_from_pwd
-  Doh.find_root(Dir.pwd)
-end
-
-def use_pkg(init_file, *name_list)
-  if name_list.empty?
-    Dir.glob(File.join(Doh.root, 'pkg/*/')).each do |rootdir|
-      name_list << File.basename(rootdir)
-    end
-  end
-
-  @pkg_used ||= []
-  name_list.each do |name|
-    next if @pkg_used.include?(name)
-    @pkg_used << name
-    use_one_pkg(init_file, name)
-  end
-end
-
-private
-
-def use_one_pkg(init_file, name)
-  libdir = File.join(Doh.root, "pkg/#{name}/lib")
-  unless $LOAD_PATH.include?(libdir)
-    $LOAD_PATH << libdir
-  end
-
-  init_path = File.join(Doh.root, "pkg/#{name}/#{init_file}.rb")
-  if File.exist?(init_path)
-    require init_path
-  end
-end
-
-end # module Doh
+require 'dohroot/main'
+require 'dohroot/pkg'

data/test/add_lib.rb

@@ -0,0 +1,2 @@
+libdir = File.expand_path(File.join(__dir__, '../lib'))
+$LOAD_PATH.push(libdir) if libdir && !$LOAD_PATH.include?(libdir)

data/test/pkg.dt.rb

@@ -0,0 +1,15 @@
+require_relative 'add_lib'
+require 'dohroot/pkg'
+require 'minitest/autorun'
+
+module Doh
+
+class Test_pkg < MiniTest::Unit::TestCase
+  def test_use_more_than_once
+    Doh.root = File.join(__dir__, 'fake_pkg_root')
+    assert(Doh.use_pkg(:none, 'some'))
+    assert(!Doh.use_pkg(:none, 'some'))
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohroot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Makani Mason
@@ -21,7 +21,11 @@ extra_rdoc_files:
 files:
 - lib/dohroot.rb
 - lib/dohroot/findup.rb
+- lib/dohroot/main.rb
 - lib/dohroot/options.rb
+- lib/dohroot/pkg.rb
+- test/add_lib.rb
+- test/pkg.dt.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohroot
 licenses:
@@ -47,4 +51,6 @@ rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: tiniest root of doh stuff
-test_files: []
+test_files:
+- test/add_lib.rb
+- test/pkg.dt.rb