fanforce-plugin-factory 1.6.1 → 2.0.0.rc1

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

@@ -29,7 +29,6 @@ class Fanforce::PluginFactory::CLI::Iron
       return puts "#{'Skipped  '.format(:bold)} #{environment.to_s.titleize} has 0 workers" if workers.size == 0
 
       upload_processes = []
-      FileUtils.cp("#{plugin.dir}/workers/.env/#{environment}.rb", "#{plugin.dir}/workers/.env/.#{environment}env.rb")
       workers.each do |filename|
         next if worker_filename and !filename.include?(worker_filename)
         code_name = filename.gsub('.worker', '')
@@ -39,12 +38,11 @@ class Fanforce::PluginFactory::CLI::Iron
         code.gem('fanforce-plugin-factory', factory_version)
         code.remote
         code.name = code_name
-        code.file("#{plugin.dir}/workers/.env/.#{environment}env.rb")
+        code.file("#{plugin.dir}/workers/.env/#{environment}.rb", '.env')
 
         upload_processes << upload_iron_worker(iron_worker, code, filename, environment)
       end
       upload_processes.each { |pid| Process.waitpid(pid) }
-      FileUtils.remove_file("#{plugin.dir}/workers/.env/.#{environment}env.rb")
     end
   end
 

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

@@ -30,9 +30,14 @@ class Fanforce::PluginFactory::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}initialize.txt") and Dir.glob("#{file.filepath}*").size == 0
+          change_data["#{file.filepath}initialize.txt"] = {status: :missing}
+        end
+        next
+      end
 
       status = file.status
       diff = file.diff_changes if [:previous,:diverged].include?(status)
@@ -58,6 +63,7 @@ class Fanforce::PluginFactory::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 =~ /\/initialize\.txt$/
       next files if scaffold_filepath =~ /\/\.\.?$/
       scaffold_filepath = "#{scaffold_filepath}/" if File.directory?(scaffold_filepath) and scaffold_filepath !~ /\/$/
       files << Fanforce::PluginFactory::CLI::ScaffoldingFile.new(scaffold_filepath, plugin)

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

@@ -18,8 +18,13 @@ class Fanforce::PluginFactory::CLI::ScaffoldingFile
 
   def create
     if File.directory?(scaffold_filepath)
-      mkdir
-      return nil
+      Dir.mkdir(filepath)
+      if File.exists?("#{scaffold_filepath}initialize.txt")
+        File.open("#{filepath}initialize.txt", 'w') {|f| f.write(File.open("#{scaffold_filepath}initialize.txt").read) }
+      end
+
+      log "#{'Created'.format(:green,:bold)} #{relativepath}"
+      return true
     end
 
     return update if File.exists?(filepath)
@@ -32,8 +37,21 @@ class Fanforce::PluginFactory::CLI::ScaffoldingFile
 
   def update
     if File.directory?(scaffold_filepath)
-      mkdir
-      return nil
+      created_dir = false
+      added_initialize_file = false
+      if !File.directory?(filepath)
+        Dir.mkdir(filepath)
+        log "#{'Created'.format(:green,:bold)} #{relativepath}"
+        created_dir = true
+      end
+
+      if File.exists?("#{scaffold_filepath}initialize.txt") and Dir.glob("#{filepath}*").size == 0
+        File.open("#{filepath}initialize.txt", 'w') {|f| f.write(File.open("#{scaffold_filepath}initialize.txt").read) }
+        log "#{'Added'.format(:green,:bold)} #{relativepath}initialize.txt" if !created_dir
+        added_initialize_file = true
+      end
+
+      return (created_dir || added_initialize_file) ? true : false
     end
     is_missing = is_missing?
     if !is_missing
@@ -79,10 +97,6 @@ class Fanforce::PluginFactory::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/plugin_factory/cli/scripts/destroy.rb

@@ -18,19 +18,17 @@ class Fanforce::PluginFactory::CLI::Scripts
     log divider '+-----'
     confirm("You are about to delete both local and remote files for #{plugin_id}.\nARE YOU SURE?", true)
 
-    # puts "\n---------------------------------------------------------------------------------------------------------------"
-    # puts 'DELETING HEROKU APPS...'
-    # [:staging,:production].each do |environment|
-    #   next if $Config[:heroku].blank? or $Config[:heroku][environment].blank?
-    #   heroku = auth_heroku(environment)
-    #   heroku_app_name = get_heroku_app_name(plugin, environment)
-    #   begin
-    #     heroku.delete_app(heroku_app_name)
-    #     puts "#{'Removed  '.format(:green,:bold)}" + " #{heroku_app_name}"
-    #   rescue Exception => e
-    #     puts "#{'Already Removed'.format(:green,:bold)}" + " #{heroku_app_name}"
-    #   end
-    # end
+    log divider '+-----------------------------------------------------------------------------------------------------'
+    log 'DELETING HEROKU APPS...'
+    [:staging,:production].each do |environment|
+      heroku = Fanforce::PluginFactory::CLI::Heroku.new(plugin, environment)
+      if heroku.app_exists?
+        heroku.destroy
+        log "#{'Removed  '.format(:green,:bold)}" + " #{heroku.app_name}"
+      else
+        log "#{'Already Removed'.format(:green,:bold)}" + " #{heroku.app_name}"
+      end
+    end
 
     log divider '+-----------------------------------------------------------------------------------------------------'
     log 'REMOVING BITBUCKET REPOSITORY...'

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

@@ -35,8 +35,8 @@ class Fanforce::PluginFactory::CLI::Scripts
     end
 
     if [:all,:heroku].include?(command) and environment != :development
-      heroku = Fanforce::PluginFactory::CLI::Heroku.new(plugin)
-      heroku.ensure_heroku_app_exists(environment)
+      heroku = Fanforce::PluginFactory::CLI::Heroku.new(plugin, environment)
+      heroku.ensure_app_exists
     end
 
     if [:all,:iron].include?(command)
@@ -69,20 +69,14 @@ class Fanforce::PluginFactory::CLI::Scripts
   end
 
   def push_heroku(heroku, plugin, environment)
-    case environment
-      when :staging then env = :stg
-      when :production then env = :prd
-    end
-    remote_name = "#{env}-heroku"
-
-    heroku.setup(environment) if !(`git remote`).split(/\r?\n/).include?(remote_name)
+    heroku.ensure_git_remote_exists
 
     vars = Fanforce::PluginFactory::CLI::Env.new(plugin).vars(environment)
-    heroku.update_config(environment, vars)
+    heroku.update_config(vars)
     log 'Updated ENV'.format(:green,:bold) + " on Heroku #{environment.to_s.titleize} (#{vars.size} variables)..."
 
-    puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Heroku #{environment.to_s.titleize} (#{remote_name})..."
-    console_command("git push #{remote_name} master", true)
+    puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Heroku #{environment.to_s.titleize} (#{heroku.git_remote_name})..."
+    console_command("git push #{heroku.git_remote_name} master", true)
   end
 
 end

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

@@ -25,13 +25,7 @@ class Fanforce::PluginFactory::CLI::Scripts
           FileUtils.mkdir("#{plugin.dir}/tmp") if !File.directory?("#{plugin.dir}/tmp")
           FileUtils.touch("#{plugin.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(plugin, environment)
+          Fanforce::PluginFactory::CLI::Heroku.new(plugin, environment).restart
         end
         log "#{"Restarted #{environment}".format(:bold,:green)} #{plugin.dir_name}"
       end

data/lib/fanforce/plugin_factory/core_config.rb

@@ -60,9 +60,9 @@ class Fanforce::Plugin::CoreConfig
     $: << File.join(@base_dir,'lib') if File.directory?("#{@base_dir}/lib")
     $: << @base_dir if File.directory?("#{@base_dir}")
 
-    require "#{factory_dir}/sinatra/helper_routes/com_initiative"
-    require "#{factory_dir}/sinatra/helper_routes/com_broadcaster"
+    require "#{factory_dir}/sinatra/helper_routes/app"
     require "#{factory_dir}/sinatra/helper_routes/com_database"
+    require "#{factory_dir}/sinatra/helper_routes/com_campaign"
     require "#{factory_dir}/sinatra/helper_routes/com_identifier"
     require "#{factory_dir}/sinatra/helper_routes/com_js_widget"
     require "#{factory_dir}/sinatra/helper_routes/plugin"

data/lib/fanforce/plugin_factory/directive_views/initiative-footer.haml

@@ -1,8 +1,9 @@
-.footer
-  %label Save initiative as...
-  .input-wrapper(onclick='$(this).find("input").focus()')
-    .prefix {{prefix}}
-    %input.form-control.input-sm(type='text' ng-disabled='is_disabled' ng-model='initiative_name')
-  %button.btn.btn-sm.btn-primary(ng-click='save()' ng-disabled='is_disabled')
-    %i.icon-plus.icon-white
-    Create
+%base-footer
+  .footer
+    %label Save initiative as...
+    .input-wrapper(onclick='$(this).find("input").focus()')
+      .prefix {{prefix}}
+      %input.form-control.input-sm(type='text' ng-disabled='is_disabled' ng-model='initiative_name')
+    %button.btn.btn-sm.btn-primary(ng-click='save()' ng-disabled='is_disabled')
+      %i.icon-plus.icon-white
+      Create

data/lib/fanforce/plugin_factory/plugin.rb

@@ -1,6 +1,8 @@
 require 'redis'
 require 'fileutils'
 require 'rack/jsonr'
+require 'rack/jquery-params'
+require 'rack/cors'
 require 'sinatra/base'
 require 'active_support/all'
 require 'fanforce/api'
@@ -52,9 +54,14 @@ class Fanforce::Plugin
       sprockets = SprocketsCompiler.setup(base_dir)
       return sprockets.index.call(env)
     end
+    return Rack::File.new("#{base_dir}").call(env) if env['PATH_INFO'] =~ /^\/(favicon.ico|robots.txt)/
+
     require_relative 'sinatra/_load'
     request = Rack::Request.new(env)
+    Sass::Plugin.options[:cache_location] = './tmp/sass-cache'
+    sass_options = {:cache_location => "path\to\tmp\sass-cache"}
     Rack::JSONR.intercept_method_override(env, request, request.params, :all)
+    Rack::JQueryParams.fix(env, :all)
     Sinatra.new.call(env)
   end
 end

data/lib/fanforce/plugin_factory/scaffolding/._Gemfile.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:ae064a186c4105989dbb1fc1d89d297c4bb50645
 fanforce-plugin-factory-1.6.0:b4efb7323d5dd68f09d7a16c16d02880a0504284
 fanforce-plugin-factory-1.6.0:8b96f77d8bb7e7cea7a96b2bd9e580bd8b12dee8
+fanforce-plugin-factory-2.0.0.rc1:804c185c4212d74d0be61e4f5f035d9eecbfa8be

data/lib/fanforce/plugin_factory/scaffolding/._Rakefile.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:26cd00b1a8da9aae4cd70711b866f29140baeaff
 fanforce-plugin-factory-1.6.0:cee70a90994a4d0f268511a584ec90db09650ed2
 fanforce-plugin-factory-1.6.0:95c9666667a190e6c562393a68f22ab6f036f008
+fanforce-plugin-factory-2.0.0.rc1:11e944488dcd7f8d930dfcde88e754ce22c3f4e1

data/lib/fanforce/plugin_factory/scaffolding/._config.ru.registry

@@ -2,3 +2,4 @@ fanforce-plugin-factory-1.6.0:caed161fa223c1350d5af2ad35473b0e70038655
 fanforce-plugin-factory-1.6.0:76016405e6284edb561d1e174d1ef8033461df64
 fanforce-plugin-factory-1.6.0:a9286ef7cb6e5c691e6d147cbf264262ee196837
 fanforce-plugin-factory-1.6.0:621e2a7626b0da72464346b506a47ef012912e23
+fanforce-plugin-factory-2.0.0.rc1:a4e60d8212d23af4273165cf818249395987ba35

data/lib/fanforce/plugin_factory/scaffolding/._robots.txt.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:fb35191721228a8b5315598705b637811e59ca56
 fanforce-plugin-factory-1.6.0:464b1266fdd658b516de626464a5aa8455cba664
 fanforce-plugin-factory-1.6.0:1fb3e86b6f8117f386bf3842718946d0157b7a0f
+fanforce-plugin-factory-2.0.0.rc1:58638c3c3504e2eb8b52a7401607fc365325dbcd

data/lib/fanforce/plugin_factory/scaffolding/Gemfile

@@ -1,6 +1,5 @@
 # PluginFactoryScaffolding : PARTIAL
 ########################################################################################################################
-
 source 'https://rubygems.org'
 ruby '1.9.3'
 

data/lib/fanforce/plugin_factory/scaffolding/Rakefile

@@ -1,6 +1,5 @@
 # PluginFactoryScaffolding : PARTIAL
 ########################################################################################################################
-
 require 'bundler'; Bundler.setup
 require 'fanforce/plugin_factory'
 

data/lib/fanforce/plugin_factory/scaffolding/Routes.rb

@@ -17,17 +17,18 @@ class Plugin::Sinatra
   ######################################################################################################################
   # DATABASE
 
-  #static '/:com_database_shortid/add_source.html', [] do route_add_source_ui end
-  #static '/:com_database_shortid/source_details.html', [] do route_source_details_ui end
+  #static '/:com_database_shortid/add_database.html', [] do route_add_database_ui end
+  #static '/:com_database_shortid/view_profile.html', [] do route_view_profile_ui end
 
   ######################################################################################################################
   # PROCESSOR
 
 
   ######################################################################################################################
-  # BROADCASTER
+  # CAMPAIGN
 
-  #static '/:com_initiative_shortid/new_message.html', [] do route_new_message_ui end
+  #static '/:com_campaign_shortid/add_campaign.html', [] do route_add_campaign_ui end
+  #static '/:com_campaign_shortid/view_campaign.html', [] do route_view_campaign_ui end
 
   ######################################################################################################################
   # IDENTIFIER

data/lib/fanforce/plugin_factory/scaffolding/assets/css/._fembedded.scss.registry

@@ -2,3 +2,4 @@ fanforce-plugin-factory-1.6.0:90e4bd9c4abaeabd9f44b29bec97f76f8149054b
 fanforce-plugin-factory-1.6.0:290a0a53557bf6151cb9db03bd91e4ff75888ef1
 fanforce-plugin-factory-1.6.0:4bbddc05c99b42b72cc9b71036b1540db02b7842
 fanforce-plugin-factory-1.6.0:3100df670df8f5fb23b7e9fce2653228db080841
+fanforce-plugin-factory-2.0.0.rc1:37b5ba82eda9b6058e6ee625916caa998dc0d64b

data/lib/fanforce/plugin_factory/scaffolding/assets/css/fembedded.scss

@@ -15,10 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 html.fembedded-layout {
-  body {
-    overflow: hidden;
-    background: #F4F8FC;
-  }
+  body { overflow: hidden; background: white; }
 }
 
 // END PARTIAL /////////////////////////////////////////////////////////////////////////////////////////////////////////

data/lib/fanforce/plugin_factory/scaffolding/assets/js/._fembedded.js.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:130fe4541ada9247bd4224b54f744f17476d7e55
 fanforce-plugin-factory-1.6.0:89a46b16eb62e6dd5b68767cc9e2d39733eb94c0
 fanforce-plugin-factory-1.6.0:bd29cc97b29b1819d13004bbecd02ef8d161e2ac
+fanforce-plugin-factory-2.0.0.rc1:d381adc3c98eb0d96afb32c12444487b6c1b16b3

data/lib/fanforce/plugin_factory/scaffolding/assets/js/controllers/initialize.txt

@@ -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/plugin_factory/scaffolding/assets/js/fembedded.js

@@ -1,12 +1,14 @@
 // PluginFactoryScaffolding : PARTIAL
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//= require fembedded-app
+//= require ./app-fembedded
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //= require plugin_factory/ui-select
+//= require plugin_factory/vendors/moment.min
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //= require plugin_factory/directives
 //= require plugin_factory/lib
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //= require_tree ./lib
 //= require_tree ./controllers
+
 // END PARTIAL /////////////////////////////////////////////////////////////////////////////////////////////////////////

data/lib/fanforce/plugin_factory/scaffolding/assets/js/lib/._filters.coffee.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:89ec4c29cda80ef22367c43e07f30c6feb53c92b
 fanforce-plugin-factory-1.6.0:aa4484417ba6f1b036316847cdff214ae3097f35
 fanforce-plugin-factory-1.6.0:34736a5dfd53d8a2fd2d137590d1d2f5d052f827
+fanforce-plugin-factory-2.0.0.rc1:ad8f95e3b051e230e7f0abc90fd9fa07cb6dfed4

data/lib/fanforce/plugin_factory/scaffolding/assets/js/lib/filters.coffee

@@ -1,9 +1,29 @@
 # PluginFactoryScaffolding : PARTIAL
 ########################################################################################################################
 
-App.filter 'fromNow', (-> (date) ->
+# FILTER: fromNow
+####################################################################################
+App.filter('fromNow', ()-> (date) ->
   return 'never' if !date
   moment(date).fromNow()
 )
 
+# FILTER: titleize
+####################################################################################
+App.filter('titleize', -> (str) ->
+  return str if typeof str != 'string'
+  smallWords = /^(a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|vs?\.?|via)$/i
+  str.replace /([^\W_]+[^\s-]*) */g, (match, p1, index, title)->
+    return match.toLowerCase() if (index > 0 && index + p1.length != title.length && p1.search(smallWords) > -1) && (title.charAt(index - 2) != ":") && (title.charAt(index - 1).search(/[^\s-]/) < 0)
+    return match if (p1.substr(1).search(/[A-Z]|\../) > -1)
+    match.charAt(0).toUpperCase() + match.substr(1)
+)
+
+# FILTER: humanize
+####################################################################################
+App.filter('humanize', -> (str) ->
+  return str if typeof str != 'string'
+  str.replace('_', ' ')
+)
+
 # END PARTIAL ##########################################################################################################

data/lib/fanforce/plugin_factory/scaffolding/assets/js/scripts/initialize.txt

@@ -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/plugin_factory/scaffolding/config.ru

@@ -3,6 +3,12 @@
 require 'bundler'; Bundler.setup
 require 'fanforce/plugin_factory'
 
+use Rack::Cors do
+  allow do
+    origins '*'
+    resource '*', :headers => :any, :methods => [:get, :post, :options, :put, :delete], :max_age => 1728000
+  end
+end
 run Fanforce::Plugin
 
 # END PARTIAL ##########################################################################################################

data/lib/fanforce/plugin_factory/scaffolding/layouts/._fembedded.haml.registry

@@ -2,3 +2,4 @@ fanforce-plugin-factory-1.6.0:0af55ae841e12060b516293b45f0e792c2ed89b9
 fanforce-plugin-factory-1.6.0:750b6bdf56a47d700a45cc8e1d3a711933603f0d
 fanforce-plugin-factory-1.6.0:429f08694937012aa6731394fca2ff57e6600070
 fanforce-plugin-factory-1.6.0:fbda63d2f1b25138acc371c7be5d2e70f05886bf
+fanforce-plugin-factory-2.0.0.rc1:0a8a72543f701e54c2f05f649a3a92ce2dc482e7

data/lib/fanforce/plugin_factory/scaffolding/layouts/fembedded.haml

@@ -4,23 +4,18 @@
 %html.fembedded-layout(ng-app='fembedded')
   %head
     %title Fanforce Plugin
-    %meta(charset='UTF-8')/
-    %meta(http-equiv='X-UA-Compatible' content='IE=edge,chrome=1')/
-    %meta(name='viewport' content='width=device-width')/
-    %meta(http-equiv='Content-Type' content='text/html charset=iso-8859-1')/
-    %meta(http-equiv='Content-Language' content='en-us')/
     :javascript
+      APP_ID = #{App._id.to_json}
       BASE_DOMAIN = #{Fanforce.base_domain.to_json}
       API_DOMAIN  = #{Fanforce.api_domain.to_json}
+      APPS_BASE_DOMAIN = #{Fanforce.apps_base_domain.to_json}
+    = javascript 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.js'
+    = javascript 'http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js'
     = javascript 'http://i.fanforce.dev/devforce.js'
-    = javascript 'http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.js'
-    = javascript 'http://ajax.googleapis.com/ajax/libs/angularjs/1.3.4/angular.min.js'
-    = stylesheet 'fembedded'
-    = javascript 'fembedded'
-
-  %body(class=page_classes)
-    .page-loading(ng-hide='app_is_loaded')
-      %loading Page loading...
-    .page-loaded(ng-show='app_is_loaded')
-      .angular-view(ng-view)
-      .standard-view= yield
+    = javascript "#{request.base_url}/assets/fembedded.js"
+    = stylesheet "#{request.base_url}/assets/fembedded.css"
+  %body
+    %loading(ng-hide='app_is_loaded') Page loading...
+    %page(class=page_classes ng-show='app_is_loaded' ng-class='{success: is_success}' ng-cloak)
+      %ng-view
+      = yield

data/lib/fanforce/plugin_factory/scaffolding/robots.txt

@@ -1,6 +1,5 @@
 # PluginFactoryScaffolding : PARTIAL
 ########################################################################################################################
-
 User-agent: *
 Allow: /