magi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b37e2f2249ebba06dacf853b32344b7de4dbc8
-  data.tar.gz: 07d0c016c8eb3cbd46433416923d912d44f8025a
+  metadata.gz: 2232fb038a30303249630f1c9f782240ae5a55f6
+  data.tar.gz: f1ef12fccfa8ffb10151443898de7680cc0f8e68
 SHA512:
-  metadata.gz: 14299f4ba42d7a39813ad25815abde2cc7096c000f5ad660599c1afc3010b2f6555872dbd229a422228e770f1c828d8875dbe163091a203f1f3cff5604f5a216
-  data.tar.gz: a0f096a9d2dbf44468755b1a84312abd4df7bb161c93bdc2c6a45d167bc9e274b2aec86928cae26846b3e1df7666ff6fdde610c6adf71c5c4e8b5a9dc88afc00
+  metadata.gz: a641d3baa3fd907bcb5b2daa3706916a80a91ac3c517f9e2bec32e20f85ff5b6e6ab4b6351c17a0c1ad31da2c8e6dae79f84425644f7efa694631c6d593e64cd
+  data.tar.gz: 8dbb5cd16914d9ce09cf06ead2cabe14ae25ece7f8d9636c34f4996965503dc461f4aebf8e3100dbda3cb6e1258489badf007e9268ff001288a37e3aad69e672

data/Gemfile

@@ -33,7 +33,5 @@ group :assets do
   gem "uglifier"
 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
+# Put Gemfile.local to use arbitrary gems for your use case.
+eval File.read("Gemfile.local") if File.exist?("Gemfile.local")

data/README.md

@@ -21,8 +21,12 @@ Magi is just a rails application with some middlewares.
 * 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
+## Plugins
+* [magi-git](https://github.com/r7kamura/magi-git): Git integration plugin
+* [magi-simple_cov](https://github.com/r7kamura/magi-simple_cov): Save simplecov coverage for each build
+
+```ruby
+# Put your favorite plugin gems into Gemfile.local
+gem "magi-git", git: "git@github.com:r7kamura/magi-git"
+gem "magi-simple_cov", git: "git@github.com:r7kamura/magi-simple_cov"
+```

data/app/models/job.rb

@@ -98,15 +98,19 @@ class Job < ActiveRecord::Base
     @workspace ||= Magi::Workspace.new(workspace_path)
   end
 
-  private
-
   def workspace_path
     Magi.configuration.workspace_path + "jobs/#{id}"
   end
 
   def execute
     execute_before_executes
-    workspace.chdir { execute_script }.tap { execute_after_executes }
+    execute_without_before_executes.tap { execute_after_executes }
+  end
+
+  private
+
+  def execute_without_before_executes
+    workspace.chdir { execute_script }
   end
 
   def execute_script

data/lib/magi/version.rb

@@ -1,3 +1,3 @@
 module Magi
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/factories/build.rb

@@ -2,5 +2,6 @@ require "factory_girl"
 
 FactoryGirl.define do
   factory(:build) do
+    job { FactoryGirl.create(:job) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -362,8 +362,6 @@ files:
 - lib/magi/workspace.rb
 - 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/plugins/git/git.rb

@@ -1,92 +0,0 @@
-require "open3"
-
-module Magi
-  class Repository
-    attr_reader :job
-
-    def initialize(job)
-      @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_repository_url
-      command("git clone #{job.repository_url} #{path}")
-    end
-
-    def update
-      command("cd #{path} && git pull")
-    end
-
-    def revision
-      command("cd #{path} && git rev-parse HEAD").rstrip
-    end
-
-    def updated_since_last_finished_build?
-      revision != job.last_finished_build.try(:revision)
-    end
-
-    def cloned?
-      path.join(".git").exist?
-    end
-
-    def command(script)
-      Open3.capture3(script)[0]
-    end
-
-    def path
-      job.workspace.path + "repository"
-    end
-
-    def has_repository_url?
-      job.repository_url.present?
-    end
-
-    private
-
-    def validate_existence_of_repository_url
-      raise RepositoryUrlNotFound unless has_repository_url?
-    end
-
-    class RepositoryUrlNotFound < StandardError
-      def message
-        "You must set `repository_url`"
-      end
-    end
-  end
-end
-
-Job.class_eval do
-  property(:repository_url)
-
-  before_enqueue { repository.before_enqueue }
-
-  before_execute { repository.before_execute }
-
-  after_execute { repository.after_execute }
-
-  def repository
-    @repository ||= Magi::Repository.new(self)
-  end
-end
-
-Build.property(:revision)

data/plugins/simplecov/simplecov.rb

@@ -1,98 +0,0 @@
-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
-    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
-      save_files
-      save_build
-    end
-
-    def save_files
-      current_build_path.mkpath
-      symlink_assets
-      copy_result_html
-    end
-
-    def save_build
-      job.current_build.update_properties(coverage: last_coverage)
-    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
-
-Build.class_eval do
-  property(:coverage)
-end