gorgon 0.4.5 → 0.5.0.rc1

data/.gitignore

@@ -1,3 +1,6 @@
+.floo
+.flooignore
+.sublime-project
 .bundle
 *.swp
 .rvmrc
@@ -7,4 +10,4 @@ pkg
 .idea
 .rbenv-version
 *.log
-*.json
+*.json

data/lib/gorgon/originator.rb

@@ -4,6 +4,7 @@ require 'gorgon/job_state'
 require 'gorgon/progress_bar_view'
 require 'gorgon/originator_logger'
 require 'gorgon/failures_printer'
+require 'gorgon/rsync_daemon'
 
 require 'awesome_print'
 require 'etc'
@@ -14,6 +15,7 @@ class Originator
 
   def initialize
     @configuration = nil
+    @rsync_daemon = RsyncDaemon.new
   end
 
   def originate
@@ -44,11 +46,13 @@ class Originator
     @job_state.cancel
 
     @protocol.disconnect
+    @rsync_daemon.stop
   end
 
   def publish
     @logger = OriginatorLogger.new configuration[:originator_log_file]
     @protocol = OriginatorProtocol.new @logger
+    @rsync_daemon.start
 
     EventMachine.run do
       @logger.log "Connecting..."
@@ -72,6 +76,7 @@ class Originator
     if @job_state.is_job_complete?
       @logger.log "Job is done"
       @protocol.disconnect
+      @rsync_daemon.stop
     end
   end
 
@@ -123,7 +128,7 @@ class Originator
   def job_definition
     job_config = configuration[:job]
     if !job_config.has_key?(:source_tree_path)
-      job_config[:source_tree_path] = "#{Etc.getlogin}@#{local_ip_addr}:#{Dir.pwd}"
+      job_config[:source_tree_path] = "rsync://#{local_ip_addr}:43434/src"
     end
     JobDefinition.new(configuration[:job])
   end

data/lib/gorgon/progress_bar_view.rb

@@ -66,7 +66,7 @@ private
   end
 
   def output_gorgon_crash_message payload
-    $stderr.puts "\nA #{'crash'.red} occured at '#{payload[:hostname].colorize Colors::HOST}':"
+    $stderr.puts "\nA #{'crash'.red} occurred at '#{payload[:hostname].colorize Colors::HOST}':"
     $stderr.puts payload[:stdout].yellow unless payload[:stdout].to_s.strip.length == 0
     $stderr.puts payload[:stderr].yellow unless payload[:stderr].to_s.strip.length == 0
     if @progress_bar.nil?

data/lib/gorgon/rsync_daemon.rb

@@ -0,0 +1,59 @@
+require "tmpdir"
+
+class RsyncDaemon
+  #for now, creates a readonly rsync daemon for the current directory on the mountpath "src"
+
+  def initialize
+    @project_directory = Dir.pwd
+    @started = false
+  end
+
+  def start
+    return if @started
+    @tmpdir = Dir.mktmpdir("gorgon")
+    success = nil
+    Dir.chdir(@tmpdir) do
+      File.write("rsyncd.conf", rsyncd_config_string(@project_directory))
+
+      success = Kernel.system("rsync --daemon --config rsyncd.conf")
+    end
+
+    if success
+      @started = true
+      return true
+    else
+      return false
+    end
+  end
+
+  def stop
+    return unless @started
+
+    success = nil
+    Dir.chdir(@tmpdir) do
+      pid = File.read("rsync.pid")
+      success = Kernel.system("kill #{pid}")
+    end
+
+    if success
+      @started = false
+      return true
+    else
+      return false
+    end
+  end
+
+  private
+
+  def rsyncd_config_string(shared_dir)
+    return <<-EOF
+port = 43434
+pid file = rsync.pid
+
+[src]
+  path = #{@project_directory}
+  read only = true
+  use chroot = false
+EOF
+  end
+end

data/lib/gorgon/source_tree_syncer.rb

@@ -5,7 +5,7 @@ class SourceTreeSyncer
   attr_reader :sys_command, :output, :errors
 
   SYS_COMMAND = 'rsync'
-  OPTS = "-azr --timeout=5 --rsh='ssh -o NumberOfPasswordPrompts=0 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'"
+  OPTS = "-azr --timeout=5"
   EXCLUDE_OPT = "--exclude"
 
   def initialize source_tree_path

data/lib/gorgon/unknown_runner.rb

@@ -1,10 +1,10 @@
- class UnknownRunner
-   UNKNOWN_FRAMEWORK_MSG = "Unkown Test Framework. Gorgon only supports Test::Unit, MiniTest, and RSpec"
-   def self.run_file(filename)
-     raise UNKNOWN_FRAMEWORK_MSG
-   end
+class UnknownRunner
+  UNKNOWN_FRAMEWORK_MSG = "Unknown Test Framework. Gorgon only supports Test::Unit, MiniTest, and RSpec"
+  def self.run_file(filename)
+    raise UNKNOWN_FRAMEWORK_MSG
+  end
 
-   def self.runner
-     :unknown_framework
-   end
- end
+  def self.runner
+   :unknown_framework
+  end
+end

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.4.5"
+  VERSION = "0.5.0.rc1"
 end

data/spec/originator_spec.rb

@@ -10,9 +10,11 @@ describe Originator do
                         :add_observer => nil)}
   let(:progress_bar_view){ stub("Progress Bar View", :show => nil)}
   let(:originator_logger){ stub("Originator Logger", :log => nil, :log_message => nil)}
+  let(:rsync_daemon) { stub("Rsync Daemon", :start => true, :stop => true)}
 
   before do
     OriginatorLogger.stub(:new).and_return originator_logger
+    RsyncDaemon.stub(:new).and_return rsync_daemon
     @originator = Originator.new
   end
 
@@ -34,6 +36,12 @@ describe Originator do
       progress_bar_view.should_receive(:show)
       @originator.publish
     end
+
+    it "starts the rsync daemon" do
+      rsync_daemon.should_receive(:start)
+
+      @originator.publish
+    end
   end
 
   describe "#cancel_job" do
@@ -54,6 +62,13 @@ describe Originator do
       @originator.publish
       @originator.cancel_job
     end
+
+    it "stops the rsync daemon" do
+      rsync_daemon.should_receive(:stop)
+
+      @originator.publish
+      @originator.cancel_job
+    end
   end
 
   describe "#cleanup_if_job_complete" do
@@ -73,6 +88,13 @@ describe Originator do
       protocol.should_receive(:disconnect)
       @originator.cleanup_if_job_complete
     end
+
+    it "stops the rsync daemon" do
+      job_state.stub!(:is_job_complete?).and_return true
+      rsync_daemon.should_receive(:stop)
+
+      @originator.cleanup_if_job_complete
+    end
   end
 
   describe "#handle_reply" do
@@ -123,7 +145,7 @@ describe Originator do
     it "builds source_tree_path if it was not specified in the configuration" do
       @originator.stub!(:configuration).and_return({:job => {}})
       UDPSocket.any_instance.stub(:addr).and_return(["1.1.1.1"])
-      @originator.job_definition.source_tree_path.should == "#{Etc.getlogin}@1.1.1.1:#{Dir.pwd}"
+      @originator.job_definition.source_tree_path.should == "rsync://1.1.1.1:43434/src"
     end
 
     it "returns source_tree_path specified in configuration if it is present" do

data/spec/rsync_daemon_spec.rb

@@ -0,0 +1,75 @@
+require 'gorgon/rsync_daemon'
+
+describe RsyncDaemon do
+  before(:each) do
+    Kernel.stub(:system => true)
+    Dir.stub(:mktmpdir => "loltmpdir", :pwd => "/lol/hax")
+    Dir.stub(:chdir).and_yield
+    File.stub(:write => 100, :read => "12345")
+    @r = RsyncDaemon.new
+  end
+
+  it "starts the rsync daemon" do
+    Kernel.should_receive(:system).with("rsync --daemon --config rsyncd.conf")
+
+    @r.start
+  end
+
+  it "creates a temporary directory for the configuration and pid files" do
+    Dir.should_receive(:mktmpdir).with("gorgon").and_return("loltmpdir")
+    Dir.should_receive(:chdir).with("loltmpdir")
+
+    @r.start
+  end
+
+  it "writes the config file" do
+    valid_config = <<-EOF
+port = 43434
+pid file = rsync.pid
+
+[src]
+  path = /lol/hax
+  read only = true
+  use chroot = false
+EOF
+    File.should_receive(:write).with("rsyncd.conf", valid_config)
+
+    @r.start
+  end
+
+  it "reports when an error has prevented startup" do
+    Kernel.should_receive(:system).and_return(false)
+
+    @r.start.should == false
+  end
+
+  it "only starts once" do
+    Kernel.should_receive(:system).once
+
+    @r.start
+    @r.start
+  end
+
+  it "stops the rsync daemon" do
+    @r.start
+
+    File.should_receive(:read).with("rsync.pid").and_return("12345")
+    Kernel.should_receive(:system).with("kill 12345")
+
+    @r.stop
+  end
+
+  it "only tries to stop if the daemon is started" do
+    Kernel.should_not_receive(:system)
+
+    @r.stop
+  end
+
+  it "can be restarted" do
+    Kernel.should_receive(:system).exactly(3).times
+
+    @r.start
+    @r.stop
+    @r.start
+  end
+end

data/spec/source_tree_syncer_spec.rb

@@ -57,24 +57,6 @@ describe SourceTreeSyncer.new("") do
         @syncer.sync
       end
 
-      it "use NumberOfPasswordPrompts 0 as ssh option to avoid password prompts that will hang the listener" do
-        opt = /--rsh='ssh .*-o NumberOfPasswordPrompts=0.*'/
-        Open4.should_receive(:popen4).with(opt)
-        @syncer.sync
-      end
-
-      it "set UserKnownHostsFile to /dev/null so we avoid hosts id changes and eavesdropping warnings in futures connections" do
-        opt = /ssh .*-o UserKnownHostsFile=\/dev\/null/
-        Open4.should_receive(:popen4).with(opt)
-        @syncer.sync
-      end
-
-      it "set StrictHostKeyChecking to 'no' to avoid confirmation prompt of connection to unkown host" do
-        opt = /ssh .*-o StrictHostKeyChecking=no/
-        Open4.should_receive(:popen4).with(opt)
-        @syncer.sync
-      end
-
       it "uses io timeout to avoid listener hanging forever in case rsync asks for any input" do
         opt = /--timeout=5/
         Open4.should_receive(:popen4).with(opt)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.4.5
-  prerelease: 
+  version: 0.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Justin Fitzsimmons
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -237,6 +237,7 @@ files:
 - lib/gorgon/pipe_forker.rb
 - lib/gorgon/progress_bar_view.rb
 - lib/gorgon/rspec_runner.rb
+- lib/gorgon/rsync_daemon.rb
 - lib/gorgon/settings/files_content.rb
 - lib/gorgon/settings/initial_files_creator.rb
 - lib/gorgon/settings/rails_project_files_content.rb
@@ -265,6 +266,7 @@ files:
 - spec/pipe_forker_spec.rb
 - spec/progress_bar_view_spec.rb
 - spec/rspec_runner_spec.rb
+- spec/rsync_daemon_spec.rb
 - spec/source_tree_syncer_spec.rb
 - spec/unknown_runner_spec.rb
 - spec/worker_manager_spec.rb
@@ -281,21 +283,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2798141738488026768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2798141738488026768
+      version: 1.3.1
 requirements: []
 rubyforge_project: gorgon
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Distributed testing for ruby with centralized management