monos 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0413c2258822899cb73e090438d21f3ea82fc5
-  data.tar.gz: a9cd0ddc80ea90a8c7cdbafc7a917eeabadb5b8f
+  metadata.gz: 4962b6373c3d482ef91c0e9657e169217a96ffb7
+  data.tar.gz: 98eb5aa97ffed451336eb0b27402a2de03b45ffb
 SHA512:
-  metadata.gz: bc5c4b2083a234faded31cc4bdad78068709c8d7f6aa0e4a21fa1eb0c276f9ba6d6b34fe77b3fcafac9f6024701536337563b5b9d1b7d7b1fa026f045592c3ac
-  data.tar.gz: db404f05b726c7d233996dca624e6e3bc9cfb204d721ca9ee43be701ea2f658d4a0f03233524aa1d4e7b70c218052ea05cf67f347185063cdb5d53b9e106ddb9
+  metadata.gz: b98911c5622bc280477824a78f28fa3da0e556ac5b3284d27a8e37dcd2c00b3162be3c13c1dbdc3118d4156fc4ef9eb769e48ff21b29695906607a426845dcac
+  data.tar.gz: 6a0cb4ef8100b218f1ef322b2fa352f4e20f3b6838249f8504ba35fd1ed106e2cc3b3a4ab1a47527301b3443aa62250624fa75e547e6990991a67ff04ba6126d

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')
@@ -11,9 +14,6 @@ module Mono
 end
 
 
-## some more stdlibs
-# require 'optparse'
-
 
 
 ###
@@ -31,4 +31,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,57 +1,5 @@
-
-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
-
-
-
-
-  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 = 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
-end  ## module Mono
-
-
-
-
 #####################
-#  add file and repo helper
+#  add repo helper
 
 ##
 ## todo/fix:  ALWAYS assert name format
@@ -63,15 +11,15 @@ class MonoGitHub
     ##   @rubycoco/gitti  or
     ##   gitti@rubycoco
     ##  =>  rubycoco/gitti
-    norm_name = MonoFile.norm_name( name )
-    path      = "#{Mono.root}/#{norm_name}"
+    mononame  = 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:#{norm_name}.git"
+    ssh_clone_url = "git@github.com:#{mononame.to_path}.git"
 
     Dir.chdir( org_path ) do
       Gitti::Git.clone( ssh_clone_url, depth: depth )
@@ -84,77 +32,19 @@ MonoGithub = MonoGitHub  ## add convenience (typo?) alias
 
 class MonoGitProject
   def self.open( name, &block )
-    path = MonoFile.real_path( name )
+    mononame = Mononame.parse( name )
+    path     = mononame.real_path
     Gitti::GitProject.open( path, &block )
   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.real_path( 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 ))
-    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 = 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
-       end
-
-       File.open( full_path, mode ) do |file|
-         block.call( file )
-       end
-    end
-
-    def self.read_utf8( path )
-       open( path, 'r:utf-8') { |file| file.read }
-    end
-end  ## class MonoFile
-
-
-
 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
 end  ## module Mono
 
 

data/lib/mono/commands/env.rb

@@ -2,7 +2,7 @@ module Mono
 
   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,7 +19,7 @@ module Mono
     Git.config( /user/, show_origin: true )
 
     puts
-    puts "monorepo.yml:"
+    puts "monofile => (#{Monofile.find}):"
     pp   Mono.monofile
   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

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 = 1    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 2
+  MINOR = 1
+  PATCH = 0
   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

data/test/test_path.rb

@@ -12,10 +12,10 @@ def test_real_path
     '@yorobot/stage/one',
     'one@yorobot/stage',
     'stage/one@yorobot',
-  ].each do |name|
-     puts "#{name} => >#{MonoFile.norm_name( name )}<"
+  ].each do |path|
+     puts "#{path} => >#{Monopath.parse( path )}<"
 
-     assert_equal "#{Mono.root}/yorobot/stage/one", Mono.real_path( name )
+     assert_equal "#{Mono.root}/yorobot/stage/one", Monopath.real_path( path )
   end
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: monos
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-02 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
@@ -104,7 +118,7 @@ files:
 - test/helper.rb
 - test/test_base.rb
 - test/test_path.rb
-homepage: https://github.com/rubycoco/git
+homepage: https://github.com/rubycoco/monos
 licenses:
 - Public Domain
 metadata: {}