fanforce-app-factory 2.0.0.rc29 → 2.0.0.rc30

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

@@ -13,23 +13,15 @@ class Fanforce::AppFactory::CLI::Heroku
     @heroku ||= {}
     @heroku[environment] ||= Heroku::API.new(:username => config[:heroku][environment][:user], :password => config[:heroku][environment][:password])
   rescue Exception => e
+    error "OOPS...  #{environment.to_s.upcase}".format(:red,:bold) + ' has not been setup for Heroku' if config[:heroku].blank? or config[:heroku][environment].blank?
     #raise "Heroku user #{config[:heroku][environment][:user]} does not seem to exist: #{e.message}" if e.response.status == 404
     raise
   end
 
   def setup(environment)
     environment = environment.to_sym
-    return puts "OOPS...  #{environment.to_s.upcase}".format(:red,:bold) + ' has not been setup for Heroku' if config[:heroku].blank? or config[:heroku][environment].blank?
-
     heroku = heroku(environment)
     heroku_app_name = app_name(environment)
-    begin
-      heroku.get_app(heroku_app_name)
-      puts "#{'Found   '.format(:green,:bold)}" + "#{environment} app on heroku (#{heroku_app_name})"
-    rescue
-      heroku.post_app(name: heroku_app_name)
-      puts "#{'Created '.format(:green,:bold)}" + "#{environment} on heroku (#{heroku_app_name})"
-    end
 
     # Setup standard app domain
     domain = "#{app._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:apps_base]}"
@@ -51,6 +43,7 @@ class Fanforce::AppFactory::CLI::Heroku
       puts "#{'Added   '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
     end
 
+    # Setup git remote
     remote_name = "#{env(environment)}-heroku"
     if (`git remote`).split(/\r?\n/).include?(remote_name)
       puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{remote_name}"
@@ -61,6 +54,24 @@ class Fanforce::AppFactory::CLI::Heroku
     `git remote add #{remote_name} git@#{config[:heroku][environment][:git_ssh_domain] || 'heroku.com'}:#{heroku_app_name}.git`
   end
 
+  def app_exists?(heroku, app_name)
+    heroku.get_app(app_name)
+    return true
+  rescue
+    return false
+  end
+
+  def ensure_app_exists(environment)
+    heroku = heroku(environment)
+    heroku_app_name = app_name(environment)
+    if app_exists?(heroku, heroku_app_name)
+      puts "#{'Found   '.format(:green,:bold)}" + "#{environment} app on heroku (#{heroku_app_name})"
+    else
+      heroku.post_app(name: heroku_app_name)
+      puts "#{'Created '.format(:green,:bold)}" + "#{environment} on heroku (#{heroku_app_name})"
+    end
+  end
+
   def update_config(environment, vars)
     heroku(environment).put_config_vars(app_name(environment), vars) if vars
   end

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

@@ -16,6 +16,7 @@ class Fanforce::AppFactory::CLI::Iron
 
     env = Fanforce::AppFactory::CLI::Env.new(app)
     vars = env.vars(environment) || {}
+    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?
 
@@ -35,7 +36,7 @@ class Fanforce::AppFactory::CLI::Iron
 
         puts "#{'Uploading'.format(:green,:bold)} #{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
         code = IronWorkerNG::Code::Base.new(:workerfile => "#{app.dir}/workers/#{filename}")
-        code.gem('fanforce-app-factory', config[:app_factory_gem][:version])
+        code.gem('fanforce-app-factory', factory_version)
         code.remote
         code.name = code_name
         code.file("#{app.dir}/workers/.env/.#{environment}env.rb")
@@ -47,6 +48,13 @@ class Fanforce::AppFactory::CLI::Iron
     end
   end
 
+  def current_factory_version
+    `bundle list`.lines.each do |line|
+      return $1 if line =~ /fanforce-app-factory \(([A-Za-z0-9.-]+)\)/
+    end
+    error 'fanforce-app-factory version was not found in `bundle list`'
+  end
+
   def upload_iron_worker(iron_worker, code, filename, environment)
     fork do
       begin

data/lib/fanforce/app_factory/cli/scripts/{status.rb → diff.rb}

@@ -6,13 +6,13 @@ class Fanforce::AppFactory::CLI::Scripts
 
   ######################################################################################################################
 
-  def status(type, detail_level=nil)
+  def diff(type, detail_level=nil)
     type = type.to_sym
-    detail_level = (detail_level||'overview').to_sym if type == :files
+    detail_level = (detail_level||'detailed').to_sym if type == :files
 
     if [:all,:files].include?(type)
       if Fanforce::CLI::TYPE == :directory_of_apps
-        if detail_level == :diff
+        if detail_level == :detailed
           directory_file_details(detail_level)
         else
           directory_file_overview
@@ -88,7 +88,7 @@ class Fanforce::AppFactory::CLI::Scripts
                     filepath,
                     ("#{metadata[:insertions]} insertions(+)" if metadata[:insertions].to_i > 0),
                     ("#{metadata[:deletions]} deletions(-)" if metadata[:insertions].to_i > 0)
-        if detail_level == :diff and metadata[:diff]
+        if detail_level == :detailed and metadata[:diff]
           lines = ''
           metadata[:diff].lines do |line|
             line = line.format(:red) if line[0] == '-'
@@ -119,7 +119,7 @@ class Fanforce::AppFactory::CLI::Scripts
                   filepath,
                   ("#{metadata[:insertions]} insertions(+)" if metadata[:insertions].to_i > 0),
                   ("#{metadata[:deletions]} deletions(-)" if metadata[:insertions].to_i > 0)
-      if detail_level == :diff and metadata[:diff]
+      if detail_level == :detailed and metadata[:diff]
         lines = ''
         metadata[:diff].lines do |line|
           line = line.format(:red) if line[0] == '-'

data/lib/fanforce/app_factory/cli/scripts/push.rb

@@ -34,6 +34,11 @@ class Fanforce::AppFactory::CLI::Scripts
       return push_app_worker(app, environment, command.to_s)
     end
 
+    if [:all,:heroku].include?(command) and environment != :development
+      heroku = Fanforce::AppFactory::CLI::Heroku.new(app)
+      heroku.ensure_app_exists(environment)
+    end
+
     if [:all,:iron].include?(command)
       push_app_workers(app, environment)
     end
@@ -42,9 +47,8 @@ class Fanforce::AppFactory::CLI::Scripts
       push_env(app, environment)
     end
 
-    if [:all,:heroku].include?(command)
-      error 'Heroku is not setup for development' if environment == :development
-      push_heroku(app, environment)
+    if [:all,:heroku].include?(command) and environment != :development
+      push_heroku(heroku, app, environment)
     end
   end
 
@@ -64,14 +68,13 @@ class Fanforce::AppFactory::CLI::Scripts
     Fanforce::AppFactory::CLI::Env.new(app).setup(environment)
   end
 
-  def push_heroku(app, environment)
+  def push_heroku(heroku, app, environment)
     case environment
       when :staging then env = :stg
       when :production then env = :prd
     end
     remote_name = "#{env}-heroku"
 
-    heroku = Fanforce::AppFactory::CLI::Heroku.new(app)
     heroku.setup(environment) if !(`git remote`).split(/\r?\n/).include?(remote_name)
 
     vars = Fanforce::AppFactory::CLI::Env.new(app).vars(environment)

data/lib/fanforce/app_factory/cli_directory_of_apps.rb

@@ -16,12 +16,12 @@ class Fanforce::AppFactory::CLI::Scripts
 
   ########################################################################################################################
 
-  Fanforce::CLI.register(self, :status,
+  Fanforce::CLI.register(self, :diff,
                          ['all/TYPE',                 'Check the status of files, git, and gems'],
-                         ['files      *overview/diff','Check for file diffs between app_factory scaffolding'],
+                         ['files  *detailed/overview','Check for file diffs between app_factory scaffolding'],
                          ['git',                      'Check the status of git commit'],
                          ['gems',                     'Check the gem versions being used across apps']
-  ) { require_relative 'cli/scripts/status' }
+  ) { require_relative 'cli/scripts/diff' }
 
   ########################################################################################################################
 

data/lib/fanforce/app_factory/cli_single_app.rb

@@ -4,12 +4,12 @@ class Fanforce::AppFactory::CLI::Scripts
 
   ########################################################################################################################
 
-  Fanforce::CLI.register(self, :status,
+  Fanforce::CLI.register(self, :diff,
                          ['all/TYPE',                  'Check the status of files, git, and gems'],
-                         ['files      *overview/diff', 'Check for file diffs between app_factory scaffolding'],
+                         ['files  *detailed/overview', 'Check for file diffs between app_factory scaffolding'],
                          ['git',                       'Check the status of git commit'],
                          # ['gems',                      'Check if the gem versions are behind other apps']
-  ) { require_relative 'cli/scripts/status' }
+  ) { require_relative 'cli/scripts/diff' }
 
   ########################################################################################################################
 

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc29'
+    VERSION = '2.0.0.rc30'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc29
+  version: 2.0.0.rc30
   prerelease: 6
 platform: ruby
 authors:
@@ -416,10 +416,10 @@ files:
 - lib/fanforce/app_factory/cli/scripts/config.rb
 - lib/fanforce/app_factory/cli/scripts/create.rb
 - lib/fanforce/app_factory/cli/scripts/destroy.rb
+- lib/fanforce/app_factory/cli/scripts/diff.rb
 - lib/fanforce/app_factory/cli/scripts/push.rb
 - lib/fanforce/app_factory/cli/scripts/restart.rb
 - lib/fanforce/app_factory/cli/scripts/setup.rb
-- lib/fanforce/app_factory/cli/scripts/status.rb
 - lib/fanforce/app_factory/cli/scripts/update.rb
 - lib/fanforce/app_factory/cli_directory_of_apps.rb
 - lib/fanforce/app_factory/cli_single_app.rb