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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e212a1da66f382e5fb89e0feb285414bd858bff
-  data.tar.gz: 4485a106e8fe69b1f4f5556ef53f780ceea3e2e8
+  metadata.gz: 390d5af91387a7f3b02561397f8c262b42b03338
+  data.tar.gz: 4a8297cd4fbe497592481d49e3d2748670fa42e6
 SHA512:
-  metadata.gz: 4246057f32d34e3a6a386a312967a2454a96a3be98b9104466456abc86c3fbe906cb4b9c9db4a166f4116475eadc168f57af8f552be3e9a971fdd3ed72f27b95
-  data.tar.gz: 9ff0cd6d538b30dc7df4cc5c53d0e07726a26813056880df469ad832ca09499f22a2632696b780f7e747fea33f32d764118837bbe990705b50c8f2832826a8be
+  metadata.gz: 4257fe4a78ea785a3b18e5796aab274b93876bc558fd983cdb96536759c0b34fcbf01551c9b2d79bad2b1513f2a34ea1b0bb4c166e91d9301812dff446c5e8ad
+  data.tar.gz: c8aed09ba1e5330ec9fbac53783d0b7d1b44f50e04c68eeb89cf178ef7beef339202e88376a472500cb66c20d9432b5f662a7154e915b9df13a7dab15569b3f3

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

data/lib/fanforce/plugin_factory/asset_framework/plugin_factory/bootstrap/_bootstrap_override.scss

@@ -15,4 +15,5 @@ body { padding:0; font-size:12px;
   }
 
 }
-.btn { padding: 2px 10px; color: #666666; border-radius: 3px; font-size: 11.05px; background-color: #F5F5F5; @include ff-gradient(#FFFFFF, #E6E6E6); border-color: #CCCCCC #CCCCCC #B3B3B3; @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05)); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); }
+.btn-primary { border-radius: 3px; background-color: #F5F5F5; @include ff-gradient(#FFFFFF, #E6E6E6); border-color: #CCCCCC #CCCCCC #B3B3B3; @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05)); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); }
+//padding: 2px 10px; color: #666666; font-size: 11.05px;

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

@@ -1,7 +1,7 @@
 class Fanforce::PluginFactory::CLI::Iron
   include Fanforce::PluginFactory::CLI::Utils
 
-  require_gem 'iron_worker_ng', 'iron_worker_ng'
+  require_gem 'iron_worker', 'iron_worker'
 
   attr_reader :plugin
 
@@ -9,44 +9,83 @@ class Fanforce::PluginFactory::CLI::Iron
     @plugin = plugin
   end
 
+  def workers_dir
+    "#{plugin.dir}/workers"
+  end
+
   def upload(environment, worker_filename=nil)
-    if !File.directory?("#{plugin.dir}/workers")
-      return log "#{'Skipped '.format(:bold)} no workers folder was found"
-    end
+    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
+    #factory_version = current_factory_version
 
     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)
+    # 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 = IronWorkerNG::Client.new(:token => vars['IRON_TOKEN'], :project_id => vars['IRON_PROJECT_ID'])
-    Dir.chdir("#{plugin.dir}/workers") do
-      workers = Dir['*.worker']
+    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
 
       upload_processes = []
       workers.each do |filename|
         next if worker_filename and !filename.include?(worker_filename)
-        code_name = filename.gsub('.worker', '')
-
-        puts "#{'Uploading'.format(:green,:bold)} #{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
-
-        code = IronWorkerNG::Code::Base.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)
+        compile_worker(filename, environment)
       end
       upload_processes.each { |pid| Process.waitpid(pid) }
     end
   end
 
+  def compile_worker(filename, environment)
+    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)
+    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) }
+    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")
+    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")
+    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'`
+
+  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
+
   def current_factory_version
     `bundle list`.lines.each do |line|
       return $1 if line =~ /fanforce-plugin-factory \(([A-Za-z0-9.-]+)\)/

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

@@ -41,6 +41,10 @@ class Fanforce::PluginFactory::CLI::Scripts
     end
   end
 
+  def expand_path(path)
+    File.expand_path(path)
+  end
+
   def update_factory
     require_gem 'rest-client', 'rest_client'
     require_gem 'multi_json', 'multi_json'
@@ -51,20 +55,22 @@ class Fanforce::PluginFactory::CLI::Scripts
     rubygems_version = MultiJson.load(response, symbolize_keys: true).first[:number]
     current_version = config[:plugin_factory_gem][:version].match(/(\S+)\s*$/)[1] if config[:plugin_factory_gem][:version]
 
-    local_path = '/Fanforce/gems/fanforce-plugin-factory'
-    if File.directory?(local_path)
-      silence_warnings do require "#{local_path}/lib/fanforce/plugin_factory/version" end
+    local_path = '~/Fanforce/gems/fanforce-plugin-factory'
+    if File.directory?(expand_path(local_path))
+      silence_warnings do require "#{expand_path(local_path)}/lib/fanforce/plugin_factory/version" end
       local_version = Fanforce::PluginFactory::VERSION
+    else
+      local_path = nil
     end
 
-    if current_version and (rubygems_version != current_version or local_version)
+    # if current_version and (rubygems_version != current_version or local_version)
       i = 0
       options = {}
       log "\n\nWe found multiple gem versions. Select the one you want used:"
 
       if local_version or config[:plugin_factory_gem][:path]
         if config[:plugin_factory_gem][:path]
-          log " #{i+=1}. #{local_version} (found in .fanforce-plugin-factory / locally)"
+          log " #{i+=1}. #{local_version || 'UNKNOWN VERSION'} (found in .fanforce-plugin-factory / locally)"
         else
           log " #{i+=1}. #{local_version} (found locally)"
         end
@@ -98,10 +104,10 @@ class Fanforce::PluginFactory::CLI::Scripts
         config[:plugin_factory_gem][:version] = version
         f.write config.to_yaml
       end
-    else
-      log 'DONE'
-      version = rubygems_version
-    end
+    # else
+    #   log 'DONE'
+    #   version = rubygems_version
+    # end
     log divider '---------------------------------------------------------------------------------------------------+'
 
 
@@ -116,10 +122,10 @@ class Fanforce::PluginFactory::CLI::Scripts
   def install_local_factory_gem(version, local_gem_path)
     return if !local_gem_path
     gem_filepath = nil
-    Dir.chdir(local_gem_path) do
+    Dir.chdir(expand_path(local_gem_path)) do
       system 'git add -A'
       system 'rake build'
-      Dir.glob("#{local_gem_path}/pkg/*.gem").each do |file|
+      Dir.glob("#{expand_path(local_gem_path)}/pkg/*.gem").each do |file|
         break gem_filepath = file if file.include?(version)
       end
     end

data/lib/fanforce/plugin_factory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc9
+  version: 2.0.0.rc10
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 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.rc4
+        version: 2.0.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc4
+        version: 2.0.0.rc6
 - !ruby/object:Gem::Dependency
   name: fanforce-test
   requirement: !ruby/object:Gem::Requirement