dronejob 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cae818f5050ff58791380e627c546e63efdddca
-  data.tar.gz: 1131b202e4e2edf76fecfd6367003bc93d85baac
+  metadata.gz: dcc5382dd0f52edabfea18b2b88953e96ded21f7
+  data.tar.gz: f682bf69fbd79bb557d75acb5df2778d7eeb2aa4
 SHA512:
-  metadata.gz: e0c6d490e93388f63e4bf6a19e3ff87d5f711408b12902554f8a5deecb3e4bbdaeb9cf28b8e874e9ffab8c8355e71bd3886612b7c5e1dbca21a95b5d158d1b9d
-  data.tar.gz: 24e8e35a177f6130e02f5acefde34bfb96e530246cb25880e7d679c4ae65ce25462ceebe78862747ce877e1253603fdcb4cd7f5d596b2f752c300846cd84e1bf
+  metadata.gz: fe7d008500c92512d507a0c684b615e18173aa392638affe1766638f3d704f31cc9740997e851bcf961b9a036c7558b8861d459dff6425f0f2a75368d4a1183f
+  data.tar.gz: d0824a0944f77dabe82eed36b79f96282d1ef865889493a2e068b079d522f6a6e73d75775861f21c162eac0b1f71e01510d58ece1b2753ec5eac94bb9e77bd93

data/.gitignore

@@ -1,3 +1,4 @@
 /*.gem
 app/*
 tmp/*
+plugins/*

data/Gemfile

@@ -1,5 +1,3 @@
 source 'http://rubygems.org'
 
 gemspec
-
-gem "gcloud", github: "GoogleCloudPlatform/gcloud-ruby", branch: "master"

data/Gemfile.lock

@@ -1,94 +1,44 @@
-GIT
-  remote: git://github.com/GoogleCloudPlatform/gcloud-ruby.git
-  revision: bde4915fe7baffae8326ed93b4ffcf3dc2de7c54
-  branch: master
-  specs:
-    gcloud (0.6.1)
-      beefcake (~> 1.0)
-      digest-crc (~> 0.4)
-      google-api-client (~> 0.8.3)
-      mime-types (~> 2.4)
-      zonefile (~> 1.04)
-
 PATH
   remote: .
   specs:
-    dronejob (1.0.2)
+    dronejob (1.0.3)
       activejob (~> 4.2)
       bundler (~> 1.11)
-      gcloud (~> 0.6)
       git (~> 1.2)
       rake (~> 10.5)
+      sidekiq (~> 4.1.0)
+      sidekiq-status (~> 0.6.0)
       thor (~> 0.19)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    beefcake (1.1.0)
     coderay (1.1.0)
+    concurrent-ruby (1.0.1)
+    connection_pool (2.2.0)
     diff-lcs (1.2.5)
-    digest-crc (0.4.1)
-    extlib (0.9.16)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
+    git (1.3.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    google-api-client (0.8.6)
-      activesupport (>= 3.2)
-      addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
     i18n (0.7.0)
     json (1.8.3)
-    jwt (1.5.2)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    little-plugger (1.1.4)
-    logging (2.0.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    memoist (0.14.0)
     method_source (0.8.2)
-    mime-types (2.99)
     minitest (5.8.4)
-    multi_json (1.11.2)
-    multipart-post (2.0.0)
-    os (0.9.6)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.5.0)
-    retriable (1.4.1)
+    redis (3.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -102,24 +52,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    signet (0.7.2)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (~> 1.5)
-      multi_json (~> 1.10)
+    sidekiq (4.1.0)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      redis (~> 3.2, >= 3.2.1)
+    sidekiq-status (0.6.0)
+      sidekiq (>= 2.7)
     slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    zonefile (1.04)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dronejob!
-  gcloud!
   pry (~> 0.10)
   rspec (~> 3.3)
 

data/dronejob.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rake", "~> 10.5"
   s.add_runtime_dependency "git", "~> 1.2"
   s.add_runtime_dependency "thor", "~> 0.19"
+  s.add_runtime_dependency "sidekiq", "~> 4.1.0"
+  s.add_runtime_dependency "sidekiq-status", "~> 0.6.0"
   s.add_runtime_dependency "activejob", "~> 4.2"
-  s.add_runtime_dependency "gcloud", "~> 0.6"
   s.add_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"
   s.files        = `git ls-files`.split("\n")

data/lib/dronejob/base.rb

@@ -3,20 +3,23 @@ require 'dronejob/modules/attr_store'
 require 'dronejob/modules/core'
 require 'dronejob/modules/git'
 require 'dronejob/modules/log'
+require 'dronejob/modules/queue'
+require 'dronejob/modules/options'
 require 'dronejob/modules/params'
 require 'dronejob/modules/phases'
-require 'dronejob/modules/pub_sub'
 require 'dronejob/modules/workspace'
 
 module Dronejob
   class Base < ActiveJob::Base
+    queue_as :dronejob
     include Modules::AttrStore
     include Modules::Core
     include Modules::Git
     include Modules::Log
+    include Modules::Queue
+    include Modules::Options
     include Modules::Params
     include Modules::Phases
-    include Modules::PubSub
     include Modules::Workspace
     
     ActiveSupport.run_load_hooks(:dronejob, self)

data/lib/dronejob/command.rb

@@ -7,10 +7,7 @@ module Dronejob
       desc identifier, "Queue #{identifier} worker"
       
       # Pub/Sub options
-      method_option(:project_id, type: :string, required: true)
-      method_option(:queue_topic, type: :string, required: false)
-      method_option(:status_topic, type: :string, required: false)
-      method_option(:queue_adapter, type: :string, default: "dronejob_queue")
+      method_option(:queue_adapter, type: :string, default: "sidekiq")
       
       # Worker options
       method_option(:run, aliases: "-r", type: :boolean, default: false)
@@ -28,10 +25,7 @@ module Dronejob
       end
       
       define_method(identifier) do
-        ActiveJob::Base.queue_adapter = options.queue_adapter
-        Dronejob::Base.project_id = options.project_id
-        Dronejob::Base.queue_topic = options.queue_topic if options.queue_topic
-        Dronejob::Base.status_topic = options.status_topic if options.status_topic
+        Dronejob::Base.queue_adapter = options.queue_adapter
         Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
         Dronejob::Base.output_path = options.output_path if options.output_path
         
@@ -63,22 +57,15 @@ module Dronejob
     end
     
     desc :server, "Start Dronejob Server"
-    method_option(:queue_adapter, type: :string, default: "dronejob_queue", enum: ["dronejob_queue"])
-    method_option(:project_id, type: :string, required: true)
-    method_option(:queue_topic, type: :string, required: false)
-    method_option(:status_topic, type: :string, required: false)
+    method_option(:queue_adapter, type: :string, default: "sidekiq", enum: ["sidekiq"])
     method_option(:jobs_path, type: :string)
     method_option(:output_path, type: :string)
     def server
-      ActiveJob::Base.queue_adapter = options.queue_adapter
-      Dronejob::Base.project_id = options.project_id
-      Dronejob::Base.queue_topic = options.queue_topic if options.queue_topic
-      Dronejob::Base.status_topic = options.status_topic if options.status_topic
+      Dronejob::Base.queue_adapter = options.queue_adapter if options.queue_adapter
       Dronejob::Base.jobs_path = options.jobs_path if options.jobs_path
       Dronejob::Base.output_path = options.output_path if options.output_path
       
       # Run worker
-      Dronejob::Base.log("info", "Subscribing to topic #{Dronejob::Base.queue_topic} in project #{Dronejob::Base.project_id}")
       Dronejob::Base.run_worker!
     end
     

data/lib/dronejob/modules/attr_store.rb

@@ -25,11 +25,11 @@ module Dronejob
         self.class.attr_stores.each do |key|
           variables[key] = instance_variable_get("@#{key}")
         end
-        file_write(".dronejob-variables", Psych.dump(variables))
+        file_write("dronejob.yml", Psych.dump(variables))
       end
   
       def load_variables
-        yaml_file = File.join(working_dir, ".dronejob-variables")
+        yaml_file = File.join(working_dir, "dronejob.yml")
         variables = File.exists?(yaml_file) ? Psych.load_file(yaml_file) : {}
         variables.each do |key, value|
           instance_variable_set("@#{key}", value)

data/lib/dronejob/modules/core.rb

@@ -12,14 +12,29 @@ module Dronejob
         validate_parameters!
         create_working_dir
         load_variables
-        git_init(@working_dir, param(:from))
+        
+        git_init(@working_dir)
+        git_collect_commits
+        git_commit("start")
+        if param(:from)
+          info("starting from phase #{param(:from)}")
+          phase = prev_phase(param(:from))
+          raise("phase '#{param(:from)}' not found!") if phase.nil? or @commits[phase.to_s].nil?
+          git_reset(phase.to_s)
+        else
+          git_reset
+        end
+        git_collect_commits
+        git_clean
         
         # Run through phases
         each_phase do |phase, config|
           begin
             phase_result = public_send(phase)
           rescue Exception => e
-            error(e)
+            error(e.message)
+            error(e.backtrace.join("\n"))
+            return false
           end
           publish_status(phase_result) if config[:notify]
           git_commit(phase)

data/lib/dronejob/modules/git.rb

@@ -6,17 +6,11 @@ module Dronejob
       extend ActiveSupport::Concern
       
       included do
-        attr_accessor :from
-        attr_reader :git
+        attr_reader :git, :commits
       end
       
-      def git_init(path, commit=nil)
+      def git_init(path)
         @git = ::Git.init(path)
-        git_collect_commits
-        git_commit("start")
-        git_reset(commit)
-        git_collect_commits
-        git_clean
       end
       
       def git_commit(commit)
@@ -46,11 +40,7 @@ module Dronejob
       
       def git_reset(commit=nil)
         if commit
-          info("resetting to phase '#{commit}'")
-          from_index = @commits.keys.index(commit)
-          error("phase '#{commit}' not found!") if from_index.nil? or !@commits.keys[from_index]
-          previous = @commits.keys[from_index]
-          @git.reset_hard(@commits[previous])
+          @git.reset_hard(@commits[commit])
         else
           @git.reset_hard()
         end

data/lib/dronejob/modules/options.rb

@@ -0,0 +1,35 @@
+module Dronejob
+  module Modules
+    module Options
+      extend ActiveSupport::Concern
+
+      included do
+        attr_reader :options
+      end
+
+      module ClassMethods
+        def options
+          if @options.nil?
+            yaml_file = File.join("dronejob.yml")
+            yaml_options = File.exists?(yaml_file) ? Psych.load_file(yaml_file) : default_options
+            @options = OpenStruct.new(default_options.merge(yaml_options))
+          end
+          @options
+        end
+        
+        def default_options
+          {redis_url: "redis://127.0.0.1:6379"}
+        end
+      end
+      
+      def options
+        self.class.options
+      end
+      
+      def option(key)
+        self.class.options.send(key)
+      end
+      
+    end
+  end
+end

data/lib/dronejob/modules/phases.rb

@@ -45,6 +45,14 @@ module Dronejob
       def skip_phase?(phase)
         param(:skip) and param(:skip).include?(phase.to_s)
       end
+      
+      def prev_phase(phase)
+        phases = self.class.phases.keys
+        index = phases.index(phase.to_sym)
+        return nil if index.nil?
+        return "start" if index == 0
+        phases[index - 1]
+      end
     
     end
   end

data/lib/dronejob/modules/queue.rb

@@ -0,0 +1,32 @@
+module Dronejob
+  module Modules
+    module Queue
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :queue_adapter
+      end
+      
+      module ClassMethods
+        def run_worker!
+          ActiveJob::Base.queue_adapter = self.queue_adapter
+          require 'sidekiq/cli'
+          $:.push("./")
+          cli = Sidekiq::CLI.instance
+          cli.parse(["-qdronejob", "-rlib/dronejob/server/sidekiq.rb"])
+          cli.run
+        end
+      end
+      
+      def publish_status(result=nil)
+        data = {phase: @phase, result: result}
+        Redis.new({url: option(:redis_url)}).publish(self.publish_channel, data.to_json)
+      end
+      
+      def publish_channel
+        "dronejob"
+      end
+      
+    end
+  end
+end

data/lib/dronejob/modules/workspace.rb

@@ -1,3 +1,5 @@
+require "dronejob/workspace_file"
+require "dronejob/workspace_dir"
 module Dronejob
   module Modules
     module Workspace
@@ -8,6 +10,14 @@ module Dronejob
         cattr_accessor(:jobs_path) { "app/jobs" }
         cattr_accessor(:output_path) { "tmp/jobs" }
       end
+      
+      def file(path)
+        WorkspaceFile.new(working_dir, path)
+      end
+      
+      def dir(path)
+        WorkspaceDir.new(working_dir, path)
+      end
 
       def create_working_dir
         @working_dir = File.join(self.class.output_path, uuid)
@@ -16,11 +26,53 @@ module Dronejob
       
       def file_write(target_path, contents)
         full_path = File.join(working_dir, target_path)
-        open(full_path, "wb") do |file|
-          file << contents
-        end
+        open(full_path, "wb"){|file| file << contents}
         full_path
       end
+      
+      def file_create_path(*args)
+        path = File.join(working_dir, *args)
+        FileUtils.mkdir_p(path)
+        path
+      end
+    
+      def file_replace_contents(target_path, &block)
+        binding.pry
+        contents = File.open(target_path).read
+        contents = block.call(contents)
+        file_write(target_path, contents)
+      end
+
+      def file_delete_path(*args)
+        binding.pry
+        path = File.join(*args)
+        FileUtils.rm_rf(path)
+        path
+      end
+    
+      def file_parse_haml(haml_path, output_path, options={})
+        binding.pry
+        engine = Haml::Engine.new(haml_path)
+        open(output_path, 'wb') do |file|
+          file << engine.render(Object.new, options)
+        end
+      end
+
+      def file_root_dir
+        binding.pry
+        File.expand_path("../../../", __FILE__)
+      end
+    
+      def file_data_path(target_path)
+        binding.pry
+        File.join(Gem.datadir("app-drone"), target_path)
+      end
+    
+      def file_data_contents(target_path)
+        binding.pry
+        path = file_data_path(target_path)
+        File.open(path).read
+      end
     
     end
   end

data/lib/dronejob/railties/dronejob.rake

@@ -1,6 +1,5 @@
 namespace :dronejob do
   task :server => :environment do
-    Dronejob::Base.log("info", "Subscribing to topic #{Dronejob::Base.queue_topic} in project #{Dronejob::Base.project_id}")
     Dronejob::Base.run_worker!
   end
 end

data/lib/dronejob/server/sidekiq.rb

@@ -0,0 +1,7 @@
+require "sidekiq-status"
+Sidekiq.configure_server do |config|
+  config.redis = { url: Dronejob::Base.options.redis_url }
+  config.server_middleware do |chain|
+    chain.add Sidekiq::Status::ServerMiddleware
+  end
+end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/dronejob/workspace_dir.rb

@@ -0,0 +1,11 @@
+module Dronejob
+  class WorkspaceDir
+    attr_accessor :workspace, :path
+    
+    def initialize(workspace, path)
+      @workspace = workspace
+      @path = path
+    end
+    
+  end
+end

data/lib/dronejob/workspace_file.rb

@@ -0,0 +1,43 @@
+module Dronejob
+  class WorkspaceFile
+    attr_accessor :workspace, :path
+    attr_reader :contents
+    
+    def initialize(workspace, path)
+      @workspace = workspace
+      @path = path
+      set(read) if exists?
+    end
+    
+    def set(contents)
+      @contents = contents
+      self
+    end
+    
+    def replace(key, value)
+      @contents.gsub!(key, value)
+      self
+    end
+      
+    def write(contents=nil)
+      contents ||= @contents
+      File.open(full_path, "wb") do |file|
+        file << contents
+      end
+      self
+    end
+    
+    def full_path
+      File.join(@workspace, @path)
+    end
+    
+    def exists?
+      File.exists?(full_path)
+    end
+    
+    def read
+      File.open(full_path).read
+    end
+    
+  end
+end

data/lib/dronejob.rb

@@ -1,6 +1,5 @@
 require "active_support"
 require 'active_support/rails'
-require "active_job/queue_adapters/dronejob_queue_adapter"
 require "dronejob/version"
 
 require 'dronejob/railtie' if defined?(Rails)

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: gcloud
+  name: sidekiq-status
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 description: Scalable worker factory for ruby
@@ -130,13 +144,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
 - bin/dronejob
 - dronejob.gemspec
-- lib/active_job/queue_adapters/dronejob_queue_adapter.rb
 - lib/dronejob.rb
 - lib/dronejob/base.rb
 - lib/dronejob/command.rb
@@ -145,13 +158,17 @@ files:
 - lib/dronejob/modules/core.rb
 - lib/dronejob/modules/git.rb
 - lib/dronejob/modules/log.rb
+- lib/dronejob/modules/options.rb
 - lib/dronejob/modules/params.rb
 - lib/dronejob/modules/phases.rb
-- lib/dronejob/modules/pub_sub.rb
+- lib/dronejob/modules/queue.rb
 - lib/dronejob/modules/workspace.rb
 - lib/dronejob/railtie.rb
 - lib/dronejob/railties/dronejob.rake
+- lib/dronejob/server/sidekiq.rb
 - lib/dronejob/version.rb
+- lib/dronejob/workspace_dir.rb
+- lib/dronejob/workspace_file.rb
 homepage: https://github.com/MagLoft/dronejob
 licenses:
 - BSD-3-Clause
@@ -162,17 +179,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: DroneJob Drone Factory

data/lib/active_job/queue_adapters/dronejob_queue_adapter.rb

@@ -1,19 +0,0 @@
-require "gcloud"
-module ActiveJob
-  module QueueAdapters
-    class DronejobQueueAdapter
-      class << self
-        
-        def enqueue(job)
-          Dronejob::Base.log("info", "Enqueuing worker #{job.class.name} with job id #{job.job_id}")
-          Dronejob::Base.publish_job(job)
-        end
-      
-        def enqueue_at(*)
-          raise NotImplementedError.new("Delayed execution is not supported on Google Cloud Pub Sub.")
-        end
-        
-      end
-    end
-  end
-end

data/lib/dronejob/modules/pub_sub.rb

@@ -1,60 +0,0 @@
-require "gcloud"
-
-module Dronejob
-  module Modules
-    module PubSub
-      extend ActiveSupport::Concern
-      
-      included do
-        cattr_accessor(:project_id) { "default" }
-        cattr_accessor(:queue_topic) { "dronejob_queue" }
-        cattr_accessor(:status_topic) { "dronejob_status" }
-      end
-      
-      module ClassMethods
-        
-        def pubsub
-          @pubsub ||= Gcloud.new(project_id).pubsub
-        end
-        
-        def publish_job(job)
-          publish(queue_topic, job.serialize)
-        end
-        
-        def publish_status(job, detail)
-          publish(status_topic, {job_id: job.job_id, detail: detail})
-        end
-        
-        def publish(topic_name, data)
-          topic = pubsub.topic(topic_name)
-          topic.publish(data.to_json)
-        end
-        
-        def run_worker!
-          subscribe(queue_topic, true) do |data|
-            begin
-              ActiveJob::Base.deserialize(data).perform_now()
-            rescue Exception => e
-              log("error", e)
-            end
-          end
-        end
-        
-        def subscribe(topic_name, autoack=true, &block)
-          topic = pubsub.topic(topic_name)
-          subscription = topic.subscription(topic_name)
-          topic.subscribe(topic_name) if subscription.nil? or !subscription.exists?
-          subscription.listen autoack: autoack do |message|
-            block.call(JSON.parse(message.data))
-          end
-        end
-        
-      end
-      
-      def publish_status(result=nil)
-        self.class.publish_status(self, {phase: @phase, result: result})
-      end
-      
-    end
-  end
-end