magi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2f3aa7e90d1b48ae6d264fe18d45927e151fe74
-  data.tar.gz: e08af400fadaf5e4ba012227a1a5ca827e988147
+  metadata.gz: 00e582eed9e7365b07a029623587010791632dae
+  data.tar.gz: d25ee1877b2ddcdfbb3ed4a8b678f3f837b8c50c
 SHA512:
-  metadata.gz: 8aaacf0941adfe403a1949c99ae5b742a6dae0fbcfc983de921f7037cec182b719a5234bdbc7922761d4e74d414b2f64cc85522cf448dd881d76a6d2e5a011e6
-  data.tar.gz: 25ce48204fb196d6133df7f04e004c1020f446dd79f33e582087a86fd62e5a10d6e10f57a4fa72635e988923b29693b7ff4cf528b13f6a2787d39598326f0585
+  metadata.gz: 501d6fb97fae40d4b13bf4add9e97dc645e7d7b87845cb76b56260cf9625bc840f7494038c0c74f6fa53ed8782fae12a8db5a98d402be99a13602b35df0da040
+  data.tar.gz: 5e06f62c92daffb43bbe257f74cb250cd43d4fd0dda0c45cbae1eefaa9f76133c6df10d5ceea54e47975b3ee2345bf9dcfabdc9d4daf953597a712103e57e754

data/Gemfile

@@ -8,6 +8,7 @@ gem "font-awesome-rails"
 gem "jquery-rails"
 gem "kaminari"
 gem "quiet_assets"
+gem "rails-backbone"
 gem "resque"
 gem "slim"
 gem "weak_parameters"

data/README.md

@@ -1,5 +1,5 @@
 # Magi
-A continuous integration server implementation.
+Casual CI server system (magi is a temporal name).
 
 ## Usage
 ```
@@ -17,10 +17,12 @@ Magi is just a rails application with some middlewares.
 * foreman: process manager
 * mysql: store jobs & builds
 * resque: background worker using redis
-* autodoc: generate [RESTful API documents](https://github.com/r7kamura/magi/blob/master/doc) from request-specs
 * jquery: ajax updated view
+* redis: build started/finished notification by pubsub system
+* autodoc: generate [RESTful API documents](https://github.com/r7kamura/magi/blob/master/doc) from request-specs
 
 ### TODO
+* authentication (with read, write)
 * build stop button
 * self-repairing system
 * plugin updater

data/app/assets/javascripts/application.js

@@ -12,6 +12,9 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require underscore
+//= require backbone
+//
 //= require magi
 //= require_tree ./magi
 //= require_tree .

data/app/assets/javascripts/events.js.coffee

@@ -1,9 +1,13 @@
 $ ->
   $('.jobs_controller.index_action').each ->
-    job = new Magi.JobModel()
-    view = new Magi.JobView(job)
-    job.onChange -> view.render()
+    new Magi.ServerEvent().on 'build.started build.finished', (attributes) ->
+      view = new Magi.JobView
+        el: "#job#{attributes.job_id}"
+        model: new Backbone.Model(attributes)
+      view.render()
 
+  $('.jobs_controller.show_action').each ->
+    view = new Magi.BuildView()
     event = new Magi.ServerEvent()
-    event.onBuildStart (attributes) -> job.set(attributes)
-    event.onBuildFinish (attributes) -> job.set(attributes)
+    event.on 'build.finished', (attributes) ->
+      view.model.set(attributes)

data/app/assets/javascripts/magi/build_view.js.coffee

@@ -0,0 +1,13 @@
+class window.Magi.BuildView
+  constructor: () ->
+    @model = new Backbone.Model()
+    @model.on 'change', => @render()
+
+  element: ->
+    $("#build#{@model.get('id')}")
+
+  render: ->
+    @element()
+      .removeClass()
+      .addClass(@model.get('status'))
+      .find('.time').text(@model.get('finished_at'))

data/app/assets/javascripts/magi/job_view.js.coffee

@@ -1,9 +1,10 @@
-class window.Magi.JobView
-  constructor: (@job) ->
-
-  element: ->
-    $("#job#{@job.attributes.job_id}")
+window.Magi.JobView = Backbone.View.extend
+  initialize: () ->
 
   render: ->
-    @element().removeClass()
-    @element().addClass(@job.attributes.status)
+    console.log(@el)
+    console.log(@$el)
+    @$el.removeClass().addClass(@status())
+
+  status: ->
+    @model.get('status')

data/app/assets/javascripts/magi/server_event.js.coffee

@@ -2,10 +2,7 @@ class window.Magi.ServerEvent
   constructor: ->
     @source = new EventSource('/events')
 
-  onBuildStart: (callback) ->
-    @source.addEventListener 'build.start', (event) ->
-      callback($.parseJSON(event.data))
-
-  onBuildFinish: (callback) ->
-    @source.addEventListener 'build.finish', (event) ->
-      callback($.parseJSON(event.data))
+  on: (string, callback) ->
+    for eventName in string.split(' ')
+      @source.addEventListener eventName, (event) ->
+        callback($.parseJSON(event.data))

data/app/controllers/events_controller.rb

@@ -21,13 +21,6 @@ class EventsController < ApplicationController
 
   private
 
-  def index_with_redis_exception
-    index_without_redis_exception
-  rescue Redis::CannotConnectError
-    head 503
-  end
-  alias_method_chain :index, :redis_exception
-
   def require_event_stream
     response.headers["Content-Type"] = "text/event-stream"
   end

data/app/models/build.rb

@@ -53,16 +53,20 @@ class Build < ActiveRecord::Base
   private
 
   def notify(type)
-    $redis.publish("build.#{type}", { id: id, job_id: job.id, status: status_name }.to_json)
+    $redis.publish("build.#{type}", notified_data)
+  end
+
+  def notified_data
+    { id: id, job_id: job.id, status: status_name, finished_at: finished_at }.to_json
   end
 
   def start
     update_attributes!(started_at: Time.now)
-    notify(:start)
+    notify(:started)
   end
 
   def finish(result)
     reload.update_attributes!(finished_at: Time.now, output: result[:output], status: result[:status])
-    notify(:finish)
+    notify(:finished)
   end
 end

data/app/models/job.rb

@@ -100,7 +100,7 @@ class Job < ActiveRecord::Base
   end
 
   def update_attributes_with_properties(params)
-    params.slice(:name, *self.class.properties).each do |key, value|
+    params.slice(:name, *self.class.property_names).each do |key, value|
       send("#{key}=", value)
     end
     tap(&:save)

data/app/views/jobs/_form.html.slim

@@ -18,10 +18,16 @@ section.job_settings
       p= f.label :schedule
       p= f.text_field :schedule, placeholder: "* * * * *"
 
-    - (resource.class.properties - [:description, :schedule, :script]).each do |name|
+    - resource.class.properties.each do |property|
+      - next if property.name.in?([:description, :schedule, :script])
       .field
-        p= f.label name
-        p= f.text_field name
+        p= f.label property.name
+        p
+          - case property.type
+          - when :boolean
+            = f.check_box property.name, {}, "true", "false"
+          - else
+            = f.text_field property.name
 
     .field
       p= f.submit class: "button"

data/app/views/jobs/show.html.slim

@@ -18,9 +18,9 @@ section.builds
 
   ul
     - @resource.builds.page(params[:page]).recent.limit(10).each do |build|
-      li class = build.status_name
+      li class=build.status_name id="build#{build.id}"
         = link_to [@resource, build] do
           span.id ##{build.id}
-          span= build.finished_at
+          span.time= build.finished_at
 
   = paginate @resource.builds.page(params[:page])

data/config/environments/development.rb

@@ -4,7 +4,7 @@ Magi::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = true
+  config.cache_classes = ENV["DISABLE_CACHE_CLASSES"] != "1"
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/config/routes.rb

@@ -5,5 +5,5 @@ Magi::Application.routes.draw do
     resources :builds, only: [:index, :show, :create, :update, :destroy]
   end
 
-  resources :events, only: :index
+  resources :events, only: :index if Rails.configuration.cache_classes
 end

data/lib/magi/executer.rb

@@ -27,7 +27,11 @@ module Magi
     end
 
     def result
-      @result ||= Open3.capture2e(script)
+      @result ||= Open3.capture2e(lines)
+    end
+
+    def lines
+      script.gsub("\n", ";")
     end
   end
 end

data/lib/magi/proprietary.rb

@@ -10,21 +10,47 @@ module Magi
     end
 
     module ClassMethods
-      def property(name)
-        properties << name
+      def property(name, options = {})
+        property = Property.new(name, options)
+        properties << property
 
         define_method(name) do
           properties[name.to_s]
         end
 
         define_method("#{name}=") do |value|
-          properties[name.to_s] = value
+          properties[name.to_s] = begin
+            case
+            when property.type != :boolean
+              value
+            when value.to_s == "false"
+              false
+            else
+              true
+            end
+          end
         end
       end
 
       def properties
         @properties ||= []
       end
+
+      def property_names
+        properties.map(&:name)
+      end
+    end
+
+    class Property
+      attr_reader :name, :options
+
+      def initialize(name, options = {})
+        @name, @options = name, options
+      end
+
+      def type
+        options[:type] || :string
+      end
     end
   end
 end

data/lib/magi/version.rb

@@ -1,3 +1,3 @@
 module Magi
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/magi.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "puma"
   spec.add_dependency "quiet_assets"
   spec.add_dependency "rails", ">= 4.0.0.rc2"
+  spec.add_dependency "rails-backbone"
   spec.add_dependency "rake"
   spec.add_dependency "redis"
   spec.add_dependency "resque"

data/plugins/git/git.rb

@@ -8,17 +8,37 @@ module Magi
       @job = job
     end
 
+    def before_enqueue
+      if has_repository_url?
+        clone unless cloned?
+        update
+        updated_since_last_finished_build?
+      end
+    end
+
+    def before_execute
+      if has_repository_url?
+        clone
+      end
+    end
+
+    def after_execute
+      if has_repository_url?
+        job.current_build.update_properties(revision: revision)
+      end
+    end
+
     def clone
-      validate_existence_of_git_url
-      command("git clone #{job.git_url} #{job.workspace.path}")
+      validate_existence_of_repository_url
+      command("git clone #{job.repository_url} #{path}")
     end
 
     def update
-      command("cd #{job.workspace.path} && git pull")
+      command("cd #{path} && git pull")
     end
 
     def revision
-      command("cd #{job.workspace.path} && git rev-parse HEAD").rstrip
+      command("cd #{path} && git rev-parse HEAD").rstrip
     end
 
     def updated_since_last_finished_build?
@@ -26,59 +46,47 @@ module Magi
     end
 
     def cloned?
-      job.workspace.path.join(".git").exist?
+      path.join(".git").exist?
     end
 
-    private
-
     def command(script)
       Open3.capture3(script)[0]
     end
 
-    def validate_existence_of_git_url
-      raise GitUrlNotFound unless job.git_url
+    def path
+      job.workspace.path + "repository"
+    end
+
+    def has_repository_url?
+      job.repository_url.present?
     end
 
-    class GitUrlNotFound < StandardError
+    private
+
+    def validate_existence_of_repository_url
+      raise RepositoryUrlNotFound unless has_repository_url?
+    end
+
+    class RepositoryUrlNotFound < StandardError
       def message
-        "You must set `git_url`"
+        "You must set `repository_url`"
       end
     end
   end
 end
 
 Job.class_eval do
-  property(:git_url)
+  property(:repository_url)
 
-  before_enqueue do
-    if git_url.present?
-      repository.clone unless repository.cloned?
-      repository.update
-      repository.updated_since_last_finished_build?
-    end
-  end
+  before_enqueue { repository.before_enqueue }
 
-  before_execute do
-    if git_url.present?
-      repository.clone unless repository.cloned?
-    end
-  end
+  before_execute { repository.before_execute }
 
-  after_execute do
-    if git_url.present?
-      current_build.update_revision
-    end
-  end
+  after_execute { repository.after_execute }
 
   def repository
     @repository ||= Magi::Repository.new(self)
   end
 end
 
-Build.class_eval do
-  property(:revision)
-
-  def update_revision
-    update_properties(revision: job.repository.revision)
-  end
-end
+Build.property(:revision)

data/plugins/simplecov/simplecov.rb

@@ -0,0 +1,85 @@
+require "json"
+require "fileutils"
+
+module Magi
+  class SimpleCov
+    attr_reader :job
+
+    def initialize(job)
+      @job = job
+    end
+
+    def after_execute
+      save if enabled? && has_coverage?
+    end
+
+    def enabled?
+      job.enable_simplecov == "1"
+    end
+
+    def workspace_path
+      job.workspace.path + "coverage"
+    end
+
+    def last_coverage
+      JSON.parse(last_run_json)["result"]["covered_percent"]
+    rescue JSON::ParserError, NoMethodError
+    end
+
+    def last_run_json
+      last_run_json_path.read
+    end
+
+    def has_last_run_json?
+      last_run_json_path.exist?
+    end
+
+    def has_coverage?
+      has_last_run_json?
+    end
+
+    def last_run_json_path
+      job.repository.path + "coverage/.last_run.json"
+    end
+
+    def assets_path
+      job.repository.path + "coverage/assets"
+    end
+
+    def assets_relative_path
+      assets_path.relative_path_from(current_build_path)
+    end
+
+    def result_html_path
+      job.repository.path + "coverage/index.html"
+    end
+
+    def current_build_path
+      workspace_path + job.current_build.id.to_s
+    end
+
+    def symlink_assets
+      File.symlink(assets_relative_path, current_build_path + "assets")
+    end
+
+    def copy_result_html
+      FileUtils.cp(result_html_path, current_build_path)
+    end
+
+    def save
+      current_build_path.mkpath
+      symlink_assets
+      copy_result_html
+    end
+  end
+end
+
+Job.class_eval do
+  property(:enable_simplecov, type: :boolean)
+
+  after_execute { coverage.after_execute }
+
+  def coverage
+    @coverage ||= Magi::SimpleCov.new(self)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clockwork
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.rc2
+- !ruby/object:Gem::Dependency
+  name: rails-backbone
+  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
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +301,7 @@ files:
 - app/assets/images/rails.png
 - app/assets/javascripts/application.js
 - app/assets/javascripts/events.js.coffee
-- app/assets/javascripts/magi/job_model.js.coffee
+- app/assets/javascripts/magi/build_view.js.coffee
 - app/assets/javascripts/magi/job_view.js.coffee
 - app/assets/javascripts/magi/server_event.js.coffee
 - app/assets/javascripts/magi.js.coffee
@@ -349,6 +363,7 @@ files:
 - lib/magi.rb
 - lib/tasks/resque.rake
 - plugins/git/git.rb
+- plugins/simplecov/simplecov.rb
 - public/404.html
 - public/422.html
 - public/500.html

data/app/assets/javascripts/magi/job_model.js.coffee

@@ -1,12 +0,0 @@
-class window.Magi.JobModel
-  constructor: (@attributes = {}) ->
-
-  set: (attributes) ->
-    @attributes[key] = value for key, value of attributes
-    @change()
-
-  onChange: (callback) ->
-    @callback = callback
-
-  change: ->
-    @callback()