magi 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b4d28573a8ed0497572635a79c1430e27e61e50
-  data.tar.gz: 108e5eca7dd38c7edde9527ebb4cd7efda53412c
+  metadata.gz: 2db7f5dff13d75dd26fc1c8440bbb8cb68b51c92
+  data.tar.gz: 10ca4a6e4a4619df58bbc5a2f3c741c113cbf629
 SHA512:
-  metadata.gz: ff4eca110f647870737e4ec032819f0b2919e7f70551f92f17f279e78ea312b203da5e5927caedbd582ccdf10e8e362b7b949cb4d4ccb09978312a9c1dbc7fe7
-  data.tar.gz: 5080f4adeae11f1bb33e8e31d7a9910b62e1de6d787d07ce7ff581993f8d45bdabd3cdb7d94c6bb95c72e724b53901b0ade57cdeb90c437c8d7cafa51f1b86f9
+  metadata.gz: a637eed71179f9ccda64cc6185d439f3ee432413da2e8448bd48b38bbe4e733191312368c934634316ba85d3128c390109af6eaa161a1646d7371b68f1c22aa4
+  data.tar.gz: 705a9126445b1f52b78b957718e3484937366b5d03f69c8dc7f5e316d1db4add2fc86ca4eca850a6acf1606738c9ca7c221acdc3100dbd51c6c0e232d08bfcda

data/Gemfile

@@ -1,3 +1,5 @@
+require "pathname"
+
 source "https://rubygems.org"
 
 gemspec
@@ -27,3 +29,8 @@ group :assets do
   gem "coffee-rails", "~> 3.2.1"
   gem "uglifier", ">= 1.0.3"
 end
+
+# Put Gemfile in plugins/:name/Gemfile to use arbitrary gems in your plugin.
+Pathname.glob("plugins/*/Gemfile").each do |pathname|
+  eval(pathname.read)
+end

data/README.md

@@ -25,8 +25,6 @@ Magi is just a rails application with some middlewares.
 
 ## Todo
 * async update by ajax
-* plugin system
-* git integration
 * command-line options
 
 ## API

data/app/controllers/builds_controller.rb

@@ -16,7 +16,7 @@ class BuildsController < ApplicationController
   end
 
   def create
-    resource = @job.enqueue
+    resource = @job.enqueue_without_before_enqueues
     respond_with resource, location: [@job, resource]
   end
 

data/app/models/build.rb

@@ -1,5 +1,5 @@
 class Build < ActiveRecord::Base
-  extend Magi::Proprietary
+  include Magi::Proprietary
 
   attr_accessible :finished_at, :started_at, :output, :properties, :status
 

data/app/models/job.rb

@@ -1,5 +1,5 @@
 class Job < ActiveRecord::Base
-  extend Magi::Proprietary
+  include Magi::Proprietary
 
   attr_accessible :name, :properties
 
@@ -20,24 +20,40 @@ class Job < ActiveRecord::Base
       new.update_attributes_with_properties(params)
     end
 
-    def enqueue_with_before_hooks
-      select(&:scheduled?).each(&:enqueue_with_before_hooks)
+    def scheduled
+      select(&:scheduled?)
     end
 
-    def before_hook(&block)
-      before_hooks << block
+    def before_enqueue(&block)
+      before_enqueues << block
     end
 
-    def before_hooks
-      @before_hooks ||= []
+    def before_enqueues
+      @before_enqueues ||= []
     end
 
-    def after_hook(&block)
-      after_hooks << block
+    def after_enqueue(&block)
+      after_enqueues << block
     end
 
-    def after_hooks
-      @after_hooks ||= []
+    def after_enqueues
+      @after_enqueues ||= []
+    end
+
+    def before_execute(&block)
+      before_executes << block
+    end
+
+    def before_executes
+      @before_executes ||= []
+    end
+
+    def after_execute(&block)
+      after_executes << block
+    end
+
+    def after_executes
+      @after_executes ||= []
     end
   end
 
@@ -59,9 +75,19 @@ class Job < ActiveRecord::Base
     builds.create.tap(&:enqueue)
   end
 
-  def enqueue_with_before_hooks
-    enqueue if execute_before_hooks
+  def enqueue_with_before_enqueues
+    if self.class.before_enqueues.all? {|hook| instance_exec(&hook) != false }
+      enqueue_without_before_enqueues
+    end
   end
+  alias_method_chain :enqueue, :before_enqueues
+
+  def enqueue_with_after_enqueues
+    enqueue_without_after_enqueues.tap do
+      self.class.after_enqueues.all? {|hook| instance_exec(&hook) != false }
+    end
+  end
+  alias_method_chain :enqueue, :after_enqueues
 
   def status_name
     last_finished_build.try(:status_name) || "unfinished"
@@ -82,24 +108,32 @@ class Job < ActiveRecord::Base
     tap(&:save)
   end
 
+  def workspace
+    @workspace ||= Magi::Workspace.new(workspace_path)
+  end
+
   private
 
-  def execute
-    Magi::Executer.execute(script)
+  def workspace_path
+    Magi.workspace.path + "jobs/#{id}"
   end
 
-  def execute_with_after_hooks
-    execute_without_after_hooks.tap { execute_after_hooks }
+  def execute
+    workspace.chdir { Magi::Executer.execute(script) }
   end
-  alias_method_chain :execute, :after_hooks
 
-  def execute_before_hooks
-    self.class.before_hooks.all? {|hook| instance_exec(&hook) != false }
+  def execute_with_before_executes
+    self.class.before_executes.all? {|hook| instance_exec(&hook) != false }
+    execute_without_before_executes
   end
+  alias_method_chain :execute, :before_executes
 
-  def execute_after_hooks
-    self.class.after_hooks.all? {|hook| instance_exec(&hook) != false }
+  def execute_with_after_executes
+    execute_without_after_executes.tap do
+      self.class.after_executes.all? {|hook| instance_exec(&hook) != false }
+    end
   end
+  alias_method_chain :execute, :after_executes
 
   def raise_script_not_found
     raise ScriptNotFound, 'You must set properties["script"]'

data/app/workers/job_enqueue_worker.rb

@@ -3,7 +3,7 @@ class JobEnqueueWorker
 
   class << self
     def perform(id)
-      Job.find(id).enqueue_with_before_hooks
+      Job.find(id).enqueue
     end
 
     def perform_async(id)

data/lib/magi/command.rb

@@ -8,7 +8,7 @@
 #   # Invokes "setup" command to set up your database.
 #   Magi::Command.call(["setup"])
 #
-#   # Invokes "start" command to start redis, rails, and sidekiq processes.
+#   # Invokes "start" command to start the processes.
 #   Magi::Command.call(["start"])
 #
 module Magi
@@ -43,11 +43,19 @@ module Magi
     end
 
     def start
-      system("cd #{root_path} && foreman start")
+      system(env, "cd #{root_path} && foreman start")
     end
 
     def root_path
       File.expand_path("../../..", __FILE__)
     end
+
+    def workspace_path
+      Dir.pwd
+    end
+
+    def env
+      { "WORKSPACE_PATH" => workspace_path }
+    end
   end
 end

data/lib/magi/plugin_manager.rb

@@ -1,13 +1,21 @@
 module Magi
   class PluginManager
-    def plugins_directory
-      @plugins_directory ||= Rails.root + "plugins"
+    def plugins_directories
+      [Rails.root + "plugins", Pathname.pwd + "plugins"].uniq
     end
 
     def load_plugins
-      Dir.glob("#{plugins_directory}/*/*.rb").sort.each do |path|
-        require path
-      end
+      plugin_filepaths.each {|path| require path }
+    end
+
+    private
+
+    def plugin_filepaths
+      Dir.glob("#{plugins_directories_pattern}/*/*.rb").sort
+    end
+
+    def plugins_directories_pattern
+      plugins_directories.join(",")
     end
   end
 end

data/lib/magi/proprietary.rb

@@ -1,19 +1,30 @@
 module Magi
   module Proprietary
-    def property(name)
-      properties << name
+    extend ActiveSupport::Concern
 
-      define_method(name) do
-        properties[name.to_s]
+    def update_properties(properties)
+      properties.each do |key, value|
+        send("#{key}=", value)
       end
+      save
+    end
+
+    module ClassMethods
+      def property(name)
+        properties << name
+
+        define_method(name) do
+          properties[name.to_s]
+        end
 
-      define_method("#{name}=") do |value|
-        properties[name.to_s] = value
+        define_method("#{name}=") do |value|
+          properties[name.to_s] = value
+        end
       end
-    end
 
-    def properties
-      @properties ||= []
+      def properties
+        @properties ||= []
+      end
     end
   end
 end

data/lib/magi/version.rb

@@ -1,3 +1,3 @@
 module Magi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/magi/workspace.rb

@@ -0,0 +1,26 @@
+module Magi
+  class Workspace
+    attr_reader :path
+
+    def initialize(path)
+      @path = Pathname.new(path)
+    end
+
+    def chdir
+      mkpath_unless_exist
+      Dir.chdir(path) { yield }
+    end
+
+    def mkpath_unless_exist
+       mkpath unless exist?
+    end
+
+    def mkpath
+      path.mkpath
+    end
+
+    def exist?
+      path.exist?
+    end
+  end
+end

data/lib/magi.rb

@@ -1,9 +1,22 @@
 require "magi/command"
 require "magi/plugin_manager"
 require "magi/version"
+require "magi/workspace"
 
 module Magi
-  def self.plugin_manager
-    @plugin_manager ||= Magi::PluginManager.new
+  class << self
+    def workspace
+      @workspace ||= Magi::Workspace.new(workspace_path)
+    end
+
+    def plugin_manager
+      @plugin_manager ||= Magi::PluginManager.new
+    end
+
+    private
+
+    def workspace_path
+      ENV["WORKSPACE_PATH"] || "."
+    end
   end
 end

data/magi.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/r7kamura/magi"
   spec.license       = "MIT"
 
-  spec.files         = Dir["{app,bin,config,db,lib,public,script,spec}/**/*"]
+  spec.files         = Dir["{app,bin,config,db,lib,plugins,public,script,spec}/**/*"]
   spec.files         += %w[
                           Gemfile
                           LICENSE.txt

data/plugins/git/git.rb

@@ -0,0 +1,84 @@
+require "open3"
+
+module Magi
+  class Repository
+    attr_reader :job
+
+    def initialize(job)
+      @job = job
+    end
+
+    def clone
+      validate_existence_of_git_url
+      command("git clone #{job.git_url} #{job.workspace.path}")
+    end
+
+    def update
+      command("cd #{job.workspace.path} && git pull")
+    end
+
+    def revision
+      command("cd #{job.workspace.path} && git rev-parse HEAD").rstrip
+    end
+
+    def updated?
+      revision != job.last_finished_build.try(:revision)
+    end
+
+    def cloned?
+      job.workspace.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
+    end
+
+    class GitUrlNotFound < StandardError
+      def message
+        "You must set `git_url`"
+      end
+    end
+  end
+end
+
+Job.class_eval do
+  property(:git_url)
+
+  before_enqueue do
+    if git_url.present?
+      repository.clone unless repository.cloned?
+      repository.update
+      repository.updated?
+    end
+  end
+
+  before_execute do
+    if git_url.present?
+      repository.clone unless repository.cloned?
+    end
+  end
+
+  after_execute do
+    if git_url.present?
+      current_build.update_revision
+    end
+  end
+
+  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

data/script/clock.rb

@@ -1,5 +1,5 @@
 require File.expand_path("../../config/environment.rb", __FILE__)
 
 Clockwork.every(1.minute, "JobEnqueueWorker") do
-  Job.enqueue_with_before_hooks
+  Job.scheduled.each(&:enqueue)
 end

data/spec/models/job_spec.rb

@@ -2,11 +2,15 @@ require "spec_helper"
 
 describe Job do
   let(:job) do
-    FactoryGirl.create(:job)
+    FactoryGirl.create(:job, properties: { "script" => "true" })
   end
 
   describe "#start" do
     context "without script" do
+      before do
+        job.script = nil
+      end
+
       it "raises Job::ScriptNotFound" do
         expect { job.start }.to raise_error(Job::ScriptNotFound)
       end
@@ -52,37 +56,35 @@ describe Job do
     end
   end
 
-  describe "#enqueue_with_before_hooks" do
+  describe "#enqueue" do
     before do
-      Job.before_hooks.clear
+      Job.before_enqueues.clear
     end
 
     after do
-      Job.before_hooks.clear
+      Job.before_enqueues.clear
     end
 
     context "with successful hooks" do
       before do
-        Job.before_hook { Job.hook_is_executed }
+        Job.before_enqueue { Job.hook_is_executed }
       end
 
       it "enqueues a new build" do
         Job.should_receive(:hook_is_executed)
-        job.should_receive(:enqueue)
-        job.enqueue_with_before_hooks
+        job.enqueue
       end
     end
 
     context "with failed hooks" do
       before do
-        Job.before_hook { false }
-        Job.before_hook { Job.hook_is_executed }
+        Job.before_enqueue { false }
+        Job.before_enqueue { Job.hook_is_executed }
       end
 
       it "stops at failed hook" do
         Job.should_not_receive(:hook_is_executed)
-        job.should_not_receive(:enqueue)
-        job.enqueue_with_before_hooks
+        job.enqueue
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clockwork
@@ -308,8 +308,10 @@ files:
 - lib/magi/proprietary.rb
 - lib/magi/scheduler.rb
 - lib/magi/version.rb
+- lib/magi/workspace.rb
 - lib/magi.rb
 - lib/tasks/resque.rake
+- plugins/git/git.rb
 - public/404.html
 - public/422.html
 - public/500.html