Merge pull request #605 from ekohl/fix-bins

Work with Modulesync 1.0.0

Gemfile

@@ -25,6 +25,6 @@ group :release do
 end
 
 gem 'puppet_forge', '>= 2.2.9'
-gem 'modulesync', '>= 0.10.0'
+gem 'modulesync', '>= 1.0.0'
 gem "octokit", "~> 4.0"
 # vim: syntax=ruby

bin/clean-git-checkouts

@@ -2,7 +2,7 @@
 
 set -e
 
-for module in modules/* ; do
+for module in modules/*/* ; do
   (cd $module
   git status
   git reset --hard

bin/clean-git-checkouts-nondestructive

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for module in modules/* ; do
+for module in modules/*/* ; do
   (
   cd "${module}" || exit
   echo "${module}"

bin/clean-metadata

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import os
+import glob
 import json
 
 # Note range is exclusive so the last number is not in the list
@@ -17,9 +17,7 @@ UNSUPPORTED = {
     'Ubuntu': {str(i) + m for i in range(4, 18) for m in ('.04', '.10')} - {'16.04'},
 }
 
-for mod in os.listdir('modules'):
-    filename = os.path.join('modules', mod, 'metadata.json')
-
+for filename in glob.glob('modules/*/*/metadata.json'):
     print('Reading {}'.format(filename))
 
     with open(filename) as fp:

bin/count-unreleased-commits

@@ -2,7 +2,7 @@
 
 set -e
 
-for module in modules/* ; do
+for module in modules/*/* ; do
   count=$(git --git-dir "${module}/.git" log "$(git --git-dir "${module}/.git" describe --tags --abbrev=0)"..HEAD --oneline | wc -l)
   printf '%-40s %3d\n' "$module" $count
 done

bin/create-pull-requests

@@ -7,7 +7,7 @@ if ! which hub > /dev/null ; then
 fi
 
 version=$(git describe)
-for module in modules/* ; do
+for module in modules/*/* ; do
   (cd "$module"
   hub pull-request -m "modulesync ${version}"
   )

bin/set-travis-secret

@@ -20,17 +20,18 @@ def cli(filename, modules):
     with open(filename) as secrets_fp:
         secrets = yaml.load(secrets_fp)
 
+    modulesync = yaml.load(Path('modulesync.yml').read_text())
+    namespace = modulesync['namespace']
+
     if not modules:
-        with open('managed_modules.yml') as managed_modules:
-            modules = yaml.load(managed_modules)
+        modules = yaml.load(Path('managed_modules.yml').read_text())
 
     modules_path = Path('modules')
 
     for module in modules:
-        path = modules_path / module / '.sync.yml'
+        path = modules_path / namespace / module / '.sync.yml'
         try:
-            with path.open() as sync_fp:
-                sync = yaml.load(sync_fp)
+            sync = yaml.load(path.read_text())
         except FileNotFoundError:
             sync = {}