fanforce-app-factory 2.0.0.rc5 → 2.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2cc605d9d2693397cdfe4a5a0a6db00790d73f8
-  data.tar.gz: 9a3b89edf82df58d356092cf3db6994b5a28cd89
+  metadata.gz: f69a47588a1916426ea604400c5f15d599bfeb51
+  data.tar.gz: 7b39b239999a276a962daa1638dc496aac4082c3
 SHA512:
-  metadata.gz: 04cb1fbe0ab56c6fbb25296b91ec7cc0ed552eb353d961022b1824ff6da9f0063245b0655859ee0a8c03c5b4db6bccf98e1e6448a347b37d7d067cb6466776d2
-  data.tar.gz: 33de98411d8abd588756b27f6b980606f38909eda0167a7f6226aa549f0728981f11fafdc03254465dcab370990021a969321eda935025417e428fb49aebb65c
+  metadata.gz: c4173c97ea4d03b8e40aba38f92625b2a36baaf927574d5bf3eb2581d60f0fde4be57aa3a08bd83666a801f81d5d39601acf321aa0dc2181bc23cf2ead46b84b
+  data.tar.gz: 195b5b5a09f9cba89050a66cad0adcfeabc222b2eb680f86053cebb69f551ceff8ec329d3d53b1e39eaf983772f51bfbd5f98f3d3ac3458ab299b02921599576

data/.gitignore

@@ -14,6 +14,7 @@ tmp
 .idea/
 .DS_STORE
 Gemfile.lock
+!._*.registry
 
 # YARD artifacts
 .yardoc

data/Rakefile

@@ -3,13 +3,64 @@ require 'rake/testtask'
 require 'fileutils'
 include FileUtils
 
-task :run_test do
+task :pre_build do
   Rake::Task['test'].execute
   puts '---------------------------------------------------------------------'
-  puts 'TESTS PASSED... READY TO BUILD...'
+  puts 'TESTS PASSED!'
   puts '---------------------------------------------------------------------'
+  puts 'UPDATING SCAFFOLDING DIGESTS...'
+  Rake::Task['scaffolding:register'].execute
+  puts 'READY TO BUILD!'
+  puts '---------------------------------------------------------------------'
+end
+
+namespace :scaffolding do
+  require 'digest'
+
+  class Fanforce::CLI
+    DIR = ''
+    TYPE = ''
+  end
+
+  require 'fanforce/app_factory/cli'
+  require 'fanforce/app_factory/cli/scaffolding_file'
+
+  task :register 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)
+
+      file_parts = scaffold_filepath.split('/')
+      registry_filepath = "#{file_parts[0...-1].join('/')}/._#{file_parts[-1]}.registry"
+
+      file = Fanforce::AppFactory::CLI::ScaffoldingFile.new(scaffold_filepath)
+      if [:file,:image,:partial].include?(file.scaffold_type)
+        next if file.digest_exists_in_registry?(file.scaffold_digest)
+        File.open(registry_filepath, 'a') {|f|
+          f.puts "fanforce-app-factory-#{Fanforce::AppFactory::VERSION}:#{file.scaffold_digest}"
+        }
+      elsif [:items].include?(file.scaffold_type)
+        scaffold_contents = File.open(file.scaffold_filepath).read
+        raise "item changes are not registered for #{file.scaffold_filepath}" if !file.list_matches_latest_registry?(scaffold_contents)
+        next
+      elsif [:json].include?(file.scaffold_type)
+        scaffold_contents = File.open(file.scaffold_filepath).read
+        raise "json changes are not registered for #{file.scaffold_filepath}" if !file.json_matches_latest_registry?(scaffold_contents)
+        next
+      elsif [:skipped].include?(file.scaffold_type)
+        next
+      else
+        raise "unknown scaffold type: #{file.scaffold_type}"
+      end
+
+      puts "- REGISTERED #{scaffold_filepath.gsub(scaffolding_dir, '')} (#{file.scaffold_type})"
+    end
+  end
+
 end
-task :build => :run_test
+
+task :build => :pre_build
 task :default => :build
 
 ########################################################################

data/apps.json

@@ -24,7 +24,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -219,7 +219,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -343,7 +343,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -434,7 +434,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -500,7 +500,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -580,7 +580,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -671,7 +671,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},
@@ -718,7 +718,7 @@
       "status": "active",
       "permissions": "ALL",
       "type": "development",
-      "domain": "{{APP_ID}}.ffapp.gg",
+      "domain": "{{APP_ID}}.ffapp.dev",
       "dns_host": "127.0.0.1"
     },
     "config_override": {},

data/lib/fanforce/app_factory.rb

@@ -1,23 +1,26 @@
-require 'redis'
-require 'fileutils'
-require 'rack/jsonr'
-require 'sinatra/base'
-require 'active_support/all'
+require_relative 'app_factory/version'
+require_relative 'app_factory/load'
 
-require 'fanforce/api'
-require 'fanforce/app_worker'
+########################################################################################################################
 
-require_relative 'app_factory/version'
+class Fanforce::AppFactory
 
+  def self.generate(app_base_dir)
+    require_relative 'app_factory/app'
+    require_relative 'app_factory/load_sprockets' if ENV['RACK_ENV'] == 'development'
+
+    Fanforce::App.load(app_base_dir)
+  end
+end
+
+########################################################################################################################
+
+# The following is run if file is required from config.ru or Rakefile
 if caller[0].split(':')[0] =~ /^(.+)\/(config\.ru|Rakefile)$/
-  $root_dir = $1
-  $loader_filename = $2
+  app_base_dir = $1
+  loader_filename = $2
   ENV['RACK_ENV'] ||= 'development'
 
-  require_relative 'app_factory/app'
-  require_relative 'app_factory/core_config'
-  require_relative 'app_factory/sprockets/_all' if ENV['RACK_ENV'] == 'development'
-
-  Fanforce::App.start($root_dir, $loader_filename)
-  load "#{Fanforce::App.config.factory_dir}/Rakefile" if $loader_filename == 'Rakefile'
+  Fanforce::AppFactory.generate(app_base_dir)
+  load "#{Fanforce::App.config.factory_dir}/Rakefile" if loader_filename == 'Rakefile'
 end

data/lib/fanforce/app_factory/Rakefile

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'json'
 require 'yaml'
 
-require_relative 'sprockets/_all'
+require_relative 'sprockets/load_sprockets'
 
 ########################################################################################################################
 
@@ -18,7 +18,7 @@ namespace :assets do
   desc 'Precompile assets for production'
   task :precompile => :clean do
     config = App.config
-    sprockets = SprocketsCompiler.setup(config.root_dir)
+    sprockets = SprocketsCompiler.setup(config.base_dir)
 
     puts 'PRECOMPILING ASSETS... '
     SprocketsCompiler.new(sprockets: sprockets, precompile: [/(\/|^)[^_\/]+[^\/]*\.(css|js|png|gif|jpeg|jpg|otf|eot|svg|ttf|woff)/]).compile
@@ -31,24 +31,16 @@ namespace :assets do
         asset_list[logical_path] = "/assets/#{asset.digest_path}"
       end
     end
-    IO.write File.join(config.root_dir, '/public/asset_manifest.json'), JSON.generate(asset_list)
-    IO.write File.join(config.root_dir, '/public/asset_manifest.json'), "ASSETS=#{JSON.generate(asset_list)}"
-    IO.write File.join(config.root_dir, '/public/asset_manifest.json'), asset_list.to_yaml
-    puts 'DONE'
-
-    print 'ENSURING FAVICON EXISTS... '
-    FileUtils.cp("#{config.factory_dir}/scafolding/public/favicon.ico", "#{config.root_dir}/public/favicon.ico") if !File.exists?(config.root_dir+'/public/favicon.ico')
-    puts 'DONE'
-
-    print 'ENSURING ROBOTS.TXT EXISTS... '
-    FileUtils.cp("#{config.factory_dir}/scafolding/public/robots.txt", "#{config.root_dir}/public/robots.txt") if !File.exists?(config.root_dir+'/public/robots.txt')
+    IO.write File.join(config.base_dir, '/public/asset_manifest.json'), JSON.generate(asset_list)
+    IO.write File.join(config.base_dir, '/public/asset_manifest.json'), "ASSETS=#{JSON.generate(asset_list)}"
+    IO.write File.join(config.base_dir, '/public/asset_manifest.json'), asset_list.to_yaml
     puts 'DONE'
   end
 
   desc 'Clean assets folder'
   task :clean do
     print 'DESTROYING PUBLIC/ASSETS... '
-    FileUtils.rm_rf File.join(App.config.root_dir, '/public/assets')
+    FileUtils.rm_rf File.join(App.config.base_dir, '/public/assets')
     puts 'DONE'
   end
 

data/lib/fanforce/app_factory/Routes.rb

@@ -1,7 +1,7 @@
 class Fanforce::App::Sinatra
 
   get '/internals/config.json' do
-    file = File.open("#{Fanforce::App.root_dir}/config.json")
+    file = File.open("#{Fanforce::App.base_dir}/config.json")
     config = MultiJson.load(file.read, symbolize_keys: true)
     config[:iron_workers] ||= []
 
@@ -14,7 +14,7 @@ class Fanforce::App::Sinatra
   end
 
   post '/internals/config.json' do
-    filename = "#{Fanforce::App.root_dir}/config.json"
+    filename = "#{Fanforce::App.base_dir}/config.json"
     file = File.open(filename)
     old_config = MultiJson.load(file.read, symbolize_keys: true)
     new_config = MultiJson.load(params[:config], symbolize_keys: true)

data/lib/fanforce/app_factory/app.rb

@@ -1,14 +1,25 @@
+require 'redis'
+require 'fileutils'
+require 'rack/jsonr'
+require 'sinatra/base'
+require 'active_support/all'
+require 'fanforce/api'
+require 'fanforce/app_worker'
+
+require_relative 'core_config'
+
 class Fanforce::App
-  @@initialized = nil
+  @@loaded = nil
   @@config = nil
 
   # Only one instance is allowed to initialize, and the resulting instance is stored in Fanforce::App.
-  # @param root_dir [String] root dir of app
+  # @param base_dir [String] base dir of app
   # @param loader_filename [String] either config.ru or Rakefile
   # @return [Fanforce::App]
-  def self.start(root_dir, loader_filename)
-    @@initialized ? (raise 'Only one instance of Fanforce::AppFactory can be initialized') : @@initialized = true
-    @@config = CoreConfig.new(root_dir, loader_filename)
+  def self.load(base_dir)
+    @@loaded ? (raise 'Only one instance of Fanforce::AppFactory can be loaded per process') : @@loaded = true
+    @@config = CoreConfig.new(base_dir)
+    return self
   end
 
   def self.app_id
@@ -20,8 +31,8 @@ class Fanforce::App
     block ? block.call(@@config) : @@config
   end
 
-  def self.root_dir
-    @@config.root_dir
+  def self.base_dir
+    @@config.base_dir
   end
 
   def self.is_bugsnag_enabled?
@@ -38,7 +49,7 @@ class Fanforce::App
   def self.call(env)
     if ENV['RACK_ENV'] == 'development' and env['PATH_INFO'] =~ /^\/assets\//
       env['PATH_INFO'] = env['PATH_INFO'].gsub(/^\/assets/, '')
-      sprockets = SprocketsCompiler.setup(root_dir)
+      sprockets = SprocketsCompiler.setup(base_dir)
       return sprockets.index.call(env)
     end
     require_relative 'sinatra/_load'

data/lib/fanforce/app_factory/cli.rb

@@ -0,0 +1,5 @@
+require_relative 'version'
+
+module Fanforce::AppFactory::CLI
+  require_relative 'cli/utils'
+end

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

@@ -0,0 +1,70 @@
+require 'bitbucket_rest_api'
+require 'rest_client'
+
+class Fanforce::AppFactory::CLI::Bitbucket
+  include Fanforce::AppFactory::CLI::Utils
+
+  attr_reader :app
+
+  def initialize(app)
+    @app = app
+  end
+
+  def bitbucket
+    @@bitbucket = ::BitBucket.new(login: config[:bitbucket][:user], password: config[:bitbucket][:password])
+  end
+
+  def create
+    repo_name = "app-#{app.dir_name}"
+    error "Bitbucket repo already exists (#{repo_name})" if find_repo(repo_name)
+    create_repo(repo_name)
+    puts "#{'Created '.format(:green,:bold)}" + "#{repo_name} repository on bitbucket"
+  end
+
+  def setup
+    repo_name = "app-#{app.dir_name}"
+    error "Bitbucket repo does not exist (#{repo_name})" if !find_repo(repo_name)
+    "#{'Found   '.format(:green,:bold)}" + "#{repo_name} repository already exists on bitbucket"
+    setup_git_remote(repo_name)
+  end
+
+  def destroy
+    repo_name = "app-#{app.dir_name}"
+    if find_repo(repo_name)
+      RestClient::Request.execute(:method => :delete, :url => "https://#{config[:bitbucket][:user]}:#{config[:bitbucket][:password]}@api.bitbucket.org/1.0/repositories/#{config[:bitbucket][:user]}/#{repo_name}", :ssl_version => 'SSLv23')
+      puts "#{'Removed'.format(:green,:bold)}" + " #{repo_name}"
+    else
+      puts "#{'Already Removed'.format(:green,:bold)}" + " #{repo_name}"
+    end
+  end
+
+  def find_repo(repo_name)
+    bitbucket.repos.find(config[:bitbucket][:user], repo_name)
+  rescue
+    return nil
+  end
+
+  def setup_git_remote(repo_name)
+    if (`git remote`).split(/\r?\n/).include?(config[:bitbucket][:user])
+      puts "#{'Updated '.format(:green,:bold)}" + "git remote for #{config[:bitbucket][:user]}"
+      `git remote rm #{config[:bitbucket][:user]}`
+    elsif (`git remote`).split(/\r?\n/).include?('bitbucket')
+      `git remote rm bitbucket`
+      puts "#{'Removed '.format(:red,:bold)}" + "git remote for #{config[:bitbucket][:user]}"
+      puts "#{'Created '.format(:green,:bold)}" + 'git remote for bitbucket'
+    else
+      puts "#{'Created '.format(:green,:bold)}" + 'git remote for bitbucket'
+    end
+    `git remote add bitbucket git@bitbucket.org:#{config[:bitbucket][:user]}/#{repo_name}.git`
+
+    puts "#{'Pushing '.format(:green,:bold)}" + "latest commit to #{config[:bitbucket][:user]}..."
+    console_command('git push bitbucket --all')
+  end
+
+  def create_repo(repo_name)
+    bitbucket.repos.create(name: repo_name, is_private: true)
+  rescue ::BitBucket::Error::Unauthorized => e
+    raise "Bitbucket user #{config[:bitbucket][:user]} does not seem to exist: #{e.message}"
+  end
+
+end

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

@@ -0,0 +1,21 @@
+class Fanforce::AppFactory::CLI::Bundler
+  include Fanforce::AppFactory::CLI::Utils
+
+  attr_reader :app
+
+  def initialize(app)
+    @app = app
+  end
+
+  def setup
+    if Gem::Specification::find_all_by_name('bundler').empty?
+      puts 'Installing Bundler... '
+      `gem install bundler`
+      puts 'DONE'
+    end
+
+    console_command('bundle')
+    puts 'DONE'.format(:green)
+  end
+
+end

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

@@ -0,0 +1,99 @@
+require 'yaml'
+
+class Fanforce::AppFactory::CLI::Env
+  include Fanforce::AppFactory::CLI::Utils
+
+  attr_reader :app
+
+  def initialize(app)
+    @app = app
+  end
+
+  def setup(environment)
+    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)
+    has_workers = File.directory?("#{app.dir}/workers") ? true : false
+
+    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)
+  end
+
+  def push_env_to(environment, vars, create_worker_env=true)
+    vars.each {|k,v| puts "  - #{k}" }
+    workers_dir = "#{app.dir}/workers"
+    workers_env_dir = "#{workers_dir}/.env"
+    if create_worker_env and File.directory?(workers_dir) and vars['IRON_PROJECT_ID']
+      FileUtils.mkdir_p(workers_env_dir) unless File.directory?(workers_env_dir)
+      File.open("#{workers_env_dir}/#{environment}.rb", 'w') {|f| f.write convert_hash_to_ruby_env(vars) }
+    end
+    if environment == :development
+      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)
+    end
+  end
+
+  def convert_hash_to_shell_env(hash)
+    hash.inject('') {|script, (k,v)| script += "export #{k}=#{v.to_s.to_json}\n" }
+  end
+
+  def convert_hash_to_ruby_env(hash)
+    hash.inject('') {|script, (k,v)| script += "ENV['#{k}']=#{v.to_s.to_json}\n" }
+  end
+
+  def load_app_vars(environment)
+    environment = environment.to_sym
+    vars = {'FANFORCE_APP_ID' => app._id}
+    raw_yaml = File.read("#{app.dir}/../.env/_bind.yml")
+    bindings = (raw_yaml.present?) ? YAML.load(raw_yaml) : {}
+    bindings.each do |filename, dir_names|
+      file = YAML.load_file("#{app.dir}/../.env/#{filename}.yml").symbolize_keys
+      next if file[environment].blank?
+
+      dir_names = [app.dir_name] if dir_names.is_a?(String) and dir_names.upcase == 'ALL'
+      file[environment].each do |k,v|
+        dir_names.each {|dir_name| vars["#{filename}_#{k}".upcase] = v if dir_name == app.dir_name }
+      end
+    end
+    return vars
+  end
+
+  def app_vars(environment)
+    @vars ||= {}
+    @vars[environment] ||= load_app_vars(environment)
+  end
+
+  # .POWENV #######################################################################
+
+  def create_powenv
+    file = powenv_lines.join("\n") + "\n"
+    File.open("#{app.dir}/.powenv", 'w') {|f| f.write file }
+  end
+
+  def update_powenv
+    return create_powenv if !File.exists?("#{app.dir}/.powenv")
+
+    lines = File.open("#{app.dir}/.powenv", 'r') {|f| f.readlines}.map {|l| l.strip }
+
+    powenv_lines.each do |line|
+      lines << line if !lines.include?(line)
+    end
+
+    File.open("#{app.dir}/.powenv", 'w') {|f| f.write(lines.join "\n") }
+  end
+
+  def powenv_lines
+    ['source .appenv']
+  end
+
+end