cukeq 0.0.1.dev → 0.0.1.dev2

data/.gitignore

@@ -1,21 +1,3 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+pkg/*
+*.gem
+.bundle

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cukeq.gemspec
+gemspec

data/Rakefile

@@ -1,34 +1,9 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |g|
-    g.name        = "cukeq"
-    g.summary     = %Q{Distributed cucumbers}
-    g.description = %Q{Cucumber features distributed using AMQP.}
-    g.email       = "jari.bakken@gmail.com"
-    g.homepage    = "http://github.com/jarib/cukeq"
-    g.authors     = ["Jari Bakken"]
-
-    g.add_dependency "amqp"
-    g.add_dependency "thin"
-    g.add_dependency "json"
-    g.add_dependency "git"
-
-    g.add_development_dependency "rspec", ">= 2.0.0"
-    g.add_development_dependency "yard", ">= 0"
-    g.add_development_dependency "cucumber", ">= 0"
-    g.add_development_dependency "rack-test", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 
-task :default => ["spec:coverage", "spec:coverage:verify"]
+task :default => [:spec, :features]
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ["--color", "--format", "progress"]
@@ -45,13 +20,11 @@ namespace :spec do
   end
 end
 
-task :spec => :check_dependencies
-
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features)
 
-  task :features => :check_dependencies
+  task :features
 rescue LoadError
   task :features do
     abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
@@ -65,4 +38,4 @@ rescue LoadError
   task :yardoc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
-end
+end

data/cukeq.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cukeq/version"
+
+Gem::Specification.new do |s|
+  s.name        = "cukeq"
+  s.version     = CukeQ::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jari Bakken"]
+  s.email       = ["jari.bakken@gmail.com"]
+  s.homepage    = "http://github.com/jarib/cukeq"
+  s.summary     = %Q{Distributed cucumbers}
+  s.description = %Q{Cucumber features distributed using AMQP.}
+
+  s.rubyforge_project = "cukeq"
+
+  s.add_runtime_dependency "amqp",      ">= 0"
+  s.add_runtime_dependency "thin",      ">= 0"
+  s.add_runtime_dependency "json",      ">= 0"
+  s.add_runtime_dependency "git",       ">= 0"
+  s.add_runtime_dependency "nokogiri",  ">= 0"
+
+  s.add_development_dependency "rspec",     ">= 2.0.0"
+  s.add_development_dependency "yard",      ">= 0"
+  s.add_development_dependency "cucumber",  ">= 0"
+  s.add_development_dependency "rack-test", ">= 0"
+  s.add_development_dependency "childprocess", ">= 0.1.4"
+  s.add_development_dependency "ruby-debug19"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/features/step_definitions/cukeq_steps.rb

@@ -9,7 +9,7 @@ end
 
 Given /^I POST the following list to the master web service:$/ do |table|
   features = table.raw.flatten
-  post(master_url, features.to_json)
+  post(master_url, {:features => features}.to_json)
 end
 
 Then /^the report app should know when the run has finished$/ do

data/features/support/cukeq_helper.rb

@@ -12,6 +12,7 @@ module CukeQHelper
   def start_master
     pids << fork { CukeQ::Master.execute(MASTER_ARGS) }
     ensure_running
+    ensure_listening(master_url)
   end
 
   def start_slave
@@ -23,7 +24,9 @@ module CukeQHelper
     app = report_app()
 
     pids << fork { app.start }
+
     ensure_running
+    ensure_listening(app.url)
   end
 
   def post(url, data)
@@ -51,6 +54,16 @@ module CukeQHelper
     end
   end
 
+  def ensure_listening(url)
+    max_time = Time.now + 10
+    until listening?(url)
+      if Time.now > max_time
+        raise "timed out waiting for #{url} to respond"
+      end
+      sleep 0.1
+    end
+  end
+
   def report_app
     @report_app ||= ReportApp.new
   end
@@ -60,7 +73,7 @@ module CukeQHelper
   end
 
   def execute_request(url, req)
-    res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+    res = Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
 
     case res
     when Net::HTTPSuccess
@@ -70,4 +83,12 @@ module CukeQHelper
     end
   end
 
-end
+  def listening?(url)
+    uri = URI.parse(url)
+    TCPSocket.new(uri.host, uri.port).close
+    true
+  rescue
+    false
+  end
+
+end

data/features/support/env.rb

@@ -2,12 +2,16 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'rubygems'
 require 'cukeq'
-require 'spec/expectations'
-require File.dirname(__FILE__) + "/report_app"
-require File.dirname(__FILE__) + "/cukeq_helper"
+require 'rspec/expectations'
+require File.expand_path("../report_app", __FILE__)
+require File.expand_path("../cukeq_helper", __FILE__)
+require File.expand_path("../test_environment", __FILE__)
+require File.expand_path("../rabbit_control", __FILE__)
 
 World(CukeQHelper)
 
+TestEnvironment.launch
+
 After do
   cleanup
 end

data/features/support/rabbit_control.rb

@@ -0,0 +1,53 @@
+require "tempfile"
+require "childprocess"
+
+class RabbitControl
+
+  TIMEOUT = 10
+
+  def initialize
+    @tmp     = Tempfile.new("rabbit-control")
+    @process = ChildProcess.build("rabbitmq-server")
+
+    @process.io.stdout = @tmp
+    @process.io.stderr = @tmp
+  end
+
+  def start
+    @process.start
+
+    max_time = Time.now + TIMEOUT
+
+    until running?
+      if Time.now > max_time
+        raise "timed out waiting for rabbitmq-server"
+      end
+      sleep 0.1
+    end
+
+    system "rabbitmqctl list_users 2>&1"
+    raise "rabbit error: #{out}" unless $?.success?
+
+    true
+  end
+
+  def stop
+    @process.stop
+    @tmp.close!
+  end
+
+  def running?
+    @tmp.rewind
+    output = @tmp.read
+    puts output if $DEBUG
+    output =~ /broker running/
+  end
+
+end
+
+if __FILE__ == $0
+  rabbitctl = RabbitControl.new
+  trap("INT") { rabbitctl.stop }
+  rabbitctl.start
+  sleep
+end

data/features/support/report_app.rb

@@ -10,6 +10,8 @@ class ReportApp
 
   def start
     Rack::Handler::Thin.run(self, :Port => port)
+  rescue => ex
+    puts $!, $@
   end
 
   def results

data/features/support/test_environment.rb

@@ -0,0 +1,19 @@
+class TestEnvironment
+  def self.launch
+    env = new
+    env.start
+    at_exit { env.stop }
+  end
+
+  def initialize
+    @rabbit = RabbitControl.new
+  end
+
+  def start
+    @rabbit.start
+  end
+
+  def stop
+    @rabbit.stop
+  end
+end

data/lib/cukeq/async_job.rb

@@ -0,0 +1,94 @@
+module CukeQ
+  class AsyncJob
+
+    def initialize(working_copy, job, callback)
+      @job          = job
+      @callback     = callback
+      @result       = {:success => true, :slave => CukeQ.identifier}
+      @invoked      = false
+      @working_copy = working_copy
+    end
+
+    def run
+      parse_job
+
+      EventMachine.system3 command, &method(:child_finished)
+    rescue => ex
+      handle_exception(ex)
+    end
+
+    private
+
+    def handle_exception(ex)
+      @result.merge!(:success => false, :error => ex.message, :backtrace => ex.backtrace, :cwd => Dir.pwd)
+      cleanup
+      invoke_callback
+    end
+
+    def invoke_callback
+      if @invoked
+        $stderr.puts "#{self} tried to invoke callback twice"
+        return
+      end
+
+      @invoked = true
+      @callback.call @result
+    end
+
+    def cleanup
+      FileUtils.rm_rf(output_file) if File.exist?(output_file)
+    end
+
+    def command
+      "cucumber -rfeatures --format Cucumber::Formatter::Json --out #{output_file} #{@feature_file}"
+    end
+
+    def child_finished(stdout, stderr, status)
+      output = <<-OUT
+  stdout:
+  #{stdout}
+
+  stderr:
+  #{stderr}
+      OUT
+
+      @result.merge!(
+        :output   => output,
+        :stderr   => stderr,
+        :stdout   => stdout,
+        :success  => status.success?,
+        :exitcode => status.exitstatus,
+        :results  => fetch_results,
+        :cwd      => Dir.pwd
+      )
+      cleanup
+      invoke_callback
+    rescue => ex
+      handle_exception ex
+    end
+
+    def fetch_results
+      return unless File.exist?(output_file)
+
+      content = File.read(output_file)
+      begin
+        JSON.parse(content)
+      rescue JSON::ParserError => ex
+        raise JSON::ParserError, "#{ex.message} (#{content.inspect})"
+      end
+    end
+
+    def parse_job
+      @feature_file = @job['unit']['file']
+      @run          = @job['run']
+      @scm          = @job['scm']
+
+      @result.merge!(:feature_file => @feature_file, :run => @run, :scm => @scm)
+    end
+
+    def output_file
+      @output_file ||= "#{CukeQ.identifier}-#{@run['id']}.json"
+    end
+
+  end
+end

data/lib/cukeq/master.rb

@@ -86,7 +86,7 @@ module CukeQ
     end
 
     def ping(&blk)
-      log log_name, :ping
+      log self.class, :ping
       @broker.subscribe :pong, &blk
       @broker.publish   :ping, '{}'
     end
@@ -139,6 +139,7 @@ module CukeQ
     end
 
     def start_webapp
+      log self.class, :start_webapp
       @webapp.run method(:run)
     end
 

data/lib/cukeq/scenario_runner.rb

@@ -6,11 +6,16 @@ require "fileutils"
 module CukeQ
   class ScenarioRunner
 
+    attr_reader :repos
+
+    def initialize(repo_directory = nil)
+      @repos = repo_directory || CukeQ.root
+    end
+
     def run(job, &callback)
       scm = scm_for job
 
       Dir.chdir scm.working_copy
-
       run_job(scm.working_copy, job, callback)
     rescue => ex
       yield :success   => false,
@@ -23,7 +28,7 @@ module CukeQ
       url = job['scm']['url']
       rev = job['scm']['revision']
 
-      scm = Scm.new(url)
+      scm = Scm.new(@repos, url)
       unless scm.current_revision.to_s == rev.to_s
         # TODO(jari): this doesn't ensure that current_revision == rev - it
         # would also make sense to move the logic to Scm
@@ -40,95 +45,3 @@ module CukeQ
   end # ScenarioRunner
 end # CukeQ
 
-class AsyncJob
-
-  def initialize(working_copy, job, callback)
-    @job          = job
-    @callback     = callback
-    @result       = {:success => true, :slave => CukeQ.identifier}
-    @invoked      = false
-    @working_copy = working_copy
-  end
-
-  def run
-    parse_job
-
-    EventMachine.system3 command, &method(:child_finished)
-  rescue => ex
-    handle_exception(ex)
-  end
-
-  private
-
-  def handle_exception(ex)
-    @result.merge!(:success => false, :error => ex.message, :backtrace => ex.backtrace, :cwd => Dir.pwd)
-    cleanup
-    invoke_callback
-  end
-
-  def invoke_callback
-    if @invoked
-      $stderr.puts "#{self} tried to invoke callback twice"
-      return
-    end
-
-    @invoked = true
-    @callback.call @result
-  end
-
-  def cleanup
-    FileUtils.rm_rf(output_file) if File.exist?(output_file)
-  end
-
-  def command
-    "cucumber -rfeatures --format Cucumber::Formatter::Json --out #{output_file} #{@feature_file}"
-  end
-
-  def child_finished(stdout, stderr, status)
-    output = <<-OUT
-stdout:
-#{stdout}
-
-stderr:
-#{stderr}
-    OUT
-
-    @result.merge!(
-      :output   => output,
-      :stderr   => stderr,
-      :stdout   => stdout,
-      :success  => status.success?,
-      :exitcode => status.exitstatus,
-      :results  => fetch_results,
-      :cwd      => Dir.pwd
-    )
-    cleanup
-    invoke_callback
-  rescue => ex
-    handle_exception ex
-  end
-
-  def fetch_results
-    return unless File.exist?(output_file)
-
-    content = File.read(output_file)
-    begin
-      JSON.parse(content)
-    rescue JSON::ParserError => ex
-      raise JSON::ParserError, "#{ex.message} (#{content.inspect})"
-    end
-  end
-
-  def parse_job
-    @feature_file = @job['unit']['file']
-    @run          = @job['run']
-    @scm          = @job['scm']
-
-    @result.merge!(:feature_file => @feature_file, :run => @run, :scm => @scm)
-  end
-
-  def output_file
-    @output_file ||= "#{CukeQ.identifier}-#{@run['id']}.json"
-  end
-
-end

data/lib/cukeq/scm.rb

@@ -5,14 +5,13 @@ module CukeQ
     autoload :GitBridge, "cukeq/scm/git_bridge"
     autoload :SvnBridge, "cukeq/scm/svn_bridge"
 
-    ROOT = File.expand_path("~/.cukeq")
-
-    def initialize(url)
+    def initialize(url, root_dir = CukeQ.root)
+      @root_dir = root_dir
       @url = url.kind_of?(String) ? URI.parse(url) : url
     end
 
     def working_copy
-      @working_copy ||= "#{ROOT}/repos/#{url.host}/#{url.path.gsub(/[^A-z]+/, '_')}"
+      @working_copy ||= "#{@root_dir}/repos/#{url.host}/#{url.path.gsub(/[^A-z]+/, '_')}"
     end
 
     def current_revision
@@ -33,7 +32,7 @@ module CukeQ
         when "svn"
           SvnBridge.new url, working_copy
         when "http", "https"
-         # TODO: fix heuristic for http scm urls
+          # TODO: fix heuristic for http scm urls
           if url.to_s.include?("svn")
             SvnBridge.new url, working_copy
           elsif url.to_s.include?("git")

data/lib/cukeq/slave.rb

@@ -24,7 +24,7 @@ module CukeQ
 
         new(
           Broker.new(opts[:broker]),
-          ScenarioRunner.new
+          ScenarioRunner.new(opts[:repos])
         )
       end
 
@@ -36,6 +36,10 @@ module CukeQ
           opts.on("-b", "--broker URI (default: #{DEFAULT_BROKER_URI})") do |b|
             options[:broker] = URI.parse(b)
           end
+
+          opts.on("-r", "--repos DIRECTORY (default: #{CukeQ.root})") do |dir|
+            options[:repos] = dir
+          end
         end.parse!
 
         options

data/lib/cukeq/version.rb

@@ -0,0 +1,3 @@
+module CukeQ
+  VERSION = "0.0.1.dev2"
+end

data/lib/cukeq.rb

@@ -35,6 +35,10 @@ module CukeQ
   def self.identifier
     @identifier ||= "#{Socket.gethostname}-#{Etc.getlogin}"
   end
+
+  def self.root
+    @root ||= File.expand_path("~/.cukeq")
+  end
 end
 
 def log(*args)

data/spec/cukeq/scenario_runner_spec.rb

@@ -17,7 +17,9 @@ describe CukeQ::ScenarioRunner do
   it "creates a configured and updated Scm instance" do
     job = {'scm' => {'url' => 'git://example.com/foo/bar', 'revision' => 'some-revision'}}
 
-    CukeQ::Scm.should_receive(:new).with(job['scm']['url']).and_return(mock_scm = mock("scm"))
+    CukeQ::Scm.should_receive(:new).with(CukeQ.root, job['scm']['url']).
+               and_return(mock_scm = mock("scm"))
+
     mock_scm.should_receive(:current_revision).and_return 'another-revision'
     mock_scm.should_receive(:update).and_yield
 

data/spec/cukeq/slave_spec.rb

@@ -36,6 +36,16 @@ describe CukeQ::Slave do
       slave.broker.pass.should == 'cukeq123'
       slave.broker.vhost.should == '/cukeq'
     end
+
+    it "uses the given repo directory" do
+      CukeQ::ScenarioRunner.should_receive(:new).with("/tmp/foo")
+      CukeQ::Slave.configured_instance(%w[--repos /tmp/foo])
+    end
+
+    it "uses the default repo directory" do
+      slave = CukeQ::Slave.configured_instance
+      slave.scenario_runner.repos.should == CukeQ.root
+    end
   end
 
   describe ".execute" do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - dev
-  version: 0.0.1.dev
+  - dev2
+  version: 0.0.1.dev2
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
-default_executable: cukeq
+date: 2010-12-06 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp
@@ -71,9 +71,22 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,11 +97,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +110,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +123,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,33 +136,64 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: childprocess
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Cucumber features distributed using AMQP.
-email: jari.bakken@gmail.com
+email: 
+- jari.bakken@gmail.com
 executables: 
 - cukeq
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .autotest
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/cukeq
+- cukeq.gemspec
 - features/cukeq.feature
 - features/example1.feature
 - features/example2.feature
 - features/step_definitions/cukeq_steps.rb
 - features/support/cukeq_helper.rb
 - features/support/env.rb
+- features/support/rabbit_control.rb
 - features/support/report_app.rb
+- features/support/test_environment.rb
 - lib/cukeq.rb
+- lib/cukeq/async_job.rb
 - lib/cukeq/broker.rb
 - lib/cukeq/em/system3.rb
 - lib/cukeq/job_clearer.rb
@@ -163,6 +207,7 @@ files:
 - lib/cukeq/scm/shell_svn_bridge.rb
 - lib/cukeq/scm/svn_bridge.rb
 - lib/cukeq/slave.rb
+- lib/cukeq/version.rb
 - lib/cukeq/webapp.rb
 - spec/cukeq/broker_spec.rb
 - spec/cukeq/cukeq_spec.rb
@@ -183,8 +228,8 @@ homepage: http://github.com/jarib/cukeq
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -207,12 +252,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: cukeq
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Distributed cucumbers
 test_files: 
+- features/cukeq.feature
+- features/example1.feature
+- features/example2.feature
+- features/step_definitions/cukeq_steps.rb
+- features/support/cukeq_helper.rb
+- features/support/env.rb
+- features/support/rabbit_control.rb
+- features/support/report_app.rb
+- features/support/test_environment.rb
 - spec/cukeq/broker_spec.rb
 - spec/cukeq/cukeq_spec.rb
 - spec/cukeq/master_spec.rb
@@ -225,4 +279,5 @@ test_files:
 - spec/cukeq/scm_spec.rb
 - spec/cukeq/slave_spec.rb
 - spec/cukeq/webapp_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb

data/.autotest

@@ -1 +0,0 @@
-require "autotest/redgreen"

data/VERSION

@@ -1 +0,0 @@
-0.0.1.dev