fanforce-factory 0.5.0 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGFhMjg0MTU4YzQ2NDVkNzk4YWE3MzViMDFhZDgzZWJhMzg4MWNkYg==
+    MjZkZGNhNzQ3NjQyNmJjMmZkYjhmMWQ4MzkxNmEzZWY4ZDgwMzNmOQ==
   data.tar.gz: !binary |-
-    NzgyMGE2NDg5NDNhZTg0ZDMzNTBkNjc3YzE1M2Y5NDIyNjM0ZTY0MA==
+    Nzk2NDhjOTc1N2I0YjdhYzQ4ZjY1MmZkNjk1NTNkYThhNDllYjhkZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDI2YWM0MTliMGVmOTk3OWExMjg1MzRlOWRkYmMyYzdmNjMzODc3ZWY5MzM5
-    ZDhlNzk4YjcwYTZjZWY4NmY4ZmJlYWVmZGNkOWQyNTNlOWQ3OTc0OGM1YTEw
-    N2M0MDNlM2VkOWVlYWMyMDgyMDMxN2ZiZmQyY2NhYTI4ZTg2NmI=
+    NWM0ODI2ZmEzZGQ0NjVmNzBhN2ViNGE5MzY3ZTY0MWM3N2RkNmFmMjhjY2Jl
+    MGM3OWMxZjgyMDQ3OWQ1OGIyMjFhNDMwYTVmNDgwZjA5ZTBmNjY1MDRkNzQw
+    NTYxZGZkMTQzYThmY2NjNTc1N2VhMTY0Mjg4OGJlZDE0MGQ1NDI=
   data.tar.gz: !binary |-
-    NDg1NDQyNGFiMTIwNzA0ZmM4NDkzZWRlMTI3NTkzZTQwZTQ2ZTU0MGNmOGIx
-    Y2RiNDUxMWQ4YWM4MGQ3ZDU4YTg4ZDRiMmFjMTBhZmQ4M2EzY2Y3MmE1ODIx
-    Y2UxZmQzNzIwZDAyNzM3ODVmZTQ2YTgzMjViOGVkYTA5YTE2NzE=
+    ZDRkODQ1YjIzZTU2NTcyZWZkODFlOTU0ZDIxNTUyNTJiZTQ4OTVhY2Q5YzAy
+    ZWQwN2M5NTNiNjBmN2M0NGZiZDhlN2I1YmIyOTBjNzE4NjMyMmE3MGQ1ZmQy
+    MDNmYzUxNWRiYzA5ZWIxMjZiMWZjMGFmZTZkZDhkYTYzMDViMTg=

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem 'iron_worker_ng', :path => '../../../Projects/iron_worker_ruby_ng'

data/lib/fanforce/factory/_base.rb

@@ -202,8 +202,8 @@ class Fanforce::Factory
       end
       puts '---------------------------------------------------------------------------------------------------------------'
 
-    #elsif ARGV[0] == 'upgrade'
-    #  factory.upgrade
+    elsif ARGV[0] == 'upgrade'
+      run(:upgrade)
 
     end
 

data/lib/fanforce/factory/commands.rb

@@ -343,7 +343,8 @@ class Fanforce::Factory
 
   def restart(addon, environment)
     if environment == :development
-      `touch tmp/restart.txt`
+      File.mkdir("#{addon.dir}/tmp") if !File.directory?("#{addon.dir}/tmp")
+      FileUtils.touch("#{addon.dir}/tmp/touch.txt")
     elsif [:production, :staging].include?(environment)
       if $Config[:heroku].blank? or $Config[:heroku][environment].blank?
         puts "#{'OOPS...'.format(:red,:bold)} #{environment} has not been setup on heroku"
@@ -430,36 +431,44 @@ class Fanforce::Factory
     end
 
     environments.each do |environment|
-      vars = Env.vars_by_addon(environment)[addon.dir_name]
+      vars = Env.vars_by_addon(environment)[addon.dir_name] || {}
       next 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?
 
-      vars = {} if vars.blank?
       puts "#{'Updating Env'.format(:green,:bold)} #{environment.to_s.titleize}... and workers have #{vars.size} env variables"
       push_env_to(environment, addon, vars, true)
 
       iron_worker = IronWorkerNG::Client.new(:token => vars['IRON_TOKEN'], :project_id => vars['IRON_PROJECT_ID'])
       Dir.chdir("#{addon.dir}/workers") do
-        workers = Dir["*.worker"]
+        workers = Dir['*.worker']
         next puts "#{'Skipped  '.format(:bold)} #{environment.to_s.titleize} has 0 workers" if workers.size == 0
 
+        upload_processes = []
         workers.each do |filename|
           code_name = "#{addon._id}-#{filename.gsub('.worker', '')}"
           remove_single_worker(code_name, iron_worker, environment) if command == :reset
 
           puts "#{'Uploading'.format(:green,:bold)} #{addon._id}-#{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
           code = IronWorkerNG::Code::Base.new(:workerfile => "#{addon.dir}/workers/#{filename}")
+          code.remote
           code.name = code_name
-          code.file("#{addon.dir}/workers/.#{addon.type}env.rb")
-          begin
-            iron_worker.codes.create(code, max_concurrency: 5)
-          rescue Exception => e
-            puts "#{'Aborted  '.format(:red,:bold)} upload of #{addon._id}-#{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
-            puts e.message
-            puts e.backtrace
-            puts ''
-          end
+          code.file("#{addon.dir}/workers/.#{environment}env.rb")
 
+          upload_processes << upload_iron_worker(addon, iron_worker, code, filename, environment)
         end
+        upload_processes.each { |pid| Process.waitpid(pid) }
+      end
+    end
+  end
+
+  def upload_iron_worker(addon, iron_worker, code, filename, environment)
+    fork do
+      begin
+        iron_worker.codes.create(code, max_concurrency: 5)
+      rescue Exception => e
+        puts "#{'Aborted  '.format(:red,:bold)} upload of #{addon._id}-#{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
+        puts e.message
+        puts e.backtrace
+        puts ''
       end
     end
   end
@@ -507,4 +516,38 @@ class Fanforce::Factory
     puts '---------------------------------------------------------------------------------------------------------------'
   end
 
+  ######################################################################################################################
+  def get_heroku_app_qa_name(addon, environment)
+    heroku_app_name = "#{environment==:production ? 'prd' : 'qa'}-#{addon.dir_name}"
+    heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
+  end
+
+  def run_upgrade(addon_dir, processed_count, total_count)
+    environment = :qa
+    addon = Addon.load(addon_dir)
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts "#{addon.type.to_s.upcase.format(:bold)} - #{addon._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
+
+    heroku = auth_heroku(:staging)
+    heroku_app_name = get_heroku_app_qa_name(addon, environment)
+    begin
+      heroku.delete_app(heroku_app_name)
+      puts "#{'Deleted   '.format(:green,:bold)}" + "#{environment} app on heroku (#{heroku_app_name})"
+    rescue
+      heroku.post_app(name: heroku_app_name)
+      puts "#{'Not Found '.format(:green,:bold)}" + "#{environment} on heroku (#{heroku_app_name})"
+    end
+
+    remote_name = "#{environment==:production ? 'prd' : 'qa'}-heroku"
+    if (`git remote`).split(/\r?\n/).include?(remote_name)
+      puts "#{'Removed '.format(:green,:bold)}" + "git remote for #{remote_name}"
+      `git remote rm #{remote_name}`
+    else
+      puts "#{'Not Found '.format(:green,:bold)}" + "git remote for #{remote_name}"
+    end
+
+
+  end
+
+
 end

data/lib/fanforce/factory/commands_support.rb

@@ -154,8 +154,10 @@ class Fanforce::Factory
   ######################################################################################################################
 
   def push_env_to(environment, addon, vars, create_worker_env=true)
+    File.delete("#{addon.dir}/workers/.#{addon.type}env.rb") if File.exists?("#{addon.dir}/workers/.#{addon.type}env.rb")
+    File.delete("#{addon.dir}/workers/.prebuildgems") if File.exists?("#{addon.dir}/workers/.prebuildgems")
     vars.each {|k,v| puts "  - #{k}" }
-    File.open("#{addon.dir}/workers/.#{addon.type}env.rb", 'w') {|f| f.write convert_hash_to_ruby_env(vars) } if create_worker_env and File.directory?("#{addon.dir}/workers") and vars['IRON_PROJECT_ID']
+    File.open("#{addon.dir}/workers/.#{environment}env.rb", 'w') {|f| f.write convert_hash_to_ruby_env(vars) } if create_worker_env and File.directory?("#{addon.dir}/workers") and vars['IRON_PROJECT_ID']
     if environment == :development
       addon.update_file(:powenv)
       File.open("#{addon.dir}/.#{addon.type}env", 'w') {|f| f.write convert_hash_to_shell_env(vars) }

data/lib/fanforce/factory/files.rb

@@ -240,7 +240,7 @@ class Fanforce::Factory::Files
   end
 
   def self.gitignore_lines(addon_type=nil)
-    %w(*.gem *.rbc .bundle .config coverage InstalledFiles lib/bundler/man pkg rdoc spec/reports test/tmp test/version_tmp tmp .idea/ .sass-cache/ .DS_STORE .powenv .pluginenv .pluginenv.rb .appenv.rb .appenv .widgetenv .widgetenv.rb .yardoc _yardoc doc/)
+    %w(*.gem *.rbc .bundle .config coverage InstalledFiles lib/bundler/man pkg rdoc spec/reports test/tmp test/version_tmp tmp .idea/ .sass-cache/ .DS_STORE .powenv .pluginenv .appenv .widgetenv .*env.rb .yardoc _yardoc doc/)
   end
 
   # .POWENV #######################################################################

data/lib/fanforce/factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Factory
-    VERSION = '0.5.0'
+    VERSION = '0.5.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-factory
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client