fanforce-app-factory 2.0.0.rc34 → 2.0.0.rc35

data/Rakefile

@@ -29,7 +29,9 @@ namespace :scaffolding do
     scaffolding_dir = File.expand_path('../lib/fanforce/app_factory/scaffolding', __FILE__)
 
     Dir.glob("#{scaffolding_dir}/**/*", File::FNM_DOTMATCH).each do |scaffold_filepath|
-      next if scaffold_filepath =~ /\.registry/ or File.directory?(scaffold_filepath)
+      next if scaffold_filepath =~ /\.registry$/
+      next if scaffold_filepath =~ /\/readme$/
+      next if File.directory?(scaffold_filepath)
 
       file_parts = scaffold_filepath.split('/')
       registry_filepath = "#{file_parts[0...-1].join('/')}/._#{file_parts[-1]}.registry"

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

@@ -30,9 +30,14 @@ class Fanforce::AppFactory::CLI::Scaffolding
     # status = :exists, :current, :missing, :previous, :diverged, :forked
     change_data = {}
     files.each do |file|
-      next change_data[file.filepath] = {
-          status: File.directory?(file.filepath) ? :exists : :missing,
-      } if File.directory?(file.scaffold_filepath)
+      if File.directory?(file.scaffold_filepath)
+        directory_exists = File.directory?(file.filepath)
+        change_data[file.filepath] = {status: directory_exists ? :exists : :missing}
+        if directory_exists and File.exists?("#{file.scaffold_filepath}readme") and Dir.glob("#{file.filepath}*").size == 0
+          change_data["#{file.filepath}readme"] = {status: :missing}
+        end
+        next
+      end
 
       status = file.status
       diff = file.diff_changes if [:previous,:diverged].include?(status)
@@ -58,6 +63,7 @@ class Fanforce::AppFactory::CLI::Scaffolding
   def files
     Dir.glob("#{self.class.dir}/**/*", File::FNM_DOTMATCH).inject([]) do |files, scaffold_filepath|
       next files if scaffold_filepath =~ /\.registry$/
+      next files if scaffold_filepath =~ /\/readme$/
       next files if scaffold_filepath =~ /\/\.\.?$/
       scaffold_filepath = "#{scaffold_filepath}/" if File.directory?(scaffold_filepath) and scaffold_filepath !~ /\/$/
       files << Fanforce::AppFactory::CLI::ScaffoldingFile.new(scaffold_filepath, app)

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

@@ -18,8 +18,13 @@ class Fanforce::AppFactory::CLI::ScaffoldingFile
 
   def create
     if File.directory?(scaffold_filepath)
-      mkdir
-      return nil
+      Dir.mkdir(filepath)
+      if File.exists?("#{scaffold_filepath}#{readme}")
+        File.open("#{filepath}#{readme}", 'w') {|f| f.write(File.open("#{scaffold_filepath}#{readme}").read) }
+      end
+
+      log "#{'Created'.format(:green,:bold)} #{relativepath}"
+      return true
     end
 
     return update if File.exists?(filepath)
@@ -32,8 +37,21 @@ class Fanforce::AppFactory::CLI::ScaffoldingFile
 
   def update
     if File.directory?(scaffold_filepath)
-      mkdir
-      return nil
+      created_dir = false
+      added_readme = false
+      if !File.directory?(filepath)
+        Dir.mkdir(filepath)
+        log "#{'Created'.format(:green,:bold)} #{relativepath}"
+        created_dir = true
+      end
+
+      if File.exists?("#{scaffold_filepath}readme") and Dir.glob("#{filepath}*").size == 0
+        File.open("#{filepath}readme", 'w') {|f| f.write(File.open("#{scaffold_filepath}readme").read) }
+        log "#{'Added'.format(:green,:bold)} #{relativepath}readme" if !created_dir
+        added_readme = true
+      end
+
+      return (created_dir || added_readme) ? true : false
     end
 
     is_missing = is_missing?
@@ -80,10 +98,6 @@ class Fanforce::AppFactory::CLI::ScaffoldingFile
 
   ######################################################################################################################
 
-  def mkdir
-    Dir.mkdir(filepath) if !File.directory?(filepath)
-  end
-
   def extension
     @extension ||= scaffold_filepath.match(/([^\/\.]+)$/)[1].to_s.downcase
   end

data/lib/fanforce/app_factory/scaffolding/assets/js/controllers/readme

@@ -0,0 +1,2 @@
+This file exists to ensure the folder is added to git (since the directory is empty). You should remove this file
+once you add some files.

data/lib/fanforce/app_factory/scaffolding/assets/js/scripts/readme

@@ -0,0 +1,2 @@
+This file exists to ensure the folder is added to git (since the directory is empty). You should remove this file
+once you add some files.

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc34'
+    VERSION = '2.0.0.rc35'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc34
+  version: 2.0.0.rc35
   prerelease: 6
 platform: ruby
 authors:
@@ -463,7 +463,7 @@ files:
 - lib/fanforce/app_factory/scaffolding/assets/js/._fembedded-app.coffee.registry
 - lib/fanforce/app_factory/scaffolding/assets/js/._fembedded.js.registry
 - lib/fanforce/app_factory/scaffolding/assets/js/._promotional.js.registry
-- lib/fanforce/app_factory/scaffolding/assets/js/controllers/.registry
+- lib/fanforce/app_factory/scaffolding/assets/js/controllers/readme
 - lib/fanforce/app_factory/scaffolding/assets/js/fembedded-app.coffee
 - lib/fanforce/app_factory/scaffolding/assets/js/fembedded.js
 - lib/fanforce/app_factory/scaffolding/assets/js/lib/._cookie.coffee.registry
@@ -473,7 +473,7 @@ files:
 - lib/fanforce/app_factory/scaffolding/assets/js/lib/filters.coffee
 - lib/fanforce/app_factory/scaffolding/assets/js/lib/utils.coffee
 - lib/fanforce/app_factory/scaffolding/assets/js/promotional.js
-- lib/fanforce/app_factory/scaffolding/assets/js/scripts/.registry
+- lib/fanforce/app_factory/scaffolding/assets/js/scripts/readme
 - lib/fanforce/app_factory/scaffolding/config.json
 - lib/fanforce/app_factory/scaffolding/config.ru
 - lib/fanforce/app_factory/scaffolding/favicon.ico

data/lib/fanforce/app_factory/scaffolding/assets/js/controllers/.registry

@@ -1 +0,0 @@
-# This file exists to ensure the folder is added to git (since the directory is empty)

data/lib/fanforce/app_factory/scaffolding/assets/js/scripts/.registry

@@ -1 +0,0 @@
-# This file exists to ensure the folder is added to git (since the directory is empty)