gush 0.0.1 → 0.1

data/spec/lib/gush/workflow_spec.rb

@@ -7,21 +7,55 @@ describe Gush::Workflow do
     context "when configure option is true" do
       it "runs #configure method " do
         expect_any_instance_of(TestWorkflow).to receive(:configure)
-        TestWorkflow.new("name", configure: true)
+        TestWorkflow.new(true)
+      end
+    end
+
+    context "when configure option is false" do
+      it "it doesn't run #configure method " do
+        expect_any_instance_of(TestWorkflow).to_not receive(:configure)
+        TestWorkflow.new(false)
       end
     end
   end
 
-  describe "#stop!" do
+  describe "#save" do
+    context "workflow not persisted" do
+      it "sets persisted to true" do
+        flow = TestWorkflow.new
+        flow.save
+        expect(flow.persisted).to be(true)
+      end
+
+      it "assigns new unique id" do
+        flow = TestWorkflow.new
+        expect(flow.id).to eq(nil)
+        flow.save
+        expect(flow.id).to_not be_nil
+      end
+    end
+
+    context "workflow persisted" do
+      it "does not assign new id" do
+        flow = TestWorkflow.new
+        flow.save
+        id = flow.id
+        flow.save
+        expect(flow.id).to eq(id)
+      end
+    end
+  end
+
+  describe "#mark_as_stopped" do
     it "marks workflow as stopped" do
-      expect{ subject.stop! }.to change{subject.stopped?}.from(false).to(true)
+      expect{ subject.mark_as_stopped }.to change{subject.stopped?}.from(false).to(true)
     end
   end
 
-  describe "#start!" do
+  describe "#mark_as_started" do
     it "removes stopped flag" do
       subject.stopped = true
-      expect{ subject.start! }.to change{subject.stopped?}.from(true).to(false)
+      expect{ subject.mark_as_started }.to change{subject.stopped?}.from(true).to(false)
     end
   end
 
@@ -37,25 +71,42 @@ describe Gush::Workflow do
 
       result = JSON.parse(klass.new("workflow").to_json)
       expected = {
-        "id"=>"workflow",
+        "id"=>nil,
         "name" => klass.to_s,
         "klass" => klass.to_s,
-        "status" => "Pending",
+        "status" => "pending",
         "total" => 2,
         "finished" => 0,
         "started_at" => nil,
         "finished_at" => nil,
         "stopped" => false,
-        "logger_builder" => "Gush::LoggerBuilder",
-        "nodes" => [
+        "jobs" => [
           {
-            "name"=>"FetchFirstJob", "klass"=>"FetchFirstJob", "finished"=>false, "enqueued"=>false, "failed"=>false,
-            "incoming"=>[], "outgoing"=>["PersistFirstJob"], "finished_at"=>nil, "started_at"=>nil, "failed_at"=>nil,
+            "name"=>"FetchFirstJob",
+            "klass"=>"FetchFirstJob",
+            "finished"=>false,
+            "enqueued"=>false,
+            "failed"=>false,
+            "incoming"=>[],
+            "outgoing"=>["PersistFirstJob"],
+            "finished_at"=>nil,
+            "started_at"=>nil,
+            "enqueued_at"=>nil,
+            "failed_at"=>nil,
             "running" => false
           },
           {
-            "name"=>"PersistFirstJob", "klass"=>"PersistFirstJob", "finished"=>false, "enqueued"=>false, "failed"=>false,
-            "incoming"=>["FetchFirstJob"], "outgoing"=>[], "finished_at"=>nil, "started_at"=>nil, "failed_at"=>nil,
+            "name"=>"PersistFirstJob",
+            "klass"=>"PersistFirstJob",
+            "finished"=>false,
+            "enqueued"=>false,
+            "failed"=>false,
+            "incoming"=>["FetchFirstJob"],
+            "outgoing"=>[],
+            "finished_at"=>nil,
+            "started_at"=>nil,
+            "enqueued_at"=>nil,
+            "failed_at"=>nil,
             "running" => false
           }
         ]
@@ -75,7 +126,7 @@ describe Gush::Workflow do
       it "adds new job with the given class as a node" do
         flow = Gush::Workflow.new("workflow")
         flow.run(Gush::Job)
-        expect(flow.nodes.first).to be_instance_of(Gush::Job)
+        expect(flow.jobs.first).to be_instance_of(Gush::Job)
       end
     end
 
@@ -87,39 +138,16 @@ describe Gush::Workflow do
         tree.run(klass1)
         tree.run(klass2, after: klass1)
         tree.create_dependencies
-        expect(tree.nodes.first).to be_an_instance_of(klass1)
-        expect(tree.nodes.first.outgoing.first).to eq(klass2.to_s)
+        expect(tree.jobs.first).to be_an_instance_of(klass1)
+        expect(tree.jobs.first.outgoing.first).to eq(klass2.to_s)
       end
     end
   end
 
-  describe "#logger_builder" do
-    it 'sets logger builder for workflow' do
-      tree = Gush::Workflow.new("workflow")
-      tree.logger_builder(TestLoggerBuilder)
-      expect(tree.instance_variable_get(:@logger_builder)).to eq(TestLoggerBuilder)
-    end
-  end
-
-  describe "#build_logger_for_job" do
-    it 'builds a logger' do
-      job = double('job')
-      allow(job).to receive(:name) { 'a-job' }
-
-      tree = Gush::Workflow.new("workflow")
-      tree.logger_builder(TestLoggerBuilder)
-
-      logger = tree.build_logger_for_job(job, :jid)
-      expect(logger).to be_a(TestLogger)
-      expect(logger.jid).to eq(:jid)
-      expect(logger.name).to eq('a-job')
-    end
-  end
-
   describe "#failed?" do
     context "when one of the jobs failed" do
       it "returns true" do
-        subject.find_job('Prepare').failed = true
+        subject.find_job('Prepare').fail!
         expect(subject.failed?).to be_truthy
       end
     end
@@ -140,14 +168,14 @@ describe Gush::Workflow do
 
     context "when some jobs are enqueued" do
       it "returns true" do
-        subject.find_job('Prepare').enqueued = true
+        subject.find_job('Prepare').enqueue!
         expect(subject.running?).to be_truthy
       end
     end
 
     context "when some jobs are running" do
       it "returns true" do
-        subject.find_job('Prepare').running = true
+        subject.find_job('Prepare').start!
         expect(subject.running?).to be_truthy
       end
     end
@@ -159,88 +187,8 @@ describe Gush::Workflow do
     end
 
     it "returns true if all jobs are finished" do
-      subject.nodes.each {|n| n.finished = true }
+      subject.jobs.each {|n| n.finish! }
       expect(subject.finished?).to be_truthy
     end
   end
-
-  describe "#next_jobs" do
-    context "when one of the dependent jobs failed" do
-      it "returns only jobs with satisfied dependencies" do
-        subject.find_job('Prepare').finished = true
-        subject.find_job('FetchFirstJob').failed = true
-        expect(subject.next_jobs.map(&:name)).to match_array(["FetchSecondJob"])
-      end
-    end
-
-    it "returns next non-queued and unfinished jobs" do
-      expect(subject.next_jobs.map(&:name)).to match_array(["Prepare"])
-    end
-
-    it "returns all parallel non-queued and unfinished jobs" do
-      subject.find_job('Prepare').finished = true
-      expect(subject.next_jobs.map(&:name)).to match_array(["FetchFirstJob", "FetchSecondJob"])
-    end
-
-    it "returns empty array when there are enqueued but unfinished jobs" do
-      subject.find_job('Prepare').enqueued = true
-      expect(subject.next_jobs).to match_array([])
-    end
-
-    it "returns only unfinished and non-queued jobs from a parallel level" do
-      subject.find_job('Prepare').finished = true
-      subject.find_job('FetchFirstJob').finished = true
-      expect(subject.next_jobs.map(&:name)).to match_array(["PersistFirstJob", "FetchSecondJob"])
-    end
-
-    it "returns next level of unfished jobs after finished parallel level" do
-      subject.find_job('Prepare').finished = true
-      subject.find_job('PersistFirstJob').finished = true
-      subject.find_job('FetchFirstJob').finished = true
-      subject.find_job('FetchSecondJob').finished = true
-      expect(subject.next_jobs.map(&:name)).to match_array(["NormalizeJob"])
-    end
-
-    context "when mixing parallel tasks with synchronous" do
-      it "properly orders nested synchronous flows inside concurrent" do
-        flow = Gush::Workflow.new("workflow")
-
-        flow.run Prepare
-        flow.run NormalizeJob
-
-        flow.run FetchFirstJob, after: Prepare
-        flow.run PersistFirstJob, after: FetchFirstJob, before: NormalizeJob
-        flow.run FetchSecondJob, after: Prepare
-        flow.run PersistSecondJob, after: FetchSecondJob, before: NormalizeJob
-
-        flow.create_dependencies
-        expect(flow.next_jobs.map(&:name)).to match_array(["Prepare"])
-        flow.find_job("Prepare").finished = true
-        expect(flow.next_jobs.map(&:name)).to match_array(["FetchFirstJob", "FetchSecondJob"])
-        flow.find_job("FetchFirstJob").finished = true
-        expect(flow.next_jobs.map(&:name)).to match_array(["FetchSecondJob", "PersistFirstJob"])
-        flow.find_job("FetchSecondJob").finished = true
-        expect(flow.next_jobs.map(&:name)).to match_array(["PersistFirstJob", "PersistSecondJob"])
-        flow.find_job("PersistFirstJob").finished = true
-        expect(flow.next_jobs.map(&:name)).to match_array(["PersistSecondJob"])
-        flow.find_job("PersistSecondJob").finished = true
-        expect(flow.next_jobs.map(&:name)).to match_array(["NormalizeJob"])
-      end
-    end
-
-    it "fails when dependency resolution recurses too deep" do
-      flow = Gush::Workflow.new("workflow")
-      klass1 = Class.new(Gush::Job)
-      klass2 = Class.new(Gush::Job)
-      klass3 = Class.new(Gush::Job)
-      flow.run(klass1, after: klass3)
-      flow.run(klass2, after: klass1)
-      flow.run(klass3, after: klass2)
-      flow.create_dependencies
-
-      expect {
-        flow.next_jobs
-      }.to raise_error(DependencyLevelTooDeep)
-    end
-  end
 end

data/spec/lib/gush_spec.rb

@@ -9,7 +9,7 @@ describe Gush do
         path.delete if path.exist?
         Gush.configuration.gushfile = path
 
-        expect { Gush.gushfile }.to raise_error(Thor::Error)
+        expect { Gush.gushfile }.to raise_error(Errno::ENOENT)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 require 'gush'
 require 'pry'
 require 'sidekiq/testing'
-require 'bbq/spawn'
 
+Sidekiq::Testing.fake!
 Sidekiq::Logging.logger = nil
 
-class Prepare < Gush::Job;  end
+class Prepare < Gush::Job; end
 class FetchFirstJob < Gush::Job; end
 class FetchSecondJob < Gush::Job; end
 class PersistFirstJob < Gush::Job; end
@@ -14,21 +14,8 @@ class NormalizeJob < Gush::Job; end
 
 GUSHFILE  = Pathname.new(__FILE__).parent.join("Gushfile.rb")
 
-TestLogger = Struct.new(:jid, :name) do
-  def <<(msg)
-  end
-end
-
-class TestLoggerBuilder < Gush::LoggerBuilder
-  def build
-    TestLogger.new(jid, job.name)
-  end
-end
-
 class TestWorkflow < Gush::Workflow
   def configure
-    logger_builder TestLoggerBuilder
-
     run Prepare
 
     run NormalizeJob
@@ -40,15 +27,29 @@ class TestWorkflow < Gush::Workflow
   end
 end
 
-module GushHelpers
-  REDIS_URL = "redis://localhost:33333/"
+class Redis
+  def publish(*)
+  end
+end
+
+REDIS_URL = "redis://localhost:6379/12"
 
+module GushHelpers
   def redis
     @redis ||= Redis.new(url: REDIS_URL)
   end
+end
+
+RSpec::Matchers.define :have_jobs do |flow, jobs|
+  match do |actual|
+    expected = jobs.map do |job|
+      hash_including("args" => include(flow, job))
+    end
+    expect(Gush::Worker.jobs).to match_array(expected)
+  end
 
-  def client
-    @client ||= Gush::Client.new(Gush::Configuration.new(gushfile: GUSHFILE, redis_url: REDIS_URL))
+  failure_message do |actual|
+    "expected queue to have #{jobs}, but instead has: #{actual.jobs.map{ |j| j["args"][1]}}"
   end
 end
 
@@ -59,18 +60,14 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  orchestrator = Bbq::Spawn::Orchestrator.new
-
-  config.before(:suite) do
-    config_path = Pathname.pwd + "spec/redis.conf"
-    executor = Bbq::Spawn::Executor.new("redis-server", config_path.to_path)
-    orchestrator.coordinate(executor, host: '127.0.0.1', port: 33333)
-    orchestrator.start
+  config.before(:each) do
+    Gush.configure do |config|
+      config.redis_url = REDIS_URL
+      config.environment = 'test'
+      config.gushfile = GUSHFILE
+    end
   end
 
-  config.after(:suite) do
-    orchestrator.stop
-  end
 
   config.after(:each) do
     Sidekiq::Worker.clear_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gush
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,126 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.4
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -196,26 +197,23 @@ files:
 - gush.gemspec
 - lib/gush.rb
 - lib/gush/cli.rb
+- lib/gush/cli/overview.rb
 - lib/gush/client.rb
 - lib/gush/configuration.rb
 - lib/gush/errors.rb
+- lib/gush/graph.rb
 - lib/gush/job.rb
-- lib/gush/logger_builder.rb
-- lib/gush/metadata.rb
-- lib/gush/null_logger.rb
-- lib/gush/version.rb
+- lib/gush/json.rb
 - lib/gush/worker.rb
 - lib/gush/workflow.rb
 - spec/Gushfile.rb
+- spec/features/workflows_spec.rb
 - spec/lib/gush/client_spec.rb
 - spec/lib/gush/configuration_spec.rb
 - spec/lib/gush/job_spec.rb
-- spec/lib/gush/logger_builder_spec.rb
-- spec/lib/gush/null_logger_spec.rb
 - spec/lib/gush/worker_spec.rb
 - spec/lib/gush/workflow_spec.rb
 - spec/lib/gush_spec.rb
-- spec/redis.conf
 - spec/spec_helper.rb
 homepage: https://github.com/pokonski/gush
 licenses:
@@ -237,20 +235,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fast and distributed workflow runner using only Sidekiq and Redis
 test_files:
 - spec/Gushfile.rb
+- spec/features/workflows_spec.rb
 - spec/lib/gush/client_spec.rb
 - spec/lib/gush/configuration_spec.rb
 - spec/lib/gush/job_spec.rb
-- spec/lib/gush/logger_builder_spec.rb
-- spec/lib/gush/null_logger_spec.rb
 - spec/lib/gush/worker_spec.rb
 - spec/lib/gush/workflow_spec.rb
 - spec/lib/gush_spec.rb
-- spec/redis.conf
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/gush/logger_builder.rb

@@ -1,15 +0,0 @@
-module Gush
-  class LoggerBuilder
-    attr_reader :workflow, :job, :jid
-
-    def initialize(workflow, job, jid)
-      @workflow = workflow
-      @job = job
-      @jid = jid
-    end
-
-    def build
-      NullLogger.new
-    end
-  end
-end

data/lib/gush/metadata.rb

@@ -1,24 +0,0 @@
-module Gush
-  module Metadata
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def metadata(params = {})
-        @metadata = (@metadata || {}).merge(params)
-      end
-    end
-
-    def name
-      metadata[:name] || @name
-    end
-
-    private
-
-    def metadata
-      self.class.metadata
-    end
-  end
-end

data/lib/gush/null_logger.rb

@@ -1,6 +0,0 @@
-module Gush
-  class NullLogger
-    def method_missing(*)
-    end
-  end
-end

data/lib/gush/version.rb

@@ -1,3 +0,0 @@
-module Gush
-  VERSION = "0.0.1"
-end

data/spec/lib/gush/logger_builder_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe Gush::LoggerBuilder do
-  it 'takes a job as an argument' do
-    builder = Gush::LoggerBuilder.new(:workflow, :job, :jid)
-    expect(builder.job).to eq(:job)
-  end
-
-  it 'takes a workflow as an argument' do
-    builder = Gush::LoggerBuilder.new(:workflow, :job, :jid)
-    expect(builder.workflow).to eq(:workflow)
-  end
-
-  it 'takes a jid as an argument' do
-    builder = Gush::LoggerBuilder.new(:workflow, :job, :jid)
-    expect(builder.jid).to eq(:jid)
-  end
-
-  describe "#build" do
-    it 'returns a logger for a job' do
-      expect(Gush::LoggerBuilder.new(:workflow, :job, :jid).build).to be_a Gush::NullLogger
-    end
-  end
-end
-