magi 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a966ad774bafeb6f1a15e2184944ada595ee0106
-  data.tar.gz: 792eaf060fd95a3c6e64c1518ac6d1bfce7f015b
+  metadata.gz: 38a310270effb9fb28e7bb7d5305c49cf7ed12c3
+  data.tar.gz: 68a7ca5195cce218b36f077d15842c01a6a9111e
 SHA512:
-  metadata.gz: f06a3977046de0e4ea1762110b7cf897c2bca10559bd128cdb83d4512b33e9b26f93660103d31a4162a0e713f9e75c0779db2f1339bf2771d6454a791f9fefb7
-  data.tar.gz: 651166b9d78f011ff6047ab3b70b92b9945c371fda85ff2c46e686c4feb94c0f2c88d3be230c8a3262e2a29bb05a73007d531b3972d236ff769cd160515c8119
+  metadata.gz: 339609bedc33c6839fbd3ae33e7aa15268ef9f0585cbfadd7ca9f32ab4d0ad453ce5ce80b296e12ca78e88c6b9824946524ddb9d72b575fc09fd9083504c5952
+  data.tar.gz: 3f2fd55ab271d85ec648d090079c3b1fa716d945f80d74c6480b5a7d931a2331a9904b8150183e9ccb6b98b220a3b562e6b1de7793806a8abed579566635a8ce

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem "font-awesome-rails"
 gem "jquery-rails"
 gem "quiet_assets"
-gem "sidekiq"
+gem "resque"
 gem "slim"
 
 group :development, :test do

data/Procfile

@@ -1,4 +1,4 @@
 redis: redis-server
 rails: rails s
-sidekiq: sidekiq
-clockwork: clockwork script/clock.rb
+worker: rake resque:work QUEUE="*"
+clock: clockwork script/clock.rb

data/app/workers/build_worker.rb

@@ -1,8 +1,13 @@
 class BuildWorker
-  include Sidekiq::Worker
+  @queue = name
 
-  # Takes a build id and invokes it.
-  def perform(id)
-    Build.find(id).start
+  class << self
+    def perform(id)
+      Build.find(id).start
+    end
+
+    def perform_async(id)
+      Resque.enqueue(self, id)
+    end
   end
 end

data/lib/magi/executer.rb

@@ -1,4 +1,4 @@
-require "tempfile"
+require "open3"
 
 module Magi
   class Executer
@@ -6,26 +6,15 @@ module Magi
       new(*args).execute
     end
 
+    attr_reader :script
+
     def initialize(script)
       @script = script
     end
 
     def execute
-      { status: status, output: output }
-    end
-
-    private
-
-    def tempfile
-      @tempfile ||= Tempfile.new("")
-    end
-
-    def status
-      system(@script, out: tempfile, err: tempfile)
-    end
-
-    def output
-      tempfile.tap(&:close).open.read
+      output, status = Open3.capture2e(script)
+      { output: output, status: status.success? }
     end
   end
 end

data/lib/magi/version.rb

@@ -1,3 +1,3 @@
 module Magi
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tasks/resque.rake

@@ -0,0 +1,3 @@
+require "resque/tasks"
+
+task "resque:setup" => :environment

data/magi.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "quiet_assets"
   spec.add_dependency "rails", "3.2.13"
   spec.add_dependency "rake"
+  spec.add_dependency "resque"
   spec.add_dependency "sass-rails", "~> 3.2.3"
-  spec.add_dependency "sidekiq"
   spec.add_dependency "slim"
   spec.add_dependency "uglifier", ">= 1.0.3"
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/models/job_spec.rb

@@ -14,7 +14,7 @@ describe Job do
 
     context "with script" do
       before do
-        job.config["script"] = "true"
+        job.script = "true"
       end
 
       it "starts its job" do

data/spec/requests/builds_spec.rb

@@ -10,7 +10,7 @@ describe "Builds" do
   end
 
   let(:job) do
-    FactoryGirl.create(:job)
+    FactoryGirl.create(:job, config: { "script" => "true" })
   end
 
   let(:build) do
@@ -42,7 +42,7 @@ describe "Builds" do
       post "/jobs/#{job.id}/builds", params, env
       response.status.should == 201
       response.body.should be_json(Hash)
-      BuildWorker.jobs.should have(1).queue
+      job.builds.should have(1).builds
     end
   end
 

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rspec/rails"
 require "rspec/autorun"
-require "sidekiq/testing"
 
 RSpec.configure do |config|
   # If you"re not using ActiveRecord, or you"d prefer not to run each of your
@@ -26,3 +25,5 @@ RSpec.configure do |config|
   config.include RSpec::JsonMatcher, type: :request
   config.include ResponseCodeMatchers, type: :request
 end
+
+Resque.inline = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -137,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +289,7 @@ files:
 - lib/magi/scheduler.rb
 - lib/magi/version.rb
 - lib/magi.rb
+- lib/tasks/resque.rake
 - public/404.html
 - public/422.html
 - public/500.html
@@ -330,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Magi