monos 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 938f3fee4f29836650bf78e6a65caed685bda945
-  data.tar.gz: 294077f35cb57a027a82d0b9533f1a80cc1f1fe5
+  metadata.gz: 0ed5ea6cba9c516588dc37be7d6f5fb8d3b34b55
+  data.tar.gz: ec4093fb26ef80b80a808d790b969cf8bc78994b
 SHA512:
-  metadata.gz: cb3f0d236dc69a7599115f31ab4a198b49c79e103e20162f158093a201bedeae26613b32e5126105aab00e2acba765d0525c9e3c73ed5aaa20eff9a9385c4010
-  data.tar.gz: 5f728eddb54857a5f3983e8be2bfc8a490c8b4ea4707a3f9928ab5ac223ae9a0c79545662c88e7e3217822ecc3f0cb906e41cd82d60f062158b26c8987427aed
+  metadata.gz: 646e57745308c2b3863531a1972497f98a5d17d0af62eef68b27ca82fcd605f5212cf5025f106ce3f053133ccdd5743279a00b8177724ea5b45f9f67eaebea52
+  data.tar.gz: 55b9207a778b841ec19885ccbbe035ea40a990eac5ea36189d02091e36ceae474d2b11b66ea24209b34ea001f1b1193f582371518644734cefd1bec0c61624b7

data/Manifest.txt

@@ -3,15 +3,16 @@ Manifest.txt
 README.md
 Rakefile
 bin/mo
-bin/moget
 bin/mono
 lib/mono.rb
 lib/mono/base.rb
+lib/mono/commands/env.rb
+lib/mono/commands/fetch.rb
+lib/mono/commands/status.rb
+lib/mono/commands/sync.rb
 lib/mono/git/base.rb
-lib/mono/git/status.rb
-lib/mono/git/sync.rb
-lib/mono/git/tool.rb
 lib/mono/sportdb.rb
+lib/mono/tool.rb
 lib/mono/version.rb
 lib/monos.rb
 test/helper.rb

data/README.md

@@ -32,23 +32,17 @@ to be part of the "virtual" all-in-one / single mono source tree
 in your project. Example:
 
 ``` yaml
-####################
-#  checkout skripts (auto-update machinery)
-yorobot:
-- cache.csv      ## incl. self
-- sport.db.more
-- football.db
-- football.csv
-
-###############
-#  use latest sportdb machinery (from source)
 sportdb:
 - sport.db
 - sport.db.sources
 - football.db
 
-#####################
-# football.db - open football
+yorobot:
+- cache.csv
+- sport.db.more
+- football.db
+- football.csv
+
 openfootball:
 - leagues
 - clubs
@@ -58,7 +52,7 @@ openfootball:
 
 ### Commands
 
-`status` • `sync` • `env`
+`status` • `fetch` • `sync` • `env`
 
 ### `status` Command
 
@@ -77,7 +71,7 @@ resulting in something like:
 ```
 2 change(s) in 9 repo(s) @ 3 org(s)
 
-== yorobot@cache.csv - CHANGES:
+-- sportdb@sport.db - CHANGES:
  M monos/Manifest.txt
  M monos/README.md
  M monos/Rakefile
@@ -88,18 +82,26 @@ RM monos/lib/monoscript.rb -> monos/lib/monos.rb
  M monos/test/test_base.rb
 ?? monos/bin/
 
-== yorobot@football.csv - CHANGES:
+-- yorobot@football.csv - CHANGES:
 ?? footballdata/
 ```
 
 
+### `fetch` Command
 
-### `sync` Command
+Use the `fetch` command to fetch all (remote) changes (will use `git fetch`) on all existing repos and warn about not-yet-cloned repos. Example:
 
+```
+$ mono fetch
+$ mo fetch         # mo is a "shortcut" convenience alias for mono
+```
 
-Use the `sync` command to sync up (pull) changes (will use `git pull --ff-only`) on all existing repos and `git clone` for new not-yet-cloned repos.
 
-Example:
+
+### `sync` Command
+
+
+Use the `sync` command to sync up (pull) changes (will use `git pull --ff-only`) on all existing repos and `git clone` for new not-yet-cloned repos. Example:
 
 ```
 $ mono sync
@@ -107,13 +109,10 @@ $ mono install    # install is an alias for sync
 $ mono get        # get is another alias for sync
 $ mo sync         # mo is a "shortcut" convenience alias for mono
 $ mo get
-$ moget           # moget is a "shortcut" convenience alis for mono get
 ```
 
 Note:  `install` or `get` or `up` are all aliases that you can use for `sync`.
 
-Note: `moget` is a shortcut convenience command for `mono get` (or, that is, `mono sync`).
-
 
 
 ### `env` Command

data/Rakefile

@@ -3,15 +3,16 @@ require './lib/mono/version.rb'
 
 Hoe.spec 'monos' do
 
-  self.version = Mono::Module::VERSION
+  self.version = Mono::VERSION
 
   self.summary = "monos - monorepo / mono source tree tools and (startup) scripts"
   self.description = summary
 
-  self.urls = ['https://github.com/sportdb/sport.db']
+  # self.urls = ['https://github.com/sportdb/sport.db' ]
+  self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email  = 'opensport@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'

data/lib/mono.rb

@@ -12,24 +12,12 @@ require 'optparse'
 require 'mono/version' # let version always go first
 require 'mono/base'
 require 'mono/git/base'
-require 'mono/git/sync'
-require 'mono/git/status'
-require 'mono/git/tool'
 
-
-
-
-module Mono
-  def self.env   ## check environment setup
-     puts "Mono.root (MOPATH): >#{Mono.root}<"
-     puts "Mono::Module.root:  >#{Mono::Module.root}<"
-     puts "git version:"
-     Git.version
-     puts
-     puts "monorepo.yml:"
-     pp   Mono.monofile
-  end
-end # module Mono
+require 'mono/commands/status'
+require 'mono/commands/fetch'
+require 'mono/commands/sync'
+require 'mono/commands/env'
+require 'mono/tool'
 
 
 

data/lib/mono/base.rb

@@ -16,6 +16,25 @@ module Mono
     end
   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
+      YAML.load_file( path )
+    else
+      {}
+    end
+  end
+
 end  ## module Mono
 
 

data/lib/mono/commands/env.rb

@@ -0,0 +1,13 @@
+module Mono
+
+  def self.env   ## check environment setup
+    puts "Mono.root (MOPATH): >#{Mono.root}<"
+    puts "Mono::Module.root:  >#{Mono::Module.root}<"
+    puts "git version:"
+    Git.version
+    puts
+    puts "monorepo.yml:"
+    pp   Mono.monofile
+  end
+
+end # module Mono

data/lib/mono/commands/fetch.rb

@@ -0,0 +1,49 @@
+module Mono
+
+  ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
+  def self.fetch( h=Mono.monofile )
+    count_orgs  = 0
+    count_repos = 0
+
+    ## sum up total number of repos
+    total_repos = h.reduce(0) {|sum,(_,names)| sum+= names.size; sum }
+
+
+    h.each do |org_with_counter,names|
+
+      ## remove optional number from key e.g.
+      ##   mrhydescripts (3)    =>  mrhydescripts
+      ##   footballjs (4)       =>  footballjs
+      ##   etc.
+      org = org_with_counter.sub( /\([0-9]+\)/, '' ).strip
+
+      org_path = "#{Mono.root}/#{org}"
+
+      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 )
+              GitProject.open( repo.name ) do |git|
+                git.fetch
+              end
+            else
+              puts "!!  repo not found / missing"
+            end
+          end
+
+          count_repos += 1
+      end
+      count_orgs += 1
+    end
+
+
+    ## print stats & changes summary
+    puts
+    print "#{count_repos} repo(s) @ #{count_orgs} org(s)"
+    print "\n"
+  end # method fetch
+
+end  # module Mono

data/lib/mono/{git → commands}/status.rb

@@ -1,5 +1,3 @@
-
-
 module Mono
 
   ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
@@ -30,7 +28,7 @@ module Mono
 
           Dir.chdir( org_path ) do
             if Dir.exist?( repo.name )
-              GitRepo.open( repo.name ) do |git|
+              GitProject.open( repo.name ) do |git|
                 output = git.changes
                 if output.empty?
                    puts "   - no changes -"

data/lib/mono/{git → commands}/sync.rb

@@ -1,44 +1,5 @@
-
-
-class GitHubRepo   ## todo: change to GitHubRepoRef or such - why? why not?
-  attr_reader :owner, :name
-
-  def initialize( owner, name )
-    @owner = owner    ## use/rename to login or something - why? why not??
-    @name  = name     #  e.g. "rubylibs/webservice"
-  end
-
-  def ssh_clone_url
-     ##  check: use https: as default? for github - http:// still supported? or redirected?
-     ## "http://github.com/#{@owner}/#{@name}"
-     "git@github.com:#{@owner}/#{@name}.git"
-  end
-end   ## class GitHubRepo
-
-
-
 module Mono
 
-  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 mo|moget|mono configuration file (that is, monorepo|monotree|repos.yml) found in >#{Dir.getwd}<"
-               nil
-            end
-
-    if path
-      YAML.load_file( path )
-    else
-      {}
-    end
-  end
-
-
   ## pass along hash of repos (e.g. monorepo.yml or repos.yml )
   def self.sync( h=Mono.monofile )
     count_orgs  = 0
@@ -65,7 +26,7 @@ module Mono
 
           Dir.chdir( org_path ) do
             if Dir.exist?( repo.name )
-              GitRepo.open( repo.name ) do |git|
+              GitProject.open( repo.name ) do |git|
                 if git.changes?
                   puts "!! WARN - local changes in workdir; skipping fast forward (remote) sync / merge"
                 else

data/lib/mono/git/base.rb

@@ -58,6 +58,11 @@ class Git   ## make Git a module - why? why not?
   #######
   ## more (major) git commands
 
+  def self.fetch
+    cmd = 'git fetch'
+    Shell.run( cmd )
+  end
+
   def self.pull
     cmd = 'git pull'
     Shell.run( cmd )
@@ -95,6 +100,26 @@ class Git   ## make Git a module - why? why not?
   end
 
 
+  #############
+  #  change git ls-files to git ls-tree ... - why? why not?
+  #
+  #  git ls-tree --full-tree --name-only -r HEAD
+  #   --full-tree makes the command run as if you were in the repo's root directory.
+  #   -r recurses into subdirectories. Combined with --full-tree, this gives you all committed, tracked files.
+  #   --name-only removes SHA / permission info for when you just want the file paths.
+  #   HEAD specifies which branch you want the list of tracked, committed files for. 
+  #     You could change this to master or any other branch name, but HEAD is the commit you have checked out right now.
+  #
+  #   see https://stackoverflow.com/questions/15606955/how-can-i-make-git-show-a-list-of-the-files-that-are-being-tracked
+ 
+  def self.files( pathspec=nil )  ## e.g. git ls-files .  or git ls-files *.rb or such
+    cmd = 'git ls-files'
+    cmd << " #{pathspec}"   unless pathspec.nil? || pathspec.empty?
+    Shell.run( cmd )
+  end
+  ## add list_files or ls_files alias - why? why not?
+
+
 ###
 #  use nested class for "base" for running commands - why? why not?
 class Shell
@@ -135,16 +160,18 @@ end # class Git
 
 
 
-class GitRepo
+class GitProject
   def self.open( path, &blk )
     new( path ).open( &blk )
   end
 
   def initialize( path )
-    raise ArgumentError, "dir >#{path}< not found; dir MUST already exist for GitRepo class - sorry"   unless Dir.exist?( path )
+    raise ArgumentError, "dir >#{path}< not found; dir MUST already exist for GitProject class - sorry"   unless Dir.exist?( path )
+    raise ArgumentError, "dir >#{path}/.git< not found; dir MUST already be initialized with git for GitProject class - sorry"  unless Dir.exist?( "#{path}/.git" )
     @path = path
   end
 
+
   def open( &blk )
     ## puts "Dir.getwd: #{Dir.getwd}"
     Dir.chdir( @path ) do
@@ -160,6 +187,8 @@ class GitRepo
   def changes?()                Git.changes?; end
   alias_method :dirty?, :changes?
 
+
+  def fetch()                   Git.fetch; end
   def pull()                    Git.pull; end
   def fast_forward()            Git.fast_forward; end
   alias_method :ff, :fast_forward
@@ -170,5 +199,27 @@ class GitRepo
   def add_all()                 Git.add_all; end
   def commit( message: )        Git.commit( message: message ); end
 
+  def files( pathspec=nil )     Git.files( pathspec ); end
+
+end # class GitProject
+
+
+
+
+## todo: change to GitHubRepoRef or GitHubProject
+##   or Git::GitHub or Git::Source::GitHub or such - why? why not?
+class GitHubRepo
+  attr_reader :owner, :name
+
+  def initialize( owner, name )
+    @owner = owner    ## use/rename to login or something - why? why not??
+    @name  = name     #  e.g. "rubylibs/webservice"
+  end
+
+  def ssh_clone_url
+     ##  check: use https: as default? for github - http:// still supported? or redirected?
+     ## "http://github.com/#{@owner}/#{@name}"
+     "git@github.com:#{@owner}/#{@name}.git"
+  end
+end   ## class GitHubRepo
 
-end # class GitRepo

data/lib/mono/sportdb.rb

@@ -9,13 +9,45 @@
 
 
 
+
+
+$RUBYLIBS_DEBUG = true
+$RUBYCOCO_DEBUG = true    ## always include (NOT just in sportdb?)
+
+
+### include / check for ruby debug flag too - why? why not?
+def debug?     ## always include (NOT just insportdb?)
+  value = ENV['DEBUG']
+  if value && ['true', 't',
+               'yes', 'y',
+               'on'].include?( value.downcase )
+    true
+  else
+    false
+  end
+end
+
+
 require_relative '../mono'
 
 
+
+
+SPORTDB_DIR      = "#{Mono.root}/sportdb"     # path to libs
+OPENFOOTBALL_DIR = "#{Mono.root}/openfootball"
+## add more "standard" dirs - why? why not? - why? why not?
+##   use
+##  module SportDb::Source / Code / Boot or such????
+##
+##  use module SportDb::Boot  - yes, yes, yes - why? why not?
+
+
+
 ## convenience pre-configured/pre-built shortcut - lets you use
 ##    require 'mono/sportdb'
 ##    Mono.setup
 
+##  use SportDb::Boot.setup (setup_load_path)  or such??? - why? why not?
 
 module Mono
     def self.setup   ## setup load path
@@ -31,15 +63,23 @@ module Mono
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sports/lib" )
 
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-importers/lib" )
-    ## todo - add readers, models, sync, etc.
-
+    $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-readers/lib" )
+    $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-sync/lib" )
+    $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-models/lib" )
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-catalogs/lib" )
+
+    ## todo/check:
+    ##   add fifa, footballdb-leagues, footballdb-clubs too ???
+    $LOAD_PATH.unshift( "#{root}/sportdb/football.db/footballdb-clubs/lib" ))
+    $LOAD_PATH.unshift( "#{root}/sportdb/football.db/footballdb-leagues/lib" ))
+    $LOAD_PATH.unshift( "#{root}/sportdb/football.db/fifa/lib" ))
+
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-formats/lib" )
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-structs/lib" )
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/sportdb-langs/lib" )
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/score-formats/lib" )
     $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/date-formats/lib" )
-
+    $LOAD_PATH.unshift( "#{root}/sportdb/sport.db/alphabets/lib" )
 
     pp $:  # print load path
   end

data/lib/mono/{git/tool.rb → tool.rb}

@@ -15,13 +15,15 @@ class Tool
 
    ## note: allow shortcut for commands
    case cmd.downcase
-   when 'status', 'stati', 'stat', 's'
+   when 'status', 'stati', 'stat', 'st', 's'
       Mono.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
+   when 'fetch', 'f'
+      Mono.fetch
    when 'env', 'e'
       Mono.env
    else

data/lib/mono/version.rb

@@ -2,16 +2,19 @@
 ##   for the gem version info e.g. Mono::Module vs Mono
 
 module Mono
-  module Module
+  MAJOR = 0    ## todo: namespace inside version or something - why? why not??
+  MINOR = 2
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
 
-    MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-    MINOR = 1
-    PATCH = 2
-    VERSION = [MAJOR,MINOR,PATCH].join('.')
+  def self.version
+    VERSION
+  end
 
-    def self.version
-      VERSION
-    end
+
+  module Module
+     ## note: move root to its own namespace to avoid
+     ##   conflict with Mono.root!!!!
 
     def self.banner
       "monos/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"

data/test/test_base.rb

@@ -7,7 +7,7 @@ require 'helper'
 class TestBase < MiniTest::Test
 
   def test_version
-    puts Mono::Module::VERSION
+    puts Mono::VERSION
     puts Mono::Module.banner
     puts Mono::Module.root
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monos
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -42,7 +42,6 @@ description: monos - monorepo / mono source tree tools and (startup) scripts
 email: opensport@googlegroups.com
 executables:
 - mo
-- moget
 - mono
 extensions: []
 extra_rdoc_files:
@@ -55,15 +54,16 @@ files:
 - README.md
 - Rakefile
 - bin/mo
-- bin/moget
 - bin/mono
 - lib/mono.rb
 - lib/mono/base.rb
+- lib/mono/commands/env.rb
+- lib/mono/commands/fetch.rb
+- lib/mono/commands/status.rb
+- lib/mono/commands/sync.rb
 - lib/mono/git/base.rb
-- lib/mono/git/status.rb
-- lib/mono/git/sync.rb
-- lib/mono/git/tool.rb
 - lib/mono/sportdb.rb
+- lib/mono/tool.rb
 - lib/mono/version.rb
 - lib/monos.rb
 - test/helper.rb

data/bin/moget

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-###################
-# DEV TIPS:
-#
-# For local testing run like:
-#
-#    ruby -Ilib bin/moget
-#
-# Set the executable bit in Linux. Example:
-#
-#    % chmod a+x bin/moget
-#
-
-require 'mono'
-
-Mono::Tool.main( ['sync'] )