Add a thin wrapper around runcmd to be DRY in tests

A lot of tests are relying on runcmd just to execute a statement through
Rails' runner the same way. Let's wrap this inside a runner method.

Author: robin850

test/sass_rails_logger_test.rb

@@ -12,7 +12,10 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
     within_rails_app "scss_project" do |app_root|
       [:debug, :warn, :info, :error, :trace].each do |level|
         message = "[#{level}]: sass message"
-        runcmd %{ruby script/rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"}, Dir.pwd, true, 'Gemfile', { 'RAILS_ENV' => 'development' }
+
+        runner 'development' do
+          "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"
+        end
 
         assert File.exists?("#{app_root}/log/development.log"), "log file was not created"
 

test/sass_rails_test.rb

@@ -8,56 +8,80 @@ class SassRailsTest < Sass::Rails::TestCase
 
   test 'style config item is honored in development mode' do
     within_rails_app 'alternate_config_project' do
-      runcmd "ruby script/rails runner 'puts Rails.application.config.sass.style'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'development'}
+      runner 'development' do
+        "puts Rails.application.config.sass.style"
+      end
+
       assert_output /compact/
     end
   end
 
   test 'style config item is not honored if environment is not development' do
     within_rails_app 'alternate_config_project' do
-      runcmd "ruby script/rails runner 'p Rails.application.config.sass.style'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'production'}
+      runner 'production' do
+        "p Rails.application.config.sass.style"
+      end
+
       assert_equal 'nil', $last_ouput.chomp
     end
   end
 
   test 'css_compressor config item is not honored in development mode' do
     within_rails_app 'alternate_config_project' do
-      runcmd "ruby script/rails runner 'p Rails.application.config.assets.css_compressor'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'development'}
+      runner 'development' do
+        "p Rails.application.config.assets.css_compressor"
+      end
+
       assert_equal 'nil', $last_ouput.chomp
     end
   end
 
   test 'css_compressor config item is honored if environment is not development' do
     within_rails_app 'alternate_config_project' do
-      runcmd "ruby script/rails runner 'puts Rails.application.config.assets.css_compressor'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'production'}
+      runner 'production' do
+        "puts Rails.application.config.assets.css_compressor"
+      end
+
       assert_output /yui/
     end
   end
 
   test 'sass uses expanded style by default in development mode' do
     within_rails_app 'scss_project' do
-      runcmd "ruby script/rails runner 'puts Rails.application.config.sass.style'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'development'}
+      runner 'development' do
+        "puts Rails.application.config.sass.style"
+      end
+
       assert_output /expanded/
     end
   end
 
   test 'sass not defines compressor in development mode' do
     within_rails_app 'scss_project' do
-      runcmd "ruby script/rails runner 'p Rails.application.config.assets.css_compressor'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'development'}
+      runner 'development' do
+        "p Rails.application.config.assets.css_compressor"
+      end
+
       assert_equal 'nil', $last_ouput.chomp
     end
   end
 
   test 'sass defines compressor by default in test mode' do
     within_rails_app 'scss_project' do
-      runcmd "ruby script/rails runner 'puts Rails.application.config.assets.css_compressor'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'test'}
+      runner 'test' do
+        "puts Rails.application.config.assets.css_compressor"
+      end
+
       assert_equal 'sass', $last_ouput.chomp
     end
   end
 
   test 'sass defines compressor by default in production mode' do
     within_rails_app 'scss_project' do
-      runcmd "ruby script/rails runner 'puts Rails.application.config.assets.css_compressor'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => 'production'}
+      runner 'production' do
+        "puts Rails.application.config.assets.css_compressor"
+      end
+
       assert_equal 'sass', $last_ouput.chomp
     end
   end

test/support/sass_rails_test_case.rb

@@ -9,17 +9,20 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
 
   class ExecutionError < StandardError
     attr_accessor :output
+
     def initialize(message, output = nil)
       super(message)
       self.output = output
     end
+
     def message
       "#{super}\nOutput was:\n#{output}"
     end
   end
 
   module SilentError
     attr_accessor :output
+
     def message
       "#{super}\nOutput was:\n#{output}"
     end
@@ -68,14 +71,19 @@ def assert_line_count(count)
   # and removes the temp directory when done.
   def within_rails_app(name, without_gems = [], gem_options = $gem_options)
     sourcedir = File.expand_path("../../fixtures/#{name}", __FILE__)
+
     Dir.mktmpdir do |tmpdir|
       FileUtils.cp_r "#{sourcedir}/.", tmpdir
+
       Dir.chdir(tmpdir) do
         gem_options.each { |gem_name, options| modify_gem_entry gem_name, options }
         without_gems.each { |gem_name| remove_gem name }
+
         FileUtils.rm("Gemfile.lock") if File.exist?("Gemfile.lock")
+
         runcmd "bundle install --verbose"
         runcmd "bundle exec rake db:create --trace"
+
         yield tmpdir
       end
     end
@@ -85,13 +93,15 @@ def process_gemfile(gemfile = "Gemfile", &blk)
     gem_contents = File.readlines(gemfile)
     gem_contents.map!(&blk)
     gem_contents.compact!
+
     File.open(gemfile, "w") do |f|
       f.print(gem_contents.join(""))
     end
   end
 
   def modify_gem_entry(gemname, options, gemfile = "Gemfile")
     found = false
+
     process_gemfile(gemfile) do |line|
       if line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/
         found = true
@@ -100,6 +110,7 @@ def modify_gem_entry(gemname, options, gemfile = "Gemfile")
         line
       end
     end
+
     unless found
       File.open(gemfile, "a") do |f|
         f.print("\n#{gem_entry(gemname, options)}\n")
@@ -123,6 +134,7 @@ def silently
     output = StringIO.new
     $stderr, old_stderr = output, $stderr
     $stdout, old_stdout = output, $stdout
+
     begin
       yield
     rescue ExecutionError => e
@@ -144,23 +156,31 @@ def runcmd(cmd, working_directory = Dir.pwd, clean_env = true, gemfile = "Gemfil
     # There's a bug in bundler where with_clean_env doesn't clear out the BUNDLE_GEMFILE environment setting
     # https://github.com/carlhuda/bundler/issues/1133
     env["BUNDLE_GEMFILE"] = "#{working_directory}/#{gemfile}" if clean_env
+
     todo = Proc.new do
       r, w = IO.pipe
       Kernel.spawn(env, cmd, :out => w , :err => w, :chdir => working_directory)
       w.close
       Process.wait
       output = r.read
       r.close
+
       unless $?.exitstatus == 0
         raise ExecutionError, "Command failed with exit status #{$?.exitstatus}: #{cmd}", output
       end
+
       $last_ouput = output
     end
+
     if clean_env
       Bundler.with_clean_env(&todo)
     else
       todo.call
     end
   end
 
+  # A thin wrapper around runcmd to be DRY in tests
+  def runner(environment)
+    runcmd "ruby script/rails runner '#{yield}'", Dir.pwd, true, 'Gemfile', {'RAILS_ENV' => environment}
+  end
 end