dronejob 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc5382dd0f52edabfea18b2b88953e96ded21f7
-  data.tar.gz: f682bf69fbd79bb557d75acb5df2778d7eeb2aa4
+  metadata.gz: 228486e1f34d82c4c9383f275f2747fec2bb87a3
+  data.tar.gz: 7f54c109f367a215126f247e28ed3b771871fd34
 SHA512:
-  metadata.gz: fe7d008500c92512d507a0c684b615e18173aa392638affe1766638f3d704f31cc9740997e851bcf961b9a036c7558b8861d459dff6425f0f2a75368d4a1183f
-  data.tar.gz: d0824a0944f77dabe82eed36b79f96282d1ef865889493a2e068b079d522f6a6e73d75775861f21c162eac0b1f71e01510d58ece1b2753ec5eac94bb9e77bd93
+  metadata.gz: e91a7bc50704804be80cb4eb41ce79a89945a40eb103788c55ee4ab566d8a8e19c6314998699b78ca855cb10ddfa695f3fbcfdff6e53acde6c4f5cc4f2d9e152
+  data.tar.gz: bea2eb4c05e8fbef73f98c60c2af2b2ca14aee6c0ad6ccf3c7f15e78dd45e3857fceb44078d9a759fd58a87f296e9e6aae496be6dfd735bcb2795e98d38e2b85

data/Gemfile.lock

@@ -1,11 +1,14 @@
 PATH
   remote: .
   specs:
-    dronejob (1.0.3)
+    dronejob (1.0.4)
       activejob (~> 4.2)
       bundler (~> 1.11)
       git (~> 1.2)
+      haml (~> 4.0)
+      open_uri_redirections (~> 0.2)
       rake (~> 10.5)
+      rubyzip (~> 1.1)
       sidekiq (~> 4.1.0)
       sidekiq-status (~> 0.6.0)
       thor (~> 0.19)
@@ -29,16 +32,19 @@ GEM
     git (1.3.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    haml (4.0.7)
+      tilt
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.8.4)
+    open_uri_redirections (0.2.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.5.0)
-    redis (3.2.2)
+    redis (3.3.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -52,7 +58,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    sidekiq (4.1.0)
+    rubyzip (1.2.0)
+    sidekiq (4.1.1)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.2, >= 3.2.1)
@@ -61,6 +68,7 @@ GEM
     slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/dronejob.gemspec

@@ -19,7 +19,10 @@ Gem::Specification.new do |s|
   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 "haml", "~> 4.0"
   s.add_runtime_dependency "sidekiq-status", "~> 0.6.0"
+  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_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"

data/lib/dronejob/modules/attr_store.rb

@@ -1,5 +1,3 @@
-require "psych"
-
 module Dronejob
   module Modules
     module AttrStore
@@ -25,12 +23,13 @@ module Dronejob
         self.class.attr_stores.each do |key|
           variables[key] = instance_variable_get("@#{key}")
         end
-        file_write("dronejob.yml", Psych.dump(variables))
+        yaml_file = working_dir.file("dronejob.yml")
+        yaml_file.write(Psych.dump(variables))
       end
   
       def load_variables
-        yaml_file = File.join(working_dir, "dronejob.yml")
-        variables = File.exists?(yaml_file) ? Psych.load_file(yaml_file) : {}
+        yaml_file = working_dir.file("dronejob.yml")
+        variables = yaml_file.exists? ? yaml_file.read_yaml : {}
         variables.each do |key, value|
           instance_variable_set("@#{key}", value)
         end

data/lib/dronejob/modules/core.rb

@@ -13,7 +13,7 @@ module Dronejob
         create_working_dir
         load_variables
         
-        git_init(@working_dir)
+        git_init(@working_dir.full_path)
         git_collect_commits
         git_commit("start")
         if param(:from)

data/lib/dronejob/modules/log.rb

@@ -44,6 +44,10 @@ module Dronejob
         log(:error, message)
       end
       
+      def error!(message)
+        throw message
+      end
+      
       def critical(message)
         log(:critical, message)
       end
@@ -54,8 +58,7 @@ module Dronejob
       
       def emergency(message)
         log(:emergency, message)
-      end
-      
+      end   
     end
   end
 end

data/lib/dronejob/modules/options.rb

@@ -17,6 +17,10 @@ module Dronejob
           @options
         end
         
+        def option(key)
+          options.send(key)
+        end
+        
         def default_options
           {redis_url: "redis://127.0.0.1:6379"}
         end
@@ -27,7 +31,7 @@ module Dronejob
       end
       
       def option(key)
-        self.class.options.send(key)
+        self.class.option(key)
       end
       
     end

data/lib/dronejob/modules/phases.rb

@@ -30,6 +30,22 @@ module Dronejob
             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

data/lib/dronejob/modules/workspace.rb

@@ -11,69 +11,66 @@ module Dronejob
         cattr_accessor(:output_path) { "tmp/jobs" }
       end
       
-      def file(path)
-        WorkspaceFile.new(working_dir, path)
+      def file(path, &block)
+        f = working_dir.file(path)
+        if !block.nil?
+          block.call(f)
+          f.write
+        end
+        f
       end
       
       def dir(path)
-        WorkspaceDir.new(working_dir, path)
+        working_dir.dir(path)
       end
 
       def create_working_dir
-        @working_dir = File.join(self.class.output_path, uuid)
-        FileUtils.mkdir_p(@working_dir)
-      end
-      
-      def file_write(target_path, contents)
-        full_path = File.join(working_dir, target_path)
-        open(full_path, "wb"){|file| file << contents}
-        full_path
+        @working_dir = WorkspaceDir.new(File.join(self.class.output_path, uuid))
+        @working_dir.create
+        @working_dir
       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)
+      def asset_file(path)
+        WorkspaceDir.new("app/assets").file(path)
       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
-    
+      # 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
 end

data/lib/dronejob/version.rb

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

data/lib/dronejob/workspace_dir.rb

@@ -2,10 +2,34 @@ module Dronejob
   class WorkspaceDir
     attr_accessor :workspace, :path
     
-    def initialize(workspace, path)
+    def initialize(workspace, path="")
       @workspace = workspace
       @path = path
     end
     
+    def full_path
+      File.join(@workspace, @path)
+    end
+    
+    def create
+      FileUtils.mkdir_p(full_path)
+      self
+    end
+    
+    def exists?
+      File.directory?(full_path)
+    end
+    
+    def delete!
+      FileUtils.rm_rf(full_path)
+    end
+    
+    def file(file_path)
+      WorkspaceFile.new(@workspace, File.join(@path, file_path))
+    end
+    
+    def dir(dir_path)
+      WorkspaceDir.new(@workspace, File.join(@path, dir_path))
+    end
   end
 end

data/lib/dronejob/workspace_file.rb

@@ -1,12 +1,14 @@
+require "psych"
+require "zip"
+require "open-uri"
+require "open_uri_redirections"
 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)
@@ -14,10 +16,27 @@ module Dronejob
       self
     end
     
+    def contents
+      @contents ||= read
+    end
+    
     def replace(key, value)
-      @contents.gsub!(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
@@ -39,5 +58,67 @@ module Dronejob
       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
+      binding.pry
+      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
+    end
+    
+    def dir
+      WorkspaceDir.new(@workspace, File.dirname(@path))
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq-status
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: open_uri_redirections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement