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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4c0732252afe2cf2ae1cf1bb6a1dea3969418d4
-  data.tar.gz: f89857793065ebe7f538470c685471bf2be5dbbc
+  metadata.gz: 882b0203620df4c54e9f07980e911a3fd823e7c0
+  data.tar.gz: d75fd3da8b48401e2fa36c0a564b435af1a0f28b
 SHA512:
-  metadata.gz: a9f025b3e67c5419b70240aa450732ecb3dfb3c3df11de27ff89c286b784d8e035ee56f598d4da0fcce1a65a344335334734d1c1ff12bebfe3e1320ed9c40a0f
-  data.tar.gz: 8d9588e426f59e9b0beb48d92f0f693c17d74c6d1ec72bf9884c24509753e1853e275de9807187d37268b111386e1d74d79b1a603a5b685785a97b530c316f24
+  metadata.gz: 8fb5e7709dbe743fcad63b62b9d23abbf87114c5ff3e993f6c29a94546c691b56fcc1aa2954e9196717dcdedff5c5d71f105ae78beadf4fd4626216a07a10460
+  data.tar.gz: ab2c1a06d059784b52be08db56ce3a61092ec9ccfb408bbd6d23f2e05b2c2fb21f3e83904cb2686f77c70e648fee576d15558a3ea1e2948d316ee05b0cf64aa9

data/fanforce-plugin-factory.gemspec

@@ -37,9 +37,9 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'bugsnag',           '~> 2.8.4'
   gem.add_runtime_dependency 'rest_client',       '= 1.7.3'
 
-  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.rc10'
+  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_development_dependency 'fanforce-test', '>= 2.0.0.rc2'
+  gem.add_development_dependency 'fanforce-test', '>= 2.0.0.rc3'
 end

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

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 class Fanforce::PluginFactory::CLI::Iron
   include Fanforce::PluginFactory::CLI::Utils
 
@@ -60,10 +62,10 @@ class Fanforce::PluginFactory::CLI::Iron
     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")
+          "require_relative 'bundle/bundler/setup'",
+          "$: << File.expand_path('../', __FILE__)",
+          "load '#{filename}'"
+      ].join("\n")
     end
 
     # Executable
@@ -85,14 +87,17 @@ class Fanforce::PluginFactory::CLI::Iron
     end
 
     # lib/
-    if File.directory?("#{plugin.dir}/lib") and !File.directory?("#{dockerized_worker_dir}/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")
       FileUtils.copy_entry("#{plugin.dir}/lib", "#{dockerized_worker_dir}/lib")
     end
 
     # mailers/
-    if File.directory?("#{plugin.dir}/mailers") and !File.directory?("#{dockerized_worker_dir}/mailers")
+    if File.directory?("#{plugin.dir}/mailers")
       puts "Copying /mailers/ to #{dockerized_worker_dir_relative}/mailers/"
+      FileUtils.rm_r("#{dockerized_worker_dir}/mailers") if File.directory?("#{dockerized_worker_dir}/mailers")
       FileUtils.copy_entry("#{plugin.dir}/mailers", "#{dockerized_worker_dir}/mailers")
     end
 
@@ -119,7 +124,15 @@ 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 worker.ru")
+        iron_cli_version = console_command('iron -version')
+        if Gem::Version.new(iron_cli_version) >= Gem::Version.new('0.0.10')
+          # Command format for v0.0.10+
+          command = "iron --project-id #{env_vars['IRON_PROJECT_ID']} --token #{env_vars['IRON_TOKEN']} worker upload --zip #{zipped_filepath} --name #{code_name} iron/images:ruby-2.1 ruby worker.ru"
+        else
+          # 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 console_command(command)
       rescue Exception => e
         puts "#{'Aborted  '.format(:red,:bold)} upload of #{code_name} to #{environment.to_s.titleize}..."
         puts e.message

data/lib/fanforce/plugin_factory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc18
+  version: 2.0.0.rc19
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -282,56 +282,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: fanforce-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc4
+        version: 2.0.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc4
+        version: 2.0.0.rc5
 - !ruby/object:Gem::Dependency
   name: fanforce-plugin-worker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc10
+        version: 2.0.0.rc11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc10
+        version: 2.0.0.rc11
 - !ruby/object:Gem::Dependency
   name: fanforce-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc3
 description: 
 email:
 - cclark@fanforce.com