juici 0.0.0.alpha1 → 0.0.0

data/Gemfile

@@ -1,5 +1,2 @@
 source :rubygems
-
-ruby '1.9.3'
-
-gemspec :name => "juici"
+gemspec

data/Gemfile.lock

@@ -2,13 +2,11 @@ PATH
   remote: .
   specs:
     juici (0.0.0)
-      ansible
       bson_ext
       github-markdown
       json
-      mongoid
+      mongoid (~> 2)
       sinatra
-      thin
 
 GEM
   remote: http://rubygems.org/
@@ -19,28 +17,24 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    ansible (0.2.0)
     bson (1.7.0)
     bson_ext (1.7.0)
       bson (~> 1.7.0)
-    builder (3.0.4)
-    daemons (1.1.9)
+    builder (3.0.3)
     diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    github-markdown (0.5.3)
+    github-markdown (0.5.1)
     i18n (0.6.1)
     json (1.7.5)
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
-    mongoid (3.0.10)
+    mongo (1.7.0)
+      bson (~> 1.7.0)
+    mongoid (2.5.0)
       activemodel (~> 3.1)
-      moped (~> 1.1)
-      origin (~> 1.0)
+      mongo (~> 1.7)
       tzinfo (~> 0.3.22)
-    moped (1.2.7)
-    multi_json (1.3.7)
-    origin (1.0.10)
+    multi_json (1.3.6)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -57,12 +51,8 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     tilt (1.3.3)
-    tzinfo (0.3.34)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby

data/README.md

@@ -13,8 +13,8 @@ It's designed to work well with [agent99](https://github.com/99designs/agent99)
 
 ## Important but Miscellaneous
 
-If you create child processes in modules/plugins then you need to register your
-disinterest or JuiCI will think they're builds and that would be bad.
+If you create child process in modules/plugins then you need to register your
+disinterest or JuiCI will think they're builds and that would be bad
 
 ## Setup
 
@@ -27,26 +27,12 @@ bundle exec bin/juici
 
 is all you need to have a working instance (provided that you have mongo installed)
 
-### Gotchas
-
-Make sure you don't do something innocuous like
-
-```bash
-bundle install --path .bundle
-```
-
-this might look sane (and it is, kinda) but owing to a quick in bundler, it
-will break any ruby code you try to build.
-
-I'm working on a workaround, but in the meantime the fix is to not do it!
-
 ## Usage
 
-JuiCI is very focused on minimal configuration; meaning that beyond starting
-the server and pointing it at a mongoDB instance, you do not need to do
-anything special to build a new project. Just request a build; however this
-means that on your first build you will need to send the commands to create
-your test environment)
+JuiCI chooses to be very "Mongo" (which is an adjective now), in that you don't
+need to formally create a project. Just request a build; however this means
+that on your first build you will need to send the commands to create your test
+environment)
 
 Example:
 
@@ -81,20 +67,6 @@ called with an (as yet unformalised) json body as the body if/when the build
 reaches that state. Alternately you may specify "any" as the callback state and
 it will be called on all state changes.
 
-## Integration
-
-Apps written in ruby wanting to interact with Juici can include the
-`juici-interface` gem, which presently exposes a few constants to line up with
-JuiCI's internal state.
-Over time this will be expanded, but for now they are:
-
-```ruby
-Juici::BuildStatus::PASS
-Juici::BuildStatus::FAIL
-Juici::BuildStatus::START
-Juici::BuildStatus::WAIT
-```
-
 ## Security
 
 JuiCI poses some interesting security conecerns. First off, it will allow
@@ -120,19 +92,8 @@ specifically implement it, your process won't see any of the signal handling
 madness. The shell(`/bin/sh`) will see everything, and if killed, your
 processes will become orphaned, but carry on.
 
-## Authors
-
-* [Richo Healey](https://github.com/rcho)
-* [Alec Sloman](https://github.com/alecsloman)
-
 ## Contact
 
 JuiCI's code lives on [Github](https://github.com/richo/juici)
 and the [author](mailto:richo@psych0tik.net) can be contacted on
  [Twitter](https://twitter.com/rich0H)
-
-## Legalese
-
-(c) Richo Healey 2012, richo@psych0tik.net
-
-Released under the terms of the MIT license.

data/Rakefile

@@ -1,33 +1,9 @@
 require 'rake'
 require 'rspec/core/rake_task'
 
-require 'juici/database'
-
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = "spec/**/*_spec.rb"
 end
 
 desc 'Default: run specs'
 task :default => :spec
-
-namespace :db do
-  desc "Destroy the test db specified in mongoid.yml"
-  task :destroy do
-    Juici::Database.initialize!
-    Mongoid.purge!
-  end
-end
-
-desc "Build all gems"
-task :gems do
-  %w[juici juici-interface].each do |gem|
-    `gem build #{gem}.gemspec`
-  end
-end
-
-desc "Delete all built gems"
-task :clean do
-  Dir["juici-*.gem"].each do |gem|
-    File.unlink(gem)
-  end
-end

data/config/mongoid.yml.sample

@@ -1,25 +1,10 @@
 development:
-  sessions:
-    default:
-      database: juici
-      hosts:
-        - localhost:27017
+  database: juici
+  host: localhost
 
 production:
-  sessions:
-    default:
-      database: juici
-      hosts:
-        - localhost:27017
-
-test:
-  sessions:
-    default:
-      database: juici-test
-      hosts:
-        - localhost:27017
+  database: juici
+  host: localhost
 
 heroku:
-  sessions:
-    default:
-      uri: <%= ENV['MONGOLAB_URI'] %>
+  uri: <%= ENV['MONGOLAB_URI'] %>

data/juici.gemspec

@@ -1,10 +1,8 @@
 # vim: ft=ruby
-#
-require File.expand_path("../lib/juici/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "juici"
-  s.version     = Juici::VERSION
+  s.version     = "0.0.0"
   s.authors     = ["Richo Healey"]
   s.email       = ["richo@psych0tik.net"]
   s.homepage    = "http://github.com/richo/juici"
@@ -12,12 +10,10 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.add_dependency "sinatra"
-  s.add_dependency "thin"
   s.add_dependency "json"
-  s.add_dependency "mongoid"
+  s.add_dependency "mongoid", "~> 2"
   s.add_dependency "bson_ext"
   s.add_dependency "github-markdown"
-  s.add_dependency "ansible"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "mocha"
@@ -25,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = 'juici'
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
 

data/lib/juici.rb

@@ -1,17 +1,12 @@
+require 'mongo'
+require 'mongoid'
 require 'github/markdown'
-require 'ansible'
 
 ENV['RACK_ENV'] ||= "development"
 
 module Juici
   def self.dbgp(*args)
-    if ENV['JUICI_DEBUG'] || env == "development"
-      $stderr.puts(args)
-    end
-  end
-
-  def self.env
-    ENV['JUICI_ENV'] || ENV['RACK_ENV']
+    ENV['JUICY_DEBUG'] && $stderr.puts(args)
   end
 end
 

data/lib/juici/app.rb

@@ -8,20 +8,31 @@ module Juici
 
     def self.shutdown
       ::Juici.dbgp "Shutting down Juici"
-      ::Juici::Watcher.instance.shutdown!
+      @@watchers.each do |watcher|
+        ::Juici.dbgp "Killing #{watcher.inspect}"
+        watcher.kill
+        watcher.join
+        ::Juici.dbgp "Dead:   #{watcher.inspect}"
+      end
 
       shutdown_build_queue
     end
 
     attr_reader :opts
     def initialize(opts={})
-      Database.initialize!
       @opts = opts
-      reset_stale_children
-      start_watcher
+      # NOTE: this happening before we start a build queue is important, it
+      # means we can't start any more workers and get tied in knots
+      # clear_stale_children
+      #
+      # Urgh
       init_build_queue
       reload_unfinished_work
-      start_queue
+      start_workers
+    end
+
+    def spawn_watcher
+      @@watchers << Watcher.start!
     end
 
   private
@@ -40,28 +51,21 @@ module Juici
       # Ensure that any killed builds will be retried
     end
 
-    def start_watcher
-      ::Juici::Watcher.instance.start
+    def start_workers
+      no_workers = opts[:workers] || 1
+      warn "More than 1 worker is liable to do strange things" if no_workers > 1
+      no_workers.times do
+        spawn_watcher
+      end
     end
 
     def reload_unfinished_work
       # At this point no workers have started yet, we can safely assume that
       # :started means aborted
-      Build.where(:status => Juici::BuildStatus::WAIT).each do |build|
+      Build.where(:status.in => [:started, :waiting]).each do |build|
         $build_queue << build
       end
     end
 
-    def reset_stale_children
-      Build.where(:status => Juici::BuildStatus::START).each do |build|
-        build[:status] = Juici::BuildStatus::WAIT
-        build.save!
-      end
-    end
-
-    def start_queue
-      $build_queue.start!
-    end
-
   end
 end

data/lib/juici/build_environment.rb

@@ -1,5 +1,5 @@
 module Juici
-  BUILD_SENSITIVE_VARIABLES = %w[RUBYOPT BUNDLE_GEMFILE RACK_ENV MONGOLAB_URI GEM_PATH WORKING_DIR]
+  BUILD_SENSITIVE_VARIABLES = %w[RUBYOPT BUNDLE_GEMFILE RACK_ENV MONGOLAB_URI]
   class BuildEnvironment
 
     attr_reader :env

data/lib/juici/build_logic.rb

@@ -1,20 +1,11 @@
 require 'fileutils'
 require 'tempfile'
 module Juici
-  module BuildLogic
+   module BuildLogic
 
     def spawn_build
       raise "No such work tree" unless FileUtils.mkdir_p(worktree)
       spawn(command, worktree)
-    rescue AbortBuild
-      :buildaborted
-    end
-
-    def kill!
-      warn! "Killed!"
-      if pid = self[:pid]
-        Process.kill(15, pid)
-      end
     end
 
   private

data/lib/juici/build_queue.rb

@@ -9,7 +9,6 @@ module Juici
       @child_pids = []
       # This is never expired, for now
       @builds_by_pid = {}
-      @started = false
     end
 
     def shutdown!
@@ -40,28 +39,17 @@ module Juici
       end
     end
 
-    def delete(id)
-      purge(:_id, OpenStruct.new(:_id => id))
-    end
-
     # Magic hook that starts a process if there's a good reason to.
     # Stopgap measure that means you can knock on this if there's a chance we
     # should start a process
     def bump!
-      return unless @started
       update_children
       if not_working? && work_to_do?
         Juici.dbgp "Starting another child process"
         next_child.tap do |child|
-          if pid = child.build!
-            Juici.dbgp "Started child: #{pid}"
-            @child_pids << pid
-            @builds_by_pid[pid] = child
-          else
-            Juici.dbgp "Child #{child} failed to start"
-            bump! # Ruby's recursion isn't great, but re{try,do} may as well be
-                  # undefined behaviour here.
-          end
+          pid = child.build!
+          @child_pids << pid
+          @builds_by_pid[pid] = child
         end
       else
         Juici.dbgp "I have quite enough to do"
@@ -92,20 +80,5 @@ module Juici
       @builds.length > 0
     end
 
-    def currently_building
-      @child_pids.map do |pid|
-        get_build_by_pid(pid)
-      end
-    end
-
-    def start!
-      @started = true
-      bump!
-    end
-
-    def builds
-      @builds
-    end
-
   end
 end

data/lib/juici/callback.rb

@@ -2,24 +2,20 @@ require 'net/http'
 module Juici
   class Callback
 
-    attr_reader :url
-    attr_accessor :payload
+    attr_reader :build, :url
 
-    def initialize(url, pl=nil)
+    def initialize(build, url)
+      @build = build
       @url = URI(url)
-      @payload = pl if pl
     end
 
     def process!
       Net::HTTP.start(url.host, url.port) do |http|
         request = Net::HTTP::Post.new(url.request_uri)
-        request.body = payload
+        request.body = build.to_callback_json
 
-        http.request request # Net::HTTPResponse object
+        response = http.request request # Net::HTTPResponse object
       end
-    rescue SocketError => e
-      # We don't get a reference to build any more, can't warn :(
-      # TODO Throw a warning on the build
     end
 
   end