fanforce-factory 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk1MjlmM2I1OTQxZmE0ZTEzYjEwMTAzNDFmNGZjYjI3NjY5ZGZjOQ==
+    NWExMGJlMmQ4OTc2YmM3MDZiMGEwMTAxZDJjYmJkODc0ZmRhYTk3Mg==
   data.tar.gz: !binary |-
-    MTY4NGJmOWM5MzUzY2Q3NThkZGQ2YWEzNmRiNDU1ZTc5ODc2ZTc5YQ==
+    ZTQ2NzRjMmM2MTZhNjdjZTZhZTFiMzQ0NDkyYjQwM2U0OWU5NDk2YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDAyOTI4YzJjYjUxMDdhZjA3MmQ0MWUzNzBlZTUxNjkzMmFjZmM0YTY2YTQ1
-    Nzk1M2M0NTU2MGI1ZTFkN2QzMjMwY2UwMDk1YjU3Y2M1MWVjZTUxYmI4Y2Q1
-    MjA1Nzc3ZDQ2YjlmMWRlOTVmMDg5YzZlOTJhNDNiNjY3OTJjZDQ=
+    YjFmZjRkNzVhYWJhZjljNDlhYTE1YzBlNjRkZDQ3NTg2MGI2Y2ZmMDU3ZDNk
+    ZGNlMDBkMzUzNTFkMTNjYTYwMGJhYWI1MjQ4NDRmZjlhMDUzZmZjMDY5MWEx
+    NDJjY2NjMDJhMTdiNWNlODE5ZTc2ZTMwNWJlYjdhZjlhNDY1Y2M=
   data.tar.gz: !binary |-
-    NDZmYjhlYmE3MDE0ZWMxNWUxY2Y5NTgwZmIwNjkzYTIwNDBhODUwMmI1OTgx
-    YjgyMzM2NDUzMmM4NDBmMjJmNWYwMTNmYTJiZmQ4NmRmNDRlZDAxNGRiNzM3
-    N2Y5ZGFkYWIzOGE5OWQ0ZThmZDc2Yzc0NWU1YzhlNDYwYzE2OWY=
+    OGVlNjcwNmUxNzE2OTkxMmQyMjM1NzE5YjZmMmMyZTk3NjgzMzI2Y2FlOWE2
+    ZTBjMDZkYjg3MzNiMmVkMWFjNzhjNjUzYTZiNmU3NWZkNzhiYjg5NDdhNWQ2
+    ZGY2YjhmMmZkNWIwYzczMTYyMTYwMzc5NzI2NzFhYjJjN2E1NjM=

data/lib/fanforce/factory/commands.rb

@@ -366,7 +366,7 @@ class Fanforce::Factory
     puts "\n---------------------------------------------------------------------------------------------------------------"
     puts "#{addon.type.to_s.upcase.format(:bold)} - #{addon._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
 
-    push_iron(addon, command, environments)
+    upload_iron(addon, command, environments)
   end
 
   def upload_iron(addon, command, environments)
@@ -376,15 +376,13 @@ class Fanforce::Factory
 
     environments.each do |environment|
       vars = Env.vars_by_addon(environment)[addon.dir_name]
-      has_workers = File.directory?("#{addon.dir}/workers") ? true : false
-
-      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?
+      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}#{has_workers ? '... and workers have' : 'has'} #{vars.size} env variables"
+      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'])
+      iron_worker = IronWorkerNG::Client.new(:token => vars['IRON_TOKEN'], :project_id => vars['IRON_PROJECT_ID'])
       Dir.chdir("#{addon.dir}/workers") do
         workers = Dir["*.worker"]
         next puts "#{'Skipped  '.format(:bold)} #{environment.to_s.titleize} has 0 workers" if workers.size == 0
@@ -407,7 +405,7 @@ class Fanforce::Factory
     iron_worker.codes.list.each do |code|
       next if code.name != code_name
       iron_worker.codes.delete(code.id)
-      puts "#{'Removing '.format(:green,:bold)} #{addon._id}-#{filename.gsub('.worker', '')} from #{environment.to_s.titleize}..."
+      puts "#{'Removing '.format(:green,:bold)} #{code_name} from #{environment.to_s.titleize}..."
       return true
     end
   end
@@ -423,7 +421,7 @@ class Fanforce::Factory
       environments.each do |environment|
         vars = Env.vars_by_addon(environment)[addon.dir_name]
         iron_auths[environment] ||= {}
-        iron_auths[environment][vars['iron_project_id']] = vars['iron_token'] if vars['iron_project_id'].present?
+        iron_auths[environment][vars['IRON_PROJECT_ID']] = vars['IRON_TOKEN'] if vars['IRON_PROJECT_ID'].present?
       end
     end
 

data/lib/fanforce/factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Factory
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-factory
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -124,7 +124,6 @@ files:
 - lib/fanforce/factory/run.rb
 - lib/fanforce/factory/utils.rb
 - lib/fanforce/factory/version.rb
-- lib/fanforce_factory.rb
 homepage: ''
 licenses: []
 metadata: {}

data/lib/fanforce_factory.rb

@@ -1,3 +0,0 @@
-class Fanforce
-  require 'fanforce/factory/version'
-end