juici 0.0.0.alpha1 → 0.0.0

data/lib/juici/config.rb

@@ -4,8 +4,4 @@ class Juici::Config; class << self
     "/tmp/juici/workspace"
   end
 
-  def builds_per_page
-    10
-  end
-
 end; end

data/lib/juici/controllers/{trigger.rb → trigger_controller.rb}

@@ -1,31 +1,15 @@
-module Juici::Controllers
-  class Trigger
+module Juici
+  class TriggerController
 
     attr_reader :project, :params
     def initialize(project, params)
-      @project = ::Juici::Project.find_or_create_by(name: project)
+      @project = Project.find_or_create_by(name: project)
       @params = params
     end
 
-    # Find an existing build, duplicate the sane parts of it.
-    def rebuild!
-      unless project = ::Juici::Project.where(name: params[:project]).first
-        not_found
-      end
-      unless build = ::Juici::Build.where(parent: project.name, _id: params[:id]).first
-        not_found
-      end
-
-      ::Juici::Build.new_from(build).tap do |new_build|
-        new_build.save!
-        $build_queue << new_build
-        $build_queue.bump!
-      end
-    end
-
     def build!
-      environment = ::Juici::BuildEnvironment.new
-      ::Juici::Build.new(parent: project.name).tap do |build|
+      environment = BuildEnvironment.new
+      Build.new(parent: project.name).tap do |build|
         # The seperation of concerns around this madness is horrifying
         unless environment.load_json!(params['environment'])
           build.warn!("Failed to parse environment")
@@ -52,9 +36,6 @@ module Juici::Controllers
       # TODO Throw 422 not acceptable if missing
       params['command'].tap do |c|
         raise "No command given" if c.nil?
-        # TODO Detect that we've recieved this from a browser session and only
-        # do this replacement there, we can trust API supplied data.
-        c.gsub!(/\r\n/, "\n")
       end
     end
 

data/lib/juici/database.rb

@@ -1,25 +1,19 @@
-require 'mongoid'
-module Juici
-  class Database
-    class << self
-      def mongoid_config_file
-        %w[mongoid.yml mongoid.yml.sample].each do |file|
-          path = File.join("config", file)
-          return path if File.exist?(path)
-        end
-        raise "No database config file"
+class Juici::Database
+  class << self
+    def mongoid_config_file
+      %w[mongoid.yml mongoid.yml.sample].each do |file|
+        path = File.join("config", file)
+        return path if File.exist?(path)
       end
+      raise "No database config file"
+    end
 
-      def initialize!
-        if ::Juici.respond_to? :dbgp
-          ::Juici.dbgp "initializing Mongoid with environment: #{ENV['RACK_ENV']}"
-        end
-        if ENV['RACK_ENV'] == "development"
-          Mongoid.logger.level = Logger::INFO
-        end
-
-        Mongoid.load!(mongoid_config_file)
+    def initialize!
+      if ENV['RACK_ENV'] == "development"
+        Mongoid.logger.level = Logger::INFO
       end
+
+      Mongoid.load!(mongoid_config_file)
     end
   end
 end

data/lib/juici/helpers/url_helpers.rb

@@ -8,31 +8,3 @@ def build_url_for(entity)
     "/builds/#{entity[:parent]}/show/#{entity[:_id]}"
   end
 end
-
-def rebuild_url_for(entity)
-  URI.escape case entity
-  when ::Juici::Build
-    "/builds/#{entity[:parent]}/rebuild/#{entity[:_id]}"
-  end
-end
-
-def kill_url_for(entity)
-  URI.escape case entity
-  when ::Juici::Build
-    "/builds/kill"
-  end
-end
-
-def cancel_url_for(entity)
-  URI.escape case entity
-  when ::Juici::Build
-    "/builds/cancel"
-  end
-end
-
-def edit_url_for(entity)
-  URI.escape case entity
-  when ::Juici::Build
-    "/builds/#{entity[:parent]}/edit/#{entity[:_id]}"
-  end
-end

data/lib/juici/models/build.rb

@@ -1,43 +1,29 @@
 require 'json'
-
+# status enum
+#   :waiting
+#   :started
+#   :failed
+#   :success
+#
+#   ???
+#   :profit!
+#
 module Juici
   class Build
     # A wrapper around the build process
 
     include Mongoid::Document
+    include ::Juici.url_helpers("builds")
     include BuildLogic
-    include BuildStatus
-    extend FindLogic
     # TODO Builds should probably be children of projects in the URL?
 
-    # Finder classmethods
-    def self.get_recent(n, opts={})
-      self.where(opts).
-        limit(n).
-        desc(:_id)
-    end
-
-    CLONABLE_FIELDS = [:command, :priority, :environment, :callbacks, :title, :parent]
-    EDITABLE_ATTRIBUTES = {
-      :string => [:priority, :title],
-      :array  => [:environment, :callbacks]
-    }
-
-    def self.new_from(other)
-      new.tap do |b|
-        CLONABLE_FIELDS.each do |prop|
-          b[prop] = other[prop]
-        end
-      end
-    end
-
     field :parent, type: String
     field :command, type: String
     field :environment, type: Hash
     field :create_time, type: Time, :default => Proc.new { Time.now }
     field :start_time, type: Time, :default => nil
     field :end_time, type: Time, :default => nil
-    field :status, type: Symbol, :default => WAIT.to_sym
+    field :status, type: Symbol, :default => :waiting
     field :priority, type: Fixnum, :default => 1
     field :pid, type: Fixnum
     field :buffer, type: String
@@ -46,43 +32,37 @@ module Juici
     field :title, type: String, :default => Proc.new { Time.now.to_s }
 
     def set_status(value)
-      self.status= value
+      self[:status] = value
       save!
     end
 
     def start!
       self[:start_time] = Time.now
-      set_status START
+      set_status :started
     end
 
     def success!
       finish
-      set_status PASS
+      set_status :success
       process_callbacks
     end
 
     def failure!
       finish
-      set_status FAIL
+      set_status :failed
       process_callbacks
     end
 
     def finish
       self[:end_time] = Time.now
       self[:output] = get_output
-      $build_queue.purge(:pid, self) if $build_queue
-    end
-
-    def cancel
-      warn! "Cancelled"
-      set_status FAIL
-      $build_queue.delete(self[:_id]) if $build_queue
+      $build_queue.purge(:pid, self)
     end
 
     def build!
-      start!
       case pid = spawn_build
       when Fixnum
+        start!
         Juici.dbgp "#{pid} away!"
         self[:pid] = pid
         self[:buffer] = @buffer.path
@@ -100,22 +80,18 @@ module Juici
 
     def worktree
       File.join(Config.workspace, parent)
-    rescue TypeError => e
-      warn! "Invalid workdir"
-      failure!
-      raise AbortBuild
     end
 
     # View helpers
     def heading_color
       case status
-      when WAIT
+      when :waiting
         "build-heading-pending"
-      when FAIL
+      when :failed
         "build-heading-failed"
-      when PASS
+      when :success
         "build-heading-success"
-      when START
+      when :started
         "build-heading-started"
       end
     end
@@ -133,20 +109,14 @@ module Juici
       self[:title] || self[:create_time]
     end
 
-    def link_title
-      "#{self[:parent]}/#{display_title}"
-    end
-
     def warn!(msg)
       warnings << msg
       save!
     end
 
     def process_callbacks
-      callbacks.each do |callback_url|
-        c = Callback.new(callback_url)
-        c.payload = self.to_callback_json
-        c.process!
+      self[:callbacks].each do |callback_url|
+        Callback.new(self, callback_url).process!
       end
     end
 
@@ -155,36 +125,9 @@ module Juici
       {
         "project" => self[:parent],
         "status" => self[:status],
-        "url" => build_url_for(self),
-        "time" => time_elapsed
+        "url" => build_url_for(self)
       }.to_json
     end
 
-    def callbacks
-      self[:callbacks] || []
-    end
-
-    def time_elapsed
-      if self[:end_time]
-        self[:end_time] - self[:start_time]
-      elsif self[:start_time]
-        Time.now - self[:start_time]
-      else
-        nil
-      end
-    rescue
-      -1 # Throw an obviously impossible build time.
-         # This will only occur as a result of old builds.
-    end
-
-    # Use symbols internally
-    def status
-      self[:status].to_s
-    end
-
-    def status=(s)
-      self[:status] = s.to_sym
-    end
-
   end
 end

data/lib/juici/models/project.rb

@@ -1,7 +1,7 @@
 module Juici
   class Project
     include Mongoid::Document
-    extend FindLogic
+    include Juici.url_helpers("builds")
 
     field :name, type: String
 

data/lib/juici/server.rb

@@ -11,8 +11,6 @@ module Juici
     end
 
     helpers do
-      include Ansible
-
       Dir[File.dirname(__FILE__) + "/helpers/**/*.rb"].each  do |file|
         load file
       end
@@ -21,16 +19,9 @@ module Juici
     dir = File.dirname(File.expand_path(__FILE__))
 
     def self.start(host, port)
-        @@juici = App.new
-        Juici::Server.run!(:host => host, :port => port) do |server|
-          [:INT, :TERM].each do |sig|
-            trap(sig) do
-              $stderr.puts "Shutting down JuiCI"
-              App.shutdown
-              server.respond_to?(:stop!) ? server.stop! : server.stop
-            end
-          end
-        end
+      Database.initialize!
+      @@juici = App.new
+      Juici::Server.run! :host => host, :port => port
     end
 
     def self.rack_start(project_path)
@@ -42,130 +33,76 @@ module Juici
     set :static, true
 
     get '/' do
-      Controllers::Index.new.index do |template, opts|
-        erb(template, {}, opts)
-      end
+      @page = :index
+      erb(:index, {}, :juici => juici)
     end
 
     get '/about' do
-      Controllers::Index.new.about do |template, opts|
-        erb(template, {}, opts)
-      end
+      @page = :about
+      @action = :show
+      erb(:about)
     end
 
     get '/builds' do
-      Controllers::Index.new.builds do |template, opts|
-        erb(template, {}, opts)
-      end
+      @page = :builds
+      @action = :list
+      erb(:builds, {}, :juici => juici)
     end
 
-    get '/support' do
-      Controllers::Index.new.support do |template, opts|
-        erb(template, {}, opts)
-      end
+    get '/builds/new' do
+      @page = :builds
+      @action = :new
+      erb(:"builds/new", :juici => juici)
     end
 
     post '/builds/new' do
-      build = Controllers::Trigger.new(params[:project], params).build!
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
-    end
-
-    post '/builds/:project/rebuild/:id' do
-      build = Controllers::Trigger.new(params[:project], params).rebuild!
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
-    end
-
-    post '/builds/:user/:project/rebuild/:id' do
-      params[:project] = "#{params[:user]}/#{params[:project]}"
-      build = Controllers::Trigger.new(params[:project], params).rebuild!
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
+      TriggerController.new(params[:project], params).build!
+      @redirect_to = build_url_for(params[:project])
+      erb(:redirect, {}, :juici => juici)
     end
 
-    post '/builds/kill' do
-      build = Controllers::Builds.new(params).kill
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
-    end
-
-    post '/builds/cancel' do
-      build = Controllers::Builds.new(params).cancel
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
-    end
-
-    get ::Juici::Routes::NEW_BUILD do
-      Controllers::Builds.new(params).new do |template, opts|
-        erb(template, {}, opts)
-      end
+    def list_builds(params)
+      erb(:"builds/list", {}, :juici => juici, :project => params[:project])
     end
 
     get '/builds/:project/list' do
-      Controllers::Builds.new(params).list do |template, opts|
-        erb(template, {}, opts)
-      end
+      @page = :builds
+      @action = :list
+      list_builds(params)
     end
 
     get '/builds/:user/:project/list' do
+      @page = :builds
+      @action = :list
       params[:project] = "#{params[:user]}/#{params[:project]}"
-      Controllers::Builds.new(params).list do |template, opts|
-        erb(template, {}, opts)
-      end
-    end
-
-    get '/builds/:project/edit/:id' do
-      Controllers::Builds.new(params).edit do |template, opts|
-        erb(template, {}, opts)
-      end
-    end
-
-    get '/builds/:user/:project/edit/:id' do
-      params[:project] = "#{params[:user]}/#{params[:project]}"
-      Controllers::Builds.new(params).edit do |template, opts|
-        erb(template, {}, opts)
-      end
-    end
-
-    post '/builds/:project/edit/:id' do
-      build = Controllers::Builds.new(params).update!
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
+      list_builds(params)
     end
 
-    post '/builds/:user/:project/edit/:id' do
-      params[:project] = "#{params[:user]}/#{params[:project]}"
-      build = Controllers::Builds.new(params).update!
-      @redirect_to = build_url_for(build)
-      erb(:redirect, {}, {})
+    def show_build(params)
+      erb(:"builds/show", {}, :juici => juici, :project => params[:project], :id => params[:id])
     end
 
     get '/builds/:project/show/:id' do
-      Controllers::Builds.new(params).show do |template, opts|
-        erb(template, {}, opts)
-      end
+      @page = :builds
+      @action = :show
+      show_build(params)
     end
 
     get '/builds/:user/:project/show/:id' do
+      @page = :builds
+      @action = :show
       params[:project] = "#{params[:user]}/#{params[:project]}"
-      Controllers::Builds.new(params).show do |template, opts|
-        erb(template, {}, opts)
-      end
+      show_build(params)
     end
 
-    post '/trigger/:project' do
-      Controllers::Trigger.new(params[:project], params).build!
-    end
-
-    get '/queue' do
-      Controllers::BuildQueue.new(params).list do |template, opts|
-        erb(template, {}, opts)
-      end
+    get '/support' do
+      @page = :support
+      @action = :show
+      erb(:"support", {})
     end
 
-    not_found do
-      erb(:not_found, {}, {})
+    post '/trigger/:project' do
+      TriggerController.new(params[:project], params).build!
     end
 
   end