specjour 0.2.2 → 0.2.3

data/History.markdown

@@ -1,6 +1,18 @@
 History
 =======
 
+0.2.3
+-----
+*2010-04-25*
+
+* [fixed] Absolute paths in rsyncd.conf restrict portability. The rsync daemon
+  completely fails when it can't find the path to serve which typically happens
+  running specjour on another computer. Remove your rsyncd.conf to regenerate a
+  new one. Back it up first if you've made changes to it.
+  **Backwards Incompatible**
+
+* [fixed] CPU core detection works on OSX Core i7 (thanks Hashrocket!)
+
 0.2.2
 -----
 *2010-04-22*

data/README.markdown

@@ -37,19 +37,31 @@ Run the rake task to distribute the features among the managers you started.
     $ rake specjour:cucumber
 
 ## Rails
-Edit your config/environment.rb
-
-    config.gem 'specjour'
-
 Each worker should run their specs in an isolated database. Modify the test database name in your `config/database.yml` to include the following environment variable (Influenced by [parallel_tests](http://github.com/grosser/parallel_tests)):
 
     test:
       database: blog_test<%=ENV['TEST_ENV_NUMBER']%>
 
-Each worker will attempt to clear its database tables before running any specs via `DELETE FROM <table_name>;`. Additionally, test databases will be created if they don't exist (i.e. `CREATE DATABASE blog_test8` for the 8th worker) and will load your schema when it has fallen behind.
+Add the specjour gem to your project:
+
+    config.gem 'specjour'
+
+Doing this enables a rails plugin wherein each worker will attempt to clear its database tables before running any specs via `DELETE FROM <table_name>;`. Additionally, test databases will be created if they don't exist (i.e. `CREATE DATABASE blog_test8` for the 8th worker) and your schema will be loaded when the database is out of date.
+
+### Customizing database setup
+If the plugin doesn't set up the database properly for your test suite, bypass it entirely. Remove specjour as a project gem and create your own initializer to setup the database. Specjour sets the environment variable PREPARE_DB when it runs your specs so you can look for that when setting up the database.
+
+    # config/initializers/specjour.rb
+
+    if ENV['PREPARE_DB']
+      load 'Rakefile'
+
+      # clear the db and load db/seeds.rb
+      Rake::Task['db:reset'].invoke
+    end
 
 ## Only listen to supported projects
-By default, a manager will listen to all projects trying to distribute specs over the network. Sometimes you'll only want a manager to respond to one specific spec suite. You can accomplish this with the `--projects` flags.
+By default, a manager will listen to all projects trying to distribute specs over the network. Sometimes you'll only want a manager to respond to one specific spec suite. You can accomplish this with the `--projects` flag.
 
     $ specjour --projects bizconf # only run specs for the bizconf project
 
@@ -72,10 +84,14 @@ Distributed testing doesn't have to happen over multiple machines, just multiple
 * shayarnett - Cucumber support, pairing and other various patches
 * voxdolo - Endless support, alpha testing, various patches
 * leshill - Made rsync daemon configurable
+* testjour - Ripped off your name
+* parallel_tests - Made my test suite twice as fast
 
 ## Note on Patches/Pull Requests
 
 * Fork the project.
+* `$ source .dev` to ensure you're using the local specjour binary, not the
+  rubygems version
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_dependency "dnssd", "1.3.1"
     gem.add_dependency "rspec"
     gem.add_development_dependency "rspec", "1.3.0"
+    gem.add_development_dependency "rr", "0.10.11"
     gem.add_development_dependency "yard", "0.5.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/specjour/cpu.rb

@@ -1,13 +1,19 @@
 module Specjour
   module CPU
-    # inspired by github.com/grosser/parallel
     def self.cores
       case RUBY_PLATFORM
       when /darwin/
-        `hwprefs cpu_count`.to_i
+        command('hostinfo') =~ /^(\d+).+logically/
+        $1.to_i
       when /linux/
-        `grep --count processor /proc/cpuinfo`.to_i
+        command('grep --count processor /proc/cpuinfo').to_i
       end
     end
+
+    protected
+
+    def self.command(cmd)
+      %x(#{cmd})
+    end
   end
 end

data/lib/specjour/manager.rb

@@ -61,6 +61,7 @@ module Specjour
 
     def start
       drb_start
+      puts "Workers ready: #{worker_size}"
       bonjour_announce
       Signal.trap('INT') { puts; puts "Shutting down manager..."; exit }
       DRb.thread.join

data/lib/specjour/rsync_daemon.rb

@@ -3,6 +3,12 @@ module Specjour
     require 'fileutils'
     include SocketHelpers
 
+    # Corresponds to the version of specjour that changed the configuration
+    # file.
+    CONFIG_VERSION = "0.2.3".freeze
+    CONFIG_FILE_NAME = "rsyncd.conf"
+    PID_FILE_NAME = "rsyncd.pid"
+
     attr_reader :project_path, :project_name
 
     def initialize(project_path, project_name)
@@ -15,7 +21,7 @@ module Specjour
     end
 
     def config_file
-      @config_file ||= File.join(config_directory, "rsyncd.conf")
+      @config_file ||= File.join(config_directory, CONFIG_FILE_NAME)
     end
 
     def pid
@@ -25,13 +31,15 @@ module Specjour
     end
 
     def pid_file
-      File.join(config_directory, "rsync_daemon.pid")
+      File.join(config_directory, PID_FILE_NAME)
     end
 
     def start
       write_config
-      system *command
-      at_exit { stop }
+      Dir.chdir(project_path) do
+        Kernel.system *command
+      end
+      Kernel.at_exit { stop }
     end
 
     def stop
@@ -43,38 +51,56 @@ module Specjour
 
     protected
 
+    def command
+      ["rsync", "--daemon", "--config=#{config_file}", "--port=8989"]
+    end
+
+    def check_config_version
+      File.read(config_file) =~ /\A# (\d+.\d+.\d+)/
+      if out_of_date? Regexp.last_match(1)
+        $stderr.puts <<-WARN
+
+Specjour has made changes to the way #{CONFIG_FILE_NAME} is generated.
+Back up '#{config_file}'
+and re-run the dispatcher to generate the new config file.
+
+        WARN
+      end
+    end
+
+    def out_of_date?(version)
+      CONFIG_VERSION != version
+    end
+
     def write_config
-      unless File.exists? config_file
+      if File.exists? config_file
+        check_config_version
+      else
         FileUtils.mkdir_p config_directory
-
         File.open(config_file, 'w') do |f|
           f.write config
         end
       end
     end
 
-    def command
-      ["rsync", "--daemon", "--config=#{config_file}", "--port=8989"]
-    end
-
     def config
       <<-CONFIG
-# #{Specjour::VERSION}
-# Anonymous rsync daemon config for #{project_name}
+# #{CONFIG_VERSION}
+# Rsync daemon config for #{project_name}
 #
 # Serve this project with the following command:
-# $ #{command.join(' ')}
+# $ #{(command | ['--no-detach']).join(' ')}
 #
 # Rsync with the following command:
-# $ rsync -a --port=8989 #{hostname}::#{project_name} ~/#{project_name}
+# $ rsync -a --port=8989 #{hostname}::#{project_name} /tmp/#{project_name}
 #
 use chroot = no
 timeout = 20
 read only = yes
-pid file = #{pid_file}
+pid file = ./.specjour/#{PID_FILE_NAME}
 
 [#{project_name}]
-  path = #{project_path}
+  path = .
   exclude = .git* .specjour doc tmp/* log script
       CONFIG
     end

data/lib/specjour.rb

@@ -23,7 +23,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 
   class Error < StandardError; end
 

data/spec/cpu_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Specjour::CPU do
+  context "on a Mac" do
+    let(:hostinfo) do
+      %(
+Mach kernel version:
+	 Darwin Kernel Version 10.2.0: Tue Nov  3 10:37:10 PST 2009; root:xnu-1486.2.11~1/RELEASE_I386
+Kernel configured for up to 2 processors.
+2 processors are physically available.
+220 processors are logically available.
+Processor type: i486 (Intel 80486)
+Processors active: 0 1
+Primary memory available: 4.00 gigabytes
+Default processor set: 72 tasks, 310 threads, 2 processors
+Load average: 0.09, Mach factor: 1.90
+      )
+    end
+
+    before do
+      stub(Specjour::CPU).command.returns(hostinfo)
+    end
+
+    it "returns the number of logically available processors" do
+      Specjour::CPU.cores.should == 220
+    end
+  end
+end

data/spec/manager_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Specjour::Manager do
+  describe "#available_for?" do
+    it "is available for all projects by default" do
+      subject.available_for?(rand.to_s).should be_true
+    end
+
+    it "is available for one project" do
+      manager = Specjour::Manager.new :registered_projects => %w(one)
+      manager.available_for?('one').should be_true
+    end
+
+    it "is available for many projects" do
+      manager = Specjour::Manager.new :registered_projects => %w(one two)
+      manager.available_for?('one').should be_true
+      manager.available_for?('two').should be_true
+    end
+  end
+end

data/spec/rsync_daemon_spec.rb

@@ -6,32 +6,31 @@ describe Specjour::RsyncDaemon do
   end
 
   before do
-    stub(:system)
-    stub(:at_exit)
-    subject.stub(:write_config)
+    stub(Kernel).system
+    stub(Kernel).at_exit
+    stub(Dir).chdir
+    stub(File).open
+    stub(File).read
   end
 
-  describe "#config_directory" do
-    specify { subject.config_directory.should == '/tmp/seasonal/.specjour' }
-  end
-
-  describe "#config_file" do
-    specify { subject.config_file.should == '/tmp/seasonal/.specjour/rsyncd.conf' }
-  end
+  specify { subject.config_directory.should == '/tmp/seasonal/.specjour' }
+  specify { subject.config_file.should == '/tmp/seasonal/.specjour/rsyncd.conf' }
 
   describe "#start" do
     it "writes the config" do
-      subject.should_receive(:write_config)
+      mock(subject).write_config
       subject.start
     end
 
-    it "executes the system command" do
-      subject.should_receive(:system).with(*subject.send(:command))
+    it "executes the system command in the project directory" do
+      mock(Kernel).system(*subject.send(:command))
+      mock(Dir).chdir(subject.project_path).yields
       subject.start
     end
 
     it "stops at_exit" do
-      subject.should_receive(:at_exit)
+      mock(subject).stop
+      mock.proxy(Kernel).at_exit.yields(subject)
       subject.start
     end
   end
@@ -39,27 +38,51 @@ describe Specjour::RsyncDaemon do
   describe "#stop" do
     context "with pid" do
       before do
-        subject.stub(:pid => 100_000_000)
-        Process.stub(:kill)
-        FileUtils.stub(:rm)
+        stub(subject).pid.returns(100_000_000)
+        stub(Process).kill
+        stub(FileUtils).rm
       end
 
       it "kills the pid with TERM" do
-        Process.should_receive(:kill).with('TERM', subject.pid)
+        mock(Process).kill('TERM', subject.pid)
         subject.stop
       end
 
       it "removes the pid file" do
-        FileUtils.should_receive(:rm).with(subject.pid_file)
+        mock(FileUtils).rm(subject.pid_file)
         subject.stop
       end
     end
 
     context "without pid" do
       it "does nothing" do
-        subject.stub(:pid => nil)
+        stub(subject).pid
         subject.stop.should be_nil
       end
     end
   end
+
+  describe "#check_config_version" do
+    it "warns when the version is out of date" do
+      stub(File).read { "# 0.0.0\n" }
+      mock($stderr).puts(/made changes/)
+      subject.send(:check_config_version)
+    end
+
+    it "doesn't warn when the version isn't out of date" do
+      stub(File).read { "# #{Specjour::RsyncDaemon::CONFIG_VERSION}\n" }
+      dont_allow($stderr).puts
+      subject.send(:check_config_version)
+    end
+  end
+
+  describe "#write_config" do
+    context "config exists" do
+      it "checks if the config is out of date" do
+        stub(File).exists?(anything) { true }
+        mock(subject).check_config_version
+        subject.send(:write_config)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,5 +4,5 @@ require 'specjour'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+  config.mock_with :rr
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -04:00
+date: 2010-04-26 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,9 +58,23 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rr
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 11
+        version: 0.10.11
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -70,7 +84,7 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Distribute your spec suite amongst your LAN via Bonjour.
 email: sandro.turriate@gmail.com
 executables: 
@@ -112,7 +126,9 @@ files:
 - lib/specjour/tasks/specjour.rb
 - lib/specjour/worker.rb
 - rails/init.rb
+- spec/cpu_spec.rb
 - spec/lib/specjour/worker_spec.rb
+- spec/manager_spec.rb
 - spec/rsync_daemon_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -148,7 +164,9 @@ signing_key:
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: 
+- spec/cpu_spec.rb
 - spec/lib/specjour/worker_spec.rb
+- spec/manager_spec.rb
 - spec/rsync_daemon_spec.rb
 - spec/spec_helper.rb
 - spec/specjour_spec.rb