gorgon 0.8.2 → 0.8.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGExZTQwNzZlNWEwNDY4YTc0MmUxMDhhYWY4N2MwOTUxMjgyMDg2Mw==
+    MjQ4NWZhNTMzMjIzZWQ4NTMwNzAxYzMzMDQ0NDhiMWJjMjg1Y2NmZQ==
   data.tar.gz: !binary |-
-    ZWQyNTdlYmQ2MDBjMGU0ZWY0MmMwZWRkYzg2NjJlYjQxNDZlMzc4Yg==
+    YmRiMDAzYmU3M2Y3ZGFiNWQzOGU3NWZiYWUyM2QwZDAzNTQ4N2EwYg==
 SHA512:
   metadata.gz: !binary |-
-    Y2RiYjRjNjYyOTY2ODM5MmQ1MjJiMGRiNGVlMWNkY2E2NWE4YTk3ZTE5N2I2
-    MWFkNWIxNWU0ZDQ3MDY5M2IyN2Y4NzNhYjgyZTBhODVjN2U0NTU0ZmZiYTUz
-    MGNmZDUyZWQ1YWI4YjdiZDU0MDhhZTc3ZmMyZWRjYjc3ZjdmMTc=
+    ZWY2YTZmYjY5OGVhMjNlYjEwZWQ0ZWM2MDBmYjNiMWUzNjBmYTY5NWQ1MzBi
+    NDJiYTA0ZTA0NGQyM2ZkMmQ5YWMzZmFjYWIxMmJkOWEwYjJhZjE1Mzc0YWJj
+    YmE4NzA2ZmJhOGNlMWMyNjEyMTUwNTEwMGE0YWI0MmYwMjE2YjQ=
   data.tar.gz: !binary |-
-    MjY5ZjUxYTMyNDA4Yjg1OGMwOGZjODA5MDE1NGUxYjg0NGJjY2M1Mzk0ZTYw
-    ZmQxZDhlZTQwMjUzM2JhMzdhYjAzZDIyYzFmMWI2MGUwYmM1N2RlYjhhYjc4
-    YzhkZWEzYjIxZTg5NWI4OTYwNDJkYWRjY2IwZjczNjZjOGE1ZjU=
+    Mjk4YTUwYzNmMWJiNmZmYzU1NzY1YTc4ZWQxYzdhZDgyYjExODk2Y2M0ZmFm
+    MDI0YTljODRkNjVjNTUyMjc5YjU3MDhmMTJhMDJjNGYyOTk3YmU4ZWRlNGZk
+    ZGQ3NDFmNmRiZjgxMjdjZWRkNmI4YzFmZDk4NjJjYmRmNWJjOTc=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.8.2)
+    gorgon (0.8.3)
       amqp (~> 1.1.0)
       awesome_print
       colorize (~> 0.5.8)
@@ -20,7 +20,7 @@ GEM
     awesome_print (1.2.0)
     colorize (0.5.8)
     diff-lcs (1.1.3)
-    eventmachine (1.0.3)
+    eventmachine (1.0.4)
     open4 (1.3.4)
     rake (0.9.2.2)
     rspec (2.11.0)

data/lib/gorgon/originator.rb

@@ -152,12 +152,7 @@ class Originator
   end
 
   def files
-    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)
+    @files ||= RuntimeFileReader.new(configuration).sorted_files
   end
 
   def job_definition

data/lib/gorgon/runtime_file_reader.rb

@@ -2,8 +2,9 @@ require 'yajl'
 
 class RuntimeFileReader
 
-  def initialize(runtime_filename)
-    @runtime_filename = runtime_filename || ""
+  def initialize(configuration)
+    @runtime_filename = configuration[:runtime_file] || ""
+    @globs_of_files = configuration[:files] || [] # e.g. ["spec/file1_spec.rb", "spec/**/*_spec.rb"]
   end
 
   def old_files
@@ -18,9 +19,19 @@ class RuntimeFileReader
                    end
   end
 
-  def sorted_files(current_files = [])
+  def sorted_files # sorts by 1.) globs, 2.) runtime
+    @globs_of_files.reduce([]) do |memo, glob|
+      memo.concat( sorted_files_by_runtime(Dir[glob]) )
+    end.uniq
+  end
+
+  private
+
+  def sorted_files_by_runtime(current_files = [])
     (self.old_files+current_files).uniq - (self.old_files-current_files)
   end
 
+
+
 end
 

data/lib/gorgon/version.rb

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

data/spec/runtime_file_reader_spec.rb

@@ -3,47 +3,75 @@ require 'yajl'
 
 describe RuntimeFileReader do
 
+  let(:old_files){ ["old_a.rb", "old_b.rb", "old_c.rb", "old_d.rb"] }
+
   describe "#old_files" do
-    let(:runtime_filename){ "runtime_file.json" }
+    let(:configuration){ {runtime_file: "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 = RuntimeFileReader.new(configuration)
+      File.should_receive(:open).with(configuration[:runtime_file], '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)
+      runtime_file_reader = RuntimeFileReader.new(configuration)
       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"] }
+  describe "#sorted_files_by_runtime" do
+    let(:configuration){ {runtime_file: "runtime_file.json"} }
 
     before do
-      @runtime_file_reader = RuntimeFileReader.new "runtime_file.json"
+      @runtime_file_reader = RuntimeFileReader.new(configuration)
       @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"])
+      current_spec_files = ["new_a.rb", "old_b.rb", "old_a.rb", "new_b.rb", "old_c.rb", "old_d.rb"]
+      sorted_files_by_runtime = @runtime_file_reader.send(:sorted_files_by_runtime, current_spec_files)
+      expect(sorted_files_by_runtime.first(sorted_files_by_runtime.size-2)).to eq(old_files)
+      expect(sorted_files_by_runtime.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"])
+      sorted_files_by_runtime = @runtime_file_reader.send(:sorted_files_by_runtime, current_spec_files)
+      expect(sorted_files_by_runtime.first(2)).to eq(["old_a.rb", "old_c.rb"])
+      expect(sorted_files_by_runtime.last(1)).to eq(["new_a.rb"])
     end
   end
 
+
+  describe "#sorted_files" do
+    let(:configuration){ {files: ["glob_1", "glob_2", "glob_3"]} }
+
+    before do
+      @runtime_file_reader = RuntimeFileReader.new(configuration)
+      @runtime_file_reader.stub(:old_files).and_return old_files
+    end
+
+    it "sort by globs then by runtime" do
+      globs = {
+        "glob_1" => ["old_b.rb"],
+        "glob_2" => ["new_c.rb", "old_a.rb"],
+        "glob_3" => ["old_d.rb", "old_c.rb", "new_a.rb", "new_b.rb", "new_c.rb", "old_a.rb", "old_b.rb"]
+      }
+      Dir.stub(:[]) do |glob|
+        globs[glob]
+      end
+      sorted_files = @runtime_file_reader.sorted_files
+      expect(sorted_files).to eq(
+        ["old_b.rb", "old_a.rb", "new_c.rb", "old_c.rb", "old_d.rb", "new_a.rb", "new_b.rb"]
+      )
+    end
+  end
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Justin Fitzsimmons
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake