fanforce-app-factory 2.0.0.rc17 → 2.0.0.rc18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f8669748e3705968a85c6e23b827eb3a682a84
-  data.tar.gz: 181106208de0cf2e82651e751ef742c42d47bffc
+  metadata.gz: e73df51eb850160211a41f20ba46a6ab9f4c038d
+  data.tar.gz: dbc25ad3926d94314063dd9c25b45c59a393717a
 SHA512:
-  metadata.gz: 432472d0836d18ead8089be68a93886d41034678c2a40833396d540495f9d27f03b20c11f0d702a85f0cf0d8183f6c15727573ea90ecde2037c8b8f074bc519e
-  data.tar.gz: 094f41dee08edc6989235b6fa194b255c4265ae35b87c3c5244fdd643fc0e8f5430bc4cc0d703900a61107ce7d01bf1c7c442a84ee278876f81de2f97132b044
+  metadata.gz: 0120807082f05388a4dd2dc324979d194e3fb48908042ab49c9f5088a101cf4188bcf25c97faaa63ef8d816cd7e7b8d48d7c944c9032356e605940ad31c1a9cd
+  data.tar.gz: e8590e0ae0ffd9d5161c4ee66135a65c1d467d493ecfe135ec5f3acb6abec42560e9ec518500d6197f74b5ccd142db5fb54e339e06fa675b0595af2098ee3caa

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

@@ -17,18 +17,36 @@ module Fanforce::AppFactory::CLI::Utils
     output.join("\n")
   end
 
-  def config
-    return @@config if @@config
-    require 'yaml'
+  def silence_warnings
+    require 'stringio'
+    old_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+  ensure
+    $stderr = old_stderr
+  end
+
+  def config_filepath
     if Fanforce::CLI::TYPE == :directory_of_apps
-      config_path = "#{Fanforce::CLI::DIR}/.fanforce-app-factory"
-      config_filename = '.fanforce-app-factory'
+      "#{Fanforce::CLI::DIR}/.fanforce-app-factory"
     elsif Fanforce::CLI::TYPE == :single_app
-      config_path = "#{Fanforce::CLI::DIR}/../.fanforce-app-factory"
-      config_filename = '../.fanforce-app-factory'
+      "#{Fanforce::CLI::DIR}/../.fanforce-app-factory"
     end
-    error "The required config file was not found: #{config_filename}" if !File.exists?(config_path)
-    @@config = format_config(YAML.load_file(config_path))
+  end
+
+  def config_relativepath
+    if Fanforce::CLI::TYPE == :directory_of_apps
+      '.fanforce-app-factory'
+    elsif Fanforce::CLI::TYPE == :single_app
+      '../.fanforce-app-factory'
+    end
+  end
+
+  def config
+    return @@config if @@config
+    require 'yaml'
+    error "The required config file was not found: #{config_relativepath}" if !File.exists?(config_filepath)
+    @@config = format_config(YAML.load_file(config_filepath))
   end
 
   def format_config(hash)

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

@@ -3,12 +3,15 @@ class Fanforce::AppFactory::CLI::Scripts
 
   require_relative '../lib/env'
   require_relative '../lib/scaffolding'
+  require_relative '../lib/bundler'
 
   ######################################################################################################################
 
   def update(type)
     type = type.to_sym
 
+    return update_factory if type == :factory
+
     if Fanforce::CLI::TYPE == :directory_of_apps
       confirm("\nYou are about to update #{Fanforce::CLI::Apps.total_count} apps in this directory. This cannot be undone.\n"+
               'ARE YOU SURE?', true)
@@ -18,7 +21,7 @@ class Fanforce::AppFactory::CLI::Scripts
         log "#{'APP'.format(:bold)} - #{app._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
         update_app(app, type)
       end
-    else
+    elsif Fanforce::CLI::TYPE == :single_app
       app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
       confirm("\nYou are about to update #{app.name}. This cannot be undone.\n" +
               'ARE YOU SURE?', true)
@@ -30,7 +33,7 @@ class Fanforce::AppFactory::CLI::Scripts
   def update_app(app, type)
     if [:all,:files].include?(type)
       if !Fanforce::AppFactory::CLI::Scaffolding.new(app).update
-        log "\nNO FILES NEED UPDATING"
+        log 'NO FILES NEED UPDATING'
       end
     end
     if [:all,:env].include?(type)
@@ -38,4 +41,108 @@ class Fanforce::AppFactory::CLI::Scripts
     end
   end
 
+  def update_factory
+    require_gem 'rest-client', 'rest_client'
+    require_gem 'multi_json', 'multi_json'
+
+    log divider '+--------------------------------------------------------------------------------------------------+'
+    print 'CHECKING RUBYGEMS... '
+    response = RestClient::Request.execute(:method => :get, :url => 'https://rubygems.org/api/v1/versions/fanforce-app-factory.json', :ssl_version => 'SSLv23').body
+    rubygems_version = MultiJson.load(response, symbolize_keys: true).first[:number]
+    current_version = config[:app_factory_gem][:version].match(/(\S+)\s*$/)[1] if config[:app_factory_gem][:version]
+
+    local_path = '/Fanforce/gems/fanforce-app-factory'
+    if File.directory?(local_path)
+      silence_warnings do require "#{local_path}/lib/fanforce/app_factory/version" end
+      local_version = Fanforce::AppFactory::VERSION
+    end
+
+    if current_version and (rubygems_version != current_version or local_version)
+      i = 0
+      options = {}
+      log "\n\nWe found multiple gem versions. Select the one you want used:"
+
+      if local_version or config[:app_factory_gem][:path]
+        if config[:app_factory_gem][:path]
+          log " #{i+=1}. #{local_version} (found in .fanforce-app-factory / locally)"
+        else
+          log " #{i+=1}. #{local_version} (found locally)"
+        end
+        options[i] = :local
+      end
+
+      log " #{i+=1}. #{rubygems_version} (found in rubygems)"
+      options[i] = :rubygems
+
+      if !local_version
+        log " #{i+=1}. #{current_version} (found in .fanforce-app-factory)"
+        options[i] = :current
+      end
+
+      num_selected = prompt('> ').to_i
+      if options[num_selected] == :local
+        version = local_version
+        config[:app_factory_gem][:path] = local_path
+      elsif options[num_selected] == :rubygems
+        version = rubygems_version
+        config[:app_factory_gem].delete(:path)
+        local_path = nil
+      elsif options[num_selected] == :current
+        version = current_version
+        local_path = nil
+      else
+        error "Error: must enter a valid number [1-#{i}]"
+      end
+
+      File.open(config_filepath,'w') do |f|
+        config[:app_factory_gem][:version] = version
+        f.write config.to_yaml
+      end
+    else
+      log 'DONE'
+      version = rubygems_version
+    end
+    log divider '---------------------------------------------------------------------------------------------------+'
+
+    if Fanforce::CLI::TYPE == :directory_of_apps
+      confirm("\nYou are about to update #{Fanforce::CLI::Apps.total_count} apps in this directory. This cannot be undone.\n"+
+                  'ARE YOU SURE?', true)
+
+      Fanforce::CLI::Apps.each do |app, processed_count, total_count|
+        log divider '+-------------------------------------------------------------------------------------------------'
+        log "#{'APP'.format(:bold)} - #{app._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
+        update_factory_for_app(app)
+      end
+    elsif Fanforce::CLI::TYPE == :single_app
+      app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
+      update_factory_for_app(app)
+    end
+
+    install_factory_gem_locally(version, local_path) if local_path
+    puts ''
+  end
+
+  def update_factory_for_app(app)
+    gemfile_filepath = Fanforce::AppFactory::CLI::Scaffolding.dir + '/Gemfile'
+    file = Fanforce::AppFactory::CLI::ScaffoldingFile.new(gemfile_filepath, app)
+    if file.update
+      Fanforce::AppFactory::CLI::Bundler.new(app).setup
+    else
+      log('Gemfile up to date')
+    end
+  end
+
+  def install_factory_gem_locally(version, local_path)
+    return if !local_path
+    gem_filepath = nil
+    Dir.chdir(local_path) do
+      system 'git add -A'
+      system 'rake build'
+      Dir.glob("#{local_path}/pkg/*.gem").each do |file|
+        break gem_filepath = file if file.include?(version)
+      end
+    end
+    system "gem install #{gem_filepath}"
+  end
+
 end

data/lib/fanforce/app_factory/cli_directory_of_apps.rb

@@ -28,7 +28,8 @@ class Fanforce::AppFactory::CLI::Scripts
   Fanforce::CLI.register(self, :update,
                          ['all/TYPE', 'Update all app files and env variables'],
                          ['files',    'Copy the latest scaffolding files from fanforce-app-factory'],
-                         ['env',      'Create ENV variables from your local .env folder']
+                         ['env',      'Create ENV variables from your local .env folder'],
+                         ['factory',  'Update fanforce-app-factory gem in Gemfile and run bundle']
   ) { require_relative 'cli/scripts/update' }
 
   ########################################################################################################################

data/lib/fanforce/app_factory/cli_single_app.rb

@@ -27,7 +27,8 @@ class Fanforce::AppFactory::CLI::Scripts
   Fanforce::CLI.register(self, :update,
                          ['all/TYPE', 'Update all app files and env variables'],
                          ['files',    'Copy the latest scaffolding files from fanforce-app-factory'],
-                         ['env',      'Create ENV variables from your local .env folder']
+                         ['env',      'Create ENV variables from your local .env folder'],
+                         ['factory',  'Update fanforce-app-factory gem in Gemfile and run bundle']
   ) { require_relative 'cli/scripts/update' }
 
   ########################################################################################################################

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc17'
+    VERSION = '2.0.0.rc18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc17
+  version: 2.0.0.rc18
 platform: ruby
 authors:
 - Caleb Clark