pdksync 0.5.0 → 0.8.0

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pdksync
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.50.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,33 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.14.1
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: jenkins_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,26 +199,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
+- ".github/workflows/labeller.yml"
+- ".github/workflows/mend.yml"
+- ".github/workflows/nightly.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/release_prep.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
+- CODEOWNERS
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/pdksync.rb
-- lib/pdksync/constants.rb
+- lib/pdksync/conf/puppet_abs_supported_platforms.yaml
+- lib/pdksync/configuration.rb
 - lib/pdksync/githubclient.rb
 - lib/pdksync/gitlabclient.rb
 - lib/pdksync/gitplatformclient.rb
+- lib/pdksync/jenkinsclient.rb
+- lib/pdksync/logger.rb
 - lib/pdksync/pullrequest.rb
 - lib/pdksync/rake_tasks.rb
+- lib/pdksync/utils.rb
+- lib/pdksync/version.rb
 - managed_modules.yml
 - pdksync.gemspec
-- spec/lib/pdksync_spec.rb
+- spec/configuration_spec.rb
+- spec/fixtures/fake_managed_modules.yaml
+- spec/fixtures/pdksync.yml
+- spec/logger_spec.rb
+- spec/pdksync_spec.rb
+- spec/spec_helper.rb
+- spec/utils_spec.rb
 homepage: http://github.com/puppetlabs/pdksync
 licenses:
 - Apache-2.0
@@ -189,16 +249,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Puppet Module PDK Synchronizer
 test_files:
-- spec/lib/pdksync_spec.rb
+- spec/configuration_spec.rb
+- spec/fixtures/fake_managed_modules.yaml
+- spec/fixtures/pdksync.yml
+- spec/logger_spec.rb
+- spec/pdksync_spec.rb
+- spec/spec_helper.rb
+- spec/utils_spec.rb

data/.travis.yml

@@ -1,27 +0,0 @@
-sudo: false
-dist: trusty
-language: ruby
-cache: bundler
-before_install:
-- bundle -v
-- rm -f Gemfile.lock
-- gem update --system
-- gem --version
-- bundle -v
-script:
-- bundle exec $CHECK
-rvm:
-- 2.4.1
-matrix:
-  fast_finish: true
-  include:
-  - env: CHECK='rubocop'
-  - env: CHECK='rspec spec'
-branches:
-  only:
-  - master
-  - "/^v\\d/"
-  - release
-env:
-  global:
-    secure: Hk8cxtIHM6kyRBSmcWWUSXUV50E/yo3MGJf3mPphb3ORUfzqjB8FGZLSn1VCIP81y++U6pZAg8/AkvcDNME0at1wWh/ONiOwYKxAyyVfr0/5/i7a+dIj/9MX2kUT6MBKZXipbln/u5brdwBAHJccFHz7doq30Nd108KE5ucqf0ZbptJyDbpsrIturK9Hx+mde9sYd6MyNlzGJkQOhSL22Zd+ppBSf/GDpk2+yWN171oGwHDPWPE47q4nkIrWjnWy0kLCqxoM0zHIPxPES6lhudso4ofbumnRiHcr7DldReC8Rq1CUe/fhG7udGEdPN26JAREyUeD8MOwo2uQohQluHvjOMx9leF7Sbu+tk5E2bqVz5ofm0bksZUIBahUtGP+REvwVruFOH8RsvO3pQBndDKG11691UY55L9qZNaQ82cNOWbfG1nNuglH0GIpJgdhjvWuGw1he4c18u1fgQGM01xO7JEDIpYHrrjBboD3mL/iXMmvxwg35eIrlkfdgl9DTBWqKOoLi79WpkDajI+2B/ABXW4L/WKWlM041UjAs5/r3jgkbcZz1nZVbU4Wa5r/6RvIfrM/FXnaGuZcwx7VdPBmfyhV4rgM4siyJDdhqudTRsq1+Al9q3MhZcyKQLmad8ShEx+dfG9WRBoayE+piD/9xkfriqdMk5YEjH02grE=

data/lib/pdksync/constants.rb

@@ -1,78 +0,0 @@
-require 'yaml'
-
-# @summary
-#   A module used to contain a set of variables that are expected to remain constant across all iterations of the main pdksync module.
-# @note
-#   Configuration is loaded from `$HOME/.pdksync.yml`. If $HOME is not set, the config_path will use the current directory.
-#   Set PDKSYNC_LABEL to '' to disable adding a label during pdksync runs.
-module PdkSync # rubocop:disable Style/ClassAndModuleChildren
-  # Constants contains the configuration for pdksync to use
-  module Constants
-    default_config = {
-      namespace: 'puppetlabs',
-      pdksync_dir: 'modules_pdksync',
-      push_file_destination: 'origin',
-      create_pr_against: 'master',
-      managed_modules: 'managed_modules.yml',
-      pdksync_label: 'maintenance',
-      git_platform: :github,
-      git_base_uri: 'https://github.com',
-      gitlab_api_endpoint: 'https://gitlab.com/api/v4'
-    }
-
-    supported_git_platforms = [:github, :gitlab]
-
-    config = {}
-
-    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?
-      custom_config = YAML.load_file(config_path)
-      config[:namespace] = custom_config['namespace'] ||= default_config[:namespace]
-      config[:pdksync_dir] = custom_config['pdksync_dir'] ||= default_config[:pdksync_dir]
-      config[:push_file_destination] = custom_config['push_file_destination'] ||= default_config[:push_file_destination]
-      config[:create_pr_against] = custom_config['create_pr_against'] ||= default_config[:create_pr_against]
-      config[:managed_modules] = custom_config['managed_modules'] ||= default_config[:managed_modules]
-      config[:pdksync_label] = custom_config['pdksync_label'] ||= default_config[:pdksync_label]
-      config[:git_platform] = custom_config['git_platform'] ||= default_config[:git_platform]
-      config[:git_base_uri] = custom_config['git_base_uri'] ||= case config[:git_platform]
-                                                                when :gitlab
-                                                                  'https://gitlab.com'
-                                                                else
-                                                                  default_config[:git_base_uri]
-                                                                end
-      config[:gitlab_api_endpoint] = custom_config['gitlab_api_endpoint'] ||= default_config[:gitlab_api_endpoint]
-    else
-      config = default_config
-    end
-
-    NAMESPACE = config[:namespace].freeze
-    PDKSYNC_DIR = config[:pdksync_dir].freeze
-    PUSH_FILE_DESTINATION = config[:push_file_destination].freeze
-    CREATE_PR_AGAINST = config[:create_pr_against].freeze
-    MANAGED_MODULES = config[:managed_modules].freeze
-    PDKSYNC_LABEL = config[:pdksync_label].freeze
-    GIT_PLATFORM = config[:git_platform].downcase.to_sym.freeze
-    GIT_BASE_URI = config[:git_base_uri].freeze
-    GITLAB_API_ENDPOINT = config[:gitlab_api_endpoint].freeze
-    ACCESS_TOKEN = case GIT_PLATFORM
-                   when :github
-                     ENV['GITHUB_TOKEN'].freeze
-                   when :gitlab
-                     ENV['GITLAB_TOKEN'].freeze
-                   end
-
-    # Sanity checks
-
-    unless supported_git_platforms.include?(GIT_PLATFORM)
-      raise "Unsupported Git hosting platform '#{GIT_PLATFORM}'."\
-        " Supported platforms are: #{supported_git_platforms.join(', ')}"
-    end
-
-    if ACCESS_TOKEN.nil?
-      raise "Git platform access token for #{GIT_PLATFORM.capitalize} not set"\
-        " - use 'export #{GIT_PLATFORM.upcase}_TOKEN=\"<your token>\"' to set"
-    end
-  end
-end

data/spec/lib/pdksync_spec.rb

@@ -1,58 +0,0 @@
-require_relative '../../lib/pdksync'
-require 'git'
-require 'fileutils'
-require 'octokit'
-
-describe PdkSync do
-  before(:all) do
-    @pdksync_dir = './modules_pdksync'
-    module_name = 'puppetlabs-testing'
-    @module_names = ['puppetlabs-testing']
-    @output_path = "#{@pdksync_dir}/#{module_name}"
-    @folder = Dir.pwd
-  end
-
-  before(:each) do
-    allow(PdkSync).to receive(:return_modules).and_return(@module_names)
-    allow(PdkSync).to receive(:validate_modules_exist).and_return(@module_names)
-    Dir.chdir(@folder)
-  end
-
-  context 'main method' do
-    it 'runs clone sucessfully' do
-      FileUtils.rm_rf(@pdksync_dir)
-      PdkSync.create_filespace
-      PdkSync.main(steps: [:clone])
-      expect(Dir.exist?(@pdksync_dir)).to be(true)
-      expect(Dir.exist?(@output_path)).to be(true)
-    end
-    it 'runs pdk convert, and files have changed' do
-      PdkSync.main(steps: [:pdk_convert])
-      File.exist?("#{@output_path}/convert_report.txt")
-    end
-    it 'raise when running a command with no argument' do
-      expect { PdkSync.main(steps: [:run_a_command]) }.to raise_error(RuntimeError, %r{"run_a_command" requires an argument to run.})
-    end
-    it 'runs a command "touch cat.meow"' do
-      PdkSync.main(steps: [:run_a_command], args: 'touch cat.meow')
-      expect File.exist?("#{@output_path}/cat.meow")
-    end
-    it 'raise when create_commit with no arguments' do
-      expect { PdkSync.main(steps: [:create_commit]) }.to raise_error(RuntimeError, %r{Needs a branch_name and commit_message})
-    end
-    it 'create_commit runs, and contains the "kittens in mittens"' do
-      PdkSync.main(steps: [:create_commit], args: { branch_name: 'temp_branch', commit_message: 'kittens in mittens' })
-      git_repo = Git.open(@output_path)
-      expect(git_repo.show).to include('kittens in mittens')
-    end
-    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 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})
-    end
-  end
-end