singularity_dsl 1.3.2 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTEyZDNjOTA1YTJiY2E4ZjZlYmZlMjMyZWMxNjI3YTlhNTNkNzZiNw==
+    NjY4YmE3ODM5YjkyZDEyYzJhMTE5MWVkNDEyODg2ZGU1NmFmZmU4NQ==
   data.tar.gz: !binary |-
-    MDBkYmZjZWZjZWY0NTM3ODI2ODZiMDYyODdlYjRmNGZiZmY0YWRkYg==
+    M2RkYzJjNGI1NTcwMzQzZjc5MTQ0NDVkNDlmYTcxMGUwYmJiYzJkMA==
 SHA512:
   metadata.gz: !binary |-
-    N2EwNmZmOWM4MDgwYjA4NmU5YzE0YzYzZTIwMTM0ZmFlYzJlMjA3MDA5MzM5
-    ZTYwN2Q1NGFiZTA5MmViOTVmMWNiODA0ZmViOTM2YTgyOGMyYTk3NjYzNDU0
-    MzU2NzhjMjFmMmY1MjJmYjVkNTRkMjVhZDkyNDZkZGE1NDcyODg=
+    ODdkNTQzYzAwMDk5N2QzYWE3Y2NmMTdkM2VjZGQ5MWNhZmE2ZmRlNjc0MmJh
+    NTY4NTBhMzBmMzY0ZjI4MDM2M2RmMDY1MWE2ZDI3ZTNmNzQ2ZjljYzEzNWVj
+    ODc1NWIxNzJlOTgzNzhiMTdhOGE5OWRkZmM3YmNmZDA2NDQ1OTg=
   data.tar.gz: !binary |-
-    Y2ZjODEwZTZlNDIyMzM0NGMyNzQ1MzQ4MDE4NTNmMjE1NGQ1OTk4OGJjYzJj
-    N2E1OWE5NmM5NmRkMGVmMDg0MDE4NjU4ZGExNTkwY2MxYzYyOTBiZDNlZTg5
-    YTY5YWYxMWFiNzI5MzQxMDliYzM2NmFiYWNiOGFhNTc3YTY4YjU=
+    NDA1MzI4ZDVlZGVhYzJlZjBlYjkwYTM0Y2VlZTNlZjUxYWY2MDkxZDY4MmM1
+    ZmI5MjJjY2Q2ZDBhZjFlODY4YTQ1M2EzZWE4NzFjNzhlODkzOTYzY2IwZTZh
+    ZDBlMjE5ZWJiZDRjMzYzNTY2Zjg5NTJjNmE4ZjQ5ZTRmMTQ1ZjE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (1.3.2)
+    singularity_dsl (1.4.0)
       mixlib-shellout (~> 1.4)
       rainbow (~> 2.0.0)
       rake (~> 10.3)

data/README.md

@@ -1,5 +1,9 @@
 # SingularityDsl
 
+[![Gem Version](https://badge.fury.io/rb/singularity_dsl.svg)](http://badge.fury.io/rb/singularity_dsl)
+[![Dependency Status](https://gemnasium.com/behance/singularity_dsl.svg)](https://gemnasium.com/behance/singularity_dsl)
+[![Code Climate](https://codeclimate.com/github/behance/singularity_dsl/badges/gpa.svg)](https://codeclimate.com/github/behance/singularity_dsl)
+
 A DSL lib for your [SingularityCI](https://github.com/behance/singularity) instance.
 Inspired by TravisCI's `.travis.yml`
 

data/lib/singularity_dsl/cli/cli.rb

@@ -17,10 +17,18 @@ module SingularityDsl
       include Stdout
       include Table
 
+      attr_reader :git
+
       def initialize(*args)
         super
         @diff_list = nil
         @git = GitHelper.new
+        envvars = options[:env] || []
+        envvars.each do |pair|
+          key = pair.split(':', 2).first
+          val = pair.split(':', 2).last
+          ENV[key] = val
+        end
       end
 
       class_option :task_path,
@@ -37,6 +45,9 @@ module SingularityDsl
                    type: :string,
                    desc: 'Specify path to a .singularityrc file',
                    default: './.singularityrc'
+      class_option :env,
+                   type: :array,
+                   desc: 'EnvVars to set, formatted as VAR:VAL'
 
       # TASKS COMMAND
       desc 'tasks', 'Available tasks.'
@@ -74,7 +85,7 @@ module SingularityDsl
              desc: 'Run a batch instead, after testmerge.',
              default: ''
       def testmerge(git_fork, branch, base_branch, base_fork = nil)
-        test_merge git_fork, branch, base_branch, base_fork
+        @git.merge_refs git_fork, branch, base_branch, base_fork
         @diff_list = diff_list base_branch, base_fork
         remove_remotes git_fork, base_fork
         batch target_run_task if target_run_task
@@ -91,15 +102,6 @@ module SingularityDsl
         urls.each { |url| @git.remove_remote url }
       end
 
-      def test_merge(git_fork, branch, base_branch, base_fork)
-        @git.clean_reset
-        @git.add_remote base_fork
-        @git.checkout_remote base_branch, base_fork
-        @git.add_remote git_fork
-        @git.merge_remote branch, git_fork
-        @git.install_submodules
-      end
-
       def target_run_task
         target = options[:run_task]
         target = false if target.eql? ''

data/lib/singularity_dsl/git_helper.rb

@@ -47,6 +47,15 @@ module SingularityDsl
       exec("git remote rm #{remote}")
     end
 
+    def merge_refs(git_fork, branch, base_branch, base_fork)
+      clean_reset
+      add_remote base_fork
+      checkout_remote base_branch, base_fork
+      add_remote git_fork
+      merge_remote branch, git_fork
+      install_submodules
+    end
+
     private
 
     def remote_cmd(branch, url, action)

data/lib/singularity_dsl/version.rb

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

data/spec/singularity_dsl/cli/cli_spec.rb

@@ -7,7 +7,7 @@ describe 'Cli' do
 
   context '#testmerge' do
     before(:each) do
-      expect(cli).to receive(:test_merge)
+      expect(cli.git).to receive(:merge_refs)
       expect(cli).to receive(:diff_list)
       expect(cli).to receive(:remove_remotes)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - chr0n1x
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout