fanforce-plugin-factory 2.0.0.rc13 → 2.0.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cea631d673999782d14f2591d6b63c4e250c51c
-  data.tar.gz: 020e2a400b52cc448bc5792399c1d81d3a13b768
+  metadata.gz: 794da4cd0ff9859c513a2870f50f3354116a071e
+  data.tar.gz: 0df04009aaab8bdc8819502a4798d22911aee0a4
 SHA512:
-  metadata.gz: f4cfbb59405b6f74a4ff6b7e423242068f7b3972453d1f2e3600216743062c7ce9df201a2bec34bb05e4d13e1602044155000dd0cb462762033efcda791469c8
-  data.tar.gz: 3a1018e221d3a77f81b056d1044393891f369aa0fafdf009f678214fedd128af178b9d57f825066f548a5a29f2a367230e69ba792d231c11bb8eecf723e9979f
+  metadata.gz: fcd01f6aca569248b3e33c087fd3694f368b379979850a1f78a6f47062f089c17053edf2d0912f249b3dae15e89bda211b6884f21f404d59a438ca1df905a8e5
+  data.tar.gz: 2c0091d1373cd21c9eae075d946a4e9fc90c8a92eaa9d4a5536afbedb8510345815bb54e0720fdd7ca1ea4857332561e79c01b6a0e537be8e898d000950013f7

data/fanforce-plugin-factory.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fanforce-base',          '>= 2.0.0.rc2'
   gem.add_runtime_dependency 'fanforce-api',           '>= 2.0.0.rc4'
-  gem.add_runtime_dependency 'fanforce-plugin-worker', '>= 2.0.0.rc8'
+  gem.add_runtime_dependency 'fanforce-plugin-worker', '>= 2.0.0.rc9'
 
   gem.add_development_dependency 'fanforce-test', '>= 2.0.0.rc2'
 end

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

@@ -38,50 +38,77 @@ class Fanforce::PluginFactory::CLI::Iron
     puts "#{'Compiling'.format(:green,:bold)} #{filename.gsub('.rb', '')} to #{environment.to_s.titleize}..."
     code_name = filename.gsub('.rb', '')
 
-    dockerized_dir = "#{workers_dir}/dockerized/#{code_name}"
-    dockerized_dir_relative = "workers/dockerized/#{code_name}"
-    Dir.mkdir("#{workers_dir}/dockerized") if !File.directory?("#{workers_dir}/dockerized")
+    dockerized_dir = "#{workers_dir}/dockerized"
+    dockerized_dir_relative = 'workers/dockerized'
+    Dir.mkdir(dockerized_dir) if !File.directory?(dockerized_dir)
+
+    dockerized_worker_dir = "#{dockerized_dir}/#{code_name}"
+    dockerized_worker_dir_relative = "#{dockerized_dir_relative}/#{code_name}"
 
     zipped_dir = "#{workers_dir}/zipped"
-    zipped_filepath = "#{zipped_dir}/#{code_name}.#{env(environment)}.zip"
+    zipped_filename = "#{code_name}.#{env(environment)}.zip"
+    zipped_filepath = "#{zipped_dir}/#{zipped_filename}"
+    zipped_filepath_relative = "workers/zipped/#{zipped_filename}"
     Dir.mkdir(zipped_dir) if !File.directory?(zipped_dir)
 
-    if !File.directory?(dockerized_dir)
-      puts "Creating #{dockerized_dir_relative}/"
-      Dir.mkdir(dockerized_dir)
+    if !File.directory?(dockerized_worker_dir)
+      puts "Creating #{dockerized_worker_dir_relative}/"
+      Dir.mkdir(dockerized_worker_dir)
+    end
+
+    # worker.ru
+    puts "Creating #{dockerized_worker_dir_relative}/worker.ru"
+    File.open("#{dockerized_worker_dir}/worker.ru", 'w') do |f|
+      f.write [
+                  "require_relative 'bundle/bundler/setup'",
+                  "$: << File.expand_path('../', __FILE__)",
+                  "load '#{filename}'"
+              ].join("\n")
     end
 
-    puts "Copying /workers/#{filename} to #{dockerized_dir_relative}/#{filename}"
-    File.open("#{dockerized_dir}/#{filename}", 'w') do |f|
+    # Executable
+    puts "Copying /workers/#{filename} to #{dockerized_worker_dir_relative}/#{filename}"
+    File.open("#{dockerized_worker_dir}/#{filename}", 'w') do |f|
       f.write File.read("#{plugin.dir}/workers/#{filename}")
     end
 
-    puts "Copying /Gemfile to #{dockerized_dir_relative}/Gemfile"
-    File.open("#{dockerized_dir}/Gemfile", 'w') do |f|
+    # Gemfile
+    puts "Copying /Gemfile to #{dockerized_worker_dir_relative}/Gemfile"
+    File.open("#{dockerized_worker_dir}/Gemfile", 'w') do |f|
       f.write File.read("#{plugin.dir}/Gemfile").gsub("ruby '2.1.6'", "ruby '2.1.4'")
     end
 
-    puts "Copying /Gemfile.lock to #{dockerized_dir_relative}/Gemfile.lock"
-    File.open("#{dockerized_dir}/Gemfile.lock", 'w') do |f|
+    # Gemfile.lock
+    puts "Copying /Gemfile.lock to #{dockerized_worker_dir_relative}/Gemfile.lock"
+    File.open("#{dockerized_worker_dir}/Gemfile.lock", 'w') do |f|
       f.write File.read("#{plugin.dir}/Gemfile.lock")
     end
 
-    if File.directory?("#{plugin.dir}/lib") and !File.directory?("#{dockerized_dir}/lib")
-      puts "Copying /lib/ to #{dockerized_dir_relative}/lib/"
-      FileUtils.copy_entry("#{plugin.dir}/lib", "#{dockerized_dir}/lib")
+    # lib/
+    if File.directory?("#{plugin.dir}/lib") and !File.directory?("#{dockerized_worker_dir}/lib")
+      puts "Copying /lib/ to #{dockerized_worker_dir_relative}/lib/"
+      FileUtils.copy_entry("#{plugin.dir}/lib", "#{dockerized_worker_dir}/lib")
     end
 
-    if File.directory?("#{plugin.dir}/mailers") and !File.directory?("#{dockerized_dir}/mailers")
-      puts "Copying /mailers/ to #{dockerized_dir_relative}/mailers/"
-      FileUtils.copy_entry("#{plugin.dir}/mailers", "#{dockerized_dir}/mailers")
+    # mailers/
+    if File.directory?("#{plugin.dir}/mailers") and !File.directory?("#{dockerized_worker_dir}/mailers")
+      puts "Copying /mailers/ to #{dockerized_worker_dir_relative}/mailers/"
+      FileUtils.copy_entry("#{plugin.dir}/mailers", "#{dockerized_worker_dir}/mailers")
     end
 
+    # ENV
     puts "Setting up ENV for #{environment.to_s.titleize} (#{env_vars.size} variables)"
-    File.open("#{dockerized_dir}/env.#{env(environment)}.rb", 'w') {|f| f.write Fanforce::PluginFactory::CLI::Env.convert_hash_to_ruby_env(env_vars) }
+    File.open("#{dockerized_worker_dir}/env.#{env(environment)}.rb", 'w') {|f| f.write Fanforce::PluginFactory::CLI::Env.convert_hash_to_ruby_env(env_vars) }
 
-    puts "Dockerizing #{File.expand_path(dockerized_dir)}"
-    console_command("docker run --rm -v \"#{File.expand_path(dockerized_dir)}\":/worker -w /worker iron/images:ruby-2.1 sh -c 'bundle install --standalone'", true)
-    console_command("zip -r #{zipped_filepath} #{dockerized_dir}")
+
+    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)
+
+    puts "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
 
     return zipped_filepath
   end
@@ -92,9 +119,9 @@ class Fanforce::PluginFactory::CLI::Iron
 
     fork do
       begin
-        puts console_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 #{filename}")
+        puts console_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")
       rescue Exception => e
-        puts "#{'Aborted  '.format(:red,:bold)} upload of #{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
+        puts "#{'Aborted  '.format(:red,:bold)} upload of #{code_name} to #{environment.to_s.titleize}..."
         puts e.message
         puts e.backtrace
         puts ''

data/lib/fanforce/plugin_factory/{load_iron_worker.rb → load_from_worker.rb}

@@ -1,2 +1,3 @@
+# This file is used to load Plugin into Worker
 require_relative 'load'
 require_relative 'plugin'

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc13'
+    VERSION = '2.0.0.rc15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc13
+  version: 2.0.0.rc15
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc8
+        version: 2.0.0.rc9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc8
+        version: 2.0.0.rc9
 - !ruby/object:Gem::Dependency
   name: fanforce-test
   requirement: !ruby/object:Gem::Requirement
@@ -442,7 +442,7 @@ files:
 - lib/fanforce/plugin_factory/directive_views/initiative-added.haml
 - lib/fanforce/plugin_factory/directive_views/initiative-footer.haml
 - lib/fanforce/plugin_factory/load.rb
-- lib/fanforce/plugin_factory/load_iron_worker.rb
+- lib/fanforce/plugin_factory/load_from_worker.rb
 - lib/fanforce/plugin_factory/load_sprockets.rb
 - lib/fanforce/plugin_factory/plugin.rb
 - lib/fanforce/plugin_factory/scaffolding/._.gitignore.registry