fanforce-plugin-factory 2.0.0.rc10 → 2.0.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390d5af91387a7f3b02561397f8c262b42b03338
-  data.tar.gz: 4a8297cd4fbe497592481d49e3d2748670fa42e6
+  metadata.gz: 0117f262c7a990283c4cd07fbde01df527070bfe
+  data.tar.gz: ccfab32e2af805e520ea20d04206301b66a9390d
 SHA512:
-  metadata.gz: 4257fe4a78ea785a3b18e5796aab274b93876bc558fd983cdb96536759c0b34fcbf01551c9b2d79bad2b1513f2a34ea1b0bb4c166e91d9301812dff446c5e8ad
-  data.tar.gz: c8aed09ba1e5330ec9fbac53783d0b7d1b44f50e04c68eeb89cf178ef7beef339202e88376a472500cb66c20d9432b5f662a7154e915b9df13a7dab15569b3f3
+  metadata.gz: c22b3520fdb235b34005cf8c5b49d892e74d5a2fbb8d745e8ef02421bb871eb9dd0a87c6fc328ba4d0026ae5ab043400d217e759febe9aaaac54cdb8d298a228
+  data.tar.gz: be48557509310eebb08e9fe0028175ab5711ad021e73f2df56a9b252d9845079fe2eb08858d1cfd7e26da7eafeb2e48f79782ccab7ea97d22bfea420483e3929

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.rc6'
+  gem.add_runtime_dependency 'fanforce-plugin-worker', '>= 2.0.0.rc7'
 
   gem.add_development_dependency 'fanforce-test', '>= 2.0.0.rc2'
 end

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

@@ -22,32 +22,18 @@ class Fanforce::PluginFactory::CLI::Env
     log "#{'Updated'.format(:green,:bold)} #{environment.to_s.titleize}#{has_workers ? '... and workers have' : ' has'} #{vars.size} env variables"
   end
 
-  def push_to(environment, vars, create_worker_env=true)
+  def push_to(environment, vars)
     environment = environment.to_sym
     vars.each {|k,v| puts "  - #{k}" }
-    workers_dir = "#{plugin.dir}/workers"
-    workers_env_dir = "#{workers_dir}/.env"
-    if create_worker_env and File.directory?(workers_dir) and vars['IRON_PROJECT_ID']
-      FileUtils.mkdir_p(workers_env_dir) unless File.directory?(workers_env_dir)
-      File.open("#{workers_env_dir}/#{environment}.rb", 'w') {|f| f.write convert_hash_to_ruby_env(vars) }
-    end
     if environment == :development
       update_powenv
-      File.open("#{plugin.dir}/.pluginenv", 'w') {|f| f.write convert_hash_to_shell_env(vars) }
+      File.open("#{plugin.dir}/.pluginenv", 'w') {|f| f.write self.class.convert_hash_to_shell_env(vars) }
     else
       error 'could not find heroku in .fanforce-plugin-factory' if config[:heroku][environment].blank?
       Fanforce::PluginFactory::CLI::Heroku.new(plugin, environment).update_config(vars)
     end
   end
 
-  def convert_hash_to_shell_env(hash)
-    hash.inject('') {|script, (k,v)| script += "export #{k}=#{v.to_s.to_json}\n" }
-  end
-
-  def convert_hash_to_ruby_env(hash)
-    hash.inject('') {|script, (k,v)| script += "ENV['#{k}']=#{v.to_s.to_json}\n" }
-  end
-
   def load_vars(environment)
     environment = environment.to_sym
     vars = {'FANFORCE_PLUGIN_ID' => plugin._id}
@@ -93,4 +79,14 @@ class Fanforce::PluginFactory::CLI::Env
     ['source .pluginenv']
   end
 
+  # CLASS METHODS #######################################################################
+
+  def self.convert_hash_to_shell_env(hash)
+    hash.inject('') {|script, (k,v)| script += "export #{k}=#{v.to_s.to_json}\n" }
+  end
+
+  def self.convert_hash_to_ruby_env(hash)
+    hash.inject('') {|script, (k,v)| script += "ENV['#{k}']=#{v.to_s.to_json}\n" }
+  end
+
 end

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

@@ -101,10 +101,7 @@ class Fanforce::PluginFactory::CLI::Heroku
   end
 
   def env
-    case environment
-      when :staging then env = :stg
-      when :production then env = :prd
-    end
+    Fanforce::PluginFactory::CLI::Utils.env(environment)
   end
 
   def app_name

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

@@ -10,23 +10,16 @@ class Fanforce::PluginFactory::CLI::Iron
   end
 
   def workers_dir
-    "#{plugin.dir}/workers"
+    @workers_dir ||= "#{plugin.dir}/workers"
   end
 
   def 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 = Fanforce::PluginFactory::CLI::Env.new(plugin)
-    vars = env.vars(environment) || {}
-    #factory_version = current_factory_version
+    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?
 
-    return puts "#{'Skipped '.format(:bold)} #{environment.to_s.titleize} is missing IRON_TOKEN and/or IRON_PROJECT_ID env variables" if vars['IRON_TOKEN'].blank? or vars['IRON_PROJECT_ID'].blank?
-
-    # puts "#{'Updating Env'.format(:green,:bold)} #{environment.to_s.titleize}... and workers have #{vars.size} env variables"
-    # env.push_to(environment, vars, true)
-
-    iron_worker = IronWorker::Client.new(:token => vars['IRON_TOKEN'], :project_id => vars['IRON_PROJECT_ID'])
     Dir.chdir(workers_dir) do
       workers = Dir['*.rb']
       return puts "#{'Skipped  '.format(:bold)} #{environment.to_s.titleize} has 0 workers" if workers.size == 0
@@ -34,69 +27,72 @@ class Fanforce::PluginFactory::CLI::Iron
       upload_processes = []
       workers.each do |filename|
         next if worker_filename and !filename.include?(worker_filename)
-
-        compile_worker(filename, environment)
+        zipped_filepath = compile_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)
+  def compile_worker(filename, environment, env_vars)
     puts "#{'Compiling'.format(:green,:bold)} #{filename.gsub('.rb', '')} to #{environment.to_s.titleize}..."
     code_name = filename.gsub('.rb', '')
-    absolute_dir = "#{workers_dir}/#{code_name}"
-    relative_dir = "workers/#{code_name}"
 
-    if !File.directory?(absolute_dir)
-      puts "Creating #{relative_dir}/"
-      Dir.mkdir(absolute_dir)
+    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")
+
+    zipped_dir = "#{workers_dir}/zipped"
+    zipped_filepath = "#{zipped_dir}/#{code_name}.#{env(environment)}.zip"
+    Dir.mkdir(zipped_dir) if !File.directory?(zipped_dir)
+
+    if !File.directory?(dockerized_dir)
+      puts "Creating #{dockerized_dir_relative}/"
+      Dir.mkdir(dockerized_dir)
     end
 
-    if File.exists?("#{plugin.dir}/Gemfile") and !File.exists?("#{absolute_dir}/Gemfile")
-      puts "Copying /Gemfile to #{relative_dir}/Gemfile"
-      contents = File.read("#{plugin.dir}/Gemfile").gsub("ruby '2.1.6'", "ruby '2.1.4'")
-      File.open("#{absolute_dir}/Gemfile", 'w') {|f| f.write(contents) }
+    puts "Copying /workers/#{filename} to #{dockerized_dir_relative}/#{filename}"
+    File.open("#{dockerized_dir}/#{filename}", 'w') do |f|
+      f.write File.read("#{plugin.dir}/workers/#{filename}")
     end
 
-    if File.directory?("#{plugin.dir}/lib") and !File.directory?("#{absolute_dir}/lib")
-      puts "Copying /lib/ to #{relative_dir}/lib/"
-      FileUtils.copy_entry("#{plugin.dir}/lib", "#{absolute_dir}/lib")
+    puts "Copying /Gemfile to #{dockerized_dir_relative}/Gemfile"
+    File.open("#{dockerized_dir}/Gemfile", 'w') do |f|
+      f.write File.read("#{plugin.dir}/Gemfile").gsub("ruby '2.1.6'", "ruby '2.1.4'")
     end
 
-    if File.directory?("#{plugin.dir}/mailers") and !File.directory?("#{absolute_dir}/mailers")
-      puts "Copying /mailers/ to #{relative_dir}/mailers/"
-      FileUtils.copy_entry("#{plugin.dir}/mailers", "#{absolute_dir}/mailers")
+    puts "Copying /Gemfile.lock to #{dockerized_dir_relative}/Gemfile.lock"
+    File.open("#{dockerized_dir}/Gemfile.lock", 'w') do |f|
+      f.write File.read("#{plugin.dir}/Gemfile.lock")
     end
 
-    puts "Dockerizing #{File.expand_path(absolute_dir)}"
-    puts `docker run --rm -v "#{File.expand_path(absolute_dir)}":/worker -w /worker iron/images:ruby-2.1 sh -c 'bundle install --standalone'`
+    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")
+    end
 
-  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")
+    end
 
-  def upload_worker(filename)
-    # code_name = filename.gsub('.rb', '')
-    # puts "#{'Uploading'.format(:green,:bold)} #{filename.gsub('.rb', '')} to #{environment.to_s.titleize}..."
-    #
-    # code = IronWorker::Code::Ruby.new(:workerfile => "#{plugin.dir}/workers/#{filename}")
-    # code.gem('fanforce-plugin-factory', factory_version)
-    # code.remote
-    # code.name = code_name
-    # code.file("#{plugin.dir}/workers/.env/#{environment}.rb", '.env')
-    #
-    # upload_processes << upload_iron_worker(iron_worker, code, filename, environment)
-  end
+    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) }
 
-  def current_factory_version
-    `bundle list`.lines.each do |line|
-      return $1 if line =~ /fanforce-plugin-factory \(([A-Za-z0-9.-]+)\)/
-    end
-    error 'fanforce-plugin-factory version was not found in `bundle list`'
+    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}")
+
+    return zipped_filepath
   end
 
-  def upload_iron_worker(iron_worker, code, filename, environment)
+  def upload_worker(filename, environment, env_vars, zipped_filepath)
+    code_name = filename.gsub('.rb', '')
+    puts "#{'Uploading'.format(:green,:bold)} #{code_name} to #{environment.to_s.titleize}..."
+
     fork do
       begin
-        iron_worker.codes.create(code, max_concurrency: 5)
+        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}")
       rescue Exception => e
         puts "#{'Aborted  '.format(:red,:bold)} upload of #{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
         puts e.message
@@ -106,4 +102,14 @@ class Fanforce::PluginFactory::CLI::Iron
     end
   end
 
+  def current_factory_version
+    `bundle list`.lines.each do |line|
+      return $1 if line =~ /fanforce-plugin-factory \(([A-Za-z0-9.-]+)\)/
+    end
+    error 'fanforce-plugin-factory version was not found in `bundle list`'
+  end
+
+  def upload_iron_worker(iron_worker, code, filename, environment)
+  end
+
 end

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

@@ -14,7 +14,7 @@ module Fanforce::PluginFactory::CLI::Utils
     PTY.spawn(command) do |stdin, stdout, pid|
       stdin.each { |line| output << line; print line if print_now }
     end
-    output.join("\n")
+    output.join('')
   end
 
   def silence_warnings
@@ -54,4 +54,12 @@ module Fanforce::PluginFactory::CLI::Utils
     hash.symbolize_keys!
   end
 
+  def env(environment)
+    case environment.to_sym
+      when :development then :dev
+      when :staging     then :stg
+      when :production  then :prd
+    end
+  end
+
 end

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

@@ -9,7 +9,6 @@ class Fanforce::PluginFactory::CLI::Scripts
 
   def update(type)
     type = type.to_sym
-
     return update_factory if type == :factory
 
     if Fanforce::CLI::TYPE == :directory_of_plugins
@@ -110,7 +109,6 @@ class Fanforce::PluginFactory::CLI::Scripts
     # end
     log divider '---------------------------------------------------------------------------------------------------+'
 
-
     local_path ? install_local_factory_gem(version, local_path) : install_remote_factory_gem(version)
     puts ''
   end

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc10'
+    VERSION = '2.0.0.rc11'
   end
 end

metadata

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