modulesync 0.8.2 → 1.2.0

data/lib/modulesync/settings.rb

@@ -19,10 +19,9 @@ module ModuleSync
 
     def build_file_configs(target_name)
       file_def = lookup_config(defaults, target_name)
-      file_md  = lookup_config(module_defaults, target_name)
       file_mc  = lookup_config(module_configs, target_name)
 
-      global_defaults.merge(file_def).merge(file_md).merge(file_mc).merge(additional_settings)
+      global_defaults.merge(file_def).merge(module_defaults).merge(file_mc).merge(additional_settings)
     end
 
     def managed?(target_name)

data/lib/modulesync/util.rb

@@ -14,5 +14,15 @@ module ModuleSync
         {}
       end
     end
+
+    def self.parse_list(option_value)
+      if option_value.is_a? String
+        option_value.split(',')
+      elsif option_value.is_a? Array
+        option_value
+      else
+        []
+      end
+    end
   end
 end

data/lib/monkey_patches.rb

@@ -37,4 +37,19 @@ module Git
       final.map { |e| [e[0], DiffFile.new(@base, e[1])] }
     end
   end
+
+  class Lib
+    # Monkey patch ls_files until https://github.com/ruby-git/ruby-git/pull/320 is resolved
+    def ls_files(location=nil)
+      location ||= '.'
+      hsh = {}
+      command_lines('ls-files', ['--stage', location]).each do |line|
+        (info, file) = line.split("\t")
+        (mode, sha, stage) = info.split
+        file = eval(file) if file =~ /^\".*\"$/ # This takes care of quoted strings returned from git
+        hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
+      end
+      hsh
+    end
+  end
 end

data/modulesync.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '0.8.2'
+  spec.version               = '1.2.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
@@ -17,13 +17,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'aruba', '~> 0.14'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
 
   spec.add_runtime_dependency 'git', '~>1.3'
+  spec.add_runtime_dependency 'gitlab', '~>4.0'
+  spec.add_runtime_dependency 'octokit', '~>4.0'
   spec.add_runtime_dependency 'puppet-blacksmith', '~>3.0'
   spec.add_runtime_dependency 'thor'
 end

data/spec/unit/modulesync/pr/github_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'modulesync/pr/github'
+
+describe ModuleSync::PR::GitHub do
+  context '::manage' do
+    before(:each) do
+      @git_repo = 'test/modulesync'
+      @namespace, @repo_name = @git_repo.split('/')
+      @options = {
+        :pr => true,
+        :pr_title => 'Test PR is submitted',
+        :branch => 'test',
+        :message => 'Hello world',
+        :pr_auto_merge => false,
+      }
+
+      @client = double()
+      allow(Octokit::Client).to receive(:new).and_return(@client)
+      @it = ModuleSync::PR::GitHub.new('test', 'https://api.github.com')
+    end
+
+    it 'submits PR when --pr is set' do
+      allow(@client).to receive(:pull_requests).with(@git_repo, :state => 'open', :base => 'master', :head => "#{@namespace}:#{@options[:branch]}").and_return([])
+      expect(@client).to receive(:create_pull_request).with(@git_repo, 'master', @options[:branch], @options[:pr_title], @options[:message]).and_return({"html_url" => "http://example.com/pulls/22"})
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Submitted PR/).to_stdout
+    end
+
+    it 'skips submitting PR if one has already been issued' do
+      pr = {
+        "title" => "Test title",
+        "html_url" => "https://example.com/pulls/44",
+        "number" => "44"
+      }
+
+      expect(@client).to receive(:pull_requests).with(@git_repo, :state => 'open', :base => 'master', :head => "#{@namespace}:#{@options[:branch]}").and_return([pr])
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Skipped! 1 PRs found for branch test/).to_stdout
+    end
+
+    it 'adds labels to PR when --pr-labels is set' do
+      @options[:pr_labels] = "HELLO,WORLD"
+
+      allow(@client).to receive(:create_pull_request).and_return({"html_url" => "http://example.com/pulls/22", "number" => "44"})
+      allow(@client).to receive(:pull_requests).with(@git_repo, :state => 'open', :base => 'master', :head => "#{@namespace}:#{@options[:branch]}").and_return([])
+
+      expect(@client).to receive(:add_labels_to_an_issue).with(@git_repo, "44", ["HELLO", "WORLD"])
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Attaching the following labels to PR 44: HELLO, WORLD/).to_stdout
+    end
+  end
+end

data/spec/unit/modulesync/pr/gitlab_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+require 'modulesync/pr/gitlab'
+
+describe ModuleSync::PR::GitLab do
+  context '::manage' do
+    before(:each) do
+      @git_repo = 'test/modulesync'
+      @namespace, @repo_name = @git_repo.split('/')
+      @options = {
+        :pr => true,
+        :pr_title => 'Test PR is submitted',
+        :branch => 'test',
+        :message => 'Hello world',
+        :pr_auto_merge => false,
+      }
+
+      @client = double()
+      allow(Gitlab::Client).to receive(:new).and_return(@client)
+      @it = ModuleSync::PR::GitLab.new('test', 'https://gitlab.com/api/v4')
+    end
+
+    it 'submits MR when --pr is set' do
+      allow(@client).to receive(:merge_requests)
+        .with(@git_repo,
+              :state => 'opened',
+              :source_branch => "#{@namespace}:#{@options[:branch]}",
+              :target_branch => 'master',
+             ).and_return([])
+
+      expect(@client).to receive(:create_merge_request)
+        .with(@git_repo,
+              @options[:pr_title],
+              :labels => [],
+              :source_branch => @options[:branch],
+              :target_branch => 'master',
+             ).and_return({"html_url" => "http://example.com/pulls/22"})
+
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Submitted MR/).to_stdout
+    end
+
+    it 'skips submitting MR if one has already been issued' do
+      mr = {
+        "title" => "Test title",
+        "html_url" => "https://example.com/pulls/44",
+        "iid" => "44"
+      }
+
+      expect(@client).to receive(:merge_requests)
+        .with(@git_repo,
+              :state => 'opened',
+              :source_branch => "#{@namespace}:#{@options[:branch]}",
+              :target_branch => 'master',
+             ).and_return([mr])
+
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Skipped! 1 MRs found for branch test/).to_stdout
+    end
+
+    it 'adds labels to MR when --pr-labels is set' do
+      @options[:pr_labels] = "HELLO,WORLD"
+      mr = double()
+      allow(mr).to receive(:iid).and_return("42")
+
+      expect(@client).to receive(:create_merge_request)
+        .with(@git_repo,
+              @options[:pr_title],
+              :labels => ["HELLO", "WORLD"],
+              :source_branch => @options[:branch],
+              :target_branch => 'master',
+             ).and_return(mr)
+
+      allow(@client).to receive(:merge_requests)
+        .with(@git_repo,
+              :state => 'opened',
+              :source_branch => "#{@namespace}:#{@options[:branch]}",
+              :target_branch => 'master',
+             ).and_return([])
+
+      expect { @it.manage(@namespace, @repo_name, @options) }.to output(/Attached the following labels to MR 42: HELLO, WORLD/).to_stdout
+    end
+  end
+end

data/spec/unit/modulesync_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe ModuleSync do
+  context '::update' 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([])
+
+      options = { managed_modules_conf: 'test_file.yml' }
+      ModuleSync.update(options)
+    end
+  end
+
+  context '::create_pr_manager' do
+    describe "Raise Error" do
+      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
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: modulesync
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: gitlab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
@@ -152,13 +180,18 @@ files:
 - lib/modulesync/constants.rb
 - lib/modulesync/git.rb
 - lib/modulesync/hook.rb
+- lib/modulesync/pr/github.rb
+- lib/modulesync/pr/gitlab.rb
 - lib/modulesync/renderer.rb
 - lib/modulesync/settings.rb
 - lib/modulesync/util.rb
 - lib/monkey_patches.rb
 - modulesync.gemspec
 - spec/spec_helper.rb
+- spec/unit/modulesync/pr/github_spec.rb
+- spec/unit/modulesync/pr/gitlab_spec.rb
 - spec/unit/modulesync/settings_spec.rb
+- spec/unit/modulesync_spec.rb
 homepage: http://github.com/voxpupuli/modulesync
 licenses:
 - Apache-2.0
@@ -178,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Puppet Module Synchronizer
@@ -190,4 +222,7 @@ test_files:
 - features/support/env.rb
 - features/update.feature
 - spec/spec_helper.rb
+- spec/unit/modulesync/pr/github_spec.rb
+- spec/unit/modulesync/pr/gitlab_spec.rb
 - spec/unit/modulesync/settings_spec.rb
+- spec/unit/modulesync_spec.rb