buffet 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f749e08d06d602c95a40b3d300700085f6e5337a
-  data.tar.gz: c62257f134284331b7d5250862ec7b13be565f7b
+  metadata.gz: f02b2ed1bfb7014007bdd07bdac1f8442fe6a287
+  data.tar.gz: 7245321bb38868c5625850c07573741aed6b6cf0
 SHA512:
-  metadata.gz: 44917fa9c57e03024ccaf0893c1d3ec834f64e894a0beb52043a7f25f001e97354f6b3a13e8803897812006f05468172d4e74082d1ceef6e495ef0e1509577d0
-  data.tar.gz: f87ef20ffdcd0d6074b276d46863774f3a6c94b7e56d8d5aa0ae39e34c61e96ad6c47387898e866b5934edf3ad78cb61ad4c1f053baf75276c83aa38d6ab1bd7
+  metadata.gz: e7381b1e6165c38da088f04a9284ebbd54552c88b1d95c7e7a6b6dfce043c8298bcf1d1f801b0ac805f630658d9d57341fd389cc98555d37a1f5827e0205675d
+  data.tar.gz: 83b6b8ba29a18431fc180d753c2fa5e1d22ea45379369a28a236c1466f6dd57c4b5d879381e7c2d07ffd1298d45402162cdbd878eeb09b09fef884c909474468

data/lib/buffet.rb

@@ -54,6 +54,10 @@ module Buffet
     specs.uniq
   end
 
+  def self.environment_to_shell_string(env)
+    env.map { |key, value| "#{key}=#{value}" }.join(' ')
+  end
+
   def self.workspace_dir
     ".buffet/workspaces/#{user}" # Relative to home directory
   end

data/lib/buffet/master.rb

@@ -193,8 +193,11 @@ module Buffet
       time = Benchmark.measure do
         @project.sync_to slave
 
-        if Settings.has_prepare_script?
-          slave.execute_in_project "#{Settings.prepare_script} #{Buffet.user} #{@project.name}"
+        if Settings.prepare_command?
+          slave.execute_in_project [
+            Buffet.environment_to_shell_string(Settings.execution_environment),
+            Settings.prepare_command,
+          ].join(' ')
         end
 
         # Copy support files so they can be run on the remote machine
@@ -208,12 +211,12 @@ module Buffet
 
     def run_slave slave
       time = Benchmark.measure do
-        slave.execute_in_project([
+        slave.execute_in_project [
+          Buffet.environment_to_shell_string(Settings.execution_environment),
           Settings.worker_command,
           server_uri,
           slave.user_at_host,
-          Settings.framework,
-        ].join(' '))
+        ].join(' ')
       end.real
 
       @lock.synchronize { @slaves_stats[slave.name][:test_time] = time }

data/lib/buffet/settings.rb

@@ -1,10 +1,11 @@
 require 'yaml'
 
 module Buffet
+  # Stores configuration settings for Buffet.
   class Settings
     DEFAULT_LOG_FILE            = 'buffet.log'
     DEFAULT_SETTINGS_FILE       = 'buffet.yml'
-    DEFAULT_PREPARE_SCRIPT      = 'bin/before-buffet-run'
+    DEFAULT_PREPARE_COMMAND     = 'bin/before-buffet-run'
     DEFAULT_EXCLUDE_FILTER_FILE = '.buffet-exclude-filter'
 
     class << self
@@ -36,6 +37,13 @@ module Buffet
         self['worker_command'] || '.buffet/buffet-worker'
       end
 
+      def execution_environment
+        {
+          'BUFFET_MASTER' => Buffet.user,
+          'BUFFET_PROJECT' => project.name,
+        }.merge(self['execution_environment'] || {})
+      end
+
       def log_file=(log)
         @log_file = log
       end
@@ -52,16 +60,12 @@ module Buffet
         @project ||= Project.new Dir.pwd
       end
 
-      def framework
-        self['framework'].upcase || 'RSPEC1'
-      end
-
-      def prepare_script
-        self['prepare_script'] || DEFAULT_PREPARE_SCRIPT
+      def prepare_command
+        self['prepare_command'] || DEFAULT_PREPARE_COMMAND
       end
 
-      def has_prepare_script?
-        self['prepare_script'] || File.exist?(DEFAULT_PREPARE_SCRIPT)
+      def prepare_command?
+        self['prepare_command'] || File.exist?(DEFAULT_PREPARE_COMMAND)
       end
 
       def exclude_filter_file

data/lib/buffet/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Buffet
-  VERSION = '1.4.0'
+  VERSION = '2.0.0'
 end

data/support/buffet-worker

@@ -8,52 +8,37 @@ if File.exist? 'Gemfile'
   require 'bundler/setup'
 end
 
+if ENV['BUFFET_MASTER'].to_s.strip.empty?
+  puts 'BUFFET_MASTER environment variable not defined'
+  exit 1
+elsif ENV['BUFFET_PROJECT'].to_s.strip.empty?
+  puts 'BUFFET_MASTER environment variable not defined'
+  exit 1
+end
+
 # NOTE: ARGV is used by the spec runner. If I leave the drb server address
 # in ARGV, rspec will think it's an argument to the test runner.
 buffet_server = DRbObject.new_with_uri(ARGV.shift)
 slave_name = ARGV.shift
-framework = ARGV.shift
 
 FileUtils.mkdir_p('./tmp')
 
-if framework == 'RSPEC1'
-  require 'spec'
-  require 'spec/runner/command_line'
-  require File.expand_path('rspec1_formatter', File.dirname(__FILE__))
-
-  Spec::Runner::Formatter::AugmentedTextFormatter.configure buffet_server, slave_name
-
-  while file = buffet_server.next_file_for(slave_name)
-    # RSpec1 closes stderr/out after each run, so we reopen them each time
-    outlog = File.open('./tmp/buffet.out.log', 'a')
-    errlog = File.open('./tmp/buffet.error.log', 'a')
-
-    Spec::Runner::CommandLine.run(
-      Spec::Runner::OptionParser.parse(
-        ['--format', 'Spec::Runner::Formatter::AugmentedTextFormatter', file],
-        errlog,
-        outlog
-      )
-    )
-  end
-else
-  require 'rspec'
-  require File.expand_path('rspec2_formatter', File.dirname(__FILE__))
-
-  begin
-    require 'ci/reporter/rspec'
-    use_ci_reporter = true
-  rescue LoadError
-  end
-
-  RSpec::Core::Formatters::AugmentedTextFormatter.configure buffet_server, slave_name
-  RSpec::Core::Runner.disable_autorun!
-  rspec_opts = ['--format', 'RSpec::Core::Formatters::AugmentedTextFormatter']
-  rspec_opts += ['--format', 'CI::Reporter::RSpec'] if use_ci_reporter
-
-  while file = buffet_server.next_file_for(slave_name, file)
-    RSpec::Core::CommandLine.new(rspec_opts.dup << file).
-      run($stderr, $stdout)
-    RSpec.world.example_groups.clear
-  end
+require 'rspec'
+require File.expand_path('rspec2_formatter', File.dirname(__FILE__))
+
+begin
+  require 'ci/reporter/rspec'
+  use_ci_reporter = true
+rescue LoadError
+end
+
+RSpec::Core::Formatters::AugmentedTextFormatter.configure buffet_server, slave_name
+RSpec::Core::Runner.disable_autorun!
+rspec_opts = ['--format', 'RSpec::Core::Formatters::AugmentedTextFormatter']
+rspec_opts += ['--format', 'CI::Reporter::RSpec'] if use_ci_reporter
+
+while file = buffet_server.next_file_for(slave_name, file)
+  RSpec::Core::CommandLine.new(rspec_opts.dup << file).
+    run($stderr, $stdout)
+  RSpec.world.example_groups.clear
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buffet
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -86,7 +86,6 @@ files:
 - lib/buffet/slave.rb
 - lib/buffet/version.rb
 - support/buffet-worker
-- support/rspec1_formatter.rb
 - support/rspec2_formatter.rb
 - bin/buffet
 homepage: http://github.com/causes/buffet

data/support/rspec1_formatter.rb

@@ -1,44 +0,0 @@
-require 'spec/runner/formatter/base_text_formatter'
-
-module Spec
-  module Runner
-    module Formatter
-      class AugmentedTextFormatter < BaseTextFormatter
-        def self.configure buffet_server, slave_name
-          @@buffet_server = buffet_server
-          @@slave_name = slave_name
-        end
-
-        def example_passed example_proxy
-          super
-          @@buffet_server.example_passed(@@slave_name, {
-            :description => example_proxy.description,
-            :location    => example_proxy.location,
-            :slave_name  => @@slave_name,
-          })
-        end
-
-        def example_failed example_proxy, counter, failure
-          super
-          @@buffet_server.example_failed(@@slave_name, {
-            :backtrace   => failure.exception.backtrace.join("\n"),
-            :description => failure.header,
-            :location    => example_proxy.location,
-            :message     => failure.exception.message,
-            :slave_name  => @@slave_name,
-          })
-        end
-
-        def example_pending example, message, deprecated_pending_location=nil
-          super
-          @@buffet_server.example_pending(@@slave_name, {
-            :description => example.description,
-            :location    => example.location,
-            :message     => message,
-            :slave_name  => @@slave_name,
-          })
-        end
-      end
-    end
-  end
-end