monos 0.6.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b5768d1c5b1f9862099eb5d67e7c574561f256
-  data.tar.gz: e257ffe48bab62974a02b76443e0d0c4aad563af
+  metadata.gz: ef0e3b6e34281f0de5814be5353282f3433ff7a2
+  data.tar.gz: 0adb54bd17a900418ebeb7c8cb72aff6db9c95cb
 SHA512:
-  metadata.gz: 63f482ee7c5696cff694e57a22efc2a187a20a074e10c651bbd272acedb03104a8646464fe0386cea3bb71f0e532b7f039ebcec9301c185437ca23ac6bfffad0
-  data.tar.gz: 4d6213f4928e6abcb3809101f7b7d299eeaf24c51edeee8424f497bdeed6b3e7406127472e3639eb6efb719d4d98f98663a93b59c77634130074b2053cfc66be
+  metadata.gz: 75be1cebf370650581e4600debea7b128a0f53a7661bff57fc22b6086d2b53306f09bcb4e1e481f2be003489c160440f3708fe329de4c6eede610968bf948aa0
+  data.tar.gz: 279c3310bb58d3272b596d5fd511fb40bc6749ea0f71087b0558f343ea46c5c4e6a7b8eca7cfe4b388cd2b8395a817432bc2fb322ac45beb48c3258ad7fa9ed8

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/README.md

@@ -1,8 +1,8 @@
 # monos - monorepo / mono source tree tools and (startup) scripts
 
 
-* home  :: [github.com/rubycoco/git](https://github.com/rubycoco/git)
-* bugs  :: [github.com/rubycoco/git/issues](https://github.com/rubycoco/git/issues)
+* home  :: [github.com/rubycoco/monos](https://github.com/rubycoco/monos)
+* bugs  :: [github.com/rubycoco/monos/issues](https://github.com/rubycoco/monos/issues)
 * gem   :: [rubygems.org/gems/monos](https://rubygems.org/gems/monos)
 * rdoc  :: [rubydoc.info/gems/monos](http://rubydoc.info/gems/monos)
 * forum :: [opensport](http://groups.google.com/group/opensport)

data/Rakefile

@@ -3,12 +3,12 @@ require './lib/mono/version.rb'
 
 Hoe.spec 'monos' do
 
-  self.version = MonoCore::VERSION
+  self.version = Mono::Module::Tool::VERSION
 
   self.summary = "monos - monorepo / mono source tree tools and (startup) scripts"
   self.description = summary
 
-  self.urls = { home: 'https://github.com/rubycoco/git' }
+  self.urls = { home: 'https://github.com/rubycoco/monos' }
 
   self.author = 'Gerald Bauer'
   self.email  = 'opensport@googlegroups.com'
@@ -20,8 +20,9 @@ Hoe.spec 'monos' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-    ['gitti',         '>= 0.6.1' ],
-    ['gitti-backup',  '>= 0.4.1' ],
+    ['monofile',      '>= 0.2.2'],
+    ['gitti',         '>= 0.6.1'],
+    ['gitti-backup',  '>= 0.4.1'],
   ]
 
   self.spec_extras = {

data/lib/mono.rb

@@ -1,3 +1,6 @@
+require 'monofile'
+
+
 ## first add git support
 ##   note: use the "modular" version WITHOUT auto-include gitti,
 ##          thus, require 'gitti/base' (and NOT 'gitti')
@@ -8,11 +11,14 @@ require 'gitti/backup/base'
 module Mono
   ## note: make Git, GitProject, GitRepoSet, etc. available without Gitti::
   include Gitti
-end
 
+  class Tool
+    include Gitti
+  end
+
+  ## add more classes e.g. MonoGitProject, etc. - why? why not?
+end
 
-## some more stdlibs
-# require 'optparse'
 
 
 
@@ -31,4 +37,20 @@ require 'mono/commands/run'
 require 'mono/tool'
 
 
-puts MonoCore.banner   # say hello
+
+module Mono
+def self.monofile
+  path = Monofile.find
+
+  if path
+    Monofile.read( path )
+  else
+    puts "!! WARN: no mono configuration file found; looking for #{Monofile::NAMES.join(', ')} in (#{Dir.getwd})"
+    Monofile.new   ## return empty set -todo/check: return nil - why? why not?
+  end
+end
+end  ## module Mono
+
+
+
+puts Mono::Module::Tool.banner   # say hello

data/lib/mono/base.rb

@@ -1,73 +1,27 @@
-
-module Mono
-
-  def self.root   ## root of single (monorepo) source tree
-    @@root ||= begin
-        ## todo/fix:
-        ##  check if windows - otherwise use /sites
-        ##  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' )
-          'C:/Sites'
-        else
-          '/sites'
-        end
-    end
-  end
-
-  def self.root=( path )
-    ## use expand path to make (assure) absolute path - why? why not?
-    @@root = ::File.expand_path( path )
-  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
-
-    if path
-      GitRepoSet.read( path )
-    else
-      GitRepoSet.new( {} )  ## return empty set -todo/check: return nil - why? why not?
-    end
-  end
-end  ## module Mono
-
-
-
-
 #####################
-#  add file and repo helper
+#  add repo helper
 
-##
-## todo/fix:  ALWAYS assert name format
-##   (rename to mononame and monopath) - why? why not?
 
 class MonoGitHub
-  def self.clone( name )
-    path = MonoFile.expand_path( name )
+  def self.clone( name, depth: nil )
+    ## lets you use:
+    ##   @rubycoco/gitti  or
+    ##   gitti@rubycoco
+    ##  =>  rubycoco/gitti
+
+    ## note: allow passing in (reusing) of mononames too
+    mononame =  name.is_a?( Mononame ) ? name : Mononame.parse( name )
+    path      = mononame.real_path
 
     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:#{mononame.to_path}.git"
 
     Dir.chdir( org_path ) do
-      Gitti::Git.clone( ssh_clone_url )
+      Gitti::Git.clone( ssh_clone_url, depth: depth )
     end
   end
 end
@@ -77,61 +31,45 @@ MonoGithub = MonoGitHub  ## add convenience (typo?) alias
 
 class MonoGitProject
   def self.open( name, &block )
-    path = MonoFile.expand_path( name )
+    ## note: allow passing in (reusing) of mononames too
+    mononame = name.is_a?( Mononame ) ? name : Mononame.parse( name )
+    path     = mononame.real_path
     Gitti::GitProject.open( path, &block )
   end
 end
 
 
-module Mono
-  ## add some short cuts
-  def self.open( name, &block ) MonoGitProject.open( name, &block ); end
-  def self.clone( name )        MonoGitHub.clone( name ); end
-end
-
-
-
-class MonoFile
-    ## e.g. openfootball/austria etc.
-    ##      expand to to "real" absolute path
-    ##
-    ## todo/check: assert name must be  {orgname,username}/reponame
-    def self.expand_path( path )
-      "#{Mono.root}/#{path}"
-    end
-    def self.exist?( path )
-      ::File.exist?( expand_path( path ))
-    end
-
-
-    ## add some aliases - why? why not?
-    class << self
-      alias_method :real_path, :expand_path
-      alias_method :exists?,   :exist?   ## add deprecated exists? too - why? why not?
-    end
-
 
 
-    ## path always relative to Mono.root
-    ##   todo/fix:  use File.expand_path( path, Mono.root ) - why? why not?
-    ##    or always enfore "absolut" path e.g. do NOT allow ../ or ./ or such
-    def self.open( path, mode='r:utf-8', &block )
-       full_path = "#{Mono.root}/#{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
-       end
-
-       ::File.open( full_path, mode ) do |file|
-         block.call( file )
+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
+
+  ######################################
+  ## add some more "porcelain" helpers
+  def self.sync( name )
+     ## add some options - why? why not?
+     ##  -  :readonly    - auto-adds  depth: 1 on clone or such - why? why not?
+     ##  -  :clone  true/false  - do NOT clone only fast forward or such - why? why not?
+     ##  -  :clean  true/false or similar  - only clone repos; no fast forward
+     ##  others - ideas -- ??
+
+     ## note: allow passing in (reusing) of mononames too
+     mononame =  name.is_a?( Mononame ) ? name : Mononame.parse( name )
+     if mononame.exist?
+       MonoGitProject.open( mononame ) do |proj|
+         if proj.changes?
+           puts "!! WARN - local changes in workdir; skipping fast forward (remote) sync / merge"
+         else
+           proj.fast_forward   ## note: use git pull --ff-only (fast forward only - do NOT merge)
+         end
        end
-    end
-
-    def self.read_utf8( path )
-       open( path, 'r:utf-8') { |file| file.read }
-    end
-end  ## class MonoFile
-
-
+     else
+       MonoGitHub.clone( mononame )
+     end
+  end # method self.sync
+end  ## module Mono
 
 

data/lib/mono/commands/backup.rb

@@ -1,6 +1,7 @@
 module Mono
 
-  ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+class Tool
   def self.backup
     repos = Mono.monofile
 
@@ -11,5 +12,5 @@ module Mono
     ##   2) git remote update  (if local backup already exists)
     backup.backup( repos )
   end # method backup
-
+end  # class Tool
 end  # module Mono

data/lib/mono/commands/env.rb

@@ -1,8 +1,9 @@
 module Mono
 
+class Tool
   def self.env   ## check environment setup
     puts "Mono.root (MOPATH): >#{Mono.root}<"
-    puts "MonoCore.root:  >#{MonoCore.root}<"
+    puts "Mono::Module::Tool.root:  >#{Mono::Module::Tool.root}<"
     puts
 
     ## add ruby version and path - why? why not? e.g.
@@ -19,8 +20,8 @@ module Mono
     Git.config( /user/, show_origin: true )
 
     puts
-    puts "monorepo.yml:"
+    puts "monofile => (#{Monofile.find}):"
     pp   Mono.monofile
   end
-
+end # class Tool
 end # module Mono

data/lib/mono/commands/fetch.rb

@@ -1,5 +1,6 @@
 module Mono
   ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+class Tool
   def self.fetch
     repos = Mono.monofile
 
@@ -18,8 +19,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
@@ -39,5 +40,5 @@ module Mono
     print "#{count_repos} repo(s) @ #{count_orgs} org(s)"
     print "\n"
   end # method fetch
-
+end  # class Tool
 end  # module Mono

data/lib/mono/commands/run.rb

@@ -1,5 +1,6 @@
 module Mono
 
+class Tool
   def self.run( *args )
     ## todo/fix: use a "standard" argument to pass along hash of repos
     ##   (e.g. monorepo.yml or repos.yml ) how?  - why? why not?
@@ -22,8 +23,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
@@ -43,5 +44,5 @@ module Mono
     print "#{count_repos} repo(s) @ #{count_orgs} org(s)"
     print "\n"
   end # method run
-
+end  # class Tool
 end  # module Mono

data/lib/mono/commands/status.rb

@@ -1,6 +1,7 @@
 module Mono
 
-  ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+class Tool
   def self.status
     repos = Mono.monofile
 
@@ -20,8 +21,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?
@@ -61,5 +62,5 @@ module Mono
     end
 
   end # method status
-
+end  # class Tool
 end  # module Mono

data/lib/mono/commands/sync.rb

@@ -1,6 +1,7 @@
 module Mono
 
-  ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+class Tool
   def self.sync
     repos = Mono.monofile
 
@@ -11,15 +12,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"
@@ -50,4 +51,5 @@ module Mono
     puts "#{count_repos} repo(s) @ #{count_orgs} org(s)"
   end # method sync
 
+end  # class Tool
 end  # module Mono

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/tool.rb

@@ -4,9 +4,37 @@ module Mono
 class Tool
   def self.main( args=ARGV )
 
-   ## note: for now assume first argument is command
-   ##  add options later
+    options = {}
+    OptionParser.new do |parser|
+      ## note:
+      ##  you can add many/multiple modules
+      ##  e.g. -r gitti -r mono etc.
+      parser.on( '-r NAME', '--require NAME') do |name|
+        options[:requires] ||= []
+        options[:requires] << name
+      end
+      ## todo/fix:
+      ##    add --verbose
+      ##    add -d/--debug
+    end.parse!( args )
+
+
+    ## add check for auto-require (e.g. ./config.rb)
+    if options[:requires]  ## use custom (auto-)requires
+      options[:requires].each do |path|
+        puts "[monofile] auto-require >#{path}<..."
+        require( path )
+      end
+    else  ## use/try defaults
+      config_path = "./config.rb"
+      if File.exist?( config_path )
+        puts "[monofile] auto-require (default) >#{config_path}<..."
+        require( config_path )
+      end
+    end
+
 
+   ## note: for now assume first argument is command
    cmd = if args.size == 0
            'status'   ## make status "default" command
          else
@@ -16,20 +44,26 @@ class Tool
    ## note: allow shortcut for commands
    case cmd.downcase
    when 'status', 'stati', 'stat', 'st', 's'
-      Mono.status
+      status
    when 'sync', 'syn', 'sy',  ## note: allow aliases such as install, get & up too
         'get', 'g',
         'install', 'insta', 'inst', 'ins', 'i',
         'up', 'u'
-      Mono.sync
+      sync
    when 'fetch', 'f'
-      Mono.fetch
+      fetch
    when 'env', 'e'
-      Mono.env
+      env
    when 'backup', 'back', 'b'
-      Mono.backup
+      backup
    when 'run', 'r', 'exec'
-      Mono.run( args )
+      run( args )
+
+
+   ##################
+   ## for debugging / linting
+   when 'walk'
+      Mono.walk
    else
      puts "!! ERROR: unknown command >#{cmd}<"
      exit 1

data/lib/mono/version.rb

@@ -1,13 +1,13 @@
 ## note: use a different module/namespace
 ##   for the gem version info e.g. MonoCore vs Mono
 
-module MonoCore   ## todo/check: rename to MonoMeta, MonoModule or such - why? why not?
+module Mono
+module Module
+module Tool     ## todo/check: rename to MonoMeta, MonoModule or such - why? why not?
 
-  ## note: move root to its own namespace to avoid
-  ##   conflict with Mono.root!!!!
-  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 6
-  PATCH = 0
+  MAJOR = 1    ## todo: namespace inside version or something - why? why not??
+  MINOR = 1
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -18,16 +18,19 @@ module MonoCore   ## todo/check: rename to MonoMeta, MonoModule or such - why? w
     "monos/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
+  ## note: move root to its own namespace to avoid
+  ##   conflict with Mono.root!!!!
   def self.root
     File.expand_path( File.dirname(File.dirname(__FILE__) ))
   end
 
-end # module MonoCore
-
+end # module Tool
+end # module Module
+end # module Mono
 
 ##################################
 # add a convenience shortcut for now - why? why not?
 module Mono
-  VERSION = MonoCore::VERSION
+  VERSION = Mono::Module::Tool::VERSION
 end
 

data/lib/monos.rb

@@ -1,5 +1,5 @@
 # note: allow require 'monos' too
 #        (in addition to require 'mono')
 
-require_relative './mono'
+require_relative './mono'     ## todo/check: use just 'mono' - why? why not?
 

data/test/test_base.rb

@@ -9,9 +9,9 @@ class TestBase < MiniTest::Test
   Git = Mono::Git
 
   def test_version
-    puts MonoCore::VERSION
-    puts MonoCore.banner
-    puts MonoCore.root
+    puts Mono::Module::Tool::VERSION
+    puts Mono::Module::Tool.banner
+    puts Mono::Module::Tool.root
 
     puts Mono::VERSION
   end
@@ -21,7 +21,7 @@ class TestBase < MiniTest::Test
   end
 
   def test_env
-    puts Mono.env
+    puts Mono::Tool.env
   end
 
 

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 |path|
+     puts "#{path} => >#{Monopath.parse( path )}<"
+
+     assert_equal "#{Mono.root}/yorobot/stage/one", Monopath.real_path( path )
+  end
+end
+
+end # class TestPath
+

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: monos
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: monofile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: gitti
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +117,8 @@ files:
 - lib/monos.rb
 - test/helper.rb
 - test/test_base.rb
-homepage: https://github.com/rubycoco/git
+- test/test_path.rb
+homepage: https://github.com/rubycoco/monos
 licenses:
 - Public Domain
 metadata: {}