dronejob 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8e68837e8fb8f8a898f16ef5a412c8defe43e8
-  data.tar.gz: 585eb857b76e5acaf998d16fbe25aedfd170de94
+  metadata.gz: f9dbb72f363b027c7375e6d4c0c3ac4944e210df
+  data.tar.gz: 1fc73ad750f50c725ecc8472ccab543c6de62842
 SHA512:
-  metadata.gz: 088fd4626a488e973a27458cadbf6660f3e515de9444a744abab6e15d49f1d79e122c2389750f1f1c75b54de50f1d6f8d0d1df5a70f42133d20856d9cd1247f1
-  data.tar.gz: 98cf94d0b923cc10fdeeceaf2c184f1cb0b7feb33e045c99c6c156923b028aadc15f24ab692a68ee583e8e08e845d1b9a4e68007a717e3034f22dba8088cdd75
+  metadata.gz: 9c3809dd877e6ced5dd54a528e9f39580201884610dd8fe577ef345d53e2809097a09ee8a3dcb0acd6cc9331740b3434e5704efd0cb2538051a45674564f9b85
+  data.tar.gz: 21c53828b64f5fec596b8f0c487181b81731cd3b25fe2b7c4e2772fff3729b96065ea7a9829a14090b8c8d32988648bd7e23923f31783d2f7bfa2b3113f1457b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.0.8)
+    dronejob (1.0.9)
       activejob (~> 4.2)
       bundler (~> 1.11)
       git (~> 1.2)
@@ -12,6 +12,7 @@ PATH
       sidekiq (~> 4.1.0)
       sidekiq-status (~> 0.6.0)
       thor (~> 0.19)
+      typhoeus (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -29,6 +30,9 @@ GEM
     concurrent-ruby (1.0.1)
     connection_pool (2.2.0)
     diff-lcs (1.2.5)
+    ethon (0.9.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.10)
     git (1.3.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -69,6 +73,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.2)
+    typhoeus (1.0.2)
+      ethon (>= 0.9.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/dronejob.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "open_uri_redirections", "~> 0.2"
   s.add_runtime_dependency "rubyzip", "~> 1.1"
   s.add_runtime_dependency "activejob", "~> 4.2"
+  s.add_runtime_dependency "typhoeus", "~> 1.0"
   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

@@ -7,6 +7,7 @@ require 'dronejob/modules/queue'
 require 'dronejob/modules/options'
 require 'dronejob/modules/params'
 require 'dronejob/modules/phases'
+require 'dronejob/modules/stateful'
 require 'dronejob/modules/workspace'
 
 module Dronejob
@@ -21,6 +22,7 @@ module Dronejob
     include Modules::Options
     include Modules::Params
     include Modules::Phases
+    include Modules::Stateful
     include Modules::Workspace
     
     ActiveSupport.run_load_hooks(:dronejob, self)

data/lib/dronejob/command.rb

@@ -21,7 +21,7 @@ module Dronejob
       
       # Worker options
       worker.params.each do |key, config|
-        method_option(key, required: config[:required], type: config[:type], default: config[:default])
+        method_option(key, required: config[:required], type: config[:argument_type], default: config[:default])
       end
       
       define_method(identifier) do
@@ -59,18 +59,6 @@ module Dronejob
       end
     end
     
-    Dronejob::Loader.workers(:one_off).each do |identifier, worker|
-      desc identifier, "Run #{identifier} one-off worker"
-      method_option(:break, aliases: "-b", type: :boolean, default: false)
-      method_option(:skip, aliases: "-s", type: :array, default: [])
-      worker.params.each do |key, config|
-        method_option(key, required: config[:required], type: config[:type], default: config[:default])
-      end
-      define_method(identifier) do
-        worker.new.perform(options)
-      end
-    end
-    
     desc :server, "Start Dronejob Server"
     method_option(:queue_adapter, type: :string, default: "sidekiq", enum: ["sidekiq"])
     method_option(:jobs_path, type: :string)
@@ -95,7 +83,7 @@ module Dronejob
           Dronejob::Base.log("info", "Archiving #{dir.name}")
           archive_file = archive_dir.file("#{dir.name}.zip")
           if archive_file.exists? and !options.force
-            Dronejob::Base.log("error", "Error: Archive '#{archive_file.full_path}' already exists. Use --force to replace.")
+            Dronejob::Base.log("error", "Error: Archive '#{archive_file}' already exists. Use --force to replace.")
           else
             archive_file.delete! if archive_file.exists?
             dir.compress(archive_file)
@@ -113,7 +101,7 @@ module Dronejob
     def unarchive
       archives_dir = WorkspaceDir.new("archive")
       archive_file = archives_dir.file("#{options.archive}.zip")
-      Dronejob::Base.log("info", "Unarchiving '#{archive_file.full_path}'")
+      Dronejob::Base.log("info", "Unarchiving '#{archive_file}'")
       target_dir = WorkspaceDir.new("tmp/jobs").dir(options.archive)
       if !options.force and target_dir.exists?
         Dronejob::Base.log("error", "Error: Job directory already exists")

data/lib/dronejob/modules/core.rb

@@ -8,45 +8,57 @@ module Dronejob
       end
       
       def perform(params)
-        @params = params
+        set_parameters(params)
         validate_parameters!
         create_working_dir
-        load_variables
         
-        git_init(@working_dir.full_path)
-        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
+        if self.class.stateful?
+          load_variables
+          git_init(@working_dir.to_s)
+          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
         end
-        git_collect_commits
-        git_clean
         
         # Run through phases
-        each_phase do |phase, config|
+        each_phase do |phase, phase_config|
           begin
             phase_result = public_send(phase)
           rescue Exception => e
             error(e.message)
             error(e.backtrace.join("\n"))
+            delete_working_dir if self.class.cleanup_on_error?
+            publish_status({title: self.title, description: e.message, phase: phase, backtrace: e.backtrace}, "failed") if param(:notify) and !param(:run)
             return false
           end
-          publish_status(phase_result) if config[:notify]
-          git_commit(phase)
+          
+          publish_status({title: self.title, description: phase_config[:title], phase: phase}, "working") if phase_config[:notify] and param(:notify) and !param(:run)
+          git_commit(phase) if self.class.stateful?
         end
         @phase = "complete"
-        publish_status(true) if param(:notify) and !param(:run)
+
+        publish_status({title: self.title, description: "Job Completed!", phase: @phase}, "complete") if param(:notify) and !param(:run)
+        
+        delete_working_dir if self.class.cleanup_on_complete?
       end
       
       def uuid
         @uuid ||= "#{self.class.name.split('::').last.underscore}_#{SecureRandom.uuid}"
       end
       
+      def title
+        self.class.name
+      end
+      
       def shell
         @shell ||= Thor::Shell::Color.new
       end

data/lib/dronejob/modules/params.rb

@@ -7,6 +7,14 @@ module Dronejob
         def param(key, options)
           @params ||= {}
           @params[key] = options
+          @params[key][:argument_type] = @params[key][:type]
+          if @params[key][:type] == :base64 or @params[key][:type] == :json64
+            @params[key][:argument_type] = :string
+          end
+        end
+        
+        def param_config(key)
+          @params[key.to_sym]
         end
       
         def params
@@ -14,6 +22,18 @@ module Dronejob
         end
       end
       
+      def set_parameters(params)
+        @params = params.map{|name, value| [name, transform_parameter(name, value)]}.to_h
+      end
+      
+      def transform_parameter(name, value)
+        if config = self.class.param_config(name)
+          return Base64.strict_decode64(value) if config[:type] == :base64
+          return JSON.parse(Base64.strict_decode64(value)) if config[:type] == :json64
+        end
+        value
+      end
+      
       def param(key)
         @params ||= {}
         @params[key.to_s]
@@ -29,7 +49,7 @@ module Dronejob
         end
         
         # Validate parameters
-        type_map = {string: [String], numeric: [Fixnum, Integer, Float], array: [Array], boolean: [TrueClass, FalseClass]}
+        type_map = {string: [String], numeric: [Fixnum, Integer, Float], array: [Array], boolean: [TrueClass, FalseClass], base64: [String], json64: [Hash, Array]}
         self.class.params.each do |param_name, param_config|
           param_value = @params[param_name.to_s]
           if param_value.nil?

data/lib/dronejob/modules/phases.rb

@@ -30,6 +30,7 @@ module Dronejob
             elsif skip_phase?(phase)
               info("skipping...")
             else
+              info "running phase #{phase}"
               # Require libraries
               if !config[:require].nil?
                 config[:require].each do |library|
@@ -54,12 +55,15 @@ module Dronejob
         end
         
         @dronejob_completed = true
-        git_commit("dronejob_completed")
-        info("JOB COMPLETED")
+        git_commit("dronejob_completed") if self.class.stateful?
       end
       
       def completed_phase?(phase)
-        @commits.include?(phase.to_s)
+        if self.class.stateful?
+          @commits.include?(phase.to_s)
+        else
+          false
+        end
       end
   
       def skip_phase?(phase)

data/lib/dronejob/modules/queue.rb

@@ -18,9 +18,15 @@ module Dronejob
         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)
+      def publish_status(data={}, status="working", backend=false)
+        data[:action] = "update_process"
+        data[:user_id] = param(:user_id)
+        data[:jid] = job_id
+        data[:worker] = Loader.identifier_for(self)
+        data[:timestamp] = Time.now.to_i
+        data[:status] = status
+        data[:secret_key] = option(:secret_key) if backend
+        Redis.new(url: option(:redis_url)).publish("processes_#{backend ? 'backend' : data[:user_id]}", data.to_json)
       end
       
       def publish_channel

data/lib/dronejob/modules/stateful.rb

@@ -0,0 +1,18 @@
+module Dronejob
+  module Modules
+    module Stateful
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def stateful(value=true)
+          @stateful = value
+        end
+        
+        def stateful?
+          !!@stateful
+        end
+      end
+          
+    end
+  end
+end

data/lib/dronejob/modules/workspace.rb

@@ -5,6 +5,24 @@ module Dronejob
     module Workspace
       extend ActiveSupport::Concern
 
+      module ClassMethods
+        def cleanup_on_complete(value=true)
+          @cleanup_on_complete = value
+        end
+        
+        def cleanup_on_complete?
+          !!@cleanup_on_complete
+        end
+        
+        def cleanup_on_error(value=true)
+          @cleanup_on_error = value
+        end
+        
+        def cleanup_on_error?
+          !!@cleanup_on_error
+        end
+      end
+
       included do
         attr_accessor :working_dir
         cattr_accessor(:jobs_path) { "app/jobs" }
@@ -30,9 +48,17 @@ module Dronejob
         @working_dir
       end
       
+      def delete_working_dir
+        working_dir.delete!
+      end
+      
       def asset_file(path)
         WorkspaceDir.new("app/assets").file(path)
       end
+      
+      def asset_dir(path)
+        WorkspaceDir.new("app/assets").dir(path)
+      end
     end
   end
 end

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/lib/dronejob/workspace_dir/archive.rb

@@ -0,0 +1,18 @@
+module Dronejob
+  class WorkspaceDir
+    module Archive
+      extend ActiveSupport::Concern
+    
+      def compress(target_file)
+        target_file.delete!
+        require "zip"
+        Zip::File.open(target_file.to_s, 'w') do |zipfile|
+          Dir["#{to_s}/**/**"].each do |file|
+            zipfile.add(file.sub("#{to_s}/",''), file)
+          end
+        end
+        self
+      end      
+    end
+  end
+end

data/lib/dronejob/workspace_dir.rb

@@ -1,5 +1,9 @@
+require 'dronejob/workspace_dir/archive'
+
 module Dronejob
   class WorkspaceDir
+    include WorkspaceDir::Archive
+    
     attr_accessor :workspace, :path
     
     def initialize(workspace, path="")
@@ -7,25 +11,30 @@ module Dronejob
       @path = path
     end
     
-    def name
-      File.basename(full_path)
+    def to_s
+      File.join(@workspace, @path)
     end
     
-    def full_path
-      File.join(@workspace, @path)
+    def name
+      File.basename(to_s)
     end
     
     def create
-      FileUtils.mkdir_p(full_path)
+      FileUtils.mkdir_p(to_s)
       self
     end
     
     def exists?
-      File.directory?(full_path)
+      File.directory?(to_s)
+    end
+    
+    def copy(target_dir)
+      target_dir.parent_dir.create if !target_dir.parent_dir.exists?
+      FileUtils.cp_r(to_s, target_dir.to_s)
     end
     
     def delete!
-      FileUtils.rm_rf(full_path)
+      FileUtils.rm_rf(to_s)
     end
     
     def file(file_path)
@@ -36,19 +45,17 @@ module Dronejob
       WorkspaceDir.new(@workspace, File.join(@path, dir_path))
     end
     
-    def compress(target_file)
-      target_file.delete!
-      Zip::File.open(target_file.full_path, 'w') do |zipfile|
-        Dir["#{full_path}/**/**"].each do |file|
-          zipfile.add(file.sub("#{full_path}/",''), file)
-        end
-      end
-      self
+    def root_dir
+      WorkspaceDir.new(@workspace, "")
+    end
+    
+    def parent_dir
+      root_dir.dir(File.expand_path("..", @path))
     end
     
     def children
       entries = []
-      Dir.chdir(full_path) do
+      Dir.chdir(to_s) do
         Dir["*"].each do |path|
           entries.push(dir(path))
         end

data/lib/dronejob/workspace_file/archive.rb

@@ -0,0 +1,47 @@
+module Dronejob
+  class WorkspaceFile
+    module Archive
+      extend ActiveSupport::Concern
+    
+    
+      def extract(target_dir)
+        target_dir.create
+        if extension == "zip"
+          extract_zip(target_dir)
+        elsif extension == "gz"
+          extract_gz(target_dir)
+        end
+        self
+      end
+      
+      private
+    
+        def extract_zip(target_dir)
+          require "zip"
+          Zip::File.open(to_s) do |archive|
+            archive.each do |entry|
+              entry.extract(File.join(target_dir.to_s, entry.name))
+            end
+          end
+        end
+    
+        def extract_gz(target_dir)
+          require 'rubygems/package'
+          workspace_dir = target_dir.root_dir
+          archive = Gem::Package::TarReader.new(Zlib::GzipReader.open(to_s))
+          archive.rewind
+          archive.each do |entry|
+            if entry.directory?
+              archive_dir = workspace_dir.dir(entry.full_name)
+              archive_dir.create
+            elsif entry.file?
+              archive_file = workspace_dir.file(entry.full_name)
+              archive_file.write(entry.read)
+            end
+          end
+          archive.close
+        end
+      
+    end
+  end
+end

data/lib/dronejob/workspace_file/media.rb

@@ -0,0 +1,81 @@
+module Dronejob
+  class WorkspaceFile
+    module Media
+      extend ActiveSupport::Concern
+      
+      def acbaker(type, output_dir, delete=true)
+        require "acbaker"
+        output_dir.delete! if delete and output_dir.exists?
+        output_dir.create
+        config = WorkspaceDir.new("app/assets").file("acbaker/#{type}.json").read_json
+        acb = Acbaker::AssetPack.new(type, json: config)
+        acb.process(to_s, output_dir.to_s)
+        self
+      end
+    
+      def image?
+        ["jpg", "jpeg", "gif", "png"].include?(extension)
+      end
+    
+      def video?
+        ["mp4"].include?(extension)
+      end
+    
+      def audio?
+        ["mp3"].include?(extension)
+      end
+    
+      def cache_assets(cache_dir, &block)
+        hydra = Typhoeus::Hydra.new(max_concurrency: 10)
+        html = contents
+        html.scan(/["'(]{1}(https?\:\/\/[^"')]+\.(jpg|jpeg|png|gif|mp3|mp4))["')?#]{1}/).map{|match| match[0]}.uniq.each do |url|
+          ext = File.extname(url).gsub(/^\./, "")
+          cache_file = cache_dir.file("#{Digest::MD5.hexdigest(url)}.#{ext}")
+          request = cache_file.queue_download(url) do
+            cache_file.optimize!
+            html.gsub!(url, cache_file.relative_path)
+          end
+          hydra.queue(request)
+        end
+        hydra.run
+        set(html)
+        self
+      end
+      
+      def optimize!
+        return false if !exists?
+        return optimize_jpg! if image? and ["jpg", "jpeg"].include?(extension)
+        return optimize_png! if image? and ["png"].include?(extension)
+        false
+      end
+    
+      private
+    
+        def optimize_jpg!
+          require "rmagick"
+          image_max_width = Dronejob::Base.option(:image_max_width)
+          image = Magick::Image.read(to_s).first
+          image.change_geometry!("#{image_max_width}>x"){|cols, rows, img| img.resize!(cols, rows)} if image.columns > image_max_width
+          image.write(to_s) { self.quality = Dronejob::Base.option(:image_quality) }
+          image.destroy!
+        end
+      
+        def optimize_png!
+          require "rmagick"
+          image_max_width = Dronejob::Base.option(:image_max_width)
+          image = Magick::Image.read(to_s).first
+          image.change_geometry!("#{image_max_width}>x"){|cols, rows, img| img.resize!(cols, rows)} if image.columns > image_max_width
+        
+          # Convert to jpg
+          if !image.alpha? or image.resize(1,1).pixel_color(0,0).opacity == 0
+            image.format = "JPG"
+            rename!("#{basename}.jpg")
+          end
+        
+          image.write(to_s) { self.quality = Dronejob::Base.option(:image_quality) }
+          image.destroy!
+        end
+      
+    end
+  end
+end

data/lib/dronejob/workspace_file/net.rb

@@ -0,0 +1,33 @@
+require "typhoeus"
+require "open-uri"
+require "open_uri_redirections"
+
+module Dronejob
+  class WorkspaceFile
+    module Net
+      extend ActiveSupport::Concern
+    
+      def cdn_download(key)
+        download("http://#{Dronejob::Base.option(:cdn_bucket)}/#{key}")
+      end
+    
+      def queue_download(url, &block)
+         request = Typhoeus::Request.new(url)
+         request.on_complete do |response|
+           if response.success?
+             write(response.body)
+             block.call(self) if !block.nil?
+           end
+         end
+         request
+      end
+    
+      def download(url)
+        contents = open(url, { ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE, allow_redirections: :safe }).read
+        dir.create if !dir.exists?
+        write(contents)
+        self
+      end
+    end
+  end
+end

data/lib/dronejob/workspace_file/parse.rb

@@ -0,0 +1,38 @@
+module Dronejob
+  class WorkspaceFile
+    module Parse
+      extend ActiveSupport::Concern
+      
+      def pbxproj_replace(data)
+        data.each do |key, value|
+          replace(/#{key} = .*;/, "#{key} = \"#{value}\";") if !value.nil?
+        end
+        write
+        self
+      end
+    
+      def with_plist(&block)
+        require "plist"
+        plist = Plist.parse_xml(to_s)
+        block.call(plist)
+        write(Plist::Emit.dump(plist))
+      end
+    
+      def read_json
+        JSON.parse(read)
+      end
+    
+      def read_yaml
+        require "psych"
+        Psych.load_file(to_s)
+      end
+    
+      def read_haml(options)
+        require "haml"
+        engine = Haml::Engine.new(read)
+        engine.render(Object.new, options)
+      end
+
+    end
+  end
+end

data/lib/dronejob/workspace_file.rb

@@ -1,9 +1,15 @@
-require "psych"
-require "zip"
-require "open-uri"
-require "open_uri_redirections"
+require 'dronejob/workspace_file/archive'
+require 'dronejob/workspace_file/media'
+require 'dronejob/workspace_file/net'
+require 'dronejob/workspace_file/parse'
+
 module Dronejob
   class WorkspaceFile
+    include WorkspaceFile::Archive
+    include WorkspaceFile::Media
+    include WorkspaceFile::Net
+    include WorkspaceFile::Parse
+    
     attr_accessor :workspace, :path
     
     def initialize(workspace, path)
@@ -11,116 +17,67 @@ module Dronejob
       @path = path
     end
     
-    def set(contents)
-      @contents = contents
+    def set(data)
+      @contents = data
       self
     end
-    
+  
     def contents
       @contents ||= read
     end
-    
+  
     def replace(key, value)
       contents.gsub!(key, value)
       self
     end
     
-    def pbxproj_replace(data)
-      data.each do |key, value|
-        replace(/#{key} = .*;/, "#{key} = #{value};") if !value.nil?
-      end
-    end
-    
-    def with_plist(&block)
-      require "plist"
-      plist = Plist.parse_xml(full_path)
-      block.call(plist)
-      write(Plist::Emit.dump(plist))
-    end
-      
-    def write(contents=nil)
-      contents ||= @contents
-      File.open(full_path, "wb") do |file|
-        file << contents
-      end
+    def write(data=nil)
+      data ||= @contents
+      dir.create if !dir.exists?
+      File.open(to_s, "wb") {|file| file << data}
       self
     end
     
-    def full_path
+    def copy(target_file)
+      target_file.dir.create if !target_file.dir.exists?
+      FileUtils.cp(to_s, target_file.to_s)
+    end
+  
+    def to_s
       File.join(@workspace, @path)
     end
-    
+  
+    def relative_path
+      @path.gsub(/^\//, "")
+    end
+  
     def exists?
-      File.exists?(full_path)
+      File.exists?(to_s)
     end
-    
+  
     def read
-      File.open(full_path).read
-    end
-    
-    def read_json
-      JSON.parse(read)
-    end
-    
-    def read_yaml
-      Psych.load_file(full_path)
-    end
-    
-    def read_haml(options)
-      require "haml"
-      engine = Haml::Engine.new(read)
-      engine.render(Object.new, options)
-    end
-    
-    def download!(url)
-      raise "file not found at #{url}" unless download(url)
-      self
-    end
-    
-    def cdn_download!(key)
-      raise "cdn file not found at #{key}" unless cdn_download(key)
-      self
-    end
-    
-    def cdn_download(key)
-      download("#{Dronejob::Base.option(:cdn_url)}/#{key}")
-    end
-    
-    def download(url)
-      open(full_path, "wb") do |file|
-        file << open(url, { ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE, allow_redirections: :safe }).read
-      end
-      return self
-    rescue StandardError => e
-      return false
-    end
-    
-    def extract(target_dir)
-      target_dir.create
-      Zip::File.open(full_path) do |zip_file|
-        zip_file.each do |entry|
-          entry.extract(File.join(target_dir.full_path, entry.name))
-        end
-      end
-      self
-    end
-    
-    def acbaker(type, output_dir, delete=true)
-      require "acbaker"
-      output_dir.delete! if delete and output_dir.exists?
-      output_dir.create
-      config = WorkspaceDir.new("app/assets").file("acbaker/#{type}.json").read_json
-      acb = Acbaker::AssetPack.new(type, json: config)
-      acb.process(full_path, output_dir.full_path)
-      self
+      File.open(to_s).read
     end
     
     def dir
       WorkspaceDir.new(@workspace, File.dirname(@path))
     end
-    
+  
     def delete!
-      FileUtils.rm_f(full_path)
+      FileUtils.rm_f(to_s)
+    end
+  
+    def basename
+       File.basename(path, ".*")
+    end
+  
+    def extension
+      File.extname(to_s).gsub(/^\./, "")
+    end
+  
+    def rename!(filename)
+      FileUtils.mv(to_s, dir.file(filename).to_s) if exists?
+      @path = dir.file(filename).path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +218,19 @@ files:
 - lib/dronejob/modules/params.rb
 - lib/dronejob/modules/phases.rb
 - lib/dronejob/modules/queue.rb
+- lib/dronejob/modules/stateful.rb
 - lib/dronejob/modules/workspace.rb
-- lib/dronejob/one_off.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_dir/archive.rb
 - lib/dronejob/workspace_file.rb
+- lib/dronejob/workspace_file/archive.rb
+- lib/dronejob/workspace_file/media.rb
+- lib/dronejob/workspace_file/net.rb
+- lib/dronejob/workspace_file/parse.rb
 homepage: https://github.com/MagLoft/dronejob
 licenses:
 - BSD-3-Clause

data/lib/dronejob/one_off.rb

@@ -1,77 +0,0 @@
-require "active_job"
-require 'dronejob/modules/core'
-require 'dronejob/modules/log'
-require 'dronejob/modules/options'
-require 'dronejob/modules/params'
-require 'dronejob/modules/phases'
-
-module Dronejob
-  class OneOff
-    DRONEJOB_TYPE = "one_off"
-    include Modules::Core
-    include Modules::Log
-    include Modules::Options
-    include Modules::Params
-    include Modules::Phases
-    
-    def perform(params)
-      @params = params
-      validate_parameters!
-      
-      # Run through phases
-      each_phase do |phase, config|
-        begin
-          phase_result = public_send(phase)
-        rescue Exception => e
-          error(e.message)
-          error(e.backtrace.join("\n"))
-          return false
-        end
-      end
-    end
-    
-    def each_phase(&block)
-      self.class.phases.each do |phase, config|
-        fail "Phase not found: '#{phase}'" unless self.respond_to?(phase)
-        @phase = phase
-        before_phase(phase, config) if self.respond_to?(:before_phase)
-        
-        logger.tagged(phase) do
-          if completed_phase?(phase) and !config[:always_run]
-            info("already completed")
-          elsif skip_phase?(phase)
-            info("skipping...")
-          else
-            # Require libraries
-            if !config[:require].nil?
-              config[:require].each do |library|
-                require library
-              end
-            end
-
-            # Include helpers
-            if !config[:helpers].nil?
-              config[:helpers].each do |helper|
-                helper_path = "helpers/#{helper}"
-                require "./app/#{helper_path}"
-                self.class.include helper_path.camelcase.constantize
-              end
-            end
-            
-            block.call(phase, config)
-          end
-        end
-        
-        after_phase(phase, config) if self.respond_to?(:after_phase)
-      end
-      
-      info("JOB COMPLETED")
-    end
-    
-    def completed_phase?(phase)
-      false
-    end
-    
-    ActiveSupport.run_load_hooks(:dronejob, self)
-  end
-end