fanforce-app-factory 2.0.0.rc24 → 2.0.0.rc25

data/lib/fanforce/app_factory/Rakefile

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'json'
 require 'yaml'
 
-require_relative 'sprockets/load_sprockets'
+require_relative 'load_sprockets'
 
 ########################################################################################################################
 

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

@@ -10,21 +10,20 @@ class Fanforce::AppFactory::CLI::Env
   end
 
   def setup(environment)
+    environment = environment.to_sym
     bind_path = "#{app.dir}/../.env/_bind.yml"
     error 'You must setup .env/_bind.yml before updating env variables.' if !File.exists?(bind_path)
 
-    vars = app_vars(environment)
+    vars = vars(environment)
     has_workers = File.directory?("#{app.dir}/workers") ? true : false
+    return log "#{'Skipped'.format(:bold)} #{environment.to_s.titleize} has 0 env variables" if vars.blank? or vars.size == 0
 
-    if vars.blank? or vars.size == 0
-      return puts "#{'Skipped'.format(:bold)} #{environment.to_s.titleize} has 0 env variables"
-    end
-    puts "#{'Updated'.format(:green,:bold)} #{environment.to_s.titleize}#{has_workers ? '... and workers have' : ' has'} #{vars.size} env variables"
-
-    push_env_to(environment, vars)
+    push_to(environment, vars)
+    log "#{'Updated'.format(:green,:bold)} #{environment.to_s.titleize}#{has_workers ? '... and workers have' : ' has'} #{vars.size} env variables"
   end
 
   def push_env_to(environment, vars, create_worker_env=true)
+    environment = environment.to_sym
     vars.each {|k,v| puts "  - #{k}" }
     workers_dir = "#{app.dir}/workers"
     workers_env_dir = "#{workers_dir}/.env"
@@ -36,10 +35,8 @@ class Fanforce::AppFactory::CLI::Env
       update_powenv
       File.open("#{app.dir}/.appenv", 'w') {|f| f.write convert_hash_to_shell_env(vars) }
     else
-      return if config[:heroku][environment].blank?
-      heroku = auth_heroku(environment)
-      heroku_app_name = get_heroku_app_name(app, environment)
-      heroku.put_config_vars(heroku_app_name, vars)
+      error 'could not find heroku in .fanforce-app-factory' if config[:heroku][environment].blank?
+      Fanforce::AppFactory::CLI::Heroku.new(app).update_config(environment, vars)
     end
   end
 
@@ -51,7 +48,7 @@ class Fanforce::AppFactory::CLI::Env
     hash.inject('') {|script, (k,v)| script += "ENV['#{k}']=#{v.to_s.to_json}\n" }
   end
 
-  def load_app_vars(environment)
+  def load_vars(environment)
     environment = environment.to_sym
     vars = {'FANFORCE_APP_ID' => app._id}
     raw_yaml = File.read("#{app.dir}/../.env/_bind.yml")
@@ -68,9 +65,9 @@ class Fanforce::AppFactory::CLI::Env
     return vars
   end
 
-  def app_vars(environment)
+  def vars(environment)
     @vars ||= {}
-    @vars[environment] ||= load_app_vars(environment)
+    @vars[environment] ||= load_vars(environment)
   end
 
   # .POWENV #######################################################################
@@ -96,4 +93,4 @@ class Fanforce::AppFactory::CLI::Env
     ['source .appenv']
   end
 
-end
+end

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

@@ -0,0 +1,83 @@
+class Fanforce::AppFactory::CLI::Heroku
+  include Fanforce::AppFactory::CLI::Utils
+
+  attr_reader :app
+
+  require_gem 'heroku-api', 'heroku-api'
+
+  def initialize(app)
+    @app = app
+  end
+
+  def heroku(environment)
+    @heroku ||= {}
+    @heroku[environment] ||= Heroku::API.new(:username => config[:heroku][environment][:user], :password => config[:heroku][environment][:password])
+  rescue Exception => e
+    #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]}"
+    domain_found = heroku.get_domains(heroku_app_name).body.inject(false) {|result, d| d['domain'] == domain ? (break true) : false }
+    if domain_found
+      puts "#{'Found   '.format(:green,:bold)}" + "#{domain} domain on #{environment}"
+    else
+      heroku.post_domain(heroku_app_name, domain)
+      puts "#{'Added   '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
+    end
+
+    # Setup default short domain
+    domain = "#{app._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:default_short_domain]}"
+    domain_found = heroku.get_domains(heroku_app_name).body.inject(false) {|result, d| d['domain'] == domain ? (break true) : false }
+    if domain_found
+      puts "#{'Found   '.format(:green,:bold)}" + "#{domain} domain on #{environment}"
+    else
+      heroku.post_domain(heroku_app_name, domain)
+      puts "#{'Added   '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
+    end
+
+    remote_name = "#{env(environment)}-heroku"
+    if (`git remote`).split(/\r?\n/).include?(remote_name)
+      puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{remote_name}"
+      `git remote rm #{remote_name}`
+    else
+      puts "#{'Created '.format(:green,:bold)}" + "git remote for #{remote_name}"
+    end
+    `git remote add #{remote_name} git@#{config[:heroku][environment][:git_ssh_domain] || 'heroku.com'}:#{heroku_app_name}.git`
+  end
+
+  def update_config(environment, vars)
+    heroku(environment).put_config_vars(app_name(environment), vars) if vars
+  end
+
+  def env(environment)
+    case environment
+      when :staging then env = :stg
+      when :production then env = :prd
+    end
+  end
+
+  def app_name(environment)
+    environment = environment.to_sym
+    raise 'unknown environment' if ![:production, :staging].include?(environment)
+
+    heroku_app_name = "#{env(environment)}-#{app.dir_name}"
+    heroku_app_name.length > 30 ? heroku_app_name.gsub!(/(a|e|i|o|u)/, '') : heroku_app_name
+  end
+
+end

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

@@ -15,12 +15,12 @@ class Fanforce::AppFactory::CLI::Iron
     end
 
     env = Fanforce::AppFactory::CLI::Env.new(app)
-    vars = env.app_vars(environment) || {}
+    vars = env.vars(environment) || {}
 
     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?
 
     puts "#{'Updating Env'.format(:green,:bold)} #{environment.to_s.titleize}... and workers have #{vars.size} env variables"
-    env.push_env_to(environment, vars, true)
+    env.push_to(environment, vars, true)
 
     iron_worker = IronWorkerNG::Client.new(:token => vars['IRON_TOKEN'], :project_id => vars['IRON_PROJECT_ID'])
     Dir.chdir("#{app.dir}/workers") do

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

@@ -3,36 +3,45 @@ class Fanforce::AppFactory::CLI::Scripts
 
   require_relative '../lib/env'
   require_relative '../lib/iron'
+  require_relative '../lib/heroku'
 
   ######################################################################################################################
 
   def push(environment, command)
+    environment = environment.to_sym
     command = command.to_sym
     app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
 
-    if [:all,:iron].include?(command)
-      if Fanforce::CLI::TYPE == :directory_of_apps
-        confirm("\nYou are about to push iron works for #{Fanforce::CLI::Apps.total_count} apps in this directory.\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})... "
-          push_app_workers(app, environment)
-        end
-      elsif Fanforce::CLI::TYPE == :single_app
-        log divider '+-------------------------------------------------------------------------------------------------'
-        app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
-        push_app_workers(app, environment)
+    if Fanforce::CLI::TYPE == :directory_of_apps
+      confirm("\nYou are about to push iron works for #{Fanforce::CLI::Apps.total_count} apps in this directory.\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})... "
+        push_app(app, environment, command)
       end
-    elsif command.to_s.include?('.worker')
+    elsif Fanforce::CLI::TYPE == :single_app
       log divider '+---------------------------------------------------------------------------------------------------'
       app = Fanforce::CLI::App.load(Fanforce::CLI::DIR)
-      push_app_worker(app, environment, command.to_s)
+      push_app(app, environment, command)
     end
 
     log divider '----------------------------------------------------------------------------------------------------++'
   end
 
+  def push_app(app, environment, command)
+    if command.to_s.include?('.worker')
+      push_app_worker(app, environment, command.to_s)
+    elsif [:all,:iron].include?(command)
+      push_app_workers(app, environment)
+    elsif [:all,:env].include?(command)
+      push_env(app, environment)
+    elsif [:all,:heroku].include?(command)
+      error 'Heroku is not setup for development' if environment == :development
+      push_heroku(app, environment)
+    end
+  end
+
   def push_app_worker(app, environment, filename)
     Dir.chdir(app.dir) do
       Fanforce::AppFactory::CLI::Iron.new(app).upload(environment, filename)
@@ -42,39 +51,29 @@ class Fanforce::AppFactory::CLI::Scripts
   def push_app_workers(app, environment)
     Dir.chdir(app.dir) do
       Fanforce::AppFactory::CLI::Iron.new(app).upload(environment)
+    end
+  end
 
-      # if [:all,:bitbucket].include?(command) and config[:bitbucket].present?
-      #   if !(`git remote`).split(/\r?\n/).include?('bitbucket')
-      #     setup_bitbucket(app)
-      #   else
-      #     puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Bitbucket (#{$Config[:bitbucket][:user]})..."
-      #     Run.command('git push bitbucket --all')
-      #   end
-      # end
-
-      # environments = (environment==:all) ? [:staging,:production] : [environment]
-      # environments.each do |environment|
-      #   if [:all,:heroku].include?(command)
-      #     remote_name = "#{env(environment)}-heroku"
-      #     setup_heroku(app, environment) if !(`git remote`).split(/\r?\n/).include?(remote_name)
-      #
-      #     vars = Env.vars_by_app(environment)[app.dir_name] || {}
-      #     puts "\n#{"Updating Env Vars".format(:green,:bold)} on Heroku #{environment.to_s.titleize} (#{vars.size} variables)..."
-      #     push_env_to(environment, app, vars)
-      #
-      #     puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Heroku #{environment.to_s.titleize} (#{remote_name})..."
-      #     Run.command("git push #{remote_name} master")
-      #   end
-      #
-      #   if [:all,:iron].include?(command)
-      #     puts ''
-      #     upload_iron(app, command, [environment])
-      #   end
-      # end
+  def push_env(app, environment)
+    Fanforce::AppFactory::CLI::Env.new(app).setup(environment)
+  end
 
+  def push_heroku(app, environment)
+    case environment
+      when :staging then env = :stg
+      when :production then env = :prd
     end
-  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)
+    heroku.update_config(environment, 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)
+  end
 
 end

data/lib/fanforce/app_factory/cli_directory_of_apps.rb

@@ -36,8 +36,8 @@ class Fanforce::AppFactory::CLI::Scripts
 
   Fanforce::CLI.register(self, :push,
                          ['RACK_ENV all/TYPE', 'Push everything to the selected environment'],
-                         # ['RACK_ENV env',      'Setup the correct ENV variables in selected environment'],
-                         # ['RACK_ENV heroku',   'Create heroku app (if needed) and push latest commit'],
+                         ['RACK_ENV env',      'Setup the correct ENV variables in selected environment'],
+                         ['RACK_ENV heroku',   'Create heroku app (if needed) and push latest commit'],
                          ['RACK_ENV iron',     'Upload iron workers to selected environment']
   ) { require_relative 'cli/scripts/push' }
 

data/lib/fanforce/app_factory/cli_single_app.rb

@@ -36,8 +36,8 @@ class Fanforce::AppFactory::CLI::Scripts
 
   Fanforce::CLI.register(self, :push,
                          ['RACK_ENV all/TYPE',        'Push everything to the selected environment'],
-                         # ['RACK_ENV env',             'Setup the correct ENV variables in selected environment'],
-                         # ['RACK_ENV heroku',          'Create heroku app (if needed) and push latest commit'],
+                         ['RACK_ENV env',             'Setup the correct ENV variables in selected environment'],
+                         ['RACK_ENV heroku',          'Create heroku app (if needed) and push latest commit'],
                          ['RACK_ENV iron',            'Upload iron workers to selected environment'],
                          ['RACK_ENV FILENAME.worker', 'Upload single iron worker to selected environment']
   ) { require_relative 'cli/scripts/push' }

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

@@ -59,9 +59,9 @@ class App::Sinatra
 
 
   ######################################################################################################################
-  # ENGAGE
+  # VISITOR
 
-  #static '/:organization_slug/:com_behavior_shortid/:initiative_id', :engagement do route_engagement_page_ui end
+  #static '/:organization_slug/:com_behavior_shortid/:initiative_id', :engagement do route_visitor_page_ui(:engagement) end
 
   ######################################################################################################################
 

data/lib/fanforce/app_factory/scaffolding/layouts/._visitor.haml.registry

@@ -0,0 +1,5 @@
+fanforce-app-factory-2.0.0.rc6:02405b7a50a0ed450d10c57b6d6ad034a247e9d1
+fanforce-app-factory-2.0.0.rc16:b4b9aa096770b68ec2c9da62349443747d5afa88
+fanforce-app-factory-2.0.0.rc24:34de59db0e183647f76f1a35ad2bef51ef043a98
+fanforce-app-factory-2.0.0.rc24:e26e07d033f76de23a645ec185b856c332caa9b6
+fanforce-app-factory-2.0.0.rc24:704a6dfc8e71d43ffec0fcbe859c7c2860595a2c

data/lib/fanforce/app_factory/scaffolding/layouts/{engagement.haml → visitor.haml}

@@ -1,12 +1,13 @@
 -# AppFactoryScaffolding : FILE
 -#######################################################################################################################
 !!! 5
-%html.engagement-layout
+%html.visitor-layout
   %head
     %title Fanforce
     %meta{'http-equiv'=>'Content-Type', content:'text/html; charset=iso-8859-1'}/
     %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
-    = stylesheet '/engagement.css'
+    = stylesheet '/visitor.css'
+    %script(src='//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.js')
   %body
     .lyt-root
       .lyt-header
@@ -24,6 +25,7 @@
 
   = yield_content :after_fanforce_js
   :coffeescript
+    FF.css_framework = 'bootstrap3'
     FF.on('visitor.logout', ->
       $('#hello').html('')
     )

data/lib/fanforce/app_factory/sinatra/helper_routes/app.rb

@@ -43,4 +43,8 @@ class Fanforce::App::Sinatra
     json success: true
   end
 
+  def route_visitor_page_ui(page_name)
+    page :"visitor/#{page_name}", :layout => :visitor
+  end
+
 end

data/lib/fanforce/app_factory/sinatra/helper_routes/com_behavior.rb

@@ -8,10 +8,6 @@ class Fanforce::App::Sinatra
     page :edit_initiative, :layout => :fembedded, com_dir: params[:com_behavior_shortid]
   end
 
-  def route_engagement_page_ui
-    page :engagement, :layout => :engagement, com_dir: params[:com_behavior_shortid]
-  end
-
   def route_archive_initiative_callback
     json status: 'finished'
   end

data/lib/fanforce/app_factory/sinatra/helper_routes/com_broadcaster.rb

@@ -1,6 +1,6 @@
 class Fanforce::App::Sinatra
 
-def route_new_message_ui
+  def route_new_message_ui
     page :new_message, :layout => :fembedded, com_dir: params[:com_behavior_shortid]
   end
 

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc24'
+    VERSION = '2.0.0.rc25'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc24
+  version: 2.0.0.rc25
   prerelease: 6
 platform: ruby
 authors:
@@ -406,6 +406,7 @@ files:
 - 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/heroku.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
@@ -439,12 +440,12 @@ files:
 - lib/fanforce/app_factory/scaffolding/Gemfile
 - lib/fanforce/app_factory/scaffolding/Rakefile
 - lib/fanforce/app_factory/scaffolding/Routes.rb
-- lib/fanforce/app_factory/scaffolding/assets/css/._engagement.scss.registry
 - lib/fanforce/app_factory/scaffolding/assets/css/._fembedded.scss.registry
 - lib/fanforce/app_factory/scaffolding/assets/css/._promotional.scss.registry
-- lib/fanforce/app_factory/scaffolding/assets/css/engagement.scss
+- lib/fanforce/app_factory/scaffolding/assets/css/._visitor.scss.registry
 - lib/fanforce/app_factory/scaffolding/assets/css/fembedded.scss
 - lib/fanforce/app_factory/scaffolding/assets/css/promotional.scss
+- lib/fanforce/app_factory/scaffolding/assets/css/visitor.scss
 - lib/fanforce/app_factory/scaffolding/assets/img/._icon-16.png.registry
 - lib/fanforce/app_factory/scaffolding/assets/img/._icon-32.png.registry
 - lib/fanforce/app_factory/scaffolding/assets/img/._icon-42.png.registry
@@ -474,12 +475,12 @@ files:
 - lib/fanforce/app_factory/scaffolding/config.json
 - lib/fanforce/app_factory/scaffolding/config.ru
 - lib/fanforce/app_factory/scaffolding/favicon.ico
-- lib/fanforce/app_factory/scaffolding/layouts/._engagement.haml.registry
 - lib/fanforce/app_factory/scaffolding/layouts/._fembedded.haml.registry
 - lib/fanforce/app_factory/scaffolding/layouts/._promotional.haml.registry
-- lib/fanforce/app_factory/scaffolding/layouts/engagement.haml
+- lib/fanforce/app_factory/scaffolding/layouts/._visitor.haml.registry
 - lib/fanforce/app_factory/scaffolding/layouts/fembedded.haml
 - lib/fanforce/app_factory/scaffolding/layouts/promotional.haml
+- lib/fanforce/app_factory/scaffolding/layouts/visitor.haml
 - lib/fanforce/app_factory/scaffolding/robots.txt
 - lib/fanforce/app_factory/scaffolding/views/._index.haml.registry
 - lib/fanforce/app_factory/scaffolding/views/index.haml

data/lib/fanforce/app_factory/scaffolding/layouts/._engagement.haml.registry

@@ -1,2 +0,0 @@
-fanforce-app-factory-2.0.0.rc6:02405b7a50a0ed450d10c57b6d6ad034a247e9d1
-fanforce-app-factory-2.0.0.rc16:b4b9aa096770b68ec2c9da62349443747d5afa88