monos 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62adfa9ee77f46c0ff4a0c5c7946a4ccf5cac96e
-  data.tar.gz: e0d7a90b32fb6b422e00667570d69a6dea33ab09
+  metadata.gz: 9c0413c2258822899cb73e090438d21f3ea82fc5
+  data.tar.gz: a9cd0ddc80ea90a8c7cdbafc7a917eeabadb5b8f
 SHA512:
-  metadata.gz: 149cc0dc4355b4dbe4e4c1dfd715edec2b692d62b2de8487dff55ee51a00e82a5fa832bf1ae1c1ee480ca99afaf5f6a447003dc1ac6db961cbc9e5d9c928c4dc
-  data.tar.gz: 7d7e020fff8866dd966835e5a260c70282b03a87314b204bc539fe8b77333e345bfb34d159b282bcf4be06710ec621765a77f5350200dd389baddc1cc1270b22
+  metadata.gz: bc5c4b2083a234faded31cc4bdad78068709c8d7f6aa0e4a21fa1eb0c276f9ba6d6b34fe77b3fcafac9f6024701536337563b5b9d1b7d7b1fa026f045592c3ac
+  data.tar.gz: db404f05b726c7d233996dca624e6e3bc9cfb204d721ca9ee43be701ea2f658d4a0f03233524aa1d4e7b70c218052ea05cf67f347185063cdb5d53b9e106ddb9

data/Manifest.txt

@@ -18,3 +18,4 @@ lib/mono/version.rb
 lib/monos.rb
 test/helper.rb
 test/test_base.rb
+test/test_path.rb

data/lib/mono/base.rb

@@ -8,8 +8,8 @@ module Mono
         ##  check if root directory exists?
         if ENV['MOPATH']
           ## use expand path to make (assure) absolute path - why? why not?
-          ::File.expand_path( ENV['MOPATH'] )
-        elsif ::Dir.exist?( 'C:/Sites' )
+          File.expand_path( ENV['MOPATH'] )
+        elsif Dir.exist?( 'C:/Sites' )
           'C:/Sites'
         else
           '/sites'
@@ -19,27 +19,29 @@ module Mono
 
   def self.root=( path )
     ## use expand path to make (assure) absolute path - why? why not?
-    @@root = ::File.expand_path( path )
+    @@root = File.expand_path( path )
   end
 
 
 
 
+  MONOFILES = ['monorepo.yml', 'monotree.yml', 'repos.yml']
+
+  def self.find_monofile
+    MONOFILES.each do |name|
+      return "./#{name}"  if File.exist?( "./#{name}")
+    end
+
+    nil  ## no monofile found; return nil
+  end
+
   def self.monofile
-    path =  if ::File.exist?( './monorepo.yml' )
-               './monorepo.yml'
-            elsif ::File.exist?( './monotree.yml' )
-               './monotree.yml'
-            elsif ::File.exist?( './repos.yml' )
-               './repos.yml'
-            else
-               puts "!! WARN: no mono configuration file (that is, {monorepo,monotree,repos}.yml) found in >#{Dir.getwd}<"
-               nil
-            end
+    path = find_monofile
 
     if path
       GitRepoSet.read( path )
     else
+      puts "!! WARN: no mono configuration file found; looking for #{MONOFILES.join(', ')} in (#{Dir.getwd})"
       GitRepoSet.new( {} )  ## return empty set -todo/check: return nil - why? why not?
     end
   end
@@ -57,14 +59,19 @@ end  ## module Mono
 
 class MonoGitHub
   def self.clone( name, depth: nil )
-    path = MonoFile.real_path( name )
+    ## lets you use:
+    ##   @rubycoco/gitti  or
+    ##   gitti@rubycoco
+    ##  =>  rubycoco/gitti
+    norm_name = MonoFile.norm_name( name )
+    path      = "#{Mono.root}/#{norm_name}"
 
     org_path = File.dirname( path )
     FileUtils.mkdir_p( org_path ) unless Dir.exist?( org_path )   ## make sure path exists
 
     ### note: use a github clone url (using ssh) like:
     ##     git@github.com:rubycoco/gitti.git
-    ssh_clone_url = "git@github.com:#{name}.git"
+    ssh_clone_url = "git@github.com:#{norm_name}.git"
 
     Dir.chdir( org_path ) do
       Gitti::Git.clone( ssh_clone_url, depth: depth )
@@ -90,10 +97,33 @@ class MonoFile
     ##
     ## todo/check: assert name must be  {orgname,username}/reponame
     def self.real_path( path )
-      "#{Mono.root}/#{path}"
+      "#{Mono.root}/#{norm_name( path )}"
+    end
+
+    def self.norm_name( path )
+      #  turn
+      #  - @yorobot/stage/one
+      #  - one@yorobot/stage
+      #  - stage/one@yorobot
+      #      => into
+      #  - yorobot/stage/one
+
+
+      parts = path.split( '@' )
+      raise ArgumentError, "no (required) @ found in name; got >#{path}<"               if parts.size == 1
+      raise ArgumentError, "too many @ found (#{parts.size-1}) in name; got >#{path}<"  if parts.size > 2
+
+      norm_name = String.new('')
+      norm_name << parts[1]  ## add orgs path first
+      if parts[0].length > 0   ## has leading repo name (w/ optional path)
+        norm_name << '/'
+        norm_name << parts[0]
+      end
+      norm_name
     end
+
     def self.exist?( path )
-      ::File.exist?( real_path( path ))
+      File.exist?( real_path( path ))
     end
 
 
@@ -104,10 +134,10 @@ class MonoFile
        full_path = real_path( path )
        ## make sure path exists if we open for writing/appending - why? why not?
        if mode[0] == 'w' || mode[0] == 'a'
-        ::FileUtils.mkdir_p( ::File.dirname( full_path ) )  ## make sure path exists
+        FileUtils.mkdir_p( File.dirname( full_path ) )  ## make sure path exists
        end
 
-       ::File.open( full_path, mode ) do |file|
+       File.open( full_path, mode ) do |file|
          block.call( file )
        end
     end
@@ -124,7 +154,7 @@ module Mono
   ## add some short cuts
   def self.open( name, &block )      MonoGitProject.open( name, &block ); end
   def self.clone( name, depth: nil ) MonoGitHub.clone( name, depth: depth ); end
-  def self.real_path( name)          MonoFile.real_path( name ); end
+  def self.real_path( name )         MonoFile.real_path( name ); end
 end  ## module Mono
 
 

data/lib/mono/commands/fetch.rb

@@ -18,8 +18,8 @@ module Mono
 
           repo = GitHubRepo.new( org, name )  ## owner, name e.g. rubylibs/webservice
 
-          ::Dir.chdir( org_path ) do
-            if ::Dir.exist?( repo.name )
+          Dir.chdir( org_path ) do
+            if Dir.exist?( repo.name )
               GitProject.open( repo.name ) do |proj|
                 proj.fetch
               end

data/lib/mono/commands/run.rb

@@ -22,8 +22,8 @@ module Mono
 
           repo = GitHubRepo.new( org, name )  ## owner, name e.g. rubylibs/webservice
 
-          ::Dir.chdir( org_path ) do
-            if ::Dir.exist?( repo.name )
+          Dir.chdir( org_path ) do
+            if Dir.exist?( repo.name )
               GitProject.open( repo.name ) do |proj|
                 proj.run( cmd )
               end

data/lib/mono/commands/status.rb

@@ -20,8 +20,8 @@ module Mono
 
           repo = GitHubRepo.new( org, name )  ## owner, name e.g. rubylibs/webservice
 
-          ::Dir.chdir( org_path ) do
-            if ::Dir.exist?( repo.name )
+          Dir.chdir( org_path ) do
+            if Dir.exist?( repo.name )
               GitProject.open( repo.name ) do |proj|
                 output = proj.changes
                 if output.empty?

data/lib/mono/commands/sync.rb

@@ -11,15 +11,15 @@ module Mono
 
     repos.each do |org,names|
       org_path = "#{Mono.root}/#{org}"
-      ::FileUtils.mkdir_p( org_path ) unless ::Dir.exist?( org_path )   ## make sure path exists
+      FileUtils.mkdir_p( org_path ) unless Dir.exist?( org_path )   ## make sure path exists
 
       names.each do |name|
           puts "[#{count_repos+1}/#{total_repos}] #{org}@#{name}..."
 
           repo = GitHubRepo.new( org, name )  ## owner, name e.g. rubylibs/webservice
 
-          ::Dir.chdir( org_path ) do
-            if ::Dir.exist?( repo.name )
+          Dir.chdir( org_path ) do
+            if Dir.exist?( repo.name )
               GitProject.open( repo.name ) do |proj|
                 if proj.changes?
                   puts "!! WARN - local changes in workdir; skipping fast forward (remote) sync / merge"

data/lib/mono/experimental.rb

@@ -25,15 +25,15 @@ private
 
 ## todo/check - use max_depth or max_level or such - why? why not?
 def self.walk_dir( path, repos=[], level=1, depth: nil )
-  entries = ::Dir.entries(path)
+  entries = Dir.entries(path)
 
   ## filter dirs
   dirs = entries.select do |entry|
     if ['..', '.'].include?( entry )  ## first check for excludes
       false
     else
-      full_path = ::File.join( path, entry )
-      ::File.directory?( full_path )
+      full_path = File.join( path, entry )
+      File.directory?( full_path )
     end
   end
 
@@ -53,9 +53,9 @@ def self.walk_dir( path, repos=[], level=1, depth: nil )
   buf << ">#{path}< - level #{level}:\n"
   dirs.each do |entry|
     next if ['..', '.', '.git'].include?( entry )
-    full_path = ::File.join( path, entry )
+    full_path = File.join( path, entry )
 
-    if ::Dir.exist?( ::File.join( full_path, '.git' ))
+    if Dir.exist?( File.join( full_path, '.git' ))
       repos_count += 1
 
       if level == 1
@@ -69,15 +69,15 @@ def self.walk_dir( path, repos=[], level=1, depth: nil )
       end
 
       buf << "    repo ##{'%-2d' % repos_count} | "
-      buf << "#{'%-20s' % entry} @ #{::File.basename(path)} (#{path})"
+      buf << "#{'%-20s' % entry} @ #{File.basename(path)} (#{path})"
       buf << "\n"
       repos << full_path
 
     ## check for bare bone git repos  - todo/fix: add .gitconfig or such and more - why? why not?
-    elsif ::Dir.exist?( ::File.join( full_path, 'hooks' )) &&
-          ::Dir.exist?( ::File.join( full_path, 'info' )) &&
-          ::Dir.exist?( ::File.join( full_path, 'objects' )) &&
-          ::Dir.exist?( ::File.join( full_path, 'refs' ))
+    elsif Dir.exist?( File.join( full_path, 'hooks' )) &&
+          Dir.exist?( File.join( full_path, 'info' )) &&
+          Dir.exist?( File.join( full_path, 'objects' )) &&
+          Dir.exist?( File.join( full_path, 'refs' ))
       warns_count += 1
       buf << "!! WARN - skip bare git repo >#{entry}< @ #{path}\n"
     else
@@ -94,7 +94,7 @@ def self.walk_dir( path, repos=[], level=1, depth: nil )
 
   sub_dirs.each do |entry|
     ## continue walking
-    full_path = ::File.join( path, entry )
+    full_path = File.join( path, entry )
     walk_dir( full_path, repos, level+1, depth: depth )
   end
 

data/lib/mono/version.rb

@@ -7,7 +7,7 @@ module MonoCore   ## todo/check: rename to MonoMeta, MonoModule or such - why? w
   ##   conflict with Mono.root!!!!
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_path.rb

@@ -0,0 +1,23 @@
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_path.rb
+
+require 'helper'
+
+class TestPath < MiniTest::Test
+
+
+def test_real_path
+  [
+    '@yorobot/stage/one',
+    'one@yorobot/stage',
+    'stage/one@yorobot',
+  ].each do |name|
+     puts "#{name} => >#{MonoFile.norm_name( name )}<"
+
+     assert_equal "#{Mono.root}/yorobot/stage/one", Mono.real_path( name )
+  end
+end
+
+end # class TestPath
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monos
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitti
@@ -103,6 +103,7 @@ files:
 - lib/monos.rb
 - test/helper.rb
 - test/test_base.rb
+- test/test_path.rb
 homepage: https://github.com/rubycoco/git
 licenses:
 - Public Domain