specistent 0.0.1 → 0.0.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
  
 GEM = 'specistent'
 GEM_NAME = 'specistent'
-GEM_VERSION = '0.0.1'
+GEM_VERSION = '0.0.2'
 AUTHORS = ['James Pozdena']
 EMAIL = "jpoz@jpoz.net"
 HOMEPAGE = "http://github.com/jpoz/specistent"

data/bin/specistent

@@ -1,6 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'specistent'
+# require 'specistent'
+
+# development
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'specistent')
+
 require 'optparse'
 require 'yaml'
 
@@ -10,7 +15,9 @@ options = {
   :port => 8081,
   :env => 'test',
   :remote => 'origin', 
-  :yml => 'specistent.yml'
+  :yml => 'specistent.yml',
+  :workers => 1,
+  :migrate => true
 }
 
 OptionParser.new do |opts|
@@ -28,14 +35,18 @@ OptionParser.new do |opts|
     options[:port] = p.to_i
   end
   
-  opts.on("-e","--env ENV", "Environment") do |e|
-    options[:env] = e
+  opts.on('-w', '--workers [WORKERS]', Numeric, "workers (defaults to 1)") do |w|
+    options[:workers] = w 
   end
   
   opts.on("-b","--branch BRANCH", "git branch to pull from (defaults to current branch)") do |b|
     options[:branch] = b
   end
   
+  opts.on("-m","--no-migrate", "do not migrate the database") do |m|
+    options[:migrate] = false
+  end
+  
   opts.on("-r","--remote REMOTE", "git remote to pull from (default origin)") do |r|
     options[:remote] = r
   end
@@ -48,14 +59,17 @@ end.parse!
 
 if (SpecistentServer == options[:klass])
   g = Git.open(Dir.pwd)
-  RENV = options[:env]
   EventMachine::run {
-    puts "Started server on port #{options[:port]}"
-    EventMachine::start_server options[:host], options[:port], SpecistentServer
+    puts "Started server on #{options[:host]}:#{options[:port]} with #{options[:workers]} workers"
+    EventMachine::start_server( options[:host], options[:port], SpecistentServer ) { |s| 
+      s.workers = options[:workers]
+      s.migrate = options[:migrate]
+    }
   }
 else
   servers = YAML::load(File.read(options[:yml])).map { |s| s.split(":") << [] }
   options[:branch] ||= Git.open(Dir.pwd).branch.name
+  @connections = []
   EM.run {
     queue = EM::Queue.new
     processor = proc{ |connection_array| 
@@ -64,7 +78,9 @@ else
         c.branch = options[:branch]
         c.remote = options[:remote]
         c.start_spec
+        @connections << c
       }
+      
       queue.pop(&processor)
     }
     queue.pop(&processor)
@@ -75,6 +91,10 @@ else
       servers[server_index][2] << f
     end
     
+    EventMachine::PeriodicTimer.new(5) do
+      EM.stop if @connections.all? { |c| !c.connected }
+    end
+    
     servers.each do |s|
       queue.push(s)
     end

data/lib/specistent/specistent_client.rb

@@ -3,9 +3,14 @@ require 'eventmachine'
 require 'logger'
 require 'git'
 
-module SpecistentClient # < EventMachine::Connection
+module SpecistentClient
   
   attr_accessor :files, :branch, :remote
+  attr_reader   :connected
+  
+  def initialize()
+    @connected = true
+  end
 
   def start_spec 
     return puts "NO files" if files.empty?
@@ -13,12 +18,12 @@ module SpecistentClient # < EventMachine::Connection
   end
 
   def receive_data(data)
-   print data
-   STDOUT.flush
+    print data
+    STDOUT.flush
   end
 
   def unbind
-   puts "A connection has terminated"
+    @connected = false
   end
 
 end

data/lib/specistent/specistent_server.rb

@@ -10,27 +10,41 @@ module SpecProcess
   end
   
   def receive_data(data)
-    puts "sent #{data}"
+    print data
     @socket.send_data(data)
   end
   
+  def unbind
+    @socket.worker_completed
+  end
+  
 end
 
 class SpecistentServer < EM::Protocols::LineAndTextProtocol
   include EM::Protocols::LineText2
   
+  attr_accessor :workers, :migrate
+  
   def initialize
-    @databuf = []
+    @workers = 1
+    @migrate = true
+    @databuf = []  
     @g = nil
     @directory = nil
+    @files = []
+    @worker_files = []
+    @running_workers = 0
   end
   
   def command(cmd)
     case cmd
+    when /workers/
+      send_data(@workers)
     when /run\s(\w*)\/(\w*)\s(.*)/
       @g = Git.open(Dir.pwd)
       puts @g.pull($1, "#{$1}/#{$2}", "#{$1} pull")
-      EM.popen("/bin/sh -c 'RAILS_ENV=#{RENV} spec #{$3}'", SpecProcess, self)
+      @files = $3.split(' ')
+      run_enviroments
     else
       send_data("unknown command #{cmd.inspect}\r\n")
     end
@@ -38,12 +52,37 @@ class SpecistentServer < EM::Protocols::LineAndTextProtocol
 
   def receive_data(data)
     @databuf << data
-    puts data
     if (/(.*)\;/ =~ @databuf.to_s)
       command($1)
       reset_databuf()
     end
   end
+  
+  def run_enviroments
+    split_files
+    @workers.times do |i|
+      test_env_number = i < 1 ? nil : i
+      puts system("RAILS_ENV=test TEST_ENV_NUMBER=#{test_env_number} rake db:migrate") if @migrate
+      EM.popen("/bin/sh -c 'TEST_ENV_NUMBER=#{test_env_number} spec #{@worker_files[i].join(' ')}'", SpecProcess, self)
+      @running_workers += 1
+    end
+  end
+  
+  def split_files
+    @workers.times { @worker_files << [] }
+    @files.each_with_index do |f, i|
+      worker_index = (i % @workers)
+      @worker_files[worker_index] << f
+    end
+  end
+  
+  def worker_completed
+    @running_workers -= 1
+    puts "Working Completed #{@running_workers}"
+    if 0 == @running_workers
+      close_connection(true)
+    end
+  end
 
   private
   def reset_databuf

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - James Pozdena
@@ -14,8 +14,8 @@ autorequire: specistent
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
-default_executable: specistent
+date: 2010-04-02 00:00:00 -07:00
+default_executable: 
 dependencies: []
 
 description: ""