borg 0.0.6 → 0.0.7

data/TODO

@@ -0,0 +1,5 @@
+Features to implement
+1. Ensure that same SHA is checked out everywhere.
+2. Two builds of the same project, should not be running parallely.
+3. Number of processes in a worker, should be decided dynamically.
+4. Track build times and ensure that failed builds run first.

data/VERSION

@@ -1 +1,2 @@
-0.0.6
+0.0.7
+

data/borg.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{borg}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hemant Kumar", "Karunakar"]
@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
   s.email = %q{hkumar@crri.co.in}
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
@@ -23,6 +24,7 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
+    "TODO",
     "VERSION",
     "borg.gemspec",
     "lib/borg.rb",

data/lib/borg.rb

@@ -1,5 +1,4 @@
 module Borg
-  VERSION = "0.0.1"
   require 'borg/railtie'
 end
 

data/lib/borg/borg_abstract_adapter.rb

@@ -109,14 +109,14 @@ module Borg
       files.each { |x| redis.rpush(key, x.join(",")) }
     end
 
-    def remove_file_groups_from_redis(key,&block)
+    def remove_file_groups_from_redis(key,process_count,&block)
       redis_has_files = true
       @redis_connection = redis
       all_status = []
 
       loop do
         local_pids = []
-        n.times do |index|
+        process_count.times do |index|
           test_files = @redis_connection.rpop(key)
           if(test_files)
             local_pids << Process.fork { block.call(index,test_files) }

data/lib/borg/borg_cucumber.rb

@@ -6,7 +6,7 @@ module Borg
       redirect_stdout()
       load_environment('cucumber')
 
-      remove_file_groups_from_redis('cucumber') do |index,feature_files|
+      remove_file_groups_from_redis('cucumber',n) do |index,feature_files|
         prepare_databse(index) unless try_migration_first(index)
         full_feature_path = feature_files.split(',').map do |fl|
           Rails.root.to_s + fl

data/lib/borg/borg_git.rb

@@ -12,17 +12,8 @@ module Borg
 
     def update(worker)
       FileUtils.cd(Rails.root) do
-        #update_command = "git reset --hard HEAD && git fetch && git rebase origin/#{current_branch} && git submodule init && git submodule update && bundle install --local"
-
-        update_command = "bundle install --local"
-        puts "Update command is #{update_command}"
-        EM.popen(update_command,TestRunner) do |process|
-          process.worker = worker
-          process.runner_type = 'git'
-        end
-
+        @status = system("git reset --hard HEAD && git fetch && git rebase origin/#{current_branch} && git submodule init && git submodule update && bundle install --local")
       end
-
     end
 
   end

data/lib/borg/borg_test_unit.rb

@@ -5,7 +5,7 @@ module Borg
     def run(n = 3)
       redirect_stdout()
       load_environment('test')
-      remove_file_groups_from_redis('tests') do |index,test_files|
+      remove_file_groups_from_redis('tests',n) do |index,test_files|
         prepare_databse(index) unless try_migration_first(index)
         test_files.split(',').each do |fl|
           load(Rails.root.to_s + fl)

data/lib/borg/borg_worker.rb

@@ -24,25 +24,21 @@ module Borg
 
     def update_code
       source_control = Borg::Git.new()
-      source_control.update(self)
-    end
-    
-    def redis
-      Redis.new(:host => Borg::Config.redis_ip,:port => Borg::Config.redis_port)
-    end
-
-    def code_updated(last_status)
-      if(last_status.exit_status == 0)
+      source_control.update()
+      if(source_control.status)
         start_test
       else
-        puts "sending error report"
         send_object(BuildStatus.new(1))
       end
     end
+    
+    def redis
+      Redis.new(:host => Borg::Config.redis_ip,:port => Borg::Config.redis_port)
+    end
 
     def start_test
       if(redis.llen("tests") > 0)
-        EM.popen("rake tickle:test RAILS_ENV=test", TestRunner) do |process|
+        EM.popen("rake borg:test RAILS_ENV=test", TestRunner) do |process|
           process.worker = self
           process.runner_type = 'unit'
         end
@@ -54,7 +50,7 @@ module Borg
     def start_cucumber(last_status)
       @@status_reports << last_status
       if(redis.llen("cucumber") > 0)
-        EM.popen("rake tickle:cucumber RAILS_ENV=cucumber",TestRunner) do |process|
+        EM.popen("rake borg:cucumber RAILS_ENV=cucumber",TestRunner) do |process|
           process.worker = self
           process.runner_type = 'cucumber'
         end
@@ -88,11 +84,8 @@ module Borg
 
     def unbind
       puts "Sending the status thingy"
-      case runner_type
-      when 'unit'
+      if(runner_type == 'unit')
         worker.start_cucumber(BuildStatus.new(get_status.exitstatus))
-      when 'git'
-        worker.code_updated(BuildStatus.new(get_status.exitstatus))
       else
         worker.send_final_report(BuildStatus.new(get_status.exitstatus))
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: borg
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Hemant Kumar
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
+- TODO
 files: 
 - .document
 - Gemfile
@@ -109,6 +110,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - borg.gemspec
 - lib/borg.rb