modulesync 2.0.1 → 2.2.0

data/.travis.yml

@@ -1,28 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-dist: focal
-script: 'bundle exec rake test'
-bundler_args: --without release
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-notifications:
-  email: false
-  irc:
-    on_success: always
-    on_failure: always
-    channels:
-      - "chat.freenode.org#voxpupuli-notifications"
-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