pgjob 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## PGJob 0.1.1 (July 8, 2012)
+
+* Add job string status
+
 ## PGJob 0.1.0 (July 8, 2012)
 
 * First public release

data/lib/pgjob/job.rb

@@ -24,7 +24,8 @@ module PGJob
             id SERIAL,
             name character varying(255),
             params text,
-            status character varying(20),
+            mode character varying(20),
+            status character varying(255),
             log text
           );
         SQL
@@ -50,8 +51,8 @@ module PGJob
       assert_symbol_keys!(params)
 
       sql = <<-SQL
-        INSERT INTO jobs(name, params, status)
-        VALUES('#{@conn.escape(name)}', '#{@conn.escape JSON.dump(params)}', 'wait')
+        INSERT INTO jobs(name, params, mode, status)
+        VALUES('#{@conn.escape(name)}', '#{@conn.escape JSON.dump(params)}', 'wait', 'Start')
         RETURNING id;
       SQL
       @conn.exec(sql).to_a.first['id'].to_i
@@ -68,22 +69,26 @@ module PGJob
     end
 
     # Sets/Returns status
-    def status(id, value = nil)
-      if value
-        raise "wrong value" unless [:wait, :running, :success, :failed].include?(value.to_sym)
+    def status(id, mode = nil, value = nil )
+      if mode
+        raise "wrong mode #{mode}" unless [:running, :success, :failed].include?(mode.to_sym)
+        raise "set value" unless value
         sql = <<-SQL
           UPDATE jobs
-          SET status = '#{@conn.escape value.to_s}'
+          SET
+            mode = '#{mode}',
+            status = '#{@conn.escape value}'
           WHERE id = #{id};
         SQL
         @conn.exec(sql)
+        add_log(id, "[mode] #{mode} - #{value}") 
       else
         sql = <<-SQL
           SELECT status
           FROM jobs
           WHERE id = #{id};
         SQL
-        @conn.exec(sql).to_a.first['status'].to_sym
+        @conn.exec(sql).to_a.first['status']
       end
     end
 
@@ -117,6 +122,22 @@ module PGJob
       @conn.exec(sql)
     end
 
+    def running?(id)
+      [:wait, :running].include? mode(id)
+    end
+
+    def finished?(id)
+      [:success, :failed].include? mode(id)
+    end
+
+    def success?(id)
+      mode(id) == :success
+    end
+
+    def failed?(id)
+      mode(id) == :failed
+    end
+
     private
     def assert_symbol_keys!(hash)
       hash.each do |key, value|
@@ -141,6 +162,15 @@ module PGJob
       end
       out
     end
+
+    def mode(id)
+      sql = <<-SQL
+        SELECT mode
+        FROM jobs
+        WHERE id = #{id};
+      SQL
+      @conn.exec(sql).to_a.first['mode'].to_sym
+    end
                            
     def tables
       sql = <<-SQL

data/lib/pgjob/version.rb

@@ -1,3 +1,3 @@
 module PGJob
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/job_spec.rb

@@ -28,15 +28,43 @@ describe PGJob::Job do
   end
 
   describe '#status' do
-    it 'returns' do
+    it 'running' do
       id = @job.create("test", key: 'value')
-      @job.status(id).should == :wait
+
+      @job.status(id, :running, 'info')
+
+      @job.running?(id).should be_true
+      @job.finished?(id).should be_false
+      @job.success?(id).should be_false
+      @job.failed?(id).should be_false
+
+      @job.status(id).should == 'info'
     end
 
-    it 'sets' do
+    it 'success' do
       id = @job.create("test", key: 'value')
-      @job.status(id, :running)
-      @job.status(id).should == :running
+
+      @job.status(id, :success, 'info')
+
+      @job.running?(id).should be_false
+      @job.finished?(id).should be_true
+      @job.success?(id).should be_true
+      @job.failed?(id).should be_false
+
+      @job.status(id).should == 'info'
+    end
+
+    it 'failed' do
+      id = @job.create("test", key: 'value')
+
+      @job.status(id, :failed, 'info')
+
+      @job.running?(id).should be_false
+      @job.finished?(id).should be_true
+      @job.success?(id).should be_false
+      @job.failed?(id).should be_true
+
+      @job.status(id).should == 'info'
     end
   end
 
@@ -76,5 +104,13 @@ describe PGJob::Job do
       @job.add_log(id, hard)
       @job.log(id).should == hard
     end
+
+    it "log + status" do
+      id = @job.create("test")
+      @job.add_log(id, 'msg1')
+      @job.status(id, :success, 'done')
+      @job.add_log(id, 'msg2')
+      @job.log(id).should == "msg1\n[mode] success - done\nmsg2"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgjob
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: