writefully 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d7aa28aba44269ffe7397686a8afdf2a239856
-  data.tar.gz: 06e9d0183726001182722aaabcdabd2b1fcffffe
+  metadata.gz: 5c5bdf63636713fe90806dee0b0c5c4b6fa9b1ee
+  data.tar.gz: b5488f18a969d82fac453a664c6100d3a9dc3730
 SHA512:
-  metadata.gz: 77342eedab7649f552741419a9b5bb550fa053e0f9dac8a65bdfa7df75dbcdb3d351b6c5e37661077f0c06980c370e91acf52d26742348d9d04650450be98b05
-  data.tar.gz: 708d5924614dc7b80f71c994b21b65d5c7ec778ef94465a6e57e37feea17261b1eca5bb9fa61cc419f774e0d27f15d0a7288145e202a4bd6c0eb04c47493d8a8
+  metadata.gz: ae7c527d36e3eb56b6bed64165aff2408ad8a142ee095d15861e60f1ddd463686ebddbee4c9c3a1ee9e06cb16b1ee759eaf65276cc075c79d5774421649887c8
+  data.tar.gz: 7e3958cdec08dcabb2d8ae9050338f475c49d92036a959560965802a871d9d602dc29ab93c2350194fe14e65ca827ef9f89cd42bb432b2dc4ec948b4a22db94b

data/app/controllers/writefully/hooks_controller.rb

@@ -11,16 +11,15 @@ module Writefully
 
     def create
       self.__send__ request.headers["X-Github-Event"].to_sym
+      head :ok
     end
 
     def ping
-      head :ok
     end
 
     def push
       Writefully.add_job :handyman, { task: :synchronize, 
                                       site_slug: body.repository.name } if branch_match?
-      head :ok
     end
 
     def member
@@ -28,7 +27,6 @@ module Writefully
       unless authorship
         Authorship.create_from_data(body.member)
       end
-      head :ok
     end
 
   protected

data/lib/writefully/cli.rb

@@ -9,13 +9,13 @@ module Writefully
 
     def start(file)
       config = Writefully.config_from(file)
-
+      
       if options.daemonize?
-        Process.daemon(true, true)
-        pid = waitpid(spawn(listen(config)))
-        write pid, config[:pidfile]
+        ::Process.daemon(true, true)
+        write(::Process.pid, config[:pidfile])
+        spawn(listen(config))
       else
-        Signal.trap("INT") { $stdout.puts "Writefully exiting..."; exit }
+        ::Signal.trap("INT") { $stdout.puts "Writefully exiting..."; exit }
         listen(config)
       end
     end
@@ -25,7 +25,7 @@ module Writefully
       config = Writefully.config_from(file)
 
       pid = open(config[:pidfile]).read.strip.to_i
-      Process.kill("HUP", pid)
+      ::Process.kill("HUP", pid)
       true
     rescue Errno::ENOENT
       $stdout.puts "#{pidfile} does not exist: Errno::ENOENT"
@@ -52,7 +52,7 @@ module Writefully
         end
       rescue ::Exception => e
         $stderr.puts "While writing the PID to file, unexpected #{e.class}: #{e}"
-        Process.kill "HUP", pid
+        ::Process.kill "HUP", pid
       end
     end
   end

data/lib/writefully/tools/dispatcher.rb

@@ -17,7 +17,7 @@ module Writefully
 
       def heartbeat
         @job      = Marshal.load(get_job_data)
-        run_job if is_job?
+        run_job if job_valid?
       end
 
       def run_job
@@ -34,16 +34,12 @@ module Writefully
         Celluloid::Actor[:retryer].retry(job)
       end
 
-      def is_job?
-        job.has_key?(:worker) and job.has_key?(:message)
-      end
-
       def is_retry?
-        is_job? and job[:message].has_key?(:tries) and job[:message].has_key?(:run)
+        job_valid? and job[:message].has_key?(:tries) and job[:message].has_key?(:run)
       end
 
       def job_valid?
-        is_job? and job.keys.count == 2
+        job.has_key?(:worker) and job.has_key?(:message)
       end
 
       def retry_valid?

data/lib/writefully/version.rb

@@ -1,3 +1,3 @@
 module Writefully
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end