magi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e582eed9e7365b07a029623587010791632dae
-  data.tar.gz: d25ee1877b2ddcdfbb3ed4a8b678f3f837b8c50c
+  metadata.gz: d9b37e2f2249ebba06dacf853b32344b7de4dbc8
+  data.tar.gz: 07d0c016c8eb3cbd46433416923d912d44f8025a
 SHA512:
-  metadata.gz: 501d6fb97fae40d4b13bf4add9e97dc645e7d7b87845cb76b56260cf9625bc840f7494038c0c74f6fa53ed8782fae12a8db5a98d402be99a13602b35df0da040
-  data.tar.gz: 5e06f62c92daffb43bbe257f74cb250cd43d4fd0dda0c45cbae1eefaa9f76133c6df10d5ceea54e47975b3ee2345bf9dcfabdc9d4daf953597a712103e57e754
+  metadata.gz: 14299f4ba42d7a39813ad25815abde2cc7096c000f5ad660599c1afc3010b2f6555872dbd229a422228e770f1c828d8875dbe163091a203f1f3cff5604f5a216
+  data.tar.gz: a0f096a9d2dbf44468755b1a84312abd4df7bb161c93bdc2c6a45d167bc9e274b2aec86928cae26846b3e1df7666ff6fdde610c6adf71c5c4e8b5a9dc88afc00

data/Gemfile

@@ -19,6 +19,7 @@ end
 
 group :test do
   gem "autodoc"
+  gem "coveralls", require: false
   gem "factory_girl_rails"
   gem "response_code_matchers"
   gem "rspec-json_matcher"

data/README.md

@@ -1,10 +1,10 @@
-# Magi
+# Magi [![Build Status](https://travis-ci.org/r7kamura/magi.png?branch=master)](https://travis-ci.org/r7kamura/magi) [![Code Climate](https://codeclimate.com/github/r7kamura/magi.png)](https://codeclimate.com/github/r7kamura/magi) [![Coverage Status](https://coveralls.io/repos/r7kamura/magi/badge.png)](https://coveralls.io/r/r7kamura/magi)
 Casual CI server system (magi is a temporal name).
 
 ## Usage
 ```
 $ gem install magi         # install magi.gem
-$ brew install mysql redis # install MySQL and Redis
+$ brew install mysql redis # install mysql and redis
 $ magi setup               # create mysql tables
 $ magi start               # launch server on http://localhost:3000
 ```

data/app/assets/stylesheets/jobs.scss

@@ -87,6 +87,10 @@ section.builds {
     background: #fafafa;
   }
 
+  li.unfinished a {
+    @include stripe;
+  }
+
   li.unfinished a:before {
     content: "\F056";
   }

data/app/assets/stylesheets/mixin.scss

@@ -4,3 +4,23 @@
   padding: .2em .6em;
   margin-bottom: .5em;
 }
+
+@mixin stripe {
+  background-size: 30px 30px;
+  background-color: #ddd;
+  background-image: linear-gradient(
+    135deg,
+    rgba(255, 255, 255, .30) 25%,
+    transparent 25%,
+    transparent 50%,
+    rgba(255, 255, 255, .30) 50%,
+    rgba(255, 255, 255, .30) 75%,
+    transparent 75%,
+    transparent
+  );
+  -webkit-animation: progress 3s linear infinite;
+}
+
+@-webkit-keyframes progress {
+  0% { background-position: 0 0; } 100% { background-position: 60px 0; }
+}

data/app/controllers/application_controller.rb

@@ -3,23 +3,9 @@ class ApplicationController < ActionController::Base
 
   respond_to :html, :json
 
-  rescue_from WeakParameters::ValidationError do
-    head 400
-  end
-
   self.responder = Magi::Responder
 
-  private
-
-  def require_resource_params
-    head 400 unless resource_params
-  end
-
-  def resource_name
-    self.class.name.split("::").last.sub(/Controller$/, "").singularize.underscore
-  end
-
-  def resource_params
-    params[resource_name]
+  rescue_from WeakParameters::ValidationError do
+    head 400
   end
 end

data/app/models/job.rb

@@ -13,6 +13,12 @@ class Job < ActiveRecord::Base
 
   delegate :scheduled?, to: :scheduler, allow_nil: true
 
+  property(:description, type: :text)
+
+  property(:script, type: :text)
+
+  property(:schedule, placeholder: "* * * * *")
+
   class << self
     def create_with_properties(params)
       new.update_attributes_with_properties(params)
@@ -55,12 +61,6 @@ class Job < ActiveRecord::Base
     end
   end
 
-  property(:description)
-
-  property(:schedule)
-
-  property(:script)
-
   def run
     script ? execute : raise_script_not_found
   end
@@ -70,22 +70,12 @@ class Job < ActiveRecord::Base
   end
 
   def enqueue
-    builds.create.tap(&:enqueue)
-  end
-
-  def enqueue_with_before_enqueues
-    if self.class.before_enqueues.all? {|hook| instance_exec(&hook) != false }
-      enqueue_without_before_enqueues
-    end
+    enqueue_without_before_enqueues if execute_before_enqueues
   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
+  def enqueue_without_before_enqueues
+    builds.create.tap(&:enqueue).tap { execute_after_enqueues }
   end
-  alias_method_chain :enqueue, :after_enqueues
 
   def status_name
     last_finished_build.try(:status_name) || "unfinished"
@@ -100,9 +90,7 @@ class Job < ActiveRecord::Base
   end
 
   def update_attributes_with_properties(params)
-    params.slice(:name, *self.class.property_names).each do |key, value|
-      send("#{key}=", value)
-    end
+    params.slice(:name, *self.class.property_names).each {|key, value| send("#{key}=", value) }
     tap(&:save)
   end
 
@@ -117,21 +105,29 @@ class Job < ActiveRecord::Base
   end
 
   def execute
-    workspace.chdir { Magi::Executer.execute(script) }
+    execute_before_executes
+    workspace.chdir { execute_script }.tap { execute_after_executes }
   end
 
-  def execute_with_before_executes
+  def execute_script
+    Magi::Executer.execute(script)
+  end
+
+  def execute_before_enqueues
+    self.class.before_enqueues.all? {|hook| instance_exec(&hook) != false }
+  end
+
+  def execute_after_enqueues
+    self.class.after_enqueues.all? {|hook| instance_exec(&hook) != false }
+  end
+
+  def execute_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_with_after_executes
-    execute_without_after_executes.tap do
-      self.class.after_executes.all? {|hook| instance_exec(&hook) != false }
-    end
+  def execute_after_executes
+    self.class.after_executes.all? {|hook| instance_exec(&hook) != false }
   end
-  alias_method_chain :execute, :after_executes
 
   def raise_script_not_found
     raise ScriptNotFound, 'You must set properties["script"]'

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

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

data/db/schema.rb

@@ -9,28 +9,28 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130608153655) do
+ActiveRecord::Schema.define(version: 20130608153655) do
 
-  create_table "builds", :force => true do |t|
+  create_table "builds", force: true do |t|
     t.boolean  "status"
     t.datetime "started_at"
     t.datetime "finished_at"
     t.integer  "job_id"
     t.text     "output"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    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"
+  add_index "builds", ["job_id"], name: "index_builds_on_job_id", using: :btree
 
-  create_table "jobs", :force => true do |t|
+  create_table "jobs", force: true do |t|
     t.string   "name"
     t.text     "properties"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/lib/magi/version.rb

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

data/plugins/simplecov/simplecov.rb

@@ -14,7 +14,7 @@ module Magi
     end
 
     def enabled?
-      job.enable_simplecov == "1"
+      !!job.enable_simplecov
     end
 
     def workspace_path
@@ -67,10 +67,19 @@ module Magi
     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
 
@@ -83,3 +92,7 @@ Job.class_eval do
     @coverage ||= Magi::SimpleCov.new(self)
   end
 end
+
+Build.class_eval do
+  property(:coverage)
+end

data/spec/magi/command_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Magi::Command do
+  let(:command) do
+    described_class.new(arguments)
+  end
+
+  describe ".call" do
+    it "delegates to #call" do
+      described_class.any_instance.should_receive(:call)
+      described_class.call(["setup"])
+    end
+  end
+
+  describe "#call" do
+    context "with `setup`" do
+      let(:arguments) do
+        ["setup"]
+      end
+
+      it "executes setup script" do
+        command.should_receive(:system).with("cd #{Dir.pwd} && rake db:create db:migrate")
+        command.call
+      end
+    end
+
+    context "with `start`" do
+      let(:arguments) do
+        ["start"]
+      end
+
+      it "executes start script" do
+        command.should_receive(:system).with({ "WORKSPACE_PATH" => Dir.pwd }, "cd #{Dir.pwd} && foreman start")
+        command.call
+      end
+    end
+
+    context "with unknown arguments" do
+      let(:arguments) do
+        []
+      end
+
+      it "shows usage" do
+        command.should_receive(:puts).with("Usage: magi {setup|start}")
+        command.call
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
 require "simplecov"
+require "coveralls"
+Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter,
+]
 SimpleCov.start
 
 ENV["RAILS_ENV"] ||= "test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clockwork
@@ -373,6 +373,7 @@ files:
 - script/rails
 - spec/factories/build.rb
 - spec/factories/job.rb
+- spec/magi/command_spec.rb
 - spec/models/build_spec.rb
 - spec/models/job_spec.rb
 - spec/requests/builds_spec.rb
@@ -412,6 +413,7 @@ summary: Magi
 test_files:
 - spec/factories/build.rb
 - spec/factories/job.rb
+- spec/magi/command_spec.rb
 - spec/models/build_spec.rb
 - spec/models/job_spec.rb
 - spec/requests/builds_spec.rb