fanforce-plugin-factory 2.0.0.rc19 → 2.0.0.rc21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882b0203620df4c54e9f07980e911a3fd823e7c0
-  data.tar.gz: d75fd3da8b48401e2fa36c0a564b435af1a0f28b
+  metadata.gz: b34938545968edb9683e0fe8a0497252ff80c6cd
+  data.tar.gz: 6e4f825d5557d6b8124f41d27cb985c155b10541
 SHA512:
-  metadata.gz: 8fb5e7709dbe743fcad63b62b9d23abbf87114c5ff3e993f6c29a94546c691b56fcc1aa2954e9196717dcdedff5c5d71f105ae78beadf4fd4626216a07a10460
-  data.tar.gz: ab2c1a06d059784b52be08db56ce3a61092ec9ccfb408bbd6d23f2e05b2c2fb21f3e83904cb2686f77c70e648fee576d15558a3ea1e2948d316ee05b0cf64aa9
+  metadata.gz: 6235a31d6069ffad1a0d675acef98d505bd1b43d211c7174bbc9418f211f03a4878c8781015172e8ae59d24e58cf2802ee4ae382c42bdd0b3c95880475d400c6
+  data.tar.gz: d054e133b6fc6ba3b5b8de51be7c6a9b1e3f74c37ead3bf7f80b8cfee050d99ca0c06b2979d4db385dfc6b4365c7db4112ccae624d5dd1823555913ae3b98029

data/fanforce-plugin-factory.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fanforce-base',          '>= 2.0.0.rc3'
   gem.add_runtime_dependency 'fanforce-api',           '>= 2.0.0.rc5'
-  gem.add_runtime_dependency 'fanforce-plugin-worker', '>= 2.0.0.rc11'
+  gem.add_runtime_dependency 'fanforce-plugin-worker', '>= 2.0.0.rc12'
 
   gem.add_development_dependency 'fanforce-test', '>= 2.0.0.rc3'
 end

data/lib/fanforce/plugin_factory/cli/lib/iron.rb

@@ -15,7 +15,7 @@ class Fanforce::PluginFactory::CLI::Iron
     @workers_dir ||= "#{plugin.dir}/workers"
   end
 
-  def upload(environment, worker_filename=nil)
+  def dockerize(environment, worker_filename=nil)
     return log "#{'Skipped '.format(:bold)} no workers folder was found" if !File.directory?(workers_dir)
 
     worker_filename = worker_filename.gsub('.worker', '') if worker_filename
@@ -29,14 +29,35 @@ class Fanforce::PluginFactory::CLI::Iron
       upload_processes = []
       workers.each do |filename|
         next if worker_filename and !filename.include?(worker_filename)
-        zipped_filepath = compile_worker(filename, environment, env_vars)
+        dockerize_worker(filename, environment, env_vars)
+      end
+    end
+  end
+
+  def dockerize_and_upload(environment, worker_filename=nil)
+    return log "#{'Skipped '.format(:bold)} no workers folder was found" if !File.directory?(workers_dir)
+
+    worker_filename = worker_filename.gsub('.worker', '') if worker_filename
+    env_vars = Fanforce::PluginFactory::CLI::Env.new(plugin).vars(environment) || {}
+    return puts "#{'Skipped '.format(:bold)} #{environment.to_s.titleize} is missing IRON_TOKEN and/or IRON_PROJECT_ID env variables" if env_vars['IRON_TOKEN'].blank? or env_vars['IRON_PROJECT_ID'].blank?
+
+    Dir.chdir(workers_dir) do
+      workers = Dir['*.rb']
+      return puts "#{'Skipped  '.format(:bold)} #{environment.to_s.titleize} has 0 workers" if workers.size == 0
+
+      upload_processes = []
+      workers.each do |filename|
+        next if worker_filename and !filename.include?(worker_filename)
+        zipped_filepath = dockerize_worker(filename, environment, env_vars)
         upload_processes << upload_worker(filename, environment, env_vars, zipped_filepath)
       end
       upload_processes.each { |pid| Process.waitpid(pid) }
     end
   end
 
-  def compile_worker(filename, environment, env_vars)
+  ######################################################################################################################
+
+  def dockerize_worker(filename, environment, env_vars)
     puts "#{'Compiling'.format(:green,:bold)} #{filename.gsub('.rb', '')} to #{environment.to_s.titleize}..."
     code_name = filename.gsub('.rb', '')
 
@@ -87,7 +108,6 @@ class Fanforce::PluginFactory::CLI::Iron
     end
 
     # lib/
-
     if File.directory?("#{plugin.dir}/lib")
       puts "Copying /lib/ to #{dockerized_worker_dir_relative}/lib/"
       FileUtils.rm_r("#{dockerized_worker_dir}/lib") if File.directory?("#{dockerized_worker_dir}/lib")
@@ -105,15 +125,31 @@ class Fanforce::PluginFactory::CLI::Iron
     puts "Setting up ENV for #{environment.to_s.titleize} (#{env_vars.size} variables)"
     File.open("#{dockerized_worker_dir}/env.#{env(environment)}.rb", 'w') {|f| f.write Fanforce::PluginFactory::CLI::Env.convert_hash_to_ruby_env(env_vars) }
 
-
+    # Bundle
     puts "Dockerizing #{dockerized_worker_dir_relative}"
-    console_command("docker run --rm -v \"#{File.expand_path(dockerized_worker_dir)}\":/worker -w /worker iron/images:ruby-2.1 sh -c 'bundle install --standalone'", true)
+    bundle_output = console_command("docker run --rm -v \"#{File.expand_path(dockerized_worker_dir)}\":/worker -w /worker iron/images:ruby-2.1 sh -c 'bundle install --standalone'", true)
+
+    active_gems = {}
+    bundle_output.split("\n").each do |line|
+      active_gems["#{$2}-#{$3}"] = true if line =~ /^(Using|Installing)\s([^\s]+)\s([^\s]+)/
+    end
+
+    # Cleanup gems
+    dockerized_gems_dir = "#{dockerized_worker_dir}/bundle/ruby/2.1.0/gems"
+    Dir["#{dockerized_gems_dir}/*"].each do |dir_path|
+      dir_name = dir_path.gsub(/^#{dockerized_gems_dir}\//, '')
+      next if active_gems[dir_name]
+      puts "REMOVING UNUSED GEM #{dir_name}"
+      FileUtils.rm_r(dir_path)
+    end
 
-    puts "Zipping to #{zipped_filepath_relative}"
+    print "Zipping to #{zipped_filepath_relative}... "
     File.delete(zipped_filepath) if File.exists?(zipped_filepath)
     Dir.chdir(dockerized_worker_dir) do
       console_command("zip -r #{zipped_filepath} .")
     end
+    zipped_filesize = (File.size(zipped_filepath).to_f / 2**20).round(2)
+    puts "#{zipped_filesize} MB"
 
     return zipped_filepath
   end
@@ -132,6 +168,7 @@ class Fanforce::PluginFactory::CLI::Iron
           # Command format for old versions
           command = "iron --project-id #{env_vars['IRON_PROJECT_ID']} --token #{env_vars['IRON_TOKEN']} worker upload --stack ruby-2.1 --name #{code_name} #{zipped_filepath} ruby worker.ru"
         end
+        puts command
         puts console_command(command)
       rescue Exception => e
         puts "#{'Aborted  '.format(:red,:bold)} upload of #{code_name} to #{environment.to_s.titleize}..."

data/lib/fanforce/plugin_factory/cli/scripts/push.rb

@@ -54,13 +54,13 @@ class Fanforce::PluginFactory::CLI::Scripts
 
   def push_plugin_worker(plugin, environment, filename)
     Dir.chdir(plugin.dir) do
-      Fanforce::PluginFactory::CLI::Iron.new(plugin).upload(environment, filename)
+      Fanforce::PluginFactory::CLI::Iron.new(plugin).dockerize_and_upload(environment, filename)
     end
   end
 
   def push_plugin_workers(plugin, environment)
     Dir.chdir(plugin.dir) do
-      Fanforce::PluginFactory::CLI::Iron.new(plugin).upload(environment)
+      Fanforce::PluginFactory::CLI::Iron.new(plugin).dockerize_and_upload(environment)
     end
   end
 

data/lib/fanforce/plugin_factory/cli/scripts/setup.rb

@@ -7,13 +7,19 @@ class Fanforce::PluginFactory::CLI::Scripts
   require_relative '../lib/bitbucket'
   require_relative '../lib/env'
   require_relative '../lib/uranium'
+  require_relative '../lib/iron'
 
   ######################################################################################################################
 
-  def setup(type=:all)
+  def setup(type=:all, environment=nil)
     plugin = Fanforce::CLI::Plugin.new(Fanforce::CLI::DIR)
     type = type.to_s.downcase.to_sym
-    error 'Unknown setup type', :setup if ![:all,:bundler,:pow,:git,:bitbucket,:env,:uranium].include?(type)
+    environment = environment.to_sym if environment
+
+    if (![:all,:bundler,:pow,:git,:bitbucket,:env,:uranium,:workers].include?(type) &&
+        !type.to_s.include?('.worker'))
+      error 'Unknown setup type', :setup
+    end
 
     if !File.exists?("#{plugin.dir}/config.ru")
       error "This does not seem to be a valid plugin directory since it's missing config.ru"
@@ -62,6 +68,15 @@ class Fanforce::PluginFactory::CLI::Scripts
       Fanforce::PluginFactory::CLI::Uranium.new(plugin).setup
     end
 
+    if type.to_s.include?('.worker')
+      Fanforce::PluginFactory::CLI::Iron.new(plugin).dockerize(environment, type.to_s)
+    end
+
+    if [:workers].include?(type)
+      log divider '+---------------------------------------------------------------------------------------------------'
+      Fanforce::PluginFactory::CLI::Iron.new(plugin).dockerize(environment)
+    end
+
     log divider '+-----------------------------------------------------------------------------------------------------'
     log 'SUCCESS!'.format(:bold,:green)
     log divider '----------------------------------------------------------------------------------------------------++'

data/lib/fanforce/plugin_factory/cli_single_plugin.rb

@@ -14,13 +14,15 @@ class Fanforce::PluginFactory::CLI::Scripts
   ########################################################################################################################
 
   Fanforce::CLI.register(self, :setup,
-                         ['*all/TYPE', 'Setup bundle, pow, git, and env variables'],
-                         ['bundler',   'Ensure bundler is installed then run bundle'],
-                         ['pow',       'Ensure pow domains are setup correctly'],
-                         ['git',       'Ensure git repository is initialized'],
-                         ['bitbucket', 'Setup remote repository on bitbucket'],
-                         ['env',       'Create ENV variables from local .env folder'],
-                         ['uranium',   'Register config.json with uranium and add environ']
+                         ['*all/TYPE',                'Setup bundle, pow, git, and env variables'],
+                         ['bundler',                  'Ensure bundler is installed then run bundle'],
+                         ['pow',                      'Ensure pow domains are setup correctly'],
+                         ['git',                      'Ensure git repository is initialized'],
+                         ['bitbucket',                'Setup remote repository on bitbucket'],
+                         ['env',                      'Create ENV variables from local .env folder'],
+                         ['uranium',                  'Register config.json with uranium and add environ'],
+                         ['workers RACK_ENV',         'Dockerize workers to zipped files ready for iron'],
+                         ['FILENAME.worker RACK_ENV', 'Dockerize workers to zipped files ready for iron']
   ) { require_relative 'cli/scripts/setup' }
 
   ########################################################################################################################

data/lib/fanforce/plugin_factory/core_config.rb

@@ -29,15 +29,15 @@ class Fanforce::Plugin::CoreConfig
     @redis_url || ENV['REDIS_URL'] || 'redis://localhost:6379'
   end
 
-  def worker_should_bypass_enqueue
-    ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'] == 'true'
+  def worker_should_run_locally_and_instantly
+    ENV['FANFORCE_WORKER_SHOULD_RUN_LOCALLY_AND_INSTANTLY'] == 'true'
   end
 
-  def worker_should_bypass_enqueue=(bool)
+  def worker_should_run_locally_and_instantly=(bool)
     if bool == true
-      ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'] = 'true'
+      ENV['FANFORCE_WORKER_SHOULD_RUN_LOCALLY_AND_INSTANTLY'] = 'true'
     else
-      ENV.delete('FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE')
+      ENV.delete('FANFORCE_WORKER_SHOULD_RUN_LOCALLY_AND_INSTANTLY')
     end
   end
 

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc19'
+    VERSION = '2.0.0.rc21'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc19
+  version: 2.0.0.rc21
 platform: ruby
 authors:
 - Caleb Clark
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc11
+        version: 2.0.0.rc12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc11
+        version: 2.0.0.rc12
 - !ruby/object:Gem::Dependency
   name: fanforce-test
   requirement: !ruby/object:Gem::Requirement