singularity_dsl 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3884d06136bd4e766cd04b4be70b495d5db305
-  data.tar.gz: 57dd759f6fa33a3aea75a538f2f57bcce5d2c6bd
+  metadata.gz: f01317129316a96bfa285febee6db2127cd27dc3
+  data.tar.gz: 5ef3a92f5e6a24564e0474ce43db7779282922af
 SHA512:
-  metadata.gz: 9aa531c707cce01edfe9820fcff98c60986cb85adf64a74c5475783ddb33bd675bfd9fed2f59190e72be17d13538662a298c5956be73baef28199e1092080484
-  data.tar.gz: 4eab60d3d6a1f1657eba4d9414dec85bdb47443d266d02943975b8e084df87742a588932ab6c825f74b992f44a52afefea74dc61be81e19fb040574a25b4fc73
+  metadata.gz: 05f0675493eeb80798930d901d3f1ed352cdf79fa62243d6b0f58b68ef8487e5f94563f9b54ef56bddec16449f47e15985e93c0e84fe15ba4bf27f3149730d99
+  data.tar.gz: e65b776da10d271f484bb31ef8f975bee8aed8ac22a6f2d8c5842bda34fe616aa00de8d307ba4ef6dfd462c257c98e1a09c2897cde9b0e6896c9ce8263079a9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (3.0.4)
+    singularity_dsl (3.0.6)
       coveralls (~> 0.8.0)
       json (~> 1.0)
       mixlib-shellout (~> 2.0)
@@ -15,56 +15,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    coveralls (0.8.2)
+    ast (2.2.0)
+    coveralls (0.8.13)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (~> 1.6.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    gem-release (0.7.3)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+    gem-release (0.7.4)
     json (1.8.3)
-    mime-types (2.6.1)
-    mixlib-shellout (2.1.0)
-    netrc (0.10.3)
-    parser (2.3.0.pre.2)
-      ast (>= 1.1, < 3.0)
+    mixlib-shellout (2.2.6)
+    parser (2.3.0.7)
+      ast (~> 2.2)
     powerpack (0.1.1)
     rainbow (2.0.0)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -73,10 +61,8 @@ GEM
       tins (~> 1.0)
     terminal-table (1.5.2)
     thor (0.19.1)
-    tins (1.5.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
+    tins (1.6.0)
+    unicode-display_width (1.0.3)
 
 PLATFORMS
   ruby
@@ -85,3 +71,6 @@ DEPENDENCIES
   bundler (~> 1.3)
   gem-release
   singularity_dsl!
+
+BUNDLED WITH
+   1.11.2

data/lib/singularity_dsl.rb

@@ -28,8 +28,6 @@ module SingularityDsl
     @task_map = {}
   end
 
-  private
-
   def self.map_key(obj)
     obj = obj.class unless obj.class.eql? Class
     obj.to_s.to_sym

data/lib/singularity_dsl/cli.rb

@@ -76,9 +76,9 @@ 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
+             .set_fork_env(git_fork, branch)
+             .perform_merge(git_fork, branch, base_branch, base_fork)
+             .execute
         end
       end
 

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

@@ -38,7 +38,7 @@ module SingularityDsl
         end
 
         def singularity_script
-          fail "Invalid script given: #{script}" unless script_path_exists?
+          raise "Invalid script given: #{script}" unless script_path_exists?
           ::File.expand_path script
         end
 

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

@@ -14,7 +14,7 @@ module SingularityDsl
         end
 
         def execute
-          fail 'cannot execute a base Command'
+          raise 'cannot execute a base Command'
         end
 
         def tasks_path

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

@@ -13,7 +13,7 @@ module SingularityDsl
           # Exposes the app that is created so that child classes
           # can perform injections / configurations on the fly
           yield(app) if block_given?
-          exit(app.run batch, options[:all_tasks])
+          exit(app.run(batch, options[:all_tasks]))
         end
 
         def batch

data/lib/singularity_dsl/dsl/dsl.rb

@@ -32,13 +32,13 @@ module SingularityDsl
 
       def load_ex_script(path)
         @registry = Registry.new
-        instance_eval(::File.read path)
+        instance_eval(::File.read(path))
       end
 
       def define_task(klass)
         raise_task_def_error klass if task_defined klass
         # because define_method is private
-        define_singleton_method(task klass) do |&block|
+        define_singleton_method(task(klass)) do |&block|
           @registry.add_task klass.new(&block)
         end
       end
@@ -47,7 +47,7 @@ module SingularityDsl
         base_tasks = task_list
         updated_tasks = task_list
         files_in_path(path, 'rb').each do |file|
-          SingularityDsl.module_eval(::File.read file)
+          SingularityDsl.module_eval(::File.read(file))
           # keep a list of class => file mappings
           (task_list - updated_tasks).each do |klass|
             SingularityDsl.map_task_file klass, file
@@ -77,11 +77,11 @@ module SingularityDsl
       private
 
       def raise_task_def_error(klass)
-        fail "task name clash for #{klass}"
+        raise "task name clash for #{klass}"
       end
 
       def task_defined(klass)
-        singleton_methods(false).include?(task klass)
+        singleton_methods(false).include?(task(klass))
       end
 
       def load_tasks(list)

data/lib/singularity_dsl/dsl/registry.rb

@@ -41,19 +41,19 @@ module SingularityDsl
       private
 
       def batch_dne(name)
-        fail "Cannot invoke batch '#{name}', does not exist"
+        raise "Cannot invoke batch '#{name}', does not exist"
       end
 
       def batch_exists(name)
-        fail "A task batch with the name '#{name}' already exists"
+        raise "A task batch with the name '#{name}' already exists"
       end
 
       def fail_non_type(type, task)
-        fail "Non-#{type} given - #{task}"
+        raise "Non-#{type} given - #{task}"
       end
 
       def fail_raw_type(type, task)
-        fail "Cannot use raw #{type} objects - #{task}"
+        raise "Cannot use raw #{type} objects - #{task}"
       end
     end
   end

data/lib/singularity_dsl/dsl/runner.rb

@@ -70,7 +70,7 @@ module SingularityDsl
       end
 
       def raise_dsl_set_err(dsl)
-        fail "Invalid object given #{dsl}"
+        raise "Invalid object given #{dsl}"
       end
 
       def execute_task(task)

data/lib/singularity_dsl/errors.rb

@@ -25,11 +25,11 @@ module SingularityDsl
     end
 
     def resource_fail(klass)
-      fail ResourceFail, klass_failed(klass)
+      raise ResourceFail, klass_failed(klass)
     end
 
     def resource_err(klass)
-      fail ResourceError, klass_error(klass)
+      raise ResourceError, klass_error(klass)
     end
   end
 end

data/lib/singularity_dsl/git_helper.rb

@@ -28,7 +28,7 @@ module SingularityDsl
     end
 
     def clean_reset
-      fail 'failed to clean' unless (reset | clean) == 0
+      raise 'failed to clean' unless (reset | clean) == 0
     end
 
     def checkout_remote(branch, remote)
@@ -84,14 +84,14 @@ module SingularityDsl
     end
 
     def remote_action(branch, url, action)
-      status = exec(remote_cmd branch, url, action)
-      fail "failed to #{action}" unless status == 0
+      status = exec(remote_cmd(branch, url, action))
+      raise "failed to #{action}" unless status == 0
       status
     end
 
     def remote_from_url(url)
       return 'origin' if url.nil? || !url
-      url.split(':').last.gsub('/', '_')
+      url.split(':').last.tr('/', '_')
     end
 
     def fetch_all

data/lib/singularity_dsl/task.rb

@@ -12,7 +12,7 @@ module SingularityDsl
     end
 
     def execute
-      fail 'SingularityDsl::Task::execute not implemented'
+      raise 'SingularityDsl::Task::execute not implemented'
     end
 
     def failed_status(status)

data/lib/singularity_dsl/tasks/boot_coveralls.rb

@@ -31,7 +31,7 @@ class BootCoveralls < SingularityDsl::Task
   end
 
   def no_fail(switch)
-    fail 'no_fail must be bool' unless bool? switch
+    raise 'no_fail must be bool' unless bool? switch
     @no_fail = switch
   end
 

data/lib/singularity_dsl/tasks/shell_task.rb

@@ -25,7 +25,7 @@ class ShellTask < SingularityDsl::Task
   end
 
   def no_fail(switch)
-    fail 'no_fail must be bool' unless bool? switch
+    raise 'no_fail must be bool' unless bool? switch
     @no_fail = switch
   end
 

data/lib/singularity_dsl/version.rb

@@ -2,5 +2,5 @@
 
 # version const for gem
 module SingularityDsl
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'.freeze
 end

data/spec/singularity_dsl/application_spec.rb

@@ -14,8 +14,8 @@ describe 'Application' do
   context '#load_script' do
     it 'just calls runner.load_ex_script' do
       stub_res = 'spooooooky ghooooost'
-      allow(app.dsl).to(receive(:load_ex_script).and_return stub_res)
-      expect(app.load_script 'dummy').to eql stub_res
+      allow(app.dsl).to(receive(:load_ex_script).and_return(stub_res))
+      expect(app.load_script('dummy')).to eql stub_res
     end
   end
 

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

@@ -48,7 +48,7 @@ describe SingularityDsl::Cli::Command::TestMerge do
 
       it 'does nothing' do
         allow(cmd.git).to receive :verbosity
-        expect(cmd.bootstrap_cwd repo).to eql cmd
+        expect(cmd.bootstrap_cwd(repo)).to eql cmd
       end
     end
 
@@ -64,7 +64,7 @@ describe SingularityDsl::Cli::Command::TestMerge do
           allow(cmd.git).to receive :verbosity
           expect_git_cmd("git clone #{repo} .")
           expect_git_cmd('git submodule update --init --recursive')
-          expect(cmd.bootstrap_cwd repo).to eql cmd
+          expect(cmd.bootstrap_cwd(repo)).to eql cmd
         end
       end
 
@@ -78,7 +78,7 @@ describe SingularityDsl::Cli::Command::TestMerge do
           expect_git_cmd('git clean -ffdx')
           expect_git_cmd('git add . && git reset --hard')
           expect_git_cmd('git submodule update --init --recursive')
-          expect(cmd.bootstrap_cwd repo).to eql cmd
+          expect(cmd.bootstrap_cwd(repo)).to eql cmd
         end
       end
     end

data/spec/singularity_dsl/dsl/batch_spec.rb

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

data/spec/singularity_dsl/dsl/changeset_spec.rb

@@ -18,23 +18,23 @@ describe 'DslChangeset' do
 
   context '#files_changed?' do
     it 'correctly evals for single file type' do
-      expect(instance.files_changed? 'php').to eql true
+      expect(instance.files_changed?('php')).to eql true
     end
 
     it 'returns false when file type not in changeset' do
-      expect(instance.files_changed? %w(golang py)).to eql false
+      expect(instance.files_changed?(%w(golang py))).to eql false
     end
 
     it 'correctly evals for multiple file types' do
-      expect(instance.files_changed? %w(js css)).to eql true
+      expect(instance.files_changed?(%w(js css))).to eql true
     end
 
     it 'correctly detects literal file paths' do
-      expect(instance.files_changed? %w(a/file/path)).to eql true
+      expect(instance.files_changed?(%w(a/file/path))).to eql true
     end
 
     it 'returns false for non-existing literal file paths' do
-      expect(instance.files_changed? %w(another/file/path)).to eql false
+      expect(instance.files_changed?(%w(another/file/path))).to eql false
     end
   end
 
@@ -55,24 +55,24 @@ describe 'DslChangeset' do
     end
 
     it 'correctly evals for single file type' do
-      expect(instance.changed_files 'css').to eql %w(something.css)
+      expect(instance.changed_files('css')).to eql %w(something.css)
     end
 
     it 'returns [] when file type not in changeset' do
-      expect(instance.changed_files %w(golang py)).to eql []
+      expect(instance.changed_files(%w(golang py))).to eql []
     end
 
     it 'filters for existing files & sorts' do
-      expect(instance.changed_files %w(php js css a/file/path))
+      expect(instance.changed_files(%w(php js css a/file/path)))
         .to eql %w(a/file/path something.css something.js)
     end
 
     it 'correctly detects literal file paths' do
-      expect(instance.changed_files %w(a/file/path)).to eql %w(a/file/path)
+      expect(instance.changed_files(%w(a/file/path))).to eql %w(a/file/path)
     end
 
     it 'returns false for non-existing literal file paths' do
-      expect(instance.changed_files %w(another/file/path)).to eql []
+      expect(instance.changed_files(%w(another/file/path))).to eql []
     end
   end
 end

data/spec/singularity_dsl/dsl/dsl_spec.rb

@@ -106,17 +106,17 @@ describe 'Dsl' do
 
   context '#flag?' do
     it 'returns false by default' do
-      expect(dsl.flag? 'blah').to eql false
+      expect(dsl.flag?('blah')).to eql false
     end
 
     it 'returns true by default' do
       dsl.flag 'default'
-      expect(dsl.flag? 'default').to eql true
+      expect(dsl.flag?('default')).to eql true
     end
 
     it 'returns vals' do
       dsl.flag 'foo', 'bar'
-      expect(dsl.flag? 'foo').to eql 'bar'
+      expect(dsl.flag?('foo')).to eql 'bar'
     end
   end
 end

data/spec/singularity_dsl/dsl/utils_spec.rb

@@ -10,13 +10,13 @@ describe 'Utils' do
 
   context '#task_name' do
     it 'simplifies class names correctly' do
-      expect(task_name 'Foo::Bar::Blah').to eql 'Blah'
+      expect(task_name('Foo::Bar::Blah')).to eql 'Blah'
     end
   end
 
   context '#task' do
     it 'returns lowercase sym representing DSL fx' do
-      expect(task TestTask).to eql :testtask
+      expect(task(TestTask)).to eql :testtask
     end
   end
 

data/spec/singularity_dsl/git_helper_spec.rb

@@ -40,7 +40,7 @@ describe 'GitHelper' do
         .to receive(:git_installed)
         .and_return false
       expect { SingularityDsl::GitHelper.new }
-        .to(raise_error ArgumentError, /git not installed/)
+        .to(raise_error(ArgumentError, /git not installed/))
     end
   end
 
@@ -71,21 +71,21 @@ describe 'GitHelper' do
       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/)
+        .to(raise_error(RuntimeError, /failed to clean/))
     end
 
     it 'fails when clean fails' do
       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/)
+        .to(raise_error(RuntimeError, /failed to clean/))
     end
 
     it 'fails when both reset & clean fail' do
       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/)
+        .to(raise_error(RuntimeError, /failed to clean/))
     end
   end
 

data/spec/singularity_dsl/task_spec.rb

@@ -39,9 +39,9 @@ describe 'Task' do
   context '#failed_status' do
     it 'returns false for specific values' do
       task = SingularityDsl::Task.new
-      expect(task.failed_status nil).to eql false
-      expect(task.failed_status 0).to eql false
-      expect(task.failed_status false).to eql false
+      expect(task.failed_status(nil)).to eql false
+      expect(task.failed_status(0)).to eql false
+      expect(task.failed_status(false)).to eql false
     end
   end
 

data/spec/singularity_dsl/tasks/boot_coveralls_spec.rb

@@ -36,7 +36,7 @@ describe BootCoveralls do
 
   describe '#no_fail' do
     it 'fails when non-bool given' do
-      expect { coveralls.no_fail [] }.to raise_error
+      expect { coveralls.no_fail [] }.to(raise_error(/must be bool/))
     end
   end
 
@@ -65,7 +65,7 @@ describe BootCoveralls do
         allow(ENV).to receive(:key?)
           .with('COVERALLS_REPO_TOKEN').and_return true
         allow(::Coveralls).to receive(:wear!)
-          .and_raise(::StandardError.new 'NO PANTS FOR YOU')
+          .and_raise(::StandardError.new('NO PANTS FOR YOU'))
       end
 
       it 'does not fail by default' do

data/spec/singularity_dsl/tasks/shell_task_spec.rb

@@ -21,7 +21,7 @@ describe 'ShellTask' do
 
   context '#condition' do
     it 'throws when non string given' do
-      expect { sh_task.condition([]) }.to raise_error
+      expect { sh_task.condition([]) }.to raise_error(/must be string/)
     end
 
     it 'appends the cmd to conditionals array' do
@@ -32,13 +32,13 @@ describe 'ShellTask' do
 
   context '#no_fail' do
     it 'fails when non-bool given' do
-      expect { sh_task.no_fail [] }.to raise_error
+      expect { sh_task.no_fail [] }.to raise_error(/must be bool/)
     end
   end
 
   context '#alt' do
     it 'throws when non string given' do
-      expect { sh_task.alt([]) }.to raise_error
+      expect { sh_task.alt([]) }.to raise_error(/must be string/)
     end
 
     it 'sets alternative cmd' do
@@ -75,7 +75,7 @@ describe 'ShellTask' do
 
   context '#execute' do
     it 'errors when command() was never called' do
-      expect { sh_task.execute }.to raise_error
+      expect { sh_task.execute }.to raise_error(/command never/)
     end
 
     it 'runs command returns correct status, with conditionals' do

data/spec/singularity_dsl_spec.rb

@@ -15,12 +15,12 @@ describe 'SingularityDsl' do
 
   context '#task_file' do
     it 'returns false when no such class' do
-      expect(SingularityDsl.task_file 1).to eql false
+      expect(SingularityDsl.task_file(1)).to eql false
     end
 
     it 'returns the correct mapping for a class' do
       # THIS VALUE IS FROM THE RUN IN '#map_task_file'
-      expect(SingularityDsl.task_file 'foo').to eql('foo')
+      expect(SingularityDsl.task_file('foo')).to eql('foo')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - chr0n1x
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json