fanforce-factory 0.4.7 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGY5NTY1MTYwMWUyM2ExYzg0OTZlNjQ0NWYyNzM4ZDkwYjViNTVhZg==
+    OGFhMjg0MTU4YzQ2NDVkNzk4YWE3MzViMDFhZDgzZWJhMzg4MWNkYg==
   data.tar.gz: !binary |-
-    OWUwYmYwYTU2NTc3YmMyZWJiMjRmMWFkNDQwOWFjMWRkNTlhNzcyZQ==
+    NzgyMGE2NDg5NDNhZTg0ZDMzNTBkNjc3YzE1M2Y5NDIyNjM0ZTY0MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2M1OGRmYmY1NzRlYmI5NTZiM2NhZTUxOTllYjMxMTFjYTFmNjE2YzQ2NTk5
-    NzkyZjMzZDY5M2VkNWU5YWU0ZjExNzcwYmEzOTNmMGJkNjkyZTM3YTM0OWFm
-    ZTY0NGM5MDM4NzlmMTBmNGI0NGE0MjQyNmI2YzBhOTUyNjQ0ZmE=
+    NDI2YWM0MTliMGVmOTk3OWExMjg1MzRlOWRkYmMyYzdmNjMzODc3ZWY5MzM5
+    ZDhlNzk4YjcwYTZjZWY4NmY4ZmJlYWVmZGNkOWQyNTNlOWQ3OTc0OGM1YTEw
+    N2M0MDNlM2VkOWVlYWMyMDgyMDMxN2ZiZmQyY2NhYTI4ZTg2NmI=
   data.tar.gz: !binary |-
-    MDY3YWI2NDQ0ZTM0YWFkYzkwYzZjYjU2Mzc1YjJlYjkwZDBhNDhkYWE4OTcy
-    NzVkMTQ3YTlkNWY3NDg4M2ZiOGFhNTIyYTI3ZThmZjE2OTNiMmZmMzk1YWYw
-    MGUyNmQ0ZTE1M2UxMzE1OTk4NTFiNTc0M2MyM2Q5YzM1NGU3NDg=
+    NDg1NDQyNGFiMTIwNzA0ZmM4NDkzZWRlMTI3NTkzZTQwZTQ2ZTU0MGNmOGIx
+    Y2RiNDUxMWQ4YWM4MGQ3ZDU4YTg4ZDRiMmFjMTBhZmQ4M2EzY2Y3MmE1ODIx
+    Y2UxZmQzNzIwZDAyNzM3ODVmZTQ2YTgzMjViOGVkYTA5YTE2NzE=

data/README.md

@@ -86,7 +86,7 @@ bitbucket:
 
 ## Heroku Apps: Creating and Updating
 A heroku app will be automatically setup for each new addon if a heroku object is defined in your .factoryconfig file. You'll need
- one for each environment (qa|production) you want apps setup for.
+ one for each environment (staging|production) you want apps setup for.
 
 ```yaml
 heroku:
@@ -144,7 +144,7 @@ development:
   api_key: 175620799120142
   api_secret: b4e86cbf9db2ch5777609396b1d0a52f
 
-qa:
+staging:
   api_key: 362017347478160
   api_secret: cf3605c0cnda02c95ddd1bb983a59e7a
 ```

data/lib/fanforce/factory/_base.rb

@@ -21,10 +21,10 @@ class Fanforce::Factory
     @allowed_commands = options[:allowed]
     @runtype = options[:runtype]
     setup_config
-    init_counter if @runtype == :forked
+    init_counter(Process.pid) if @runtype == :forked
     parse_addons_filter
     parse_command
-    destroy_counter if @runtype == :forked
+    destroy_counter(Process.pid) if @runtype == :forked
   end
 
   def setup_config
@@ -104,7 +104,7 @@ class Fanforce::Factory
     #################################################################
 
     elsif ARGV[0] == 'update'
-      ARGV[1] =~ /^(all|files?|envs?(:all|:development|:qa|:production)?|pows?|bitbuckets?|herokus?(:all|:qa|:production)?)$/ || error('You supplied an invalid update command.', :update)
+      ARGV[1] =~ /^(all|files?|envs?(:all|:development|:staging|:production)?|pows?|bitbuckets?|herokus?(:all|:staging|:production)?)$/ || error('You supplied an invalid update command.', :update)
 
       tmp_str = $1
       if tmp_str =~ /^envs?|herokus?/
@@ -123,7 +123,7 @@ class Fanforce::Factory
 
     elsif ARGV[0] == 'restart'
       if ARGV[1].present?
-        ARGV[1] =~ /^(development|qa|production|all)?$/ || error('You supplied an invalid restart command.', :restart)
+        ARGV[1] =~ /^(development|staging|production|all)?$/ || error('You supplied an invalid restart command.', :restart)
         environment = $1.to_sym
       else
         environment = :development
@@ -135,7 +135,7 @@ class Fanforce::Factory
     #################################################################
 
     elsif ARGV[0] == 'push'
-      ARGV[1] =~ /^(development|qa|production)(:all|:heroku|:irons?(:upload|:nuclear)?|bitbuckets?)?$/ || error('You supplied an invalid push command.', :push)
+      ARGV[1] =~ /^(development|staging|production)(:all|:heroku|:irons?(:upload|:nuclear)?|bitbuckets?)?$/ || error('You supplied an invalid push command.', :push)
 
       environment = $1.to_sym
       tmp_str = $2 || 'all'
@@ -174,7 +174,7 @@ class Fanforce::Factory
     #################################################################
 
     elsif ARGV[0] == 'iron'
-      ARGV[1] =~ /^(upload|reset|delete)(:all|:development|:qa|:production)?$/ || error('You supplied an invalid iron command.', :iron)
+      ARGV[1] =~ /^(upload|reset|delete)(:all|:development|:staging|:production)?$/ || error('You supplied an invalid iron command.', :iron)
 
       command = $1.to_sym
       environment = ($2.present?) ? $2.gsub(':','').to_sym : :all
@@ -239,6 +239,7 @@ class Fanforce::Factory
   end
 
   def run_forked(method, *args)
+    counter_id = Process.pid
     processes = []
     dirs = Addons.dirs
     puts "\n---------------------------------------------------------------------------------------------------------------"
@@ -250,7 +251,7 @@ class Fanforce::Factory
         response = capture_stdout do
           self.method(:"run_#{method}").call(addon_dir, 'PROCESSED_ADDONS_COUNT', dirs.size, *args)
         end
-        puts response.gsub('PROCESSED_ADDONS_COUNT', incr_counter.to_s)
+        puts response.gsub('PROCESSED_ADDONS_COUNT', incr_counter(counter_id).to_s)
       end
       sleep(0.25)
     end
@@ -276,13 +277,13 @@ class Fanforce::Factory
     $stderr = previous_stderr
   end
 
-  def init_counter
-    File.open("#{$HomeDir}/.forked-counter", 'w') {|f| f.write('0') }
+  def init_counter(counter_id)
+    File.open("#{$HomeDir}/.forked-counter-#{counter_id}", 'w') {|f| f.write('0') }
   end
 
-  def incr_counter
+  def incr_counter(counter_id)
     new_count = nil
-    File.open("#{$HomeDir}/.forked-counter", File::RDWR|File::CREAT, 0644) do |f|
+    File.open("#{$HomeDir}/.forked-counter-#{counter_id}", File::RDWR|File::CREAT, 0644) do |f|
       f.flock(File::LOCK_EX)
       new_count = f.read.to_i + 1
       f.rewind
@@ -293,8 +294,8 @@ class Fanforce::Factory
     new_count
   end
 
-  def destroy_counter
-    File.delete("#{$HomeDir}/.forked-counter")
+  def destroy_counter(counter_id)
+    File.delete("#{$HomeDir}/.forked-counter-#{counter_id}")
   end
 
 end

data/lib/fanforce/factory/commands.rb

@@ -40,7 +40,7 @@ class Fanforce::Factory
 
     puts "\n---------------------------------------------------------------------------------------------------------------"
     puts 'CREATING HEROKU APPS...'
-    setup_heroku addon, :qa
+    setup_heroku addon, :staging
     setup_heroku addon, :production
 
     puts "\n---------------------------------------------------------------------------------------------------------------"
@@ -94,7 +94,7 @@ class Fanforce::Factory
 
     puts "\n---------------------------------------------------------------------------------------------------------------"
     puts 'CREATING HEROKU APPS...'
-    setup_heroku addon, :qa
+    setup_heroku addon, :staging
     setup_heroku addon, :production
 
     puts "\n---------------------------------------------------------------------------------------------------------------"
@@ -126,7 +126,7 @@ class Fanforce::Factory
 
     puts "\n---------------------------------------------------------------------------------------------------------------"
     puts 'DELETING HEROKU APPS...'
-    [:qa,:production].each do |environment|
+    [:staging,:production].each do |environment|
       next if $Config[:heroku].blank? or $Config[:heroku][environment].blank?
       heroku = auth_heroku(environment)
       heroku_app_name = get_heroku_app_name(addon, environment)
@@ -214,7 +214,7 @@ class Fanforce::Factory
       if [:all, :heroku].include?(scope)
         puts ''
         puts 'SETTING UP HEROKU APPS...'
-        setup_heroku addon, :qa if [:all,:qa].include?(environment)
+        setup_heroku addon, :staging if [:all,:staging].include?(environment)
         setup_heroku addon, :production if [:all,:production].include?(environment)
       end
 
@@ -270,7 +270,7 @@ class Fanforce::Factory
       if [:all, :heroku].include?(scope)
         puts ''
         puts 'UPDATING HEROKU APPS...'
-        setup_heroku addon, :qa if [:all,:qa].include?(environment)
+        setup_heroku addon, :staging if [:all,:staging].include?(environment)
         setup_heroku addon, :production if [:all,:production].include?(environment)
       end
 
@@ -301,7 +301,7 @@ class Fanforce::Factory
         puts "\n#{"Updating Env Vars".format(:green,:bold)} on Heroku #{environment.to_s.titleize} (#{vars.size} variables)..."
         push_env_to(environment, addon, vars)
 
-        remote_name = "#{environment==:qa ? 'qa' : 'prd'}-heroku"
+        remote_name = "#{environment==:staging ? 'stg' : 'prd'}-heroku"
         puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Heroku #{environment.to_s.titleize} (#{remote_name})..."
         Run.command("git push #{remote_name} master")
       end
@@ -332,8 +332,8 @@ class Fanforce::Factory
       if [:all, :development].include?(environment)
         puts "#{'DEVELOPMENT '.format(:bold)}#{addon.dir_name.format(:green)} restarted" if restart(addon, :development)
       end
-      if [:all, :qa].include?(environment)
-        puts "#{'QA          '.format(:bold)}#{addon.dir_name.format(:green)} restarted" if restart(addon, :qa)
+      if [:all, :staging].include?(environment)
+        puts "#{'STAGING     '.format(:bold)}#{addon.dir_name.format(:green)} restarted" if restart(addon, :staging)
       end
       if [:all, :production].include?(environment)
         puts "#{'PRODUCTION  '.format(:bold)}#{addon.dir_name.format(:green)} restarted" if restart(addon, :production)
@@ -344,7 +344,7 @@ class Fanforce::Factory
   def restart(addon, environment)
     if environment == :development
       `touch tmp/restart.txt`
-    elsif [:production, :qa].include?(environment)
+    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"
         return false
@@ -416,7 +416,7 @@ class Fanforce::Factory
   ######################################################################################################################
 
   def run_iron(addon_dir, processed_count, total_count, command, environment)
-    environments = environment == :all ? [:development, :qa, :production] : [environment]
+    environments = environment == :all ? [:development, :staging, :production] : [environment]
     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})... "
@@ -477,7 +477,7 @@ class Fanforce::Factory
 
   def delete_all_iron_workers(environment)
     puts ''
-    environments = environment == :all ? [:development, :qa, :production] : [environment]
+    environments = environment == :all ? [:development, :staging, :production] : [environment]
 
     iron_auths = {}
     Addons.each do |addon, cur_count, total|

data/lib/fanforce/factory/commands_support.rb

@@ -1,7 +1,7 @@
 class Fanforce::Factory
 
   def get_heroku_app_name(addon, environment)
-    heroku_app_name = "#{environment==:production ? 'prd' : 'qa'}-#{addon.dir_name}"
+    heroku_app_name = "#{environment==:production ? 'prd' : 'stg'}-#{addon.dir_name}"
     heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
   end
 
@@ -49,7 +49,7 @@ class Fanforce::Factory
   end
 
   def setup_envs(addon, environment)
-    environments = environment == :all ? [:development, :qa, :production] : [environment]
+    environments = environment == :all ? [:development, :staging, :production] : [environment]
 
     if !File.exists?("#{$HomeDir}/.env/_bind.yml")
       return puts "#{'Oops'.format(:bold)}... you must setup .env/_bind.yml before trying to update env variables."
@@ -138,7 +138,7 @@ class Fanforce::Factory
       end
     end
 
-    remote_name = "#{environment==:qa ? 'qa' : 'prd'}-heroku"
+    remote_name = "#{environment==:staging ? 'stg' : 'prd'}-heroku"
     if (`git remote`).split(/\r?\n/).include?(remote_name)
       puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{remote_name}"
       `git remote rm #{remote_name}`

data/lib/fanforce/factory/initializers/ff_globals.rb

@@ -34,8 +34,8 @@ elsif ENV['RACK_ENV'] == 'test'
   $PUSHER_KEY = '7bcc87b3c55301f687b9'
   $PUSHER_SECRET = '61c760c05430e68d7e8d'
 
-elsif ENV['RACK_ENV'] == 'qa'
-  $BASE_DOMAIN = 'fanforce-qa.com'
+elsif ENV['RACK_ENV'] == 'staging'
+  $BASE_DOMAIN = 'fanforce-staging.com'
   $APP_DOMAIN = 'app.' + $BASE_DOMAIN
   $API_DOMAIN = 'api.' + $BASE_DOMAIN
   $I_DOMAIN = 'i.' + $BASE_DOMAIN

data/lib/fanforce/factory/version.rb

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

metadata

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