fanforce-plugin-factory 2.0.0.rc6 → 2.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d300f67d5a239a4fdfe9580b79921c0b686c6050
-  data.tar.gz: c1f7b903919820d3f7de410c5158afe7ee376298
+  metadata.gz: 1beb5dcb8bd95c0458027304019549ee872eae2e
+  data.tar.gz: 5a32072e43ea141974347a08dc62ce4d5e22a088
 SHA512:
-  metadata.gz: 9a6802eb17d4c1c70b5d86d5b2979d1f6f169a8c7b5d83093bcd959300b78b3a6d4343ea570e367deec948c97478f5e3350dae0a52e7752941c3a175cf855ac9
-  data.tar.gz: 4be4f223f26fe3d70e412aa21e823dbee82d7619808dc9fed02e0aec2b4e694988f085535e0c7cec7717fe9c550887702c61afce635dadf7c9d0044123415ade
+  metadata.gz: 30effcb53f8985fb8c59c5404b7f12eeddc7395b66046a8d98e9b560ae6fe80af49a4dfb272635b75a840653a7916ace8655991a7d880d5c34386967f3d0620e
+  data.tar.gz: a9574836d6a5dbb4c50410937b45999c40acbf7f14ca437cbf155daf734e7ee6758260b4d960e5d8cb475bedf3b3c622a09f6c2395ee35d989419ea5f804003a

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

@@ -62,33 +62,38 @@ class Fanforce::PluginFactory::CLI::Heroku
   end
 
   def ensure_app_exists
-    return puts "#{'Found '.format(:green,:bold)}" + "#{environment} app on heroku (#{app_name})" if app_exists?
-    create_app
+    if app_exists?
+      puts "#{'Found '.format(:green,:bold)}" + "#{environment} app on heroku (#{app_name})"
+      ensure_domains_exist
+    else
+      create_app
+      ensure_domains_exist
+    end
   end
 
   def create_app
     heroku.post_app(name: app_name)
     puts "#{'Created '.format(:green,:bold)}" + "#{environment} on heroku (#{app_name})"
+  end
 
+  def ensure_domains_exist
     # Setup standard app domain
-    domain = "#{plugin._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:apps_base]}"
-    domain_found = heroku.get_domains(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(app_name, domain)
-      puts "#{'Added '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
-    end
+    add_domain("#{plugin._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:plugins_base]}")
 
     # Setup default short domain
-    domain = "#{plugin._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:default_short_domain]}"
-    domain_found = heroku.get_domains(app_name).body.inject(false) {|result, d| d['domain'] == domain ? (break true) : false }
+    add_domain("#{plugin._id}.#{Fanforce::Base::DomainEnvironments.method(environment).call[:default_short_domain]}")
+  end
+
+  def add_domain(domain_name)
+    domain_found = heroku.get_domains(app_name).body.inject(false) {|result, d| d['domain'] == domain_name ? (break true) : false }
     if domain_found
-      puts "#{'Found '.format(:green,:bold)}" + "#{domain} domain on #{environment}"
+      puts "#{'Found '.format(:green,:bold)}" + "#{domain_name} domain on #{environment}"
     else
-      heroku.post_domain(app_name, domain)
-      puts "#{'Added '.format(:green,:bold)}" + "#{domain} domain to #{environment}"
+      heroku.post_domain(app_name, domain_name)
+      puts "#{'Added '.format(:green,:bold)}" + "#{domain_name} domain to #{environment}"
     end
+  rescue
+    puts "#{'Error '.format(:red,:bold)}" + "adding #{domain_name} domain on #{environment}"
   end
 
   def update_config(vars)

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

@@ -75,8 +75,8 @@ class Fanforce::PluginFactory::CLI::Scripts
     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} (#{heroku.git_remote_name})..."
-    console_command("git push #{heroku.git_remote_name} master", true)
+    puts "\n#{'Pushing '.format(:green,:bold)}" + "latest commit to Heroku #{environment.to_s.titleize} (#{heroku.git_remote_name} #{environment}:master)..."
+    console_command("git push #{heroku.git_remote_name} #{environment}:master", true)
   end
 
 end

data/lib/fanforce/plugin_factory/plugin.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'sass'
 require 'fileutils'
 require 'rack/jsonr'
 require 'rack/jquery-params'
@@ -49,6 +50,8 @@ class Fanforce::Plugin
 
   # Method for use in config.ru files (i.e., run Fanforce::Plugin)
   def self.call(env)
+    Sass::Plugin.options[:cache_location] = './tmp/sass-cache'
+
     if ENV['RACK_ENV'] == 'development' and env['PATH_INFO'] =~ /^\/assets\//
       env['PATH_INFO'] = env['PATH_INFO'].gsub(/^\/assets/, '')
       sprockets = SprocketsCompiler.setup(base_dir)
@@ -58,8 +61,6 @@ class Fanforce::Plugin
 
     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)

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc6'
+    VERSION = '2.0.0.rc7'
   end
 end

metadata

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