singularity_dsl 1.2.5 → 1.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc0YjUwZWE2NmJhNGEzMzkyMzQyMjllY2VlOTk4Yzg3ZjMwYzgxZQ==
+    Mzg2MGViZWNiZjM3MWYwNWYzMTlmYTk2ZDQxYTcxZmI0NzQxZTNjMw==
   data.tar.gz: !binary |-
-    YThjODFlMDNhMTUwYTI3N2YxMDlmOWRhMGNjNzQ5MjE4ZDExNDczMg==
+    Zjk3MTE3OTk4NjI3ZGNmMzM3ZDRhMDdmZjc1NGNiOTY4ODBiY2YyNQ==
 SHA512:
   metadata.gz: !binary |-
-    MmY2NWFhZWY3ZTA5ZWRjZmU1MjVjYjUwNmI4MmM2YWNkNWI0YmRkYmJjNmNj
-    ZTljYjM3NmIwYzBmMTM4YjNlNjk0OTBkOWY5N2MwM2M4MTEwYTA4OTljNzY2
-    ZjJlMGZmN2ZmYTJhNWNiOWZiMjVmNTM0ZDdjNTliZDhlMjdmZWU=
+    OGE5ZjUwZDkwZWY1ZmI4ZjUzNDkyODQ1NmY5ZGVkYmNhOGQ2YTFiYzdkNzA0
+    MWQ4ODc0MzYxMmZlYTMyNzY0ZWFmNjhhM2ZlOTBjNmE0NzBlZjU0M2EyYzll
+    NDYxZGQ0MDAxZGJmNjkwYzJkZTRlMWMyN2JlMzNhMTQ1NzIyYWM=
   data.tar.gz: !binary |-
-    YzlkYmNiMDM2YzI2MjQzNzY1NWEwMWQ5OGQ2MDJjOTYyMDg0MzQ2YmJhY2E2
-    YTliNzYxNjU0YmNmMzhjNDA3NmRmMDUwODg4NzhkOGE3YzdjN2JhYjNlNDk1
-    YzJjMzUwNDkwMWZiZTNjYjE3NGJiYTJiYjEyZjM0ZThiZmY0ZmE=
+    N2MxM2M2ZGMxMjgxMGQ5MzZmOTlmOTU1MDQyOWYzNjYwYzM4YWMzNDllMDU3
+    YjNmNWFiMmE3NjVlYzMxM2EzM2E0MWRhMGI0MDU5ODg0Mzg0MjQ2OTBmNjI4
+    Njc3ODliODAwZDdmMWMzZTQ4OTVkNzkyY2QwMTEzMzhlMzdiMDM=

data/Gemfile.lock

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

data/lib/singularity_dsl/cli/cli.rb

@@ -58,7 +58,8 @@ module SingularityDsl
       end
 
       # BATCH COMMAND
-      desc 'batch BATCH_NAME', 'Run single task batch in the script.'
+      desc 'batch BATCH_NAME',
+           'Run single task batch in the .singularityrc script.'
       def batch(batch, app = nil)
         app ||= setup_app(Application.new, singularity_script, tasks_path)
         exit(app.run batch, options[:all_tasks])
@@ -66,30 +67,37 @@ module SingularityDsl
 
       # TEST-MERGE COMMAND
       desc 'testmerge FORK BRANCH INTO_BRANCH [INTO_FORK]',
-           'Perform a test merge into the local repo.'
+           'Perform a testmerge into the local repo and then run .singularityrc'
       option :run_task,
              aliases: '-r',
              type: :string,
-             desc: 'Run a batch after. If nothing given, script is run as-is',
+             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
-        info 'File changesets'
-        puts @git.diff_remote base_branch, base_fork, '--name-status'
-        @diff_list = @git.diff_remote base_branch, base_fork, '--name-only'
-        @git.remove_remote git_fork
-        @git.remove_remote base_fork
-        batch target_run_task if options[:run_task]
+        @diff_list = diff_list base_branch, base_fork
+        remove_remotes git_fork, base_fork
+        batch target_run_task if target_run_task
+        test unless target_run_task
       end
 
       private
 
+      def diff_list(ref, url)
+        @git.diff_remote ref, url, '--name-only'
+      end
+
+      def remove_remotes(*urls)
+        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
@@ -105,7 +113,7 @@ module SingularityDsl
         end
         unless @diff_list.nil?
           info 'Running with diff-list'
-          puts @diff_list
+          list_items @diff_list
           app.change_list @diff_list
         end
         info "Loading CI script from #{singularity_script} ..."

data/lib/singularity_dsl/git_helper.rb

@@ -19,6 +19,10 @@ module SingularityDsl
       remote_action branch, remote, 'checkout'
     end
 
+    def install_submodules
+      exec 'git submodule update --init --recursive'
+    end
+
     def merge_remote(branch, url)
       remote_action branch, url, 'merge'
     end

data/lib/singularity_dsl/stdout.rb

@@ -5,6 +5,11 @@ require 'rainbow'
 module SingularityDsl
   # mixin for output wrappers
   module Stdout
+    def list_items(items)
+      items = [*items]
+      items.each { |item| puts Rainbow(item).magenta }
+    end
+
     def info(message)
       puts Rainbow(message).cyan
     end

data/lib/singularity_dsl/version.rb

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

data/spec/singularity_dsl/cli/cli_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/cli'
+
+describe 'Cli' do
+  let(:cli) { SingularityDsl::Cli::Cli.new }
+
+  context '#testmerge' do
+    before(:each) do
+      expect(cli).to receive(:test_merge)
+      expect(cli).to receive(:diff_list)
+      expect(cli).to receive(:remove_remotes)
+    end
+
+    it 'runs test method if no run_task' do
+      cli.stub(:target_run_task).and_return false
+      expect(cli).to receive(:test)
+      cli.testmerge 'fork', 'fork_branch', 'base_branch'
+    end
+
+    it 'runs batch method if no run_task' do
+      cli.stub(:target_run_task).and_return 'test_batch'
+      expect(cli).to receive(:batch)
+      cli.testmerge 'fork', 'fork_branch', 'base_branch'
+    end
+  end
+end

data/spec/singularity_dsl/tasks/shell_task_spec.rb

@@ -4,6 +4,9 @@ require 'singularity_dsl/tasks/shell_task'
 
 describe 'ShellTask' do
   let(:sh_task) { ShellTask.new }
+  before(:each) do
+    sh_task.stub(:log_shell)
+  end
 
   context '#initialize' do
     it 'starts with no conditionals' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.8
 platform: ruby
 authors:
 - chr0n1x
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -179,6 +179,7 @@ files:
 - lib/singularity_dsl/version.rb
 - singularity_dsl.gemspec
 - spec/singularity_dsl/application_spec.rb
+- spec/singularity_dsl/cli/cli_spec.rb
 - spec/singularity_dsl/dsl/batch_spec.rb
 - spec/singularity_dsl/dsl/changeset_spec.rb
 - spec/singularity_dsl/dsl/dsl_spec.rb
@@ -217,6 +218,7 @@ specification_version: 4
 summary: ''
 test_files:
 - spec/singularity_dsl/application_spec.rb
+- spec/singularity_dsl/cli/cli_spec.rb
 - spec/singularity_dsl/dsl/batch_spec.rb
 - spec/singularity_dsl/dsl/changeset_spec.rb
 - spec/singularity_dsl/dsl/dsl_spec.rb