singularity_dsl 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjY4YmE3ODM5YjkyZDEyYzJhMTE5MWVkNDEyODg2ZGU1NmFmZmU4NQ==
+    NjMwNTkyMDAwNWM3ODg1ZjY2ZGMzY2ExYmQzNzFlMWMzMmQ5MjM3MQ==
   data.tar.gz: !binary |-
-    M2RkYzJjNGI1NTcwMzQzZjc5MTQ0NDVkNDlmYTcxMGUwYmJiYzJkMA==
+    MTE3Y2JkNDMwOWVjZjU3NmU2YTZmNTUzNzU1ZDllNGRiMGZhN2UxNw==
 SHA512:
   metadata.gz: !binary |-
-    ODdkNTQzYzAwMDk5N2QzYWE3Y2NmMTdkM2VjZGQ5MWNhZmE2ZmRlNjc0MmJh
-    NTY4NTBhMzBmMzY0ZjI4MDM2M2RmMDY1MWE2ZDI3ZTNmNzQ2ZjljYzEzNWVj
-    ODc1NWIxNzJlOTgzNzhiMTdhOGE5OWRkZmM3YmNmZDA2NDQ1OTg=
+    ZjUxMDFhYmRjMGEyMTU5MjFjYTc1YTAwZGUwMGJkMTM1ZjhjODQzZjdjYTg5
+    N2QwYzJkMmRlYTdiODA1Y2JhODE3NmNhZjI1MmRkOGZlZDUwMGU4M2I4MmQ0
+    Y2JjYjQxM2JiMmY4NzY5MTNhMzc0Mjg0Mzk0MTE2ZDM1MGE3Yjg=
   data.tar.gz: !binary |-
-    NDA1MzI4ZDVlZGVhYzJlZjBlYjkwYTM0Y2VlZTNlZjUxYWY2MDkxZDY4MmM1
-    ZmI5MjJjY2Q2ZDBhZjFlODY4YTQ1M2EzZWE4NzFjNzhlODkzOTYzY2IwZTZh
-    ZDBlMjE5ZWJiZDRjMzYzNTY2Zjg5NTJjNmE4ZjQ5ZTRmMTQ1ZjE=
+    MDhiZDg3ZTgwYWM3NzQ1MWJiNDIzOGZmNGM0NjY4NDRjODMyMzE2M2EyYWI1
+    MTlkMDNmM2NiZmFkNzA0ZTg3MGFjNmU0NWNhYTU5OGQ5MzNlYWIwOTUzMGY2
+    ODhlNjg0YmYyNzMwNzVhOWFiOTRhMDgwYmU0ODQ3ZTkwODU4OGQ=

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (1.4.0)
+    singularity_dsl (1.5.0)
       mixlib-shellout (~> 1.4)
       rainbow (~> 2.0.0)
       rake (~> 10.3)
-      rspec (~> 2.6)
-      rubocop (~> 0.23.0)
+      rspec (~> 3.0)
+      rubocop (~> 0.24)
       terminal-table (~> 1.4)
       thor (~> 0.19)
 
@@ -18,23 +18,27 @@ GEM
     gem-release (0.7.3)
     json (1.8.1)
     mixlib-shellout (1.4.0)
-    parser (2.1.9)
+    parser (2.2.0.pre.4)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     rainbow (2.0.0)
     rake (10.3.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rubocop (0.23.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    rubocop (0.24.1)
       json (>= 1.7.7, < 2)
-      parser (~> 2.1.9)
+      parser (>= 2.2.0.pre.3, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)

data/README.md

@@ -30,6 +30,8 @@ All you need is a `.singularityrc` file in your repository, the `singularity_run
       -a, [--all-tasks], [--no-all-tasks]  # Do not stop on task failure(s), collect all results
       -s, [--script=SCRIPT]                # Specify path to a .singularityrc file
                                            # Default: ./.singularityrc
+          [--env=one two three]            # EnvVars to set, formatted as VAR:VAL
+          [--flags=one two three]          # Runtime flags to set for use with flag_set?, formatted as VAR:VAL
 
 The `singularity_runner` is designed to do two things:
 
@@ -87,7 +89,7 @@ What this means is that you can pass blocks of code to tasks from your `.singula
 
 ### `singularity_runner`, Custom Tasks & Task Extensions
 
-As mentioned, `singularity_runner` can load custom tasks or task extensions. By default, it will load **all** files in `cwd/.singularity`
+As mentioned, `singularity_runner` can load custom tasks or task extensions. By default, it will load **all `.rb`** files in `cwd/.singularity`
 
 This allows you to do a few things:
 
@@ -246,6 +248,48 @@ singularity_runner testmerge git@github.com:me/repo feature-branch master git@gi
 ```
 Will perform the test merge & then pass ALL of the changed files in that merge into the `.singularityrc`!
 
+## Environment Variables && Custom Runtime Flags
+
+The `singularity_runner` allows you to set custom environment variables for your scripts & tools to use.
+
+```
+singularity_runner test --env MY_REPO:git@github.com:me/foo
+```
+
+Will set `ENV['MY_REPO'] = 'git@github.com:me/foo'`
+
+Similarly, you can also set flags to better direct more complicated workflows.
+
+```
+singularity_runner test --flags npm phpunit-suite:ci
+```
+
+Will allow you to run something like this:
+
+```ruby
+# works! npm == true here
+if flag? 'npm' do
+  npm { action 'install' }
+end
+
+# suite_name == 'ci' here
+suite_name = flag? 'phpunit-suite' || 'default'
+phpunit { suite suite_name }
+```
+
+Assuming that you have already defined `npm` & `phpunit` tasks.
+
+## Using Task File Paths during runtime
+
+The DSL also keeps a record of where each task is defined. To get that path:
+
+```
+SingularityDsl.task_file(self)
+```
+
+This is just a utility function provided to you when writing new Tasks.
+You *can* use it in your `.singularityrc` but it's not recommended that you do.
+
 ## Contributing
 
 1. Fork it

data/lib/singularity_dsl/cli/cli.rb

@@ -2,10 +2,10 @@
 
 require 'singularity_dsl/application'
 require 'singularity_dsl/cli/table'
+require 'singularity_dsl/cli/utils'
 require 'singularity_dsl/dsl/dsl'
 require 'singularity_dsl/errors'
 require 'singularity_dsl/git_helper'
-require 'singularity_dsl/stdout'
 require 'thor'
 
 module SingularityDsl
@@ -14,8 +14,8 @@ module SingularityDsl
     # CLI Thor app
     class Cli < Thor
       include Errors
-      include Stdout
       include Table
+      include Utils
 
       attr_reader :git
 
@@ -23,12 +23,7 @@ module SingularityDsl
         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
+        env_vars(options[:env] || [])
       end
 
       class_option :task_path,
@@ -48,6 +43,11 @@ module SingularityDsl
       class_option :env,
                    type: :array,
                    desc: 'EnvVars to set, formatted as VAR:VAL'
+      class_option :flags,
+                   type: :array,
+                   desc: <<-EOD
+Runtime flags to set for use with flag_set?, formatted as VAR:VAL
+EOD
 
       # TASKS COMMAND
       desc 'tasks', 'Available tasks.'
@@ -64,7 +64,10 @@ module SingularityDsl
       # TEST COMMAND
       desc 'test', 'Run singularity script.'
       def test(app = nil)
-        app ||= setup_app(Application.new, singularity_script, tasks_path)
+        app ||= setup_app(Application.new,
+                          singularity_script,
+                          tasks_path,
+                          options[:flags] || [])
         exit(app.run false, options[:all_tasks])
       end
 
@@ -72,7 +75,10 @@ module SingularityDsl
       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)
+        app ||= setup_app(Application.new,
+                          singularity_script,
+                          tasks_path,
+                          options[:flags] || [])
         exit(app.run batch, options[:all_tasks])
       end
 
@@ -108,21 +114,6 @@ module SingularityDsl
         target
       end
 
-      def setup_app(app, singularity_script, tasks_path)
-        if File.exist? tasks_path
-          info "Loading tasks from #{tasks_path}"
-          app.load_tasks tasks_path
-        end
-        unless @diff_list.nil?
-          info 'Running with diff-list'
-          list_items @diff_list
-          app.change_list @diff_list
-        end
-        info "Loading CI script from #{singularity_script} ..."
-        app.load_script singularity_script
-        app
-      end
-
       def singularity_script
         File.expand_path options[:script]
       end

data/lib/singularity_dsl/cli/utils.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require 'singularity_dsl/stdout'
+
+module SingularityDsl
+  # CLI
+  module Cli
+    # util functions
+    module Utils
+      include Stdout
+
+      private
+
+      def env_vars(vals)
+        vals.each do |pair|
+          key = pair.split(':', 2).first
+          val = pair.split(':', 2).last
+          ENV[key] = val
+        end
+      end
+
+      def setup_app(app, singularity_script, tasks_path, flags = [])
+        inject_flags app, flags
+        inject_diff_list app
+        if ::File.exist? tasks_path
+          info "Loading tasks from #{tasks_path}"
+          app.load_tasks tasks_path
+        end
+        info "Loading CI script from #{singularity_script} ..."
+        app.load_script singularity_script
+        app
+      end
+
+      def inject_flags(app, flags = [])
+        flags.each do |pair|
+          key = pair.split(':', 2).first
+          val = pair.split(':', 2).last
+          app.runner.dsl.flag key if key == val
+          app.runner.dsl.flag key, val unless key == val
+        end
+        app
+      end
+
+      def inject_diff_list(app)
+        unless @diff_list.nil?
+          info 'Running with diff-list'
+          list_items @diff_list
+          app.change_list @diff_list
+        end
+        app
+      end
+    end
+  end
+end

data/lib/singularity_dsl/dsl/dsl.rb

@@ -17,11 +17,12 @@ module SingularityDsl
       include Files
       include Utils
 
-      attr_reader :registry
+      attr_reader :registry, :flags
 
       def initialize
         super
         @registry = Registry.new
+        @flags = {}
         load_tasks_in_path default_task_dir
       end
 
@@ -55,6 +56,15 @@ module SingularityDsl
         @registry.batch(name, self, &block)
       end
 
+      def flag(name, val = true)
+        @flags[name.to_sym] = val
+      end
+
+      def flag?(flag)
+        return @flags[flag.to_sym] if @flags.key? flag.to_sym
+        false
+      end
+
       private
 
       def raise_task_def_error(klass)

data/lib/singularity_dsl/git_helper.rb

@@ -28,7 +28,7 @@ module SingularityDsl
     end
 
     def diff_remote(branch, url, flags = '')
-      flags = flags.join ' ' if flags.kind_of? Array
+      flags = flags.join ' ' if flags.is_a? Array
       cmd = remote_cmd branch, url, "diff #{flags}"
       task = Mixlib::ShellOut.new cmd
       task.run_command

data/lib/singularity_dsl/tasks/rake.rb

@@ -21,7 +21,7 @@ class Rake < Task
     throw 'target is required' if @target.nil?
     @rake.load_rakefile
     ret = @rake[@target].invoke
-    return ret.count if ret.kind_of? Array
+    return ret.count if ret.is_a? Array
     ret
   end
 

data/lib/singularity_dsl/tasks/rubocop.rb

@@ -35,11 +35,9 @@ class Rubocop < Task
   end
 
   def execute
-    inspector = ::RuboCop::FileInspector.new({})
-    # yes, have to pass in a block
-    inspector.process_files files, @cfg_store do
-      false
-    end
+    runner = ::RuboCop::Runner.new({}, @cfg_store)
+    # returns true if all files passed, false otherwise
+    !runner.run(files)
   end
 
   def description

data/lib/singularity_dsl/version.rb

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

data/singularity_dsl.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mixlib-shellout', '~> 1.4'
   spec.add_dependency 'rainbow', '~> 2.0.0'
   spec.add_dependency 'rake', '~> 10.3'
-  spec.add_dependency 'rspec', '~> 2.6'
-  spec.add_dependency 'rubocop', '~> 0.23.0'
+  spec.add_dependency 'rspec', '~> 3.0'
+  spec.add_dependency 'rubocop', '~> 0.24'
   spec.add_dependency 'terminal-table', '~> 1.4'
   spec.add_dependency 'thor', '~> 0.19'
 

data/spec/singularity_dsl/application_spec.rb

@@ -14,7 +14,7 @@ describe 'Application' do
   context '#load_script' do
     it 'just calls runner.load_ex_script' do
       stub_res = 'spooooooky ghooooost'
-      expect(app.runner).to(receive(:load_ex_script).and_return stub_res)
+      allow(app.runner).to(receive(:load_ex_script).and_return stub_res)
       expect(app.load_script 'dummy').to eql stub_res
     end
   end
@@ -22,38 +22,42 @@ describe 'Application' do
   context '#run' do
     it 'logs resource failures' do
       # don't want the entire thing to exit...
-      app.stub(:post_task_runner_actions)
-      app.runner.stub(:execute).and_raise(SingularityDsl::Errors::ResourceFail)
+      allow(app).to receive(:post_task_runner_actions)
+      allow(app.runner).to receive(:execute)
+      .and_raise(SingularityDsl::Errors::ResourceFail)
       expect(app).to receive(:log_resource_fail)
       app.run
     end
 
     it 'runner post-script actions are evaulated on failure' do
-      app.stub(:post_task_runner_actions)
-      app.stub(:log_resource_fail)
-      app.runner.stub(:execute).and_raise(SingularityDsl::Errors::ResourceFail)
+      allow(app).to receive(:post_task_runner_actions)
+      allow(app).to receive(:log_resource_fail)
+      allow(app.runner).to receive(:execute)
+      .and_raise(SingularityDsl::Errors::ResourceFail)
       expect(app).to receive(:post_task_runner_actions)
       app.run
     end
 
     it 'logs resource errors' do
-      app.stub(:post_task_runner_actions)
-      app.runner.stub(:execute).and_raise(SingularityDsl::Errors::ResourceError)
+      allow(app).to receive(:post_task_runner_actions)
+      allow(app.runner).to receive(:execute)
+      .and_raise(SingularityDsl::Errors::ResourceError)
       expect(app).to receive(:log_resource_error)
       app.run
     end
 
     it 'runner post-script actions are evaulated on error' do
-      app.stub(:post_task_runner_actions)
-      app.stub(:log_resource_error)
-      app.runner.stub(:execute).and_raise(SingularityDsl::Errors::ResourceError)
+      allow(app).to receive(:post_task_runner_actions)
+      allow(app).to receive(:log_resource_error)
+      allow(app.runner).to receive(:execute)
+      .and_raise(SingularityDsl::Errors::ResourceError)
       expect(app).to receive(:post_task_runner_actions)
       app.run
     end
 
     it 'runner post-script actions are evaulated on error' do
-      app.stub(:post_task_runner_actions)
-      app.stub(:execute)
+      allow(app).to receive(:post_task_runner_actions)
+      allow(app).to receive(:execute)
       expect(app.runner.state).to receive :exit_code
       app.run
     end
@@ -61,19 +65,19 @@ describe 'Application' do
 
   context '#post_task_runner_actions' do
     it 'outputs warning when script fails' do
-      app.stub :script_warn
-      app.runner.stub :post_actions
-      app.stub :exit_run
-      app.runner.state.stub(:failed).and_return true
+      allow(app).to receive(:script_warn)
+      allow(app.runner).to receive(:post_actions)
+      allow(app).to receive(:exit_run)
+      allow(app.runner.state).to receive(:failed).and_return(true)
       expect(app).to receive(:script_warn)
       app.post_task_runner_actions
     end
 
     it 'outputs warning when script errors' do
-      app.stub :script_error
-      app.runner.stub :post_actions
-      app.stub :exit_run
-      app.runner.state.stub(:error).and_return true
+      allow(app).to receive(:script_error)
+      allow(app.runner).to receive(:post_actions)
+      allow(app).to receive(:exit_run)
+      allow(app.runner.state).to receive(:error).and_return(true)
       expect(app).to receive(:script_error)
       app.post_task_runner_actions
     end

data/spec/singularity_dsl/cli/cli_spec.rb

@@ -13,13 +13,13 @@ describe 'Cli' do
     end
 
     it 'runs test method if no run_task' do
-      cli.stub(:target_run_task).and_return false
+      allow(cli).to receive(: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'
+      allow(cli).to receive(:target_run_task).and_return('test_batch')
       expect(cli).to receive(:batch)
       cli.testmerge 'fork', 'fork_branch', 'base_branch'
     end

data/spec/singularity_dsl/dsl/batch_spec.rb

@@ -19,7 +19,7 @@ describe 'Batch' do
   context '#execute' do
     it 'executes block in passed context' do
       dummy = TestObject.new
-      dummy.stub(:meth)
+      allow(dummy).to receive(:meth)
       batch = SingularityDsl::Dsl::Batch.new('test', dummy) do |thing|
         thing.meth
       end

data/spec/singularity_dsl/dsl/changeset_spec.rb

@@ -25,13 +25,13 @@ describe 'DslChangeset' do
 
   context '#changed_files' do
     before :each do
-      ::File.stub(:exist?)
+      allow(::File).to receive(:exist?)
             .with('something.css')
             .and_return(true)
-      ::File.stub(:exist?)
+      allow(::File).to receive(:exist?)
             .with('something.js')
             .and_return(true)
-      ::File.stub(:exist?)
+      allow(::File).to receive(:exist?)
             .with('something.php')
             .and_return(false)
     end

data/spec/singularity_dsl/dsl/dsl_spec.rb

@@ -45,4 +45,32 @@ describe 'Dsl' do
       SingularityDsl.reset_map
     end
   end
+
+  context '#flag' do
+    it 'sets true by default' do
+      dsl.flag 'default'
+      expect(dsl.flags).to eql default: true
+    end
+
+    it 'sets vals' do
+      dsl.flag 'foo', 'bar'
+      expect(dsl.flags).to eql foo: 'bar'
+    end
+  end
+
+  context '#flag?' do
+    it 'returns false by default' do
+      expect(dsl.flag? 'blah').to eql false
+    end
+
+    it 'returns true by default' do
+      dsl.flag 'default'
+      expect(dsl.flag? 'default').to eql true
+    end
+
+    it 'returns vals' do
+      dsl.flag 'foo', 'bar'
+      expect(dsl.flag? 'foo').to eql 'bar'
+    end
+  end
 end

data/spec/singularity_dsl/dsl/runner_spec.rb

@@ -21,8 +21,8 @@ describe 'DslRunner' do
   context '#execute' do
     it 'taps & evaluates failed task.execute statuses correctly' do
       task = SingularityDsl::Task.new
-      task.stub(:execute).and_return true
-      runner.dsl.registry.stub(:run_list).and_return [task]
+      allow(task).to receive(:execute).and_return(true)
+      allow(runner.dsl.registry).to receive(:run_list).and_return([task])
       expect(runner).to receive(:record_failure).with task
       expect(runner).to receive(:resource_fail).with task
       runner.execute
@@ -31,7 +31,7 @@ describe 'DslRunner' do
 
   context '#load_ex_script' do
     it 'instance_evals contents of a file' do
-      ::File.stub(:read).and_return('0')
+      allow(::File).to receive(:read).and_return('0')
       expect(runner.dsl).to receive(:instance_eval).with('0')
       runner.load_ex_script 'foo'
     end

data/spec/singularity_dsl/git_helper_spec.rb

@@ -4,18 +4,16 @@ require 'singularity_dsl/git_helper'
 
 describe 'GitHelper' do
   before :each do
-    SingularityDsl::GitHelper
-      .any_instance
-      .stub(:git_installed)
-      .and_return true
+    allow_any_instance_of(SingularityDsl::GitHelper)
+    .to receive(:git_installed)
+    .and_return true
   end
   let(:git) { SingularityDsl::GitHelper.new }
 
   context '#initialize' do
     it 'throws if git is not installed' do
-      SingularityDsl::GitHelper
-        .any_instance
-        .stub(:git_installed)
+      allow_any_instance_of(SingularityDsl::GitHelper)
+        .to receive(:git_installed)
         .and_return false
       expect { SingularityDsl::GitHelper.new }
         .to(raise_error ArgumentError, /git not installed/)
@@ -24,22 +22,22 @@ describe 'GitHelper' do
 
   context '#clean_reset' do
     it 'fails when reset fails' do
-      git.stub(:reset).and_return 1
-      git.stub(:clean).and_return 0
+      allow(git).to receive(:reset).and_return(1)
+      allow(git).to receive(:clean).and_return(0)
       expect { git.clean_reset }
         .to(raise_error RuntimeError, /failed to clean/)
     end
 
     it 'fails when clean fails' do
-      git.stub(:reset).and_return 0
-      git.stub(:clean).and_return 1
+      allow(git).to receive(:reset).and_return(0)
+      allow(git).to receive(:clean).and_return(1)
       expect { git.clean_reset }
         .to(raise_error RuntimeError, /failed to clean/)
     end
 
     it 'fails when both reset & clean fail' do
-      git.stub(:reset).and_return 1
-      git.stub(:clean).and_return 1
+      allow(git).to receive(:reset).and_return(1)
+      allow(git).to receive(:clean).and_return(1)
       expect { git.clean_reset }
         .to(raise_error RuntimeError, /failed to clean/)
     end
@@ -47,25 +45,31 @@ describe 'GitHelper' do
 
   context '#merge_remote' do
     it 'generates & calls correct cmd' do
-      git.stub(:remotes).and_return []
-      git.stub(:exec).with('git fetch --all')
-      git.stub(:exec).with('git merge bar/foo').and_return 0
+      allow(git).to receive(:remotes).and_return([])
+      allow(git).to receive(:exec)
+      .with('git fetch --all')
+      allow(git).to receive(:exec)
+      .with('git merge bar/foo').and_return(0)
       git.merge_remote 'foo', 'bar'
     end
   end
 
   context '#diff_remote' do
     it 'generates & calls correct cmd w/ single flag' do
-      git.stub(:remotes).and_return []
-      git.stub(:exec).with('git fetch --all')
-      git.stub(:exec).with('git diff bar/foo --flag').and_return 0
+      allow(git).to receive(:remotes).and_return([])
+      allow(git).to receive(:exec)
+      .with('git fetch --all')
+      allow(git).to receive(:exec)
+      .with('git diff bar/foo --flag').and_return(0)
       git.diff_remote 'foo', 'bar', '--flag'
     end
 
     it 'generates & calls correct cmd w/ multiple flags' do
-      git.stub(:remotes).and_return []
-      git.stub(:exec).with('git fetch --all')
-      git.stub(:exec).with('git diff bar/foo --flag --other').and_return 0
+      allow(git).to receive(:remotes).and_return([])
+      allow(git).to receive(:exec)
+      .with('git fetch --all')
+      allow(git).to receive(:exec)
+      .with('git diff bar/foo --flag --other').and_return(0)
       git.diff_remote 'foo', 'bar', %w(--flag, --other)
     end
   end

data/spec/singularity_dsl/tasks/shell_task_spec.rb

@@ -5,7 +5,7 @@ require 'singularity_dsl/tasks/shell_task'
 describe 'ShellTask' do
   let(:sh_task) { ShellTask.new }
   before(:each) do
-    sh_task.stub(:log_shell)
+    allow(sh_task).to receive(:log_shell)
   end
 
   context '#initialize' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - chr0n1x
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - lib/singularity_dsl/application.rb
 - lib/singularity_dsl/cli/cli.rb
 - lib/singularity_dsl/cli/table.rb
+- lib/singularity_dsl/cli/utils.rb
 - lib/singularity_dsl/dsl/batch.rb
 - lib/singularity_dsl/dsl/changeset.rb
 - lib/singularity_dsl/dsl/components.rb