fanforce-app-factory 2.0.0.rc8 → 2.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57f9b35c4d0c163bc6c2d1944b48e669629b5e6a
-  data.tar.gz: bddfb50786585ecb0e5f3363950c6c72637c520a
+  metadata.gz: cdaf9a89fc2c57ac7a93bc0a44c9d434ee2c4a53
+  data.tar.gz: 450afcc003c3c51985a9498638d20098f60b52a9
 SHA512:
-  metadata.gz: 602d15c72477cce9a44fc75d84164a2ae6f32d679955610c54ffeba8298b3966ad5e74aeea8233641de77763c59a65986ae9e97fa7f346ccef4b6277101b27b6
-  data.tar.gz: 36fd469c61be260c84320dabc0b05b7d944252de3387323bba5783d96155986e34f5a02e63ccfb3d02d0b9469e2bed6de98855bfd9822549c60051c0adfa0479
+  metadata.gz: 3255bf8df675f27ac7945695d7b66fc040df6ab3f284b8612f9af8c61a28140e8a68f4b3de99f144fe11652f23c5f20c039faaa09f933cb6ff6b2c0da803f343
+  data.tar.gz: 0745b3ac73a6960e69b304d17385b5005bba9f163adee1e71ddd9909381f6e7276ac6a419d9676b1eb1d9b6c7546779151ec2934985d1209212ac0d78ef27e30

data/Rakefile

@@ -23,7 +23,7 @@ namespace :scaffolding do
   end
 
   require 'fanforce/app_factory/cli'
-  require 'fanforce/app_factory/cli/scaffolding_file'
+  require 'fanforce/app_factory/cli/lib/scaffolding_file'
 
   task :register do
     scaffolding_dir = File.expand_path('../lib/fanforce/app_factory/scaffolding', __FILE__)

data/fanforce-app-factory.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fanforce-base',   '~> 1.2'
   gem.add_runtime_dependency 'fanforce-api',    '~> 1.0'
-  gem.add_runtime_dependency 'fanforce-app-worker', '= 1.1.0.rc1'
+  gem.add_runtime_dependency 'fanforce-app-worker', '= 1.1.0.rc2'
 end

data/lib/fanforce/app_factory/cli.rb

@@ -1,5 +1,5 @@
 require_relative 'version'
 
 module Fanforce::AppFactory::CLI
-  require_relative 'cli/utils'
+  require_relative 'cli/lib/utils'
 end

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

@@ -1,13 +1,13 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../scaffolding'
-  require_relative '../bundler'
-  require_relative '../pow'
-  require_relative '../git'
-  require_relative '../bitbucket'
-  require_relative '../env'
-  require_relative '../uranium'
+  require_relative '../lib/scaffolding'
+  require_relative '../lib/bundler'
+  require_relative '../lib/pow'
+  require_relative '../lib/git'
+  require_relative '../lib/bitbucket'
+  require_relative '../lib/env'
+  require_relative '../lib/uranium'
 
   ######################################################################################################################
 

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

@@ -1,9 +1,9 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../bitbucket'
-  require_relative '../uranium'
-  require_relative '../pow'
+  require_relative '../lib/bitbucket'
+  require_relative '../lib/uranium'
+  require_relative '../lib/pow'
 
   ######################################################################################################################
 

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

@@ -1,8 +1,8 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../env'
-  require_relative '../iron'
+  require_relative '../lib/env'
+  require_relative '../lib/iron'
 
   ######################################################################################################################
 

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

@@ -5,36 +5,37 @@ class Fanforce::AppFactory::CLI::Scripts
 
   def restart(environment=:development)
     environment = environment.to_sym
-    app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
-    puts "---------------------------------------------------------------------------------------------------------------"
-    Dir.chdir(app.dir) do
-      if [:all, :development].include?(environment)
-        puts "#{'Restarted'.format(:bold,:green)} #{app.dir_name} (development)" if restart_app(app, :development)
-      end
-      if [:all, :staging].include?(environment)
-        puts "#{'Restarted'.format(:bold,:green)} #{app.dir_name} (staging)" if restart_app(app, :staging)
-      end
-      if [:all, :production].include?(environment)
-        puts "#{'Restarted'.format(:bold,:green)} #{app.dir_name} (production)" if restart_app(app, :production)
+
+    if Fanforce::CLI::TYPE == :directory_of_apps
+      Fanforce::CLI::Apps.each do |app, current_count, total|
+        restart_app(app, environment)
       end
+    else
+      restart_app(Fanforce::CLI::App.load(Fanforce::CLI::DIR), environment)
     end
-    puts ''
+    log divider '----------------------------------------------------------------------------------------------------++'
   end
 
   def restart_app(app, environment)
-    if environment == :development
-      File.mkdir("#{app.dir}/tmp") if !File.directory?("#{app.dir}/tmp")
-      FileUtils.touch("#{app.dir}/tmp/restart.txt")
-    elsif [:production, :staging].include?(environment)
-      error 'Production and Staging are not working'
-      if config[:heroku].blank? or config[:heroku][environment].blank?
-        puts "#{'OOPS...'.format(:red,:bold)} #{environment} has not been setup on heroku"
-        return false
+    log divider '------------------------------------------------------------------------------------------------------'
+    environments = environment==:all ? [:development,:staging,:production] : [environment]
+    Dir.chdir(app.dir) do
+      environments.each do |environment|
+        if environment == :development
+          FileUtils.mkdir("#{app.dir}/tmp") if !File.directory?("#{app.dir}/tmp")
+          FileUtils.touch("#{app.dir}/tmp/restart.txt")
+        elsif [:production, :staging].include?(environment)
+          error 'Production and Staging are not working'
+          if config[:heroku].blank? or config[:heroku][environment].blank?
+            puts "#{'OOPS...'.format(:red,:bold)} #{environment} has not been setup on heroku"
+            next
+          end
+          heroku = auth_heroku(environment)
+          heroku.post_ps_restart get_heroku_app_name(app, environment)
+        end
+        log "#{"Restarted #{environment}".format(:bold,:green)} #{app.dir_name}"
       end
-      heroku = auth_heroku(environment)
-      heroku.post_ps_restart get_heroku_app_name(app, environment)
     end
-    return true
   end
 
 end

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

@@ -1,12 +1,12 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../bundler'
-  require_relative '../pow'
-  require_relative '../git'
-  require_relative '../bitbucket'
-  require_relative '../env'
-  require_relative '../uranium'
+  require_relative '../lib/bundler'
+  require_relative '../lib/pow'
+  require_relative '../lib/git'
+  require_relative '../lib/bitbucket'
+  require_relative '../lib/env'
+  require_relative '../lib/uranium'
 
   ######################################################################################################################
 

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

@@ -1,8 +1,8 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../git'
-  require_relative '../scaffolding'
+  require_relative '../lib/git'
+  require_relative '../lib/scaffolding'
 
   ######################################################################################################################
 
@@ -12,40 +12,27 @@ class Fanforce::AppFactory::CLI::Scripts
 
     if [:all,:files].include?(type)
       if Fanforce::CLI::TYPE == :directory_of_apps
-        files_overview
+        if detail_level == :diff
+          directory_file_details(detail_level)
+        else
+          directory_file_overview
+        end
       elsif Fanforce::CLI::TYPE == :single_app
         app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
-        files_details(app, detail_level)
+        app_file_details(app, detail_level)
       end
     end
 
     if [:all,:git].include?(type)
       if Fanforce::CLI::TYPE == :directory_of_apps
-        status_git_overview
+        git_overview
       elsif Fanforce::CLI::TYPE == :single_app
-        status_git
+        git_details
       end
     end
-
-  end
-
-  def status_git_overview
-    app_column_width = Fanforce::CLI::Apps.dir_names.inject(0){|l,d| d.length>l ? d.length : l}
-    log Fanforce::AppFactory::CLI::Git.status_table_header(app_column_width)
-    log divider '======================================================================================================'
-    Fanforce::CLI::Apps.each do |app, current_count, total|
-      log Fanforce::AppFactory::CLI::Git.new(app).status_row(app_column_width)
-      log divider '---------------------------------------------------------------------------------------------------+'
-    end
-    log ''
   end
 
-  def status_git
-    exec 'git status'
-    log ''
-  end
-
-  def files_overview
+  def directory_file_overview
     log ''
     log sprintf('%-12s %-50s %85s', 'FILE STATUS', 'APP NAME', 'STATS OVERVIEW').format(:bold)
     log divider '======================================================================================================'
@@ -87,21 +74,54 @@ class Fanforce::AppFactory::CLI::Scripts
     puts ''
   end
 
-  def files_details(app, detail_level)
+  def directory_file_details(detail_level)
+    Fanforce::CLI::Apps.each do |app, current_count, total|
+      log divider '+==================================================================================================='
+      has_files_to_update = false
+      Fanforce::AppFactory::CLI::Scaffolding.new(app).metadata.each do |filepath, metadata|
+        next if ![:previous,:diverged,:missing,:corrupted].include?(metadata[:status])
+        has_files_to_update = true
+        filepath = filepath.gsub(Fanforce::CLI::DIR, '')
+        log sprintf "%s%-8s#{fmt_end} %-95s %22s %22s\n",
+                    fmt_start([:previous,:diverged,:missing,:corrupted].include?(metadata[:status]) ? :red : :green),
+                    metadata[:status].to_s.titleize,
+                    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]
+          lines = ''
+          metadata[:diff].lines do |line|
+            line = line.format(:red) if line[0] == '-'
+            line = line.format(:green) if line[0] == '+'
+            line = (' '*3) + line
+            lines += line
+          end
+          log divider '   -----------------------------------------------------------------------------------------------'
+          log '   THE FOLLOWING CHANGES WILL OCCUR DURING UPDATE:'
+          log '   -----------------------------------------------'
+          log "\n" + lines + "\n"
+        end
+        log divider '---------------------------------------------------------------------------------------------------+'
+      end
+      log 'NO FILES TO UPDATE' if !has_files_to_update
+    end
+  end
+
+  def app_file_details(app, detail_level)
     log ''
     log sprintf "%-30s %119s\n", "FILES (#{app.dir_name})", 'changes needed during update'
     log divider '======================================================================================================'
-    Fanforce::AppFactory::CLI::Scaffolding.new(app).metadata.each do |filepath, change|
+    Fanforce::AppFactory::CLI::Scaffolding.new(app).metadata.each do |filepath, metadata|
       filepath = filepath.gsub(Fanforce::CLI::DIR, '')
       log sprintf "%s%-8s#{fmt_end} %-95s %22s %22s\n",
-                  fmt_start([:previous,:diverged,:missing,:corrupted].include?(change[:status]) ? :red : :green),
-                  change[:status].to_s.titleize,
+                  fmt_start([:previous,:diverged,:missing,:corrupted].include?(metadata[:status]) ? :red : :green),
+                  metadata[:status].to_s.titleize,
                   filepath,
-                  ("#{change[:insertions]} insertions(+)" if change[:insertions].to_i > 0),
-                  ("#{change[:deletions]} deletions(-)" if change[:insertions].to_i > 0)
-      if detail_level == :diff and change[:diff]
+                  ("#{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]
         lines = ''
-        change[:diff].lines do |line|
+        metadata[:diff].lines do |line|
           line = line.format(:red) if line[0] == '-'
           line = line.format(:green) if line[0] == '+'
           line = (' '*3) + line
@@ -117,4 +137,20 @@ class Fanforce::AppFactory::CLI::Scripts
     puts ''
   end
 
+  def git_overview
+    app_column_width = Fanforce::CLI::Apps.dir_names.inject(0){|l,d| d.length>l ? d.length : l}
+    log Fanforce::AppFactory::CLI::Git.status_table_header(app_column_width)
+    log divider '======================================================================================================'
+    Fanforce::CLI::Apps.each do |app, current_count, total|
+      log Fanforce::AppFactory::CLI::Git.new(app).status_row(app_column_width)
+      log divider '---------------------------------------------------------------------------------------------------+'
+    end
+    log ''
+  end
+
+  def git_details
+    exec 'git status'
+    log ''
+  end
+
 end

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

@@ -1,8 +1,8 @@
 class Fanforce::AppFactory::CLI::Scripts
   include Fanforce::AppFactory::CLI::Utils
 
-  require_relative '../env'
-  require_relative '../scaffolding'
+  require_relative '../lib/env'
+  require_relative '../lib/scaffolding'
 
   ######################################################################################################################
 

data/lib/fanforce/app_factory/cli_directory_of_apps.rb

@@ -17,10 +17,10 @@ class Fanforce::AppFactory::CLI::Scripts
   ########################################################################################################################
 
   Fanforce::CLI.register(self, :status,
-                         ['all/TYPE', 'Check the status of files, git, and gems'],
-                         ['files',    'Check for file diffs between app_factory scaffolding'],
-                         ['git',      'Check the status of git commit'],
-                         ['gems',     'Check the gem versions being used across apps']
+                         ['all/TYPE',                 'Check the status of files, git, and gems'],
+                         ['files      *overview/diff','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' }
 
   ########################################################################################################################

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc8'
+    VERSION = '2.0.0.rc9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc8
+  version: 2.0.0.rc9
 platform: ruby
 authors:
 - Caleb Clark
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
 description: 
 email:
 - cclark@fanforce.com
@@ -362,14 +362,16 @@ files:
 - lib/fanforce/app_factory/asset_framework/app_factory/ui-select/select_override.scss
 - lib/fanforce/app_factory/asset_framework/app_factory/ui-select/selectize.default.css
 - lib/fanforce/app_factory/cli.rb
-- lib/fanforce/app_factory/cli/bitbucket.rb
-- lib/fanforce/app_factory/cli/bundler.rb
-- lib/fanforce/app_factory/cli/env.rb
-- lib/fanforce/app_factory/cli/git.rb
-- lib/fanforce/app_factory/cli/iron.rb
-- lib/fanforce/app_factory/cli/pow.rb
-- lib/fanforce/app_factory/cli/scaffolding.rb
-- lib/fanforce/app_factory/cli/scaffolding_file.rb
+- lib/fanforce/app_factory/cli/lib/bitbucket.rb
+- lib/fanforce/app_factory/cli/lib/bundler.rb
+- lib/fanforce/app_factory/cli/lib/env.rb
+- lib/fanforce/app_factory/cli/lib/git.rb
+- lib/fanforce/app_factory/cli/lib/iron.rb
+- lib/fanforce/app_factory/cli/lib/pow.rb
+- lib/fanforce/app_factory/cli/lib/scaffolding.rb
+- lib/fanforce/app_factory/cli/lib/scaffolding_file.rb
+- lib/fanforce/app_factory/cli/lib/uranium.rb
+- lib/fanforce/app_factory/cli/lib/utils.rb
 - lib/fanforce/app_factory/cli/scripts/config.rb
 - lib/fanforce/app_factory/cli/scripts/create.rb
 - lib/fanforce/app_factory/cli/scripts/destroy.rb
@@ -378,8 +380,6 @@ files:
 - 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/uranium.rb
-- lib/fanforce/app_factory/cli/utils.rb
 - lib/fanforce/app_factory/cli_directory_of_apps.rb
 - lib/fanforce/app_factory/cli_single_app.rb
 - lib/fanforce/app_factory/controllers/base_controller.rb