writefully 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c578de39737faf4bcb838175f4ac604262b874e7
-  data.tar.gz: d6ddeb25fcf43d553f1b992ed6b43aa93c2499a7
+  metadata.gz: 06d7aa28aba44269ffe7397686a8afdf2a239856
+  data.tar.gz: 06e9d0183726001182722aaabcdabd2b1fcffffe
 SHA512:
-  metadata.gz: 6ed18f2b874486eb6c055b430a2bfd5489be4ce36a7bc567382616840bb3fe4dea85bba93214c00cb26990f89997b2dbbfbecbe536601ec78376e570f5be6a90
-  data.tar.gz: 8b28483bbc1141ec538af5e9196b66844a70bde65a3015fe8f1c3ac4dd817482f24ea71f29f15a967dde120808bf6dd04a6ceb7661a7896492b4346611bdd76e
+  metadata.gz: 77342eedab7649f552741419a9b5bb550fa053e0f9dac8a65bdfa7df75dbcdb3d351b6c5e37661077f0c06980c370e91acf52d26742348d9d04650450be98b05
+  data.tar.gz: 708d5924614dc7b80f71c994b21b65d5c7ec778ef94465a6e57e37feea17261b1eca5bb9fa61cc419f774e0d27f15d0a7288145e202a4bd6c0eb04c47493d8a8

data/app/controllers/writefully/hooks_controller.rb

@@ -11,12 +11,16 @@ module Writefully
 
     def create
       self.__send__ request.headers["X-Github-Event"].to_sym
+    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
@@ -24,6 +28,7 @@ module Writefully
       unless authorship
         Authorship.create_from_data(body.member)
       end
+      head :ok
     end
 
   protected

data/app/models/writefully/authorship.rb

@@ -1,5 +1,7 @@
 module Writefully
   class Authorship < ActiveRecord::Base
+    self.table_name = "writefully_authorships"
+
     belongs_to :user
 
     has_many :posts

data/app/models/writefully/post.rb

@@ -1,5 +1,7 @@
 module Writefully
   class Post < ActiveRecord::Base
+    self.table_name = "writefully_posts"
+
     extend FriendlyId
     include Writefully::Postable
 

data/app/models/writefully/site.rb

@@ -1,5 +1,7 @@
 module Writefully
   class Site < ActiveRecord::Base
+    self.table_name = "writefully_sites"
+
     extend FriendlyId
 
     HOOK_EVENTS = %w(push collaborator)

data/app/models/writefully/tag.rb

@@ -1,5 +1,7 @@
 module Writefully
   class Tag < ActiveRecord::Base
+    self.table_name = "writefully_tags"
+
     has_many :taggings
     has_many :posts, through: :taggings
 

data/app/models/writefully/tagging.rb

@@ -1,5 +1,7 @@
 module Writefully
   class Tagging < ActiveRecord::Base
+    self.table_name = "writefully_taggings"
+
     belongs_to :tag,  class_name: "Writefully::Tag"
     belongs_to :post, class_name: "Writefully::Post"
   end

data/bin/writefully

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'writefully'
+require 'writefully/loader'
 require 'writefully/cli'
 
 

data/lib/sample/README.md

@@ -8,7 +8,7 @@ Thats how you include an image
 
 Checkout `meta.yml` you can add extra details to the 'details' area. Anything you like for example
 
-```yml
+```yaml
 title: "Sample Post"
 slug: "sample-post"
 tags: ["Writefully"]

data/lib/sample/meta.yml

@@ -1,5 +1,4 @@
 title: "Change Me"
-slug: "change-me"
 tags: ["Writefully"]
 publish: true
 details:

data/lib/writefully/cli.rb

@@ -1,28 +1,30 @@
 require 'thor'
 require 'writefully/process'
-
+require 'pry'
 module Writefully
   class CLI < Thor
     desc "start", "Start listening to the content directory"
 
     method_options %w( daemonize -d ) => :boolean
-    method_options %w( config -c )    => :string
 
-    def start
-      config = Writefully.config_from(options.config)
+    def start(file)
+      config = Writefully.config_from(file)
 
       if options.daemonize?
         Process.daemon(true, true)
         pid = waitpid(spawn(listen(config)))
         write pid, config[:pidfile]
       else
+        Signal.trap("INT") { $stdout.puts "Writefully exiting..."; exit }
         listen(config)
       end
     end
 
     desc "stop", "Stop listening for content directory changes"
-    def stop(pidfile = nil)
-      pid = open(pidfile).read.strip.to_i
+    def stop(file)
+      config = Writefully.config_from(file)
+
+      pid = open(config[:pidfile]).read.strip.to_i
       Process.kill("HUP", pid)
       true
     rescue Errno::ENOENT

data/lib/writefully/loader.rb

@@ -0,0 +1,72 @@
+require 'writefully/storage'
+require 'erb'
+
+module Writefully
+  SCOPES  = %w(repo public_repo user write:repo_hook)
+
+  class << self
+
+    def options=(config)
+      @_options = config
+    end
+
+    def options
+      @_options ||= config_from(config_yml)
+    end
+
+    def redis
+      r = Redis.new(host: 'localhost', port: 6379)
+      @_redis ||= ConnectionPool.new(size: 5, timeout: 5) do 
+        Redis::Namespace.new(:"#{env}:writefully", redis: r)
+      end
+    end
+
+    def add_job worker, message
+      Writefully.redis.with { |c| c.sadd "jobs", convert_job(worker, message) }
+    end
+
+    def convert_job worker, message
+       Marshal.dump({worker: worker, message: message})
+    end
+
+    def env
+      ENV["RACK_ENV"] || ENV["RAILS_ENV"] || 'development'
+    end
+
+    def github_app
+      @_github_app ||= Github.new(client_id:     options[:github_client], 
+                                  client_secret: options[:github_secret])
+    end
+
+    def logger
+      @logger ||= Logger.new(log_location)
+    end
+
+    def log_location
+      env == 'development' ? STDOUT : Writefully.options[:logfile]
+    end
+
+    def db_config
+      YAML::load(ERB.new(IO.read(File.join(options[:app_directory], 'config', 'database.yml'))).result)[env]
+    end
+
+    def config_from(path = nil)
+      YAML::load(ERB.new(IO.read(path)).result)[env]
+    rescue Errno::ENOENT
+      $stdout.puts "config/writefully.yml does not exist"
+    end
+
+
+    def config_yml
+      Rails.root.join('config', 'writefully.yml') if defined?(Rails)
+    end
+
+  end
+end
+
+require 'writefully/taxon'
+require 'writefully/asset'
+require 'writefully/source'
+require 'writefully/postable'
+require 'writefully/indices'
+require 'writefully/content'

data/lib/writefully/process.rb

@@ -1,38 +1,46 @@
+require 'fog'
 require 'listen'
 require 'logger'
-
 require 'celluloid'
-
+require 'github_api'
 require 'active_record'
-require 'writefully'
+require 'friendly_id'
+require 'activerecord-import'
+require 'connection_pool'
 require 'redis'
 require 'redis-namespace'
+require 'writefully/loader'
+require 'writefully/tools'
+require 'writefully/workers'
+require 'writefully/news_agency'
 
 %w(tag post site tagging authorship).each do |model|
   require File.dirname(__FILE__) + "/../../app/models/writefully/#{model}"
 end
 
-Writefully::Source.to_load.each do |model|
-  require File.join(Writefully.options[:app_directory], 'app', 'models', model)
-end
-
-require 'github_api'
-
-require 'writefully/tools'
-require 'writefully/workers'
-require 'writefully/news_agency'
-
 module Writefully
   Process = Struct.new(:config) do
 
     def listen
+      set_options
       log_start
+      load_models
       connect_to_database!
       start_news_agency!
       start_dispatcher!
       boot_listener!
     end
 
+    def set_options
+      Writefully.options = config
+    end
+
+    def load_models
+      Writefully::Source.to_load.each do |model|
+        require File.join(config[:app_directory], 'app', 'models', model)
+      end
+    end
+
     # connect to db
     def connect_to_database!
       ActiveRecord::Base.establish_connection(Writefully.db_config)
@@ -41,6 +49,7 @@ module Writefully
     # Dispatcher monitors job queue and throws job at workers
     def start_dispatcher!
       Tools::Dispatcher.supervise_as :dispatch
+      Tools::Retryer.supervise_as    :retryer
     end
 
     # Supervises the actors that manage all the work with converting content

data/lib/writefully/tools/dispatcher.rb

@@ -21,9 +21,9 @@ module Writefully
       end
 
       def run_job
-        if is_retry? and retry_valid? then retry_job
-        elsif is_job? and job_valid?  then dispatch
-        else mark_as_failed end
+        if    retry_valid?   then retry_job
+        elsif job_valid?     then dispatch
+        end
       end
 
       def dispatch
@@ -31,11 +31,7 @@ module Writefully
       end
 
       def retry_job
-        after((job[:tries] * job[:tries]).seconds) { dispatch(job) }
-      end
-
-      def mark_as_failed
-        Writefully.redis.with { |c| c.sadd 'failed', Marshal.dump(job) }
+        Celluloid::Actor[:retryer].retry(job)
       end
 
       def is_job?
@@ -43,15 +39,15 @@ module Writefully
       end
 
       def is_retry?
-        is_job? and job.has_key?(:tries)
+        is_job? and job[:message].has_key?(:tries) and job[:message].has_key?(:run)
       end
 
       def job_valid?
-        job.keys.count == 2
+        is_job? and job.keys.count == 2
       end
 
       def retry_valid?
-        job[:tries] <= 5
+        is_retry? and (job[:message][:run] == false)
       end
 
     end

data/lib/writefully/tools/pigeon.rb

@@ -6,8 +6,7 @@ module Writefully
       def upload endpoint, path, name
         file = File.open(File.join(path, name))
         Writefully::Storage.store_file(File.join(endpoint, name), file)
-        true
-      rescue Exception => e
+      rescue StandardError => e
         nil
       end
 

data/lib/writefully/tools/retryer.rb

@@ -0,0 +1,30 @@
+module Writefully
+  module Tools
+    class Retryer
+      include Celluloid
+
+      attr_accessor :job
+
+      def retry(job)
+        @job   = job
+        if job[:message][:tries] <= 5
+          after(delay) { queue_retry }
+        else
+          mark_as_failed
+        end 
+      end
+
+      def queue_retry
+        Writefully.add_job job[:worker], job[:message].merge({ run: true })
+      end
+
+      def delay
+        (job[:message][:tries] * job[:message][:tries]).seconds
+      end
+
+      def mark_as_failed
+        Writefully.redis.with { |c| c.sadd 'failed', Marshal.dump(job) }
+      end
+    end
+  end
+end

data/lib/writefully/tools.rb

@@ -9,5 +9,6 @@ require 'writefully/tools/pencil'
 require 'writefully/tools/pigeon'
 require 'writefully/tools/hammer'
 require 'writefully/tools/dispatcher'
+require 'writefully/tools/retryer'
 require 'writefully/tools/initializer'
 require 'writefully/tools/synchronizer'

data/lib/writefully/version.rb

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

data/lib/writefully/workers/journalist.rb

@@ -12,7 +12,7 @@ module Writefully
       end
 
       def message_with_tries
-        message.merge({ tries: (message[:tries] || 1) + 1 })
+        message.merge({ tries: (message[:tries] || 1) + 1, run: false })
       end
 
       def on_death actor, reason

data/lib/writefully.rb

@@ -1,77 +1,17 @@
 require 'yaml'
 require 'hashie'
+require 'celluloid'
 require 'github_api'
+require 'active_record'
 require 'activerecord-import'
 
 require 'connection_pool'
 require 'redis'
 require 'redis-namespace'
 
-require 'writefully/engine'
-require 'writefully/storage'
-
 module Writefully
-  SCOPES  = %w(repo public_repo user write:repo_hook)
-
-  class << self
-
-    def options
-      @_options ||= config_from(config_yml)
-    end
-
-    def redis
-      r = Redis.new(host: 'localhost', port: 6379)
-      @_redis ||= ConnectionPool.new(size: 5, timeout: 5) do 
-        Redis::Namespace.new(:"#{env}:writefully", redis: r)
-      end
-    end
-
-    def add_job worker, message
-      Writefully.redis.with { |c| c.sadd "jobs", convert_job(worker, message) }
-    end
-
-    def convert_job worker, message
-       Marshal.dump({worker: worker, message: message})
-    end
-
-    def env
-      ENV["RACK_ENV"] || ENV["RAILS_ENV"] || 'development'
-    end
 
-    def github_app
-      @_github_app ||= Github.new(client_id:     options[:github_client], 
-                                  client_secret: options[:github_secret])
-    end
-
-    def logger
-      @logger ||= Logger.new(log_location)
-    end
-
-    def log_location
-      env == 'development' ? STDOUT : Writefully.options[:logfile]
-    end
-
-    def db_config
-      YAML::load(ERB.new(IO.read(File.join(options[:app_directory], 'config', 'database.yml'))).result)[env]
-    end
-
-    def config_from(path = nil)
-      YAML::load(ERB.new(IO.read(path)).result)[env]
-    rescue Errno::ENOENT
-      $stdout.puts "config/writefully.yml does not exist"
-    end
-
-
-    def config_yml
-      Rails.root.join('config', 'writefully.yml') if defined?(Rails)
-    end
-
-  end
 end
 
-require 'writefully/taxon'
-require 'writefully/asset'
-require 'writefully/source'
-require 'writefully/postable'
-require 'writefully/indices'
-require 'writefully/content'
+require 'writefully/engine'
+require 'writefully/loader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: writefully
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Zack Siri
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -392,12 +420,12 @@ files:
 - lib/sample/meta.yml
 - lib/sample/README.md
 - lib/sample/writefully.png
-- lib/tasks/writefully_tasks.rake
 - lib/writefully/asset.rb
 - lib/writefully/cli.rb
 - lib/writefully/content.rb
 - lib/writefully/engine.rb
 - lib/writefully/indices.rb
+- lib/writefully/loader.rb
 - lib/writefully/news_agency.rb
 - lib/writefully/postable.rb
 - lib/writefully/process.rb
@@ -410,6 +438,7 @@ files:
 - lib/writefully/tools/initializer.rb
 - lib/writefully/tools/pencil.rb
 - lib/writefully/tools/pigeon.rb
+- lib/writefully/tools/retryer.rb
 - lib/writefully/tools/synchronizer.rb
 - lib/writefully/tools.rb
 - lib/writefully/version.rb

data/lib/tasks/writefully_tasks.rake

@@ -1,9 +0,0 @@
-require 'writefully/process'
-
-namespace :writefully do 
-  desc "Starts the writefully monitor"
-  task :start do
-    Signal.trap("INT") { $stdout.puts "Writefully exiting..."; exit }
-    Writefully::Process.new(Writefully.options).listen
-  end
-end