modulesync 1.2.0 → 2.1.0

data/spec/unit/modulesync_spec.rb

@@ -5,17 +5,21 @@ describe ModuleSync do
     it 'loads the managed modules from the specified :managed_modules_conf' do
       allow(ModuleSync).to receive(:find_template_files).and_return([])
       allow(ModuleSync::Util).to receive(:parse_config).with('./config_defaults.yml').and_return({})
-      expect(ModuleSync).to receive(:managed_modules).with('./test_file.yml', nil, nil).and_return([])
+      expect(ModuleSync).to receive(:managed_modules).with(no_args).and_return([])
 
       options = { managed_modules_conf: 'test_file.yml' }
       ModuleSync.update(options)
     end
   end
 
-  context '::create_pr_manager' do
+  context '::pr' do
     describe "Raise Error" do
+      let(:puppet_module) do
+        ModuleSync::PuppetModule.new 'puppet-test', remote: 'dummy'
+      end
+
       it 'raises an error when neither GITHUB_TOKEN nor GITLAB_TOKEN are set for PRs' do
-        expect { ModuleSync.create_pr_manager() }.to raise_error(RuntimeError).and output(/GITHUB_TOKEN/).to_stderr
+        expect { ModuleSync.pr(puppet_module) }.to raise_error(RuntimeError).and output(/No GitHub or GitLab token specified for --pr/).to_stderr
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,22 @@ dependencies:
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -158,13 +164,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".config/cucumber.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
@@ -175,18 +184,25 @@ files:
 - features/step_definitions/git_steps.rb
 - features/support/env.rb
 - features/update.feature
+- features/update/bad_context.feature
+- features/update/bump_version.feature
 - lib/modulesync.rb
 - lib/modulesync/cli.rb
+- lib/modulesync/cli/thor.rb
 - lib/modulesync/constants.rb
-- lib/modulesync/git.rb
 - lib/modulesync/hook.rb
 - lib/modulesync/pr/github.rb
 - lib/modulesync/pr/gitlab.rb
+- lib/modulesync/puppet_module.rb
 - lib/modulesync/renderer.rb
+- lib/modulesync/repository.rb
 - lib/modulesync/settings.rb
+- lib/modulesync/source_code.rb
 - lib/modulesync/util.rb
 - lib/monkey_patches.rb
 - modulesync.gemspec
+- spec/helpers/faker.rb
+- spec/helpers/faker/puppet_module_remote_repo.rb
 - spec/spec_helper.rb
 - spec/unit/modulesync/pr/github_spec.rb
 - spec/unit/modulesync/pr/gitlab_spec.rb
@@ -204,14 +220,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer
@@ -221,6 +237,10 @@ test_files:
 - features/step_definitions/git_steps.rb
 - features/support/env.rb
 - features/update.feature
+- features/update/bad_context.feature
+- features/update/bump_version.feature
+- spec/helpers/faker.rb
+- spec/helpers/faker/puppet_module_remote_repo.rb
 - spec/spec_helper.rb
 - spec/unit/modulesync/pr/github_spec.rb
 - spec/unit/modulesync/pr/gitlab_spec.rb

data/.travis.yml

@@ -1,27 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-dist: trusty
-script: 'bundle exec rake test'
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-notifications:
-  email: false
-deploy:
-  provider: rubygems
-  api_key:
-    secure: "Tbf1EbLEobIIox+fftJZADZsfQQ6kl0urcMNetK7NJzFo/negD/WyJIUj3kro/B7buyYADEjTui/JR4o8EPbugfM3ie5vYOd5k3AesSzbdr4BSwGe/cGbGOB7/PZuGfFLkb94/FiCU2mIwibkbh1rHWGlBoPj7ntL0+5ZtdvsM4="
-  gem: modulesync
-  on:
-    rvm: 2.7
-    tags: true
-    all_branches: true
-    repo: voxpupuli/modulesync

data/lib/modulesync/git.rb

@@ -1,194 +0,0 @@
-require 'git'
-require 'puppet_blacksmith'
-
-module ModuleSync
-  module Git # rubocop:disable Metrics/ModuleLength
-    include Constants
-
-    def self.remote_branch_exists?(repo, branch)
-      repo.branches.remote.collect(&:name).include?(branch)
-    end
-
-    def self.local_branch_exists?(repo, branch)
-      repo.branches.local.collect(&:name).include?(branch)
-    end
-
-    def self.remote_branch_differ?(repo, local_branch, remote_branch)
-      !remote_branch_exists?(repo, remote_branch) ||
-        repo.diff("#{local_branch}..origin/#{remote_branch}").any?
-    end
-
-    def self.default_branch(repo)
-      symbolic_ref = repo.branches.find { |b| b.full =~ %r{remotes/origin/HEAD} }
-      return unless symbolic_ref
-      %r{remotes/origin/HEAD\s+->\s+origin/(?<branch>.+?)$}.match(symbolic_ref.full)[:branch]
-    end
-
-    def self.switch_branch(repo, branch)
-      unless branch
-        branch = default_branch(repo)
-        puts "Using repository's default branch: #{branch}"
-      end
-      return if repo.current_branch == branch
-
-      if local_branch_exists?(repo, branch)
-        puts "Switching to branch #{branch}"
-        repo.checkout(branch)
-      elsif remote_branch_exists?(repo, branch)
-        puts "Creating local branch #{branch} from origin/#{branch}"
-        repo.checkout("origin/#{branch}")
-        repo.branch(branch).checkout
-      else
-        repo.checkout('origin/master')
-        puts "Creating new branch #{branch}"
-        repo.branch(branch).checkout
-      end
-    end
-
-    def self.pull(git_base, name, branch, project_root, opts)
-      puts "Syncing #{name}"
-      Dir.mkdir(project_root) unless Dir.exist?(project_root)
-
-      # Repo needs to be cloned in the cwd
-      if !Dir.exist?("#{project_root}/#{name}") || !Dir.exist?("#{project_root}/#{name}/.git")
-        puts 'Cloning repository fresh'
-        remote = opts[:remote] || (git_base.start_with?('file://') ? "#{git_base}#{name}" : "#{git_base}#{name}.git")
-        local = "#{project_root}/#{name}"
-        puts "Cloning from #{remote}"
-        repo = ::Git.clone(remote, local)
-        switch_branch(repo, branch)
-      # Repo already cloned, check out master and override local changes
-      else
-        # Some versions of git can't properly handle managing a repo from outside the repo directory
-        Dir.chdir("#{project_root}/#{name}") do
-          puts "Overriding any local changes to repositories in #{project_root}"
-          repo = ::Git.open('.')
-          repo.fetch
-          repo.reset_hard
-          switch_branch(repo, branch)
-          repo.pull('origin', branch) if remote_branch_exists?(repo, branch)
-        end
-      end
-    end
-
-    def self.update_changelog(repo, version, message, module_root)
-      changelog = "#{module_root}/CHANGELOG.md"
-      if File.exist?(changelog)
-        puts "Updating #{changelog} for version #{version}"
-        changes = File.readlines(changelog)
-        File.open(changelog, 'w') do |f|
-          date = Time.now.strftime('%Y-%m-%d')
-          f.puts "## #{date} - Release #{version}\n\n"
-          f.puts "#{message}\n\n"
-          # Add old lines again
-          f.puts changes
-        end
-        repo.add('CHANGELOG.md')
-      else
-        puts 'No CHANGELOG.md file found, not updating.'
-      end
-    end
-
-    def self.bump(repo, m, message, module_root, changelog = false)
-      new = m.bump!
-      puts "Bumped to version #{new}"
-      repo.add('metadata.json')
-      update_changelog(repo, new, message, module_root) if changelog
-      repo.commit("Release version #{new}")
-      repo.push
-      new
-    end
-
-    def self.tag(repo, version, tag_pattern)
-      tag = tag_pattern % version
-      puts "Tagging with #{tag}"
-      repo.add_tag(tag)
-      repo.push('origin', tag)
-    end
-
-    def self.checkout_branch(repo, branch)
-      selected_branch = branch || repo.current_branch || 'master'
-      repo.branch(selected_branch).checkout
-      selected_branch
-    end
-    private_class_method :checkout_branch
-
-    # Git add/rm, git commit, git push
-    def self.update(name, files, options)
-      module_root = "#{options[:project_root]}/#{name}"
-      message = options[:message]
-      repo = ::Git.open(module_root)
-      branch = checkout_branch(repo, options[:branch])
-      files.each do |file|
-        if repo.status.deleted.include?(file)
-          repo.remove(file)
-        elsif File.exist?("#{module_root}/#{file}")
-          repo.add(file)
-        end
-      end
-      begin
-        opts_commit = {}
-        opts_push = {}
-        opts_commit = { :amend => true } if options[:amend]
-        opts_push = { :force => true } if options[:force]
-        if options[:pre_commit_script]
-          script = "#{File.dirname(File.dirname(__FILE__))}/../contrib/#{options[:pre_commit_script]}"
-          `#{script} #{module_root}`
-        end
-        repo.commit(message, opts_commit)
-        if options[:remote_branch]
-          if remote_branch_differ?(repo, branch, options[:remote_branch])
-            repo.push('origin', "#{branch}:#{options[:remote_branch]}", opts_push)
-          end
-        else
-          repo.push('origin', branch, opts_push)
-        end
-        # Only bump/tag if pushing didn't fail (i.e. there were changes)
-        m = Blacksmith::Modulefile.new("#{module_root}/metadata.json")
-        if options[:bump]
-          new = bump(repo, m, message, module_root, options[:changelog])
-          tag(repo, new, options[:tag_pattern]) if options[:tag]
-        end
-      rescue ::Git::GitExecuteError => git_error
-        if git_error.message =~ /working (directory|tree) clean/
-          puts "There were no files to update in #{name}. Not committing."
-          return false
-        else
-          puts git_error
-          raise
-        end
-      end
-
-      true
-    end
-
-    # Needed because of a bug in the git gem that lists ignored files as
-    # untracked under some circumstances
-    # https://github.com/schacon/ruby-git/issues/130
-    def self.untracked_unignored_files(repo)
-      ignore_path = "#{repo.dir.path}/.gitignore"
-      ignored = File.exist?(ignore_path) ? File.read(ignore_path).split : []
-      repo.status.untracked.keep_if { |f, _| ignored.none? { |i| File.fnmatch(i, f) } }
-    end
-
-    def self.update_noop(name, options)
-      puts "Using no-op. Files in #{name} may be changed but will not be committed."
-
-      repo = ::Git.open("#{options[:project_root]}/#{name}")
-      checkout_branch(repo, options[:branch])
-
-      puts 'Files changed:'
-      repo.diff('HEAD', '--').each do |diff|
-        puts diff.patch
-      end
-
-      puts 'Files added:'
-      untracked_unignored_files(repo).each_key do |file|
-        puts file
-      end
-
-      puts "\n\n"
-      puts '--------------------------------'
-    end
-  end
-end