pdksync 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2ac9994044ffbddbbe2a6a18933d764477c2cdff17578abc2b203272c0bca0
-  data.tar.gz: da3644827bdad46868369dd0297ebae4dedfd15225ccf41def3aecdb5c0bfd73
+  metadata.gz: db56fccacb1a8fd65ffe4179aaad15fecbcd041b199748f08984dbce2a8d5064
+  data.tar.gz: 25586423e467cf87fa7986237dd954d1be333bbe343eed24f50653627e90385e
 SHA512:
-  metadata.gz: 9d35e566ef6c5f29fdff5536721343d9c21aeedca3c3465afc4813183cc6b3ff6919687e43c63167649a6024fb711f420fbd9d604f402880eb99d32d0c1483f1
-  data.tar.gz: e5a4b656cc8a940d106a652b6a3818e3fc7106020b3581d192eb2d5706183a069edf59e1d6196c4aaf06c495f876bfe6c2591079abbb3e9b585196a863bf91ba
+  metadata.gz: bc7e96689dcba3b6c19c5b3f04be7ce8a89f5ec08de728336d20e688d34dd0676a9e26b3a877e373c7b5f89cec352921e58c13e8b017a91b34cdb4f38129a79e
+  data.tar.gz: b2866e5751b9528062b907b2d1292c17037aa437d4f2e1bab3d2a63c21a6d459a6f35bb8a1517ad98a8c2022ab09a3434f7c13518130cdec1a4363469af13215

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## [0.5.0](https://github.com/puppetlabs/pdksync/tree/0.5.0) (2019-08-21)
+
+[Full Changelog](https://github.com/puppetlabs/pdksync/compare/0.4.0...0.5.0)
+
+### Added
+
+- pdksync externalisation fixes [\#95](https://github.com/puppetlabs/pdksync/pull/95) ([DavidS](https://github.com/DavidS))
+- \(MODULES-8730\) Display warning on outdated pdk version [\#92](https://github.com/puppetlabs/pdksync/pull/92) ([eimlav](https://github.com/eimlav))
+
+### Fixed
+
+- \(MODULES-9011\) deal with modules that do not need updating [\#101](https://github.com/puppetlabs/pdksync/pull/101) ([DavidS](https://github.com/DavidS))
+
 ## [0.4.0](https://github.com/puppetlabs/pdksync/tree/0.4.0) (2019-02-04)
 
 [Full Changelog](https://github.com/puppetlabs/pdksync/compare/v0.3.0...0.4.0)

data/Gemfile

@@ -7,4 +7,3 @@ gemspec
 
 gem 'github_changelog_generator', git: 'https://github.com/skywinder/github-changelog-generator', ref: 'master'
 gem 'travis'
-gem 'colorize'

data/README.md

@@ -25,50 +25,93 @@ Pdksync by default expects that your Puppet module repositories live on GitHub a
 
 1. To use pdksync, clone the GitHub repo or install it as a gem. Set up the environment by exporting a GitHub token:
 
-   ```
+   ```shell
    export GITHUB_TOKEN=<access_token>
    ```
 
    If you use GitLab instead of GitHub export your GitLab access token:
 
-   ```
+   ```shell
    export GITLAB_TOKEN=<access_token>
    ```
 2. Before the script will run, you need to install the gems:
-```
+```shell
 bundle install --path .bundle/gems/
 ```
 3. Once this is complete, call the built-in rake task to run the module:
-```
+```shell
 bundle exec rake pdksync
 ```
 
 ### How it works
 ------------
 
-Pdksync is a gem that works to clone, update, and push module repositories. It is activated from within the pdksync module.
+Pdksync is a gem that works to clone, update, and push module repositories. Create a new git repository to store your working config. You need the following files in there:
+
+Rakefile:
+```ruby
+require 'pdksync/rake_tasks'
+```
+
+Gemfile:
+```ruby
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+gem 'pdksync', github: 'puppetlabs/pdksync', ref: 'pdksync-externalisation-fixes'
+gem 'rake'
+```
+
+managed_modules.yml:
+```yaml
+---
+- repo1
+- repo2
+- repo3
+- repo4
+```
+
+pdksync.yml:
+```yaml
+---
+namespace: 'YOUR GITHUB NAME'
+git_base_uri: 'git@github.com:'
+```
 
-The gem takes in a file, `managed_modules.yml`, stored within the gem that lists all the repositories that need to be updated. It then clones them, one after another, so that a local copy exists. The update command is ran against this local copy, with the subsequent changes being added into a commit on a unique branch. It is then pushed back to the remote master — where the local copy was originally cloned. The commit is merged to the master via a pull request, causing the gem to begin to clone the next repository.
 
-By default, pdksync will supply a label to a PR (default is 'maintenance'). This can be changed by creating `$HOME/.pdksync.yml` and setting the `pdksync_label` key. You must ensure that the label selected exists on the modules that you are applying pdksync to. Should you wish to disable this feature, simply change `pdksync_label` to an empty string i.e. `''`. Similarly, when supplying a label using the `git:push_and_create_pr` rake task, the label must exist on each of the managed modules to run successfully.
+Run the following commands to check that everything is working as expected:
+
+```shell
+bundle install --path .bundle/gems/
+bundle exec rake -T
+bundle exec rake git:clone_managed_modules
+```
+
+The rake tasks take in a file, `managed_modules.yml`, stored within the local directory that lists all the repositories that need to be updated. It then clones them, one after another, so that a local copy exists. The `pdk update` command is ran against this local copy, with the subsequent changes being added into a commit on a unique branch. It is then pushed back to the remote master — where the local copy was originally cloned. A pull request against master is opened, and pdksync begins to clone the next repository.
+
+By default, pdksync will supply a label to a PR (default is 'maintenance'). This can be changed by creating `pdksync.yml` in the local directory and setting the `pdksync_label` key. You must ensure that the label selected exists on the modules that you are applying pdksync to. Should you wish to disable this feature, set `pdksync_label` to an empty string i.e. `''`. Similarly, when supplying a label using the `git:create_pr` rake task, the label must exist on each of the managed modules to run successfully.
 
 The following rake tasks are available with pdksync:
-- `show_config` Display the current configuration of pdksync
+- `pdksync:show_config` Display the current configuration of pdksync
 - `git:clone_managed_modules` Clone managed modules.
 - `git:create_commit[:branch_name, :commit_message]` Stage commits for modules, branchname and commit message eg rake 'git:create_commit[flippity, commit messagez]'.
-- `git:push_and_create_pr[:pr_title, :label]` Push commit, and create PR for modules. Label is optional eg rake 'git:push_and_create_pr[pr title goes here, optional label right here]'.
+- `git:push` Push staged commits eg rake 'git:push'.
+- `git:create_pr[:pr_title, :label]` Create PR for modules. Label is optional eg rake 'git:create_pr[pr title goes here, optional label right here]'.
 - `git:clean[:branch_name]` Clean up origin branches, (branches must include pdksync in their name) eg rake 'git:clean[pdksync_origin_branch]'.
-- `pdk:pdk_convert` Runs PDK convert against modules.
-- `pdk:pdk_validate` Runs PDK validate against modules.
+- `pdksync:pdk_convert` Runs PDK convert against modules.
+- `pdksync:pdk_validate` Runs PDK validate against modules.
 - `pdksync[:additional_title]` Run full pdksync process, clone repository, pdk update, create pr. Additional information can be added to the title, which will be appended before the reference section.
   - `rake pdksync` PR title outputs as `pdksync - pdksync_heads/master-0-gabccfb1`
   - `rake 'pdksync[MODULES-8231]'` PR title outputs as `pdksync - MODULES-8231 - pdksync_heads/master-0-gabccfb1`
-- `run_a_command[:command]` Run a command against modules eg rake 'run_a_command[complex command here -f -gx]'
+- `pdksync:run_a_command[:command]` Run a command against modules eg rake 'pdksync:run_a_command[complex command here -f -gx]'
 
 ### Configuration
 
-By default pdksync will use hardcoded values for configuring itself. However, if you wish to override these values, simply create `$HOME/.pdksync.yml` and use the following format:
-```
+By default pdksync will use hardcoded values for configuring itself. However, if you wish to override these values, create a `pdksync.yml` in your working directory and use the following format:
+```yaml
 ---
 namespace: 'puppetlabs'
 pdksync_dir: 'modules_pdksync'
@@ -105,7 +148,7 @@ need to export your GitLab access token as the environment variable
 
 Your `$HOME/.pdksync.yml` then looks like this:
 
-```
+```yaml
 # ~/pdksync.yml
 ---
 namespace: 'acme'
@@ -114,8 +157,8 @@ git_platform: :gitlab
 
 Export your GitLab access token:
 
-```
-$ export GITLAB_TOKEN=<your GitLab access token here>
+```shell
+export GITLAB_TOKEN=<your GitLab access token here>
 ```
 
 If you are running your own GitLab instance on premise or use a GitLab instance
@@ -124,7 +167,7 @@ other than the official one at `https://gitlab.com` you also need to configure
 pdksync knows from where to clone your modules and where to access to GitLab
 API to create the live merge requests:
 
-```
+```yaml
 # ~/pdksync.yml
 ---
 namespace: 'puppetmodules'
@@ -145,7 +188,7 @@ It currently runs without additional arguments. To alter how it runs, make alter
 
 This module runs through a pre-set array of modules, with this array set within the `managed_modules.yml` file. This file makes use of a simple `yaml` style format to set out the different module names, for example:
 
-```
+```yaml
 ---
 - puppetlabs-motd
 - puppetlabs-stdlib
@@ -185,7 +228,7 @@ When you're confident everything is in good shape, you can start converting your
 Useful commands via the .sync.yml:
 
 - Add additional gem dependencies:
-```
+```yaml
 Gemfile:
   required:
     ':system_tests':
@@ -193,18 +236,18 @@ Gemfile:
         platforms: ruby
 ```
 - Make changes to your travis configuration:
-```
+```yaml
 .travis.yml:
   branches:
     - release
 ```
 - Delete files that you don't want to exist in the repo:
-```
+```yaml
 .gitlab-ci.yml:
   delete: true
 ```
 - Unmanage files that you don't want to be managed:
-```
+```yaml
 .gitlab-ci.yml:
   unmanaged: true
 ```
@@ -236,15 +279,15 @@ This tool has been developed and tested on OSX and Linux. **It currently does no
 
 1. Fork the repo
 2. Create your feature branch:
-```
+```shell
 git checkout -b my-new-feature
 ```
 3. Commit your changes:
-```
+```shell
 git commit -am 'Add some feature'
 ```
 4. Push to the branch:
-```
+```shell
 git push origin my-new-feature
 ```
 5. Create a new pull request

data/Rakefile

@@ -1,77 +1,16 @@
-require_relative 'lib/pdksync'
-require 'colorize'
+require 'pdksync/rake_tasks'
 require 'github_changelog_generator/task'
+require 'rubocop/rake_task'
 
-desc 'Display the current configuration of pdksync'
-task :show_config do
-  include PdkSync::Constants
-  puts 'PDKSync Configuration'.bold.yellow
-  puts '- Git hosting platform: '.bold + "#{PdkSync::Constants::GIT_PLATFORM}".cyan
-  puts '- Git base URI: '.bold + "#{PdkSync::Constants::GIT_BASE_URI}".cyan
-  if PdkSync::Constants::GIT_PLATFORM == :gitlab
-    puts '- Gitlab API endpoint: '.bold + "#{PdkSync::Constants::GITLAB_API_ENDPOINT}".cyan
-  end
-  puts '- Namespace: '.bold + "#{PdkSync::Constants::NAMESPACE}".cyan
-  puts '- PDKSync Dir: '.bold + "#{PdkSync::Constants::PDKSYNC_DIR}".cyan
-  puts '- Push File Destination: '.bold + "#{PdkSync::Constants::PUSH_FILE_DESTINATION}".cyan
-  puts '- Create PR Against: '.bold + "#{PdkSync::Constants::CREATE_PR_AGAINST}".cyan
-  puts '- Managed Modules: '.bold + "#{PdkSync::Constants::MANAGED_MODULES}".cyan
-  puts '- Default PDKSync Label: '.bold + "#{PdkSync::Constants::PDKSYNC_LABEL}".cyan
-end
-
-desc 'Run full pdksync process, clone repository, pdk update, create pr. Additional title information can be added to the title, which will be appended before the reference section.'
-task :pdksync, [:additional_title] do |task, args|
-  args = {:branch_name    => "pdksync_{ref}",
-          :commit_message => "pdksync_{ref}",
-          :pr_title       => "pdksync_{ref}",
-          :additional_title => args[:additional_title]}
-  PdkSync::main(steps: [:use_pdk_ref, :clone, :pdk_update, :create_commit, :push_and_create_pr], args: args)
-end
-
-namespace :pdk do
-  desc 'Runs PDK convert against modules'
-  task :pdk_convert do
-    PdkSync::main(steps: [:pdk_convert])
-  end
-
-  desc 'Runs PDK validate against modules'
-  task :pdk_validate do
-    PdkSync::main(steps: [:pdk_validate])
-  end
-end
-
-namespace :git do
-  desc 'Clone managed modules'
-  task :clone_managed_modules do
-    PdkSync::main(steps: [:clone])
-  end
-
-  desc "Stage commits for modules, branchname and commit message eg rake 'git:create_commit[flippity, commit messagez]'"
-  task :create_commit, [:branch_name, :commit_message] do |task, args|
-    PdkSync::main(steps: [:create_commit], args: args)
-  end
-
-  desc "Push commit, and create PR for modules eg rake 'git:push_and_create_pr[pr title goes here, optional label right here]'"
-  task :push_and_create_pr, [:pr_title, :label]  do |task, args|
-    PdkSync::main(steps: [:push_and_create_pr], args: args)
-  end
-
-  desc "Clean up origin branches, (branches must include pdksync in their name) eg rake 'git:clean[pdksync_origin_branch]'"
-  task :clean_branches, [:branch_name]  do |task, args|
-    PdkSync::main(steps: [:clean_branches], args: args)
-  end
-end
-
-desc "Run a command against modules eg rake 'run_a_command[complex command here -f -gx]'"
-task :run_a_command, [:command] do |task, args|
-  PdkSync::main(steps: [:run_a_command], args: args[:command])
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ['--display-cop-names']
 end
 
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
   config.user = 'puppetlabs'
   config.project = 'pdksync'
   # config.since_tag = '1.1.1'
-  config.future_release = '0.4.0'
+  config.future_release = '0.5.0'
   config.exclude_labels = ['maintenance']
   config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
   config.add_pr_wo_labels = true

data/lib/pdksync.rb

@@ -10,6 +10,7 @@ require 'json'
 require 'yaml'
 require 'colorize'
 require 'bundler'
+require 'octokit'
 
 # @summary
 #   This module set's out and controls the pdksync process
@@ -49,6 +50,7 @@ module PdkSync
   }
 
   def self.main(steps: [:clone], args: nil)
+    check_pdk_version
     create_filespace
     client = setup_client
     module_names = return_modules
@@ -69,8 +71,8 @@ module PdkSync
       raise 'Needs a branch_name and commit_message' if args.nil? || args[:commit_message].nil? || args[:branch_name].nil?
       puts "Commit branch_name=#{args[:branch_name]} commit_message=#{args[:commit_message]}"
     end
-    # validation push_and_create_pr
-    if steps.include?(:push_and_create_pr)
+    # validation create_pr
+    if steps.include?(:create_pr)
       raise 'Needs a pr_title' if args.nil? || args[:pr_title].nil?
       puts "PR title =#{args[:additional_title]} #{args[:pr_title]}"
     end
@@ -134,35 +136,47 @@ module PdkSync
         create_commit(git_instance, module_args[:branch_name], module_args[:commit_message])
         print 'commit created, '
       end
-      if steps.include?(:push_and_create_pr)
+      if steps.include?(:push)
         Dir.chdir(main_path) unless Dir.pwd == main_path
         git_instance = Git.open(output_path)
-        push_staged_files(git_instance, git_instance.current_branch, repo_name)
-        print 'push, '
-        pdk_version = return_pdk_version("#{output_path}/metadata.json")
-
-        # If a label is supplied, verify that it is available in the repo
-        label = module_args[:pdksync_label] ? module_args[:pdksync_label] : module_args[:label]
-        label_valid = (label.is_a?(String) && !label.to_str.empty?) ? check_for_label(client, repo_name, label) : nil
-
-        # Exit current iteration if an error occured retrieving a label
-        if label_valid == false
-          raise 'Ensure label is valid'
+        if git_instance.diff(git_instance.current_branch, "#{@push_file_destination}/#{@create_pr_against}").size != 0 # Git::Diff doesn't have empty? # rubocop:disable Style/ZeroLengthPredicate
+          push_staged_files(git_instance, git_instance.current_branch, repo_name)
+          print 'push, '
+        else
+          print 'skipped push, '
         end
-
-        # Create the PR and add link to pr list
-        pr = create_pr(client, repo_name, git_instance.current_branch, pdk_version, module_args[:pr_title])
-        if pr.nil?
-          break
-        end
-
-        pr_list.push(pr.html_url)
-        print 'created pr, '
-
-        # If a valid label is supplied, add this to the PR
-        if label_valid == true
-          add_label(client, repo_name, pr.number, label)
-          print "added label '#{label}' "
+      end
+      if steps.include?(:create_pr)
+        Dir.chdir(main_path) unless Dir.pwd == main_path
+        git_instance = Git.open(output_path)
+        if git_instance.diff(git_instance.current_branch, "#{@push_file_destination}/#{@create_pr_against}").size != 0 # Git::Diff doesn't have empty? # rubocop:disable Style/ZeroLengthPredicate
+          pdk_version = return_pdk_version("#{output_path}/metadata.json")
+
+          # If a label is supplied, verify that it is available in the repo
+          label = module_args[:pdksync_label] ? module_args[:pdksync_label] : module_args[:label]
+          label_valid = (label.is_a?(String) && !label.to_str.empty?) ? check_for_label(client, repo_name, label) : nil
+
+          # Exit current iteration if an error occured retrieving a label
+          if label_valid == false
+            raise 'Ensure label is valid'
+          end
+
+          # Create the PR and add link to pr list
+          pr = create_pr(client, repo_name, git_instance.current_branch, pdk_version, module_args[:pr_title])
+          if pr.nil?
+            break
+          end
+
+          pr_list.push(pr.html_url)
+          print 'created pr, '
+
+          # If a valid label is supplied, add this to the PR
+          if label_valid == true
+            add_label(client, repo_name, pr.number, label)
+            print "added label '#{label}' "
+          end
+        else
+          print 'skipped pr, '
         end
       end
       if steps.include?(:clean_branches)
@@ -179,6 +193,22 @@ module PdkSync
     end
   end
 
+  # @summary
+  #   Check the local pdk version against the most recent tagged release on GitHub
+  def self.check_pdk_version
+    stdout, _stderr, status = Open3.capture3("#{return_pdk_path} --version")
+    raise "(FAILURE) Unable to find pdk at '#{return_pdk_path}'.".red unless status.exitstatus
+
+    local_version = stdout.strip
+    remote_version = Octokit.tags('puppetlabs/pdk').first[:name][1..-1]
+
+    unless Gem::Version.new(remote_version) <= Gem::Version.new(local_version)
+      puts "(WARNING) The current version of pdk is #{remote_version} however you are using #{local_version}".red
+    end
+  rescue StandardError => error
+    puts "(WARNING) Unable to check latest pdk version. #{error}".red
+  end
+
   # @summary
   #   This method when called will create a directory identified by the set global variable '@pdksync_dir', on the condition that it does not already exist.
   def self.create_filespace
@@ -243,8 +273,9 @@ module PdkSync
 
   def self.create_commit(git_repo, branch_name, commit_message)
     checkout_branch(git_repo, branch_name)
-    add_staged_files(git_repo)
-    commit_staged_files(git_repo, branch_name, commit_message)
+    if add_staged_files(git_repo) # ignore rubocop for clarity on side effect ordering # rubocop:disable Style/GuardClause
+      commit_staged_files(git_repo, branch_name, commit_message)
+    end
   end
 
   # @summary
@@ -357,8 +388,10 @@ module PdkSync
     if git_repo.status.changed != {}
       git_repo.add(all: true)
       puts 'All files have been staged.'
+      true
     else
       puts 'Nothing to commit.'
+      false
     end
   end
 

data/lib/pdksync/constants.rb

@@ -24,7 +24,7 @@ module PdkSync # rubocop:disable Style/ClassAndModuleChildren
 
     config = {}
 
-    config_path = "#{ENV['HOME']}/.pdksync.yml"
+    config_path = File.exist?('pdksync.yml') ? 'pdksync.yml' : "#{ENV['HOME']}/.pdksync.yml"
 
     # pdksync config file must exist, not be empty and not be an empty YAML file
     if File.exist?(config_path) && YAML.load_file(config_path) && !YAML.load_file(config_path).nil?

data/lib/pdksync/rake_tasks.rb

@@ -0,0 +1,73 @@
+require 'pdksync'
+require 'colorize'
+
+desc 'Run full pdksync process, clone repository, pdk update, create pr. Additional title information can be added to the title, which will be appended before the reference section.'
+task :pdksync, [:additional_title] do |_task, args|
+  args = { branch_name: 'pdksync_{ref}',
+           commit_message: 'pdksync_{ref}',
+           pr_title: 'pdksync_{ref}',
+           additional_title: args[:additional_title] }
+  PdkSync.main(steps: [:use_pdk_ref, :clone, :pdk_update, :create_commit, :push, :create_pr], args: args)
+end
+
+namespace :pdksync do
+  desc 'Runs PDK convert against modules'
+  task :pdk_convert do
+    PdkSync.main(steps: [:pdk_convert])
+  end
+
+  desc 'Runs PDK validate against modules'
+  task :pdk_validate do
+    PdkSync.main(steps: [:pdk_validate])
+  end
+
+  desc "Run a command against modules eg rake 'run_a_command[complex command here -f -gx]'"
+  task :run_a_command, [:command] do |_task, args|
+    PdkSync.main(steps: [:run_a_command], args: args[:command])
+  end
+
+  desc 'Display the current configuration of pdksync'
+  task :show_config do
+    include PdkSync::Constants
+    puts 'Please note that you can override any of the configuration by using an additional file at `$HOME/.pdksync.yml`.'.bold.red
+    puts 'PDKSync Configuration'.bold.yellow
+    puts '- Git hosting platform: '.bold + PdkSync::Constants::GIT_PLATFORM.to_s.cyan
+    puts '- Git base URI: '.bold + PdkSync::Constants::GIT_BASE_URI.to_s.cyan
+    if PdkSync::Constants::GIT_PLATFORM == :gitlab
+      puts '- Gitlab API endpoint: '.bold + PdkSync::Constants::GITLAB_API_ENDPOINT.to_s.cyan
+    end
+    puts '- Namespace: '.bold + PdkSync::Constants::NAMESPACE.to_s.cyan
+    puts '- PDKSync Dir: '.bold + PdkSync::Constants::PDKSYNC_DIR.to_s.cyan
+    puts '- Push File Destination: '.bold + PdkSync::Constants::PUSH_FILE_DESTINATION.to_s.cyan
+    puts '- Create PR Against: '.bold + PdkSync::Constants::CREATE_PR_AGAINST.to_s.cyan
+    puts '- Managed Modules: '.bold + PdkSync::Constants::MANAGED_MODULES.to_s.cyan
+    puts '- Default PDKSync Label: '.bold + PdkSync::Constants::PDKSYNC_LABEL.to_s.cyan
+  end
+end
+
+namespace :git do
+  desc 'Clone managed modules'
+  task :clone_managed_modules do
+    PdkSync.main(steps: [:clone])
+  end
+
+  desc "Stage commits for modules, branchname and commit message eg rake 'git:create_commit[flippity, commit messagez]'"
+  task :create_commit, [:branch_name, :commit_message] do |_task, args|
+    PdkSync.main(steps: [:create_commit], args: args)
+  end
+
+  desc "Push commits for the module eg rake 'git:push'"
+  task :push do |_task|
+    PdkSync.main(steps: [:push], args: nil)
+  end
+
+  desc "Create PR for modules eg rake 'git:create_pr[pr title goes here, optional label right here]'"
+  task :create_pr, [:pr_title, :label] do |_task, args|
+    PdkSync.main(steps: [:create_pr], args: args)
+  end
+
+  desc "Clean up origin branches, (branches must include pdksync in their name) eg rake 'git:clean[pdksync_origin_branch]'"
+  task :clean_branches, [:branch_name] do |_task, args|
+    PdkSync.main(steps: [:clean_branches], args: args)
+  end
+end

data/managed_modules.yml

@@ -41,15 +41,16 @@
 #- puppetlabs-translate
 #- puppetlabs-vcsrepo
 #- puppetlabs-websphere_application_server
-# networking team
+## networking team
 #- cisco_ios
 #- device_manager
 #- puppetlabs-panos
 #- puppetlabs-resource_api
 ## testing only
-# - puppetlabs-testing
-# - puppetlabs-testing1
-# - puppetlabs-testing2
+#- puppetlabs-testing
+#- puppetlabs-testing1
+#- puppetlabs-testing2
 ## cloud and containers team
-# - puppetlabs-kubernetes
-# - puppetlabs-rook
+#- puppetlabs-kubernetes
+#- puppetlabs-helm
+#- puppetlabs-rook

data/pdksync.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'pdksync'
-  spec.version               = '0.4.0'
+  spec.version               = '0.5.0'
   spec.authors               = ['Puppet']
   spec.email                 = ['']
   spec.summary               = 'Puppet Module PDK Synchronizer'
@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
-  spec.add_development_dependency 'octokit'
-  spec.add_development_dependency 'gitlab'
   spec.add_development_dependency 'pry'
 
   spec.add_runtime_dependency 'git', '~>1.3'
   spec.add_runtime_dependency 'pdk', '>= 1.4.1'
+  spec.add_runtime_dependency 'rake'
+  spec.add_runtime_dependency 'gitlab'
+  spec.add_runtime_dependency 'octokit'
+  spec.add_runtime_dependency 'colorize'
 end

data/spec/lib/pdksync_spec.rb

@@ -45,11 +45,11 @@ describe PdkSync do
       git_repo = Git.open(@output_path)
       expect(git_repo.show).to include('kittens in mittens')
     end
-    it 'raise when push_and_create_pr with no arguments' do
-      expect { PdkSync.main(steps: [:push_and_create_pr]) }.to raise_error(RuntimeError, %r{Needs a pr_title})
+    it 'raise when create_pr with no arguments' do
+      expect { PdkSync.main(steps: [:create_pr]) }.to raise_error(RuntimeError, %r{Needs a pr_title})
     end
-    it 'raise when push_and_create_pr with invalid label' do
-      expect { PdkSync.main(steps: [:push_and_create_pr], args: { pr_title: 'My amazing PR', label: 'doot doot' }) }.to raise_error(RuntimeError, %r{Ensure label is valid})
+    it 'raise when create_pr with invalid label' do
+      expect { PdkSync.main(steps: [:create_pr], args: { pr_title: 'My amazing PR', label: 'doot doot' }) }.to raise_error(RuntimeError, %r{Ensure label is valid})
     end
     it 'raise when clean_branches with no arguments' do
       expect { PdkSync.main(steps: [:clean_branches]) }.to raise_error(RuntimeError, %r{Needs a branch_name, and the branch name contains the string pdksync})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdksync
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,41 +67,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: pdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.4.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: gitlab
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pdk
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 description: Utility to synchronize common files across puppet modules using PDK Update.
 email:
 - ''
@@ -159,6 +173,7 @@ files:
 - lib/pdksync/gitlabclient.rb
 - lib/pdksync/gitplatformclient.rb
 - lib/pdksync/pullrequest.rb
+- lib/pdksync/rake_tasks.rb
 - managed_modules.yml
 - pdksync.gemspec
 - spec/lib/pdksync_spec.rb
@@ -181,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Puppet Module PDK Synchronizer