gorgon 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: eef07ed03530c2480e46991f18ffaedcb485dd2e
-  data.tar.gz: 69d4d71b43c58958eafbb489e9fea40aac62eea1
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGExZTQwNzZlNWEwNDY4YTc0MmUxMDhhYWY4N2MwOTUxMjgyMDg2Mw==
+  data.tar.gz: !binary |-
+    ZWQyNTdlYmQ2MDBjMGU0ZWY0MmMwZWRkYzg2NjJlYjQxNDZlMzc4Yg==
 SHA512:
-  metadata.gz: e546e88bc56e0e7d91a87691246d0ba555fdacb344f0cc832c968ce0f07599db929123061da6b6608f3d27cf7d754c82655153a193a0b9e0ca226d632841d397
-  data.tar.gz: fc1d646ada5533fdd070a7cdaeabdf61a3219f8edca3150fe69aabe62afebbea33c257515692bb1847133f6a1f9ecd470b0388b80554621cb05571d6ec831705
+  metadata.gz: !binary |-
+    Y2RiYjRjNjYyOTY2ODM5MmQ1MjJiMGRiNGVlMWNkY2E2NWE4YTk3ZTE5N2I2
+    MWFkNWIxNWU0ZDQ3MDY5M2IyN2Y4NzNhYjgyZTBhODVjN2U0NTU0ZmZiYTUz
+    MGNmZDUyZWQ1YWI4YjdiZDU0MDhhZTc3ZmMyZWRjYjc3ZjdmMTc=
+  data.tar.gz: !binary |-
+    MjY5ZjUxYTMyNDA4Yjg1OGMwOGZjODA5MDE1NGUxYjg0NGJjY2M1Mzk0ZTYw
+    ZmQxZDhlZTQwMjUzM2JhMzdhYjAzZDIyYzFmMWI2MGUwYmM1N2RlYjhhYjc4
+    YzhkZWEzYjIxZTg5NWI4OTYwNDJkYWRjY2IwZjczNjZjOGE1ZjU=

data/.gitignore

@@ -12,3 +12,5 @@ pkg
 *.log
 *.json
 .rspec
+
+*.gem

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p484
+ruby-1.9.3-p551

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.8.1)
+    gorgon (0.8.2)
       amqp (~> 1.1.0)
       awesome_print
       colorize (~> 0.5.8)

data/gorgon.json.sample

@@ -30,6 +30,6 @@
       "test/functional/**/*_test.rb",
       "test/integration/**/*_test.rb"
   ],
-
+  "runtime_file": "tmp/recorded_specs_list.json",
   "originator_log_file": "log/gorgon-orginator.log"
 }

data/lib/gorgon/originator.rb

@@ -8,6 +8,8 @@ require 'gorgon/failures_printer'
 require 'gorgon/source_tree_syncer'
 require 'gorgon/shutdown_manager'
 require 'gorgon/callback_handler'
+require 'gorgon/runtime_recorder'
+require 'gorgon/runtime_file_reader'
 
 require 'awesome_print'
 require 'etc'
@@ -135,6 +137,7 @@ class Originator
 
   def create_job_state_and_observers
     @job_state = JobState.new files.count
+    RuntimeRecorder.new @job_state, configuration[:runtime_file]
     @progress_bar_view = ProgressBarView.new @job_state
     @progress_bar_view.show
     FailuresPrinter.new @job_state
@@ -149,9 +152,12 @@ class Originator
   end
 
   def files
-    @files ||= configuration[:files].reduce([]) do |memo, obj|
+    return @files unless @files.nil?
+    current_files = configuration[:files].reduce([]) do |memo, obj|
       memo.concat(Dir[obj])
     end.uniq
+    runtime_file_reader = RuntimeFileReader.new configuration[:runtime_file]
+    @files = runtime_file_reader.sorted_files(current_files)
   end
 
   def job_definition

data/lib/gorgon/runtime_file_reader.rb

@@ -0,0 +1,26 @@
+require 'yajl'
+
+class RuntimeFileReader
+
+  def initialize(runtime_filename)
+    @runtime_filename = runtime_filename || ""
+  end
+
+  def old_files
+    @old_files ||= unless File.file?(@runtime_filename)
+                     []
+                   else
+                     File.open(@runtime_filename, 'r') do |f|
+                       parser = Yajl::Parser.new
+                       hash = parser.parse(f)
+                       hash.nil? ? [] : hash.keys
+                     end
+                   end
+  end
+
+  def sorted_files(current_files = [])
+    (self.old_files+current_files).uniq - (self.old_files-current_files)
+  end
+
+end
+

data/lib/gorgon/runtime_recorder.rb

@@ -0,0 +1,36 @@
+require 'yajl'
+
+class RuntimeRecorder
+  attr_accessor :records
+
+  def initialize(job_state, runtime_filename)
+    @records = {}
+    @job_state = job_state
+    @job_state.add_observer(self)
+    @runtime_filename = runtime_filename || ""
+  end
+
+  def update payload
+    @records[payload[:filename]] = payload[:runtime] if payload[:action] == "finish"
+    self.write_records_to_file if @job_state.is_job_complete?
+  end
+
+  def write_records_to_file
+    return if @runtime_filename.empty?
+    make_directories
+    @records = Hash[@records.sort_by{|filename, runtime| -1*runtime}]
+    File.open(@runtime_filename, 'w') do |f|
+      f.write(Yajl::Encoder.encode(@records, pretty: true))
+    end
+  end
+
+
+  private
+
+  def make_directories
+    dirname = File.dirname(@runtime_filename)
+    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+  end
+
+end
+

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/gorgon/worker.rb

@@ -7,6 +7,7 @@ require 'gorgon/job_definition'
 require "uuidtools"
 require "awesome_print"
 require "socket"
+require "benchmark"
 
 module TestRunner
   def self.run_file filename, test_runner
@@ -92,9 +93,12 @@ class Worker
       @amqp.start_worker @file_queue_name, @reply_exchange_name do |queue, exchange|
         while filename = queue.pop
           exchange.publish make_start_message(filename)
-          log "Running '#{filename}'"
-          test_results = run_file(filename)
-          exchange.publish make_finish_message(filename, test_results)
+          log "Running '#{filename}' with Worker: #{@worker_id}"
+          test_results = nil # needed so run_file() inside the Benchmark will use this
+          runtime = Benchmark.realtime do
+            test_results = run_file(filename)
+          end
+          exchange.publish make_finish_message(filename, test_results, runtime)
         end
       end
     rescue Exception => e
@@ -142,11 +146,11 @@ class Worker
   end
 
   def make_start_message(filename)
-    {:action => :start, :hostname => Socket.gethostname, :worker_id => @worker_id, :filename => filename}
+    {action: :start, hostname: Socket.gethostname, worker_id: @worker_id, filename: filename}
   end
 
-  def make_finish_message(filename, results)
-    {:action => :finish, :hostname => Socket.gethostname, :worker_id => @worker_id, :filename => filename}.merge(results)
+  def make_finish_message(filename, results, runtime)
+    {action: :finish, hostname: Socket.gethostname, worker_id: @worker_id, filename: filename, runtime: runtime}.merge(results)
   end
 
   def require_runner_code_for framework

data/spec/runtime_file_reader_spec.rb

@@ -0,0 +1,49 @@
+require 'gorgon/runtime_file_reader'
+require 'yajl'
+
+describe RuntimeFileReader do
+
+  describe "#old_files" do
+    let(:runtime_filename){ "runtime_file.json" }
+
+    it "should read runtime_file" do
+      File.stub(:file?).and_return(true)
+      runtime_file_reader = RuntimeFileReader.new(runtime_filename)
+      File.should_receive(:open).with(runtime_filename, 'r')
+      runtime_file_reader.old_files
+    end
+
+    it "should return empty array if runtime_file is invalid" do
+      File.should_receive(:file?).and_return(false)
+      runtime_file_reader = RuntimeFileReader.new(runtime_filename)
+      File.should_not_receive(:open)
+      runtime_file_reader.old_files
+    end
+  end
+
+
+  describe "#sorted_files" do
+    let (:old_files){ [ "old_a.rb", "old_b.rb", "old_c.rb"] }
+
+    before do
+      @runtime_file_reader = RuntimeFileReader.new "runtime_file.json"
+      @runtime_file_reader.stub(:old_files).and_return old_files
+    end
+
+    it "should include new files at the end" do
+      current_spec_files = ["new_a.rb", "old_b.rb", "old_a.rb", "new_b.rb", "old_c.rb"]
+      sorted_files = @runtime_file_reader.sorted_files(current_spec_files)
+      expect(sorted_files.first(sorted_files.size-2)).to eq(old_files)
+      expect(sorted_files.last(2)).to eq(["new_a.rb", "new_b.rb"])
+    end
+
+    it "should remove old files that are not in current files" do
+      current_spec_files = ["new_a.rb", "old_a.rb", "old_c.rb"]
+      sorted_files = @runtime_file_reader.sorted_files(current_spec_files)
+      expect(sorted_files.first(2)).to eq(["old_a.rb", "old_c.rb"])
+      expect(sorted_files.last(1)).to eq(["new_a.rb"])
+    end
+  end
+
+end
+

data/spec/runtime_recorder_spec.rb

@@ -0,0 +1,79 @@
+require 'gorgon/job_state'
+require 'gorgon/runtime_recorder'
+require 'yajl'
+
+describe RuntimeRecorder do
+
+  let (:runtime_filename){ "runtime_file.json" }
+
+  describe "#initialize" do
+    it "adds itself to observers of job_state and sets records as empty" do
+      job_state = JobState.new 1
+      job_state.should_receive(:add_observer)
+      runtime_recorder = RuntimeRecorder.new job_state, runtime_filename
+      expect(runtime_recorder.records).to eq({})
+    end
+  end
+
+
+  describe "#update" do
+    let(:payload){ {filename: "file_spec.rb", runtime: 1.23, action: "finish"} }
+    before do
+      @job_state = JobState.new 1
+      @runtime_recorder = RuntimeRecorder.new @job_state, nil
+    end
+
+    it "should record if a file finished" do
+      expect(@runtime_recorder.records).to be_empty
+      @runtime_recorder.update(payload)
+      @runtime_recorder.records = { "file_spec.rb" => 1.23 }
+    end
+
+    it "should not record if a file is not finished" do
+      expect(@runtime_recorder.records).to be_empty
+      @runtime_recorder.update(payload.merge({action:"not_finish"}))
+      expect(@runtime_recorder.records).to be_empty
+    end
+
+    it "should write to the file if job is completed" do
+      @job_state.stub(:is_job_complete?).and_return(true)
+      @runtime_recorder.should_receive(:write_records_to_file)
+      @runtime_recorder.update(payload)
+    end
+
+    it "should not write to the file if job is not completed" do
+      @job_state.stub(:is_job_complete?).and_return(false)
+      @runtime_recorder.should_not_receive(:write_records_to_file)
+      @runtime_recorder.update(payload)
+    end
+  end
+
+
+  describe "#write_records_to_file" do
+    let(:sample_records){ {"zero.rb" => 0.23, "one.rb" => 1.23, "two.rb" => 2.23} }
+
+    before do
+      @job_state = JobState.new 1
+    end
+
+    it "should not write if no file is given" do
+      runtime_recorder = RuntimeRecorder.new @job_state, nil
+      runtime_recorder.records = sample_records
+      file = mock('file')
+      File.should_not_receive(:open).and_yield(file)
+      file.should_not_receive(:write)
+      runtime_recorder.write_records_to_file
+    end
+
+    it "should write sorted records to the given file" do
+      runtime_recorder = RuntimeRecorder.new @job_state, runtime_filename
+      runtime_recorder.records = sample_records
+      file = mock('file')
+      File.should_receive(:open).with(runtime_filename, 'w').and_yield(file)
+      file.should_receive(:write).with("{\n  \"two.rb\": 2.23,\n  \"one.rb\": 1.23,\n  \"zero.rb\": 0.23\n}")
+      runtime_recorder.write_records_to_file
+    end
+  end
+
+end
+

data/tutorial.md

@@ -1,6 +1,6 @@
 # Gorgon Setup Tutorial
 
-This is an example on how to setup [Gorgon](https://github.com/Fitzsimmons/Gorgon). For this tutorial, we will use a version of a Rails app from [Ruby on Rails Tutorial](https://www.railstutorial.org/) by Michael Hartl.
+This is an example on how to setup [Gorgon](https://github.com/nulogy/Gorgon). For this tutorial, we will use a version of a Rails app from [Ruby on Rails Tutorial](https://www.railstutorial.org/) by Michael Hartl.
 
 ### Setup the sample Rails app
 
@@ -68,7 +68,7 @@ To check if you have SSH access without password, running ```ssh localhost``` sh
 1. Download a listener configuration sample:
 
   ```bash
-  wget https://raw.githubusercontent.com/Fitzsimmons/Gorgon/master/gorgon_listener.json.sample
+  wget https://raw.githubusercontent.com/nulogy/Gorgon/master/gorgon_listener.json.sample
   mv gorgon_listener.json.sample gorgon_listener.json
   ```
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Justin Fitzsimmons
@@ -12,34 +12,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -74,14 +74,14 @@ dependencies:
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -204,6 +204,8 @@ files:
 - lib/gorgon/progress_bar_view.rb
 - lib/gorgon/rspec_runner.rb
 - lib/gorgon/rsync_daemon.rb
+- lib/gorgon/runtime_file_reader.rb
+- lib/gorgon/runtime_recorder.rb
 - lib/gorgon/settings/files_content.rb
 - lib/gorgon/settings/initial_files_creator.rb
 - lib/gorgon/settings/rails_project_files_content.rb
@@ -271,7 +273,6 @@ files:
 - lib/gorgon_bunny/lib/gorgon_bunny/version.rb
 - lib/gorgon_bunny/lib/gorgon_bunny/versioned_delivery_tag.rb
 - rsync_transport.md
-- spec/acceptance/run_tests_spec.rb
 - spec/acceptance_spec_helper.rb
 - spec/callback_handler_spec.rb
 - spec/crash_reporter_spec.rb
@@ -292,6 +293,8 @@ files:
 - spec/progress_bar_view_spec.rb
 - spec/rspec_runner_spec.rb
 - spec/rsync_daemon_spec.rb
+- spec/runtime_file_reader_spec.rb
+- spec/runtime_recorder_spec.rb
 - spec/shutdown_manager_spec.rb
 - spec/source_tree_syncer_spec.rb
 - spec/support/mock_app/.gitignore
@@ -359,22 +362,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gorgon
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Distributed testing for ruby with centralized management
 test_files:
-- spec/acceptance/run_tests_spec.rb
 - spec/acceptance_spec_helper.rb
 - spec/callback_handler_spec.rb
 - spec/crash_reporter_spec.rb
@@ -395,6 +397,8 @@ test_files:
 - spec/progress_bar_view_spec.rb
 - spec/rspec_runner_spec.rb
 - spec/rsync_daemon_spec.rb
+- spec/runtime_file_reader_spec.rb
+- spec/runtime_recorder_spec.rb
 - spec/shutdown_manager_spec.rb
 - spec/source_tree_syncer_spec.rb
 - spec/support/mock_app/.gitignore

data/spec/acceptance/run_tests_spec.rb

@@ -1,9 +0,0 @@
-require 'acceptance_spec_helper'
-
-describe 'Gorgon' do
-  it 'run tests' do
-    pending 'Use a different observer of job_state to check expectations'
-
-    run_originator
-  end
-end