magi 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8670d413c9cc9a48fc8ab40a8a61bf7644df09
-  data.tar.gz: bdcde50c3ccb2bb39de71b4d706d36ceb59980a4
+  metadata.gz: 7b4d28573a8ed0497572635a79c1430e27e61e50
+  data.tar.gz: 108e5eca7dd38c7edde9527ebb4cd7efda53412c
 SHA512:
-  metadata.gz: 9d816fdc2a44c697af5bad160e83fc1e1dcf56eaee8b4270f560cc621372ed8d45966c874f19514563b36482533b8fbbe78ddd3eb6aeced1cf98f7cce5712878
-  data.tar.gz: 9fe5724e18f3063c5a800dedc4c6f3f5e076b40f6a82597d091351ca8768bebce04cb7095160062d509b81141bdc9a0fa18075938f0d7144ea2051d6254333f1
+  metadata.gz: ff4eca110f647870737e4ec032819f0b2919e7f70551f92f17f279e78ea312b203da5e5927caedbd582ccdf10e8e362b7b949cb4d4ccb09978312a9c1dbc7fe7
+  data.tar.gz: 5080f4adeae11f1bb33e8e31d7a9910b62e1de6d787d07ce7ff581993f8d45bdabd3cdb7d94c6bb95c72e724b53901b0ade57cdeb90c437c8d7cafa51f1b86f9

data/app/controllers/builds_controller.rb

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

data/app/controllers/jobs_controller.rb

@@ -4,12 +4,10 @@ class JobsController < ApplicationController
 
   validates :create do
     string :name, required: true
-    hash :config
   end
 
   validates :update do
     string :name
-    hash :config
   end
 
   def index
@@ -25,11 +23,11 @@ class JobsController < ApplicationController
   end
 
   def create
-    respond_with @resource = scope.create_with_properties(params.slice(:config, :name))
+    respond_with @resource = scope.create_with_properties(params)
   end
 
   def update
-    respond_with @resource.update_attributes_with_properties(params.slice(:config, :name))
+    respond_with @resource.update_attributes_with_properties(params)
   end
 
   def destroy

data/app/models/build.rb

@@ -1,5 +1,9 @@
 class Build < ActiveRecord::Base
-  attr_accessible :finished_at, :started_at, :output, :status
+  extend Magi::Proprietary
+
+  attr_accessible :finished_at, :started_at, :output, :properties, :status
+
+  serialize :properties, Hash
 
   validates :job_id, presence: true
 
@@ -9,8 +13,18 @@ class Build < ActiveRecord::Base
 
   scope :finished, -> { where("finished_at IS NOT NULL") }
 
+  scope :unfinished, -> { where("finished_at IS NULL") }
+
+  scope :started, -> { where("started_at IS NOT NULL") }
+
+  scope :running, -> { started.unfinished }
+
+  def self.latest
+    recent.first
+  end
+
   # Pushes this build to worker's queue.
-  def queue
+  def enqueue
     BuildWorker.perform_async(id)
   end
 
@@ -18,7 +32,7 @@ class Build < ActiveRecord::Base
   def start
     update_attributes!(started_at: Time.now)
     result = job.start
-    update_attributes!(finished_at: Time.now, status: result[:status], output: result[:output])
+    reload.update_attributes!(finished_at: Time.now, status: result[:status], output: result[:output])
   end
 
   # Returns elapsed sec as a Float or nil.

data/app/models/job.rb

@@ -1,7 +1,9 @@
 class Job < ActiveRecord::Base
-  attr_accessible :name, :config
+  extend Magi::Proprietary
 
-  serialize :config, Hash
+  attr_accessible :name, :properties
+
+  serialize :properties, Hash
 
   validates :name, presence: true
 
@@ -11,31 +13,31 @@ class Job < ActiveRecord::Base
 
   delegate :status, :status_name, :status_icon_css_class, to: :last_finished_build, allow_nil: true
 
+  delegate :scheduled?, to: :scheduler, allow_nil: true
+
   class << self
-    def create_with_properties(properties)
-      job = new
-      properties.each {|key, value| job.send("#{key}=", value) }
-      job.tap(&:save)
+    def create_with_properties(params)
+      new.update_attributes_with_properties(params)
     end
 
-    def queue
-      select(&:scheduled?).each(&:queue)
+    def enqueue_with_before_hooks
+      select(&:scheduled?).each(&:enqueue_with_before_hooks)
     end
 
-    def property(name)
-      properties << name
+    def before_hook(&block)
+      before_hooks << block
+    end
 
-      define_method(name) do
-        config[name.to_s]
-      end
+    def before_hooks
+      @before_hooks ||= []
+    end
 
-      define_method("#{name}=") do |value|
-        config[name.to_s] = value
-      end
+    def after_hook(&block)
+      after_hooks << block
     end
 
-    def properties
-      @properties ||= []
+    def after_hooks
+      @after_hooks ||= []
     end
   end
 
@@ -50,27 +52,33 @@ class Job < ActiveRecord::Base
   end
 
   def scheduler
-    Magi::Scheduler.new(schedule)
+    Magi::Scheduler.new(schedule) if schedule
   end
 
-  def scheduled?
-    schedule && scheduler.scheduled?
+  def enqueue
+    builds.create.tap(&:enqueue)
   end
 
-  def queue
-    builds.create.tap(&:queue)
+  def enqueue_with_before_hooks
+    enqueue if execute_before_hooks
   end
 
   def status_name
     last_finished_build.try(:status_name) || "unfinished"
   end
 
+  def current_build
+    builds.running.latest
+  end
+
   def last_finished_build
     builds.finished.order(:finished_at).last
   end
 
-  def update_attributes_with_properties(properties)
-    properties.each {|key, value| send("#{key}=", value) }
+  def update_attributes_with_properties(params)
+    params.slice(:name, *self.class.properties).each do |key, value|
+      send("#{key}=", value)
+    end
     tap(&:save)
   end
 
@@ -80,8 +88,21 @@ class Job < ActiveRecord::Base
     Magi::Executer.execute(script)
   end
 
+  def execute_with_after_hooks
+    execute_without_after_hooks.tap { execute_after_hooks }
+  end
+  alias_method_chain :execute, :after_hooks
+
+  def execute_before_hooks
+    self.class.before_hooks.all? {|hook| instance_exec(&hook) != false }
+  end
+
+  def execute_after_hooks
+    self.class.after_hooks.all? {|hook| instance_exec(&hook) != false }
+  end
+
   def raise_script_not_found
-    raise ScriptNotFound, 'You must set script["config"]'
+    raise ScriptNotFound, 'You must set properties["script"]'
   end
 
   class ScriptNotFound < StandardError; end

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

@@ -1,7 +1,7 @@
 section.job_settings
   h1 Settings
 
-  = form_for resource do |f|
+  = form_for resource, as: "" do |f|
     .field
       p= f.label :name
       p= f.text_field :name, placeholder: "required"

data/app/workers/job_enqueue_worker.rb

@@ -0,0 +1,13 @@
+class JobEnqueueWorker
+  @queue = name
+
+  class << self
+    def perform(id)
+      Job.find(id).enqueue_with_before_hooks
+    end
+
+    def perform_async(id)
+      Resque.enqueue(self, id)
+    end
+  end
+end

data/config/initializers/load_plugins.rb

@@ -0,0 +1 @@
+Magi.plugin_manager.load_plugins

data/db/migrate/20130608153135_change_job_column_name_from_config_to_properties.rb

@@ -0,0 +1,9 @@
+class ChangeJobColumnNameFromConfigToProperties < ActiveRecord::Migration
+  def up
+    rename_column :jobs, :config, :properties
+  end
+
+  def down
+    rename_column :jobs, :properties, :config
+  end
+end

data/db/migrate/20130608153655_add_column_properties_to_builds.rb

@@ -0,0 +1,5 @@
+class AddColumnPropertiesToBuilds < ActiveRecord::Migration
+  def change
+    add_column :builds, :properties, :text
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130531155155) do
+ActiveRecord::Schema.define(:version => 20130608153655) do
 
   create_table "builds", :force => true do |t|
     t.boolean  "status"
@@ -21,13 +21,14 @@ ActiveRecord::Schema.define(:version => 20130531155155) do
     t.text     "output"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.text     "properties"
   end
 
   add_index "builds", ["job_id"], :name => "index_builds_on_job_id"
 
   create_table "jobs", :force => true do |t|
     t.string   "name"
-    t.text     "config"
+    t.text     "properties"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

data/lib/magi/executer.rb

@@ -13,8 +13,21 @@ module Magi
     end
 
     def execute
-      output, status = Open3.capture2e(script)
       { output: output, status: status.success? }
     end
+
+    private
+
+    def output
+      result[0]
+    end
+
+    def status
+      result[1]
+    end
+
+    def result
+      @result ||= Open3.capture2e(script)
+    end
   end
 end

data/lib/magi/plugin_manager.rb

@@ -0,0 +1,13 @@
+module Magi
+  class PluginManager
+    def plugins_directory
+      @plugins_directory ||= Rails.root + "plugins"
+    end
+
+    def load_plugins
+      Dir.glob("#{plugins_directory}/*/*.rb").sort.each do |path|
+        require path
+      end
+    end
+  end
+end

data/lib/magi/proprietary.rb

@@ -0,0 +1,19 @@
+module Magi
+  module Proprietary
+    def property(name)
+      properties << name
+
+      define_method(name) do
+        properties[name.to_s]
+      end
+
+      define_method("#{name}=") do |value|
+        properties[name.to_s] = value
+      end
+    end
+
+    def properties
+      @properties ||= []
+    end
+  end
+end

data/lib/magi/version.rb

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

data/lib/magi.rb

@@ -1,2 +1,9 @@
 require "magi/command"
+require "magi/plugin_manager"
 require "magi/version"
+
+module Magi
+  def self.plugin_manager
+    @plugin_manager ||= Magi::PluginManager.new
+  end
+end

data/magi.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sass-rails", "~> 3.2.3"
   spec.add_dependency "slim"
   spec.add_dependency "uglifier", ">= 1.0.3"
-  spec.add_dependency "weak_parameters", ">= 0.0.2"
+  spec.add_dependency "weak_parameters", ">= 0.0.3"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry-rails"
   spec.add_development_dependency "thin"

data/script/clock.rb

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

data/spec/models/build_spec.rb

@@ -6,7 +6,7 @@ describe Build do
   end
 
   let(:job) do
-    FactoryGirl.create(:job, config: { "script" => "true" })
+    FactoryGirl.create(:job, properties: { "script" => "true" })
   end
 
   describe "#start" do
@@ -21,7 +21,7 @@ describe Build do
 
     context "with failure" do
       before do
-        build.job.config["script"] = "false"
+        build.job.script = "false"
       end
 
       it "starts its job and sets status with false" do

data/spec/models/job_spec.rb

@@ -33,7 +33,7 @@ describe Job do
 
     context "with matched schedule" do
       before do
-        job.config["schedule"] = "* * * * *"
+        job.schedule = "* * * * *"
       end
 
       it "returns true" do
@@ -43,7 +43,7 @@ describe Job do
 
     context "without matched schedule" do
       before do
-        job.config["schedule"] = "0 0 0 0 0"
+        job.schedule = "0 0 0 0 0"
       end
 
       it "returns false" do
@@ -51,4 +51,39 @@ describe Job do
       end
     end
   end
+
+  describe "#enqueue_with_before_hooks" do
+    before do
+      Job.before_hooks.clear
+    end
+
+    after do
+      Job.before_hooks.clear
+    end
+
+    context "with successful hooks" do
+      before do
+        Job.before_hook { 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
+      end
+    end
+
+    context "with failed hooks" do
+      before do
+        Job.before_hook { false }
+        Job.before_hook { 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
+      end
+    end
+  end
 end

data/spec/requests/builds_spec.rb

@@ -10,7 +10,7 @@ describe "Builds" do
   end
 
   let(:job) do
-    FactoryGirl.create(:job, config: { "script" => "true" })
+    FactoryGirl.create(:job, properties: { "script" => "true" })
   end
 
   let(:build) do

data/spec/requests/jobs_spec.rb

@@ -36,6 +36,7 @@ describe "Jobs" do
   describe "POST /jobs" do
     before do
       params[:name] = "name"
+      params[:description] = "description"
     end
 
     context "with invalid params" do
@@ -53,7 +54,9 @@ describe "Jobs" do
       it "creates a new job", :autodoc do
         post "/jobs", params, env
         response.status.should == 201
-        Job.should have(1).job
+        job = Job.first
+        job.name.should == "name"
+        job.description.should == "description"
       end
     end
   end
@@ -61,24 +64,16 @@ describe "Jobs" do
   describe "PUT /jobs/:id" do
     before do
       params[:name] = "name"
-    end
-
-    context "with invalid params" do
-      before do
-        params[:config] = "invalid"
-      end
-
-      it "returns 400" do
-        put "/jobs/#{job.id}", params, env
-        response.status.should == 400
-      end
+      params[:description] = "description"
     end
 
     context "with valid condition" do
       it "updates the job", :autodoc do
         put "/jobs/#{job.id}", params, env
         response.status.should == 204
-        job.reload.name.should == "name"
+        job.reload
+        job.name.should == "name"
+        job.description.should == "description"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clockwork
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - app/views/jobs/show.html.slim
 - app/views/layouts/application.html.slim
 - app/workers/build_worker.rb
+- app/workers/job_enqueue_worker.rb
 - bin/magi
 - config/application.rb
 - config/boot.rb
@@ -288,6 +289,7 @@ files:
 - config/environments/test.rb
 - config/initializers/backtrace_silencers.rb
 - config/initializers/inflections.rb
+- config/initializers/load_plugins.rb
 - config/initializers/mime_types.rb
 - config/initializers/secret_token.rb
 - config/initializers/session_store.rb
@@ -296,10 +298,14 @@ files:
 - config/routes.rb
 - db/migrate/20130531143239_create_jobs.rb
 - db/migrate/20130531155155_create_builds.rb
+- db/migrate/20130608153135_change_job_column_name_from_config_to_properties.rb
+- db/migrate/20130608153655_add_column_properties_to_builds.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/magi/command.rb
 - lib/magi/executer.rb
+- lib/magi/plugin_manager.rb
+- lib/magi/proprietary.rb
 - lib/magi/scheduler.rb
 - lib/magi/version.rb
 - lib/magi.rb