singularity_dsl 2.1.1 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzJmODVlN2ZlZjk1OTM0YjFmYTlkNTkxMjQyOThiYWRlOTg3YWJiMw==
+    MjMyZGI0MWNkZDRhNWZmODhhYzFmZTljZTVjYWQxNWMwOWZhMGJhMQ==
   data.tar.gz: !binary |-
-    ODI2MWRkYzdmMDNhNjNjYWYyY2U4OTQ1ODc2MGMxZGYwNmM4OGRkZQ==
+    ZjNhNTQ2MjZlNGEyODllYTMxZDE2NjMyYzZjOTU5MGUxZTRlNzk4ZA==
 SHA512:
   metadata.gz: !binary |-
-    NjRkNmM0ODBmNTc5MWU3ZGU2ZjhiY2QwMTE0MjcxZmQ0MGUxZDA1Y2E2MWIz
-    NDRlOGZlMWE3NGQ5NzFlNGIxZjBmZDVjMDIwMGZhNDE0NzNmODU3YmQ0YmMw
-    N2Q4NGVlN2I0MDJkOWNiMTI1M2Y1MGQ1YzdlMGQ2OTQ2ZDk4YzA=
+    NmExNWZkNTI1NzVmOGUzZDUyNjQwMTJlMjExNWU5NjNlYTg3MDA2OGMwOTVl
+    MzI5NWRhM2MwNDhhZWFlYTBlNWYwNjYzNDMyY2U0YmUxMjFkOTYzZWNkZDE2
+    MzIwMWU0Nzg5NmMzNmUwNDA1MTg1MjZkOTgzNWUwNWM3NTlhNGM=
   data.tar.gz: !binary |-
-    OTAxODQyZmY5Yjk4Zjc2ZGNiYTIzMTYxN2Q1YWQ4ZjIwZWE3ZGMzODQzNjg0
-    YWZmMjY5ZjY0ZmE3NGE5YjU5NjFiZTA5N2I2ZWM1OTRlNTU1ZTc3NWZkYTgw
-    YjEzMjcwMzkyM2U5N2JmMzM1YjZiNjNmNjI4MDY4M2RlZTc2Zjg=
+    NWMxYTJjODc0N2I2MjEwMjVlOTIwMTRhNjM5OGMyYmFhOWVkN2Y1ZThmNmUw
+    OWFhNDhlYTYwOWYxMDUyNWIwYzMyYTg5M2FmYjg3MjI2MTcyMDU2NzIwZmYz
+    OGYxMjdhODRmNzNkYTdhMmQ5YmNkNDM2OGM0MzhlZjVhZjlmM2E=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (2.1.1)
+    singularity_dsl (2.2.0)
       coveralls (~> 0.7.9)
       json (~> 1.0)
       mixlib-shellout (~> 2.0)

data/lib/singularity_dsl/cli/command/test_merge.rb

@@ -26,6 +26,14 @@ module SingularityDsl
           self
         end
 
+        def set_fork_env(fork_url, branch)
+          git.add_remote(fork_url)
+          git.checkout_remote(branch, fork_url)
+          setup_git_env(branch)
+          git.remove_remote(fork_url)
+          self
+        end
+
         def perform_merge(fork_url, branch, base_branch, repo_url = nil)
           git.merge_refs fork_url, branch, base_branch, repo_url
           git.install_submodules
@@ -46,6 +54,22 @@ module SingularityDsl
 
         private
 
+        def git_env_flags
+          {
+            'GIT_AUTHOR_NAME' => "--pretty=format:'%aN'",
+            'GIT_AUTHOR_EMAIL' => "--pretty=format:'%ae'",
+            'GIT_COMMITTER_NAME' => "--pretty=format:'%cN'",
+            'GIT_COMMITTER_EMAIL' => "--pretty=format:'%ce'",
+            'GIT_ID' => "--pretty=format:'%H'",
+            'GIT_MESSAGE' => "--pretty=format:'%s'"
+          }
+        end
+
+        def setup_git_env(branch)
+          git_env_flags.each { |k, f| ENV[k] = git.log("-1 #{f}") }
+          ENV['GIT_BRANCH'] = branch
+        end
+
         def inject_diff_list(app)
           return if diff_list.empty?
           info 'Running with diff-list'

data/lib/singularity_dsl/cli.rb

@@ -76,6 +76,7 @@ EOD
       def testmerge(git_fork, branch, base_branch, base_fork = nil)
         Command::TestMerge.new(options).tap do |cmd|
           cmd.bootstrap_cwd(base_fork)
+            .set_fork_env(git_fork, branch)
             .perform_merge(git_fork, branch, base_branch, base_fork)
             .execute
         end

data/lib/singularity_dsl/git_helper.rb

@@ -15,6 +15,10 @@ module SingularityDsl
       @verbose = false
     end
 
+    def log(flags = '')
+      exec("git log #{flags}", true)
+    end
+
     def cwd_is_git_repo
       ::File.exist? "#{::Dir.pwd}/.git"
     end
@@ -114,14 +118,15 @@ module SingularityDsl
       exec 'git clean -fdx'
     end
 
-    def exec(cmd)
+    def exec(cmd, output = false)
       task = Mixlib::ShellOut.new cmd
       if @verbose
         info cmd
         task.live_stream = STDOUT
       end
       task.run_command
-      task.exitstatus
+      return task.stdout if output
+      return task.exitstatus unless output
     end
   end
 end

data/lib/singularity_dsl/version.rb

@@ -2,5 +2,5 @@
 
 # version const for gem
 module SingularityDsl
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/spec/singularity_dsl/cli/command/test_merge_spec.rb

@@ -3,10 +3,25 @@
 require 'singularity_dsl/cli/command/test_merge'
 
 describe SingularityDsl::Cli::Command::TestMerge do
-  def create_command(params)
+  def create_command(params = {})
     SingularityDsl::Cli::Command::TestMerge.new params
   end
 
+  def cmd_double(expected = false)
+    mock = double.as_null_object
+    allow(mock).to receive(:exitstatus).and_return 0
+    allow(mock).to receive(:stdout).and_return expected if expected
+    mock
+  end
+
+  def expect_git_cmd(cmd, expected = false)
+    mock = cmd_double(expected)
+    expect(::Mixlib::ShellOut)
+      .to receive(:new).with(cmd)
+      .once
+      .and_return(mock)
+  end
+
   describe '#batch' do
     context ':run_task given' do
       let(:cmd) { create_command(run_task: 'foo') }
@@ -38,15 +53,6 @@ describe SingularityDsl::Cli::Command::TestMerge do
     end
 
     context ':bootstrap_cwd is true' do
-      def expect_git_cmd(cmd)
-        cmd_double = double.as_null_object
-        allow(cmd_double).to receive(:exitstatus).and_return 0
-        expect(::Mixlib::ShellOut)
-          .to receive(:new).with(cmd)
-          .once
-          .and_return(cmd_double)
-      end
-
       let(:cmd) { create_command(bootstrap_cwd: true) }
 
       context 'and the cwd is an empty directory' do
@@ -77,4 +83,40 @@ describe SingularityDsl::Cli::Command::TestMerge do
       end
     end
   end
+
+  describe '#set_fork_env' do
+    let(:cmd) { create_command }
+    let(:repo) { 'fakedood/fakerepo' }
+    let(:branch) { 'fakedoodbranch' }
+
+    it 'sets ENV vars correctly' do
+      gitid = 'gitid'
+      author = 'fakedood'
+      author_email = 'fakedood@usa.lan'
+      committer = 'fakedoodbro'
+      committer_email = 'fakedoodbro@fakedoodsbutt.lan'
+      message = 'bro I commit some things tight tight tight'
+
+      expect_git_cmd("git remote add fakedood_fakerepo #{repo}")
+      expect_git_cmd('git fetch --all')
+      expect_git_cmd("git checkout fakedood_fakerepo/#{branch}")
+      expect_git_cmd('git remote rm fakedood_fakerepo')
+      expect_git_cmd("git log -1 --pretty=format:'%H'", gitid)
+      expect_git_cmd("git log -1 --pretty=format:'%aN'", author)
+      expect_git_cmd("git log -1 --pretty=format:'%ae'", author_email)
+      expect_git_cmd("git log -1 --pretty=format:'%cN'", committer)
+      expect_git_cmd("git log -1 --pretty=format:'%ce'", committer_email)
+      expect_git_cmd("git log -1 --pretty=format:'%s'", message)
+
+      expect(ENV).to receive(:[]=).with('GIT_ID', gitid)
+      expect(ENV).to receive(:[]=).with('GIT_AUTHOR_NAME', author)
+      expect(ENV).to receive(:[]=).with('GIT_AUTHOR_EMAIL', author_email)
+      expect(ENV).to receive(:[]=).with('GIT_COMMITTER_NAME', committer)
+      expect(ENV).to receive(:[]=).with('GIT_COMMITTER_EMAIL', committer_email)
+      expect(ENV).to receive(:[]=).with('GIT_MESSAGE', message)
+      expect(ENV).to receive(:[]=).with('GIT_BRANCH', branch)
+
+      cmd.set_fork_env(repo, branch)
+    end
+  end
 end

data/spec/singularity_dsl/git_helper_spec.rb

@@ -10,6 +10,26 @@ describe 'GitHelper' do
   end
   let(:git) { SingularityDsl::GitHelper.new }
 
+  context '#log' do
+    let(:task) { double.as_null_object }
+
+    it 'passes flags directly to the command' do
+      expect(::Mixlib::ShellOut).to receive(:new)
+        .with('git log flags!')
+        .and_return task
+
+      git.log('flags!')
+    end
+
+    it 'returns output of the command' do
+      log = 'this is a gitlog yo!'
+      allow(task).to receive(:stdout).and_return log
+      allow(::Mixlib::ShellOut).to receive(:new).and_return task
+
+      expect(git.log('flags!')).to eql log
+    end
+  end
+
   context '#initialize' do
     it 'sets verbose off' do
       expect(git.verbose).to eql false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - chr0n1x