swiftly 4.0.1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a49b797b143b1083d3ba630b306558b632f8b5d
-  data.tar.gz: 95443497949365f74775f08bb2135caf0a3cf0d9
+  metadata.gz: d783503de636e427ab81750c033953513ab53d95
+  data.tar.gz: 1d4b754bc088690b9513dbabf2253cd7a04b4c17
 SHA512:
-  metadata.gz: e323166837244ed8817e5eff2d3c420068a4a3c2b034fabc81317ab0eb9d3a8f75444347a51b62f93e9bcd439ffb2e544dd13daff7741552e2c1a1524987a67a
-  data.tar.gz: a1ebbc8a798cf15d560c43e399efd20735daacb672d4c4624032b8687db0e06808339580f56a6886100f12d3ab9c78b4423877481374b8cf5c0da2d4d4950d16
+  metadata.gz: 7c56d006554c3d79b436ce5bdc4a58da4a012b93f8d6ca1896c7c18b1a1092fc0fd6ad30a39660c92dbc0443f55c51192b100b181fbd14f01c7f02bde06bc335
+  data.tar.gz: 9dabc4f9bba3c91d6916dd712e4d17cfa82d5908a2ddd6af74c36f8f7b102242f892926ecaa7a6e540db731ed71f91b10a4e5396b861529a16cd95915a57131b

data/README.md

@@ -0,0 +1,196 @@
+# Swiftly 5.0.1 (formally known as Obi)
+
+Swiftly is a web development project management tool.
+
+## Features
+
+1. Create projects swiftly on the fly
+2. Deploy to multiple environments. Deployment is managed by [mina](https://github.com/mina-deploy/mina)
+3. Will also push database to server while performing a find and replace on URLs
+4. Backs up destination database on each push
+5. Allows for rollback of database and files in the event that it becomes necessary
+6. And much much more...
+
+## Getting started
+
+    $ gem install swiftly
+
+Run it:
+
+    $ swiftly <command> <args>
+
+## Requirements
+
+Mysql must be in your $PATH. You can check this by running:
+
+    $ which mysql
+
+This should yield something like:
+
+    $ /opt/boxen/homebrew/bin/mysql
+
+If nothing is displayed after running `which mysql` then you need to add it manually by running the following.
+
+***Note that everything between `PATH=` and `:$PATH` in the command below, needs to be the absolute path to your mysql.***
+
+    $ echo 'export PATH=/usr/local/mysql/bin:$PATH' >> ~/.bash_profile && source ~/.bash_profile
+
+If all goes correctly, you should be able to run `which mysql` again, and it should yield the location of your mysql.
+
+## Usage
+
+Running `swiftly init` will walk you through setting up the basic settings necessary to get swiftly up and running.
+
+    $ swiftly init
+
+At this point you will be able to run `swiftly help` to get a list of commands and their arguments in order to interact with swiftly.
+
+    $ swiftly help
+
+Once you complete the interactive setup, a "Swiftlyfile" will be created in your sites directory. This file will contain your local settings and will look something like this:
+
+~~~ruby
+
+set :server, :type => :local do
+
+  db_host 'localhost'
+  db_user 'root'
+  db_pass 'supersecurepassword'
+
+end
+
+~~~
+
+The "Swiftlyfile" is used as a global config for your different server settings.
+
+Currently the only server types that are recognized by swiftly are `:local`, `:staging`, and `:production`. *Eventually swiftly will allow for user specified server types!*
+
+The `:staging` and `:production` server type settings can be overridden locally by adding a `config/config.rb` file in the root directory of an individual project. These server types except more parameters than just `db_host`, `db_user`, and `db_name` which are required in order to manage each project. Below is an example of a `config/config.rb` file using all possible parameters.
+
+~~~ruby
+
+set :server, :type => :staging do
+
+  db_host  'localhost'
+  db_user  'root'
+  db_pass  'supersecurepassword'
+  repo     'git@bitbucket.org:micalexander/micalexander.git'
+  branch   'master'
+  ssh_path '/var/www/micalexander_micalexander_com'
+  ssh_user 'username'
+  domain   'http://micalexander.micalexander.com'
+
+end
+
+set :server, :type => :production do
+
+  db_host  'localhost'
+  db_user  'root'
+  db_pass  'supersecurepassword'
+  repo     'git@bitbucket.org:micalexander/micalexander.git'
+  branch   'master'
+  ssh_path '/var/www/micalexander_com'
+  ssh_user 'username'
+  domain   'micalexander.com'
+
+end
+
+~~~
+
+## Projects
+
+Swiftly currently supports three types of projects, an `empty`, a `git` enabled, and a `wordpress` (git enabled) project.
+
+Example folder structure:
+
+~~~ruby
+
+    project-name
+        |
+        |-- _resources // Not required. Opinionated organization
+        |     |
+        |     |-- assets
+        |          |
+        |          |-- architecture
+        |          |-- doc
+        |          |-- emails
+        |          |-- fonts
+        |          |-- images
+        |          |-- raster
+        |          |-- vector
+        |
+        |-- _backups // Required for automated backups of environments
+        |     |
+        |     |-- local
+        |     |-- production
+        |     |-- staging
+        |     |-- temp
+        |
+        |-- .git // Not required but a good idea
+        |     |
+        |     |-- ...
+        |
+        |-- .gitignore // Not required but a good
+        |
+        |-- config // Required for project specific settings
+              |
+              |-- config.rb // Required for project specific settings
+~~~
+
+The above gives you an idea of what to expect when creating a project.
+
+To create a project you can simply run:
+
+    $ swiftly create [project_type] [project_name]
+
+An `empty` project will include the structure in the diagram above with the exception of the .git directory, the .gitignore.
+
+A `git` project will include everything in the diagram above.
+
+A `wordpress` project will include everything in the diagram above with the addition of a full Wordpress installation.
+
+## Wordpress
+
+To install Wordpress as a project run the following command replacing "[project_name]" with your desired project name.
+
+    $ swiftly create wordpress [project_name]
+
+This will download Wordpress into a folder named "[project_name]", setup the Wordpress database for you, and automatically install a theme for you named "[project_name]".
+
+By default the theme that will be installed into Wordpress will be [mask](https://github.com/micalexander/mask). This is because swiftly requires a customized "wp-config.php" file in order to setup the databases and manage the push and pulling of environments.
+
+When using the customized "wp-config.php" file you will not need to include the `db_host`, `db_user`, `db_name` and `domain` parameters in the `config/config.rb` file. Doing so will override the "wp-config.php" file settings.
+
+### Themes
+
+You can tell swiftly what theme to use by following the syntax below. Keep in mind that your theme structure must match that of the [mask](https://github.com/micalexander/mask) theme in order for things to run smoothly.
+
+The location parameter accepts a URL to a zip or a file path to a folder.
+
+***Note the status parameter is set to `:disabled`, therefore it will be ignored and not installed. In order to have swiftly install this theme, remove the status altogether or set it to `:enabled`.***
+
+~~~ruby
+set :package, :type => :template do
+  name     'mask'
+  location 'https://github.com/micalexander/mask/archive/master.zip'
+  status   :disabled
+end
+~~~
+
+### Plugins
+
+You can tell swiftly what plugin to use by following the syntax below.
+
+The location parameter accepts a URL to a zip or a file path to a folder.
+
+***Note the status parameter is set to `:disabled`, therefore it will be ignored and not installed. In order to have swiftly install this plugin, remove the status altogether or set it to `:enabled`.***
+
+~~~ruby
+set :package, :type => :plugin do
+  name     'advanced-custom-fields-pro'
+  location '/Users/username/plugins'
+  status   :disabled
+end
+~~~
+
+*More examples coming...*

data/bin/swiftly

@@ -12,4 +12,5 @@ Swiftly::Init.start unless File.exist? File.join( Dir.home, ".swiftly" )
 global_config = YAML.load_file File.join( Dir.home, ".swiftly" ) unless !File.exists? File.join( Dir.home, ".swiftly" )
 
 Swiftly::Init.start unless File.exist? File.join( global_config[:sites_path], "Swiftlyfile" )
+
 Swiftly::CLI.start  unless !File.exist? File.join( global_config[:sites_path], "Swiftlyfile" )

data/lib/swiftly/cli.rb

@@ -3,15 +3,12 @@ require 'json'
 require 'swiftly/app_module'
 require 'swiftly/config'
 require 'swiftly/create'
-require 'swiftly/configure'
 require 'swiftly/push'
 require 'swiftly/pull'
 require 'swiftly/ssh'
 require 'swiftly/clean'
 require 'swiftly/setup'
 require 'swiftly/rollback'
-require 'swiftly/generate'
-require 'swiftly/enable'
 require 'swiftly/destroy'
 
 module Swiftly
@@ -21,15 +18,12 @@ module Swiftly
     include Helpers
 
     register Swiftly::Create,    "create",    "create COMMAND PROJECT_NAME",           "Create projects by passing a project name"
-    register Swiftly::Configure, "configure", "configure COMMAND",                     "Configure settings"
     register Swiftly::Setup,     "setup",     "setup COMMAND PROJECT_NAME",            "Setup [environment] on server"
     register Swiftly::Push,      "push",      "push COMMAND PROJECT_NAME",             "Push [environment] database and files to server"
     register Swiftly::Pull,      "pull",      "pull COMMAND PROJECT_NAME",             "Pull [environment] database and files to local"
     register Swiftly::Rollback,  "rollback",  "rollback COMMAND PROJECT_NAME",         "Rollback the [environment] database and files on server"
     register Swiftly::SSH,       "ssh",       "ssh COMMAND PROJECT_NAME",              "SSH into the [environment] server and cd into site path"
     register Swiftly::Clean,     "clean",     "clean COMMAND PROJECT_NAME",            "Clean the [environment] releases on server"
-    register Swiftly::Generate,  "generate",  "generate POSTTYPE FILTER PROJECT_NAME", "Generate a custom post type"
-    register Swiftly::Enable,    "enable",    "enable COMMAND FRAMEWORK",              "Enable global framework intergrations"
     register Swiftly::Destroy,   "destroy",   "destroy PROJECT_NAME",                  "Destroy local project!"
 
   end

data/lib/swiftly/config.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 require 'swiftly/version'
 require 'swiftly/app_module'
+require 'swiftly/smokestack'
+require 'swiftly/resolver'
 
 module Swiftly
   class Config < Thor
@@ -41,10 +43,10 @@ module Swiftly
 
         File.join(
           global_config[:sites_path],
-          project_name, 'config', 'config.yml'
+          project_name, 'config', 'config.rb'
         ) unless !File.exists? File.join(
           global_config[:sites_path],
-          project_name, 'config', 'config.yml'
+          project_name, 'config', 'config.rb'
         )
 
       end
@@ -65,67 +67,150 @@ module Swiftly
 
       end
 
-      def self.load file, project_name = nil
+      def self.set setting, *args, &block
 
-        case file
-        when :wp_config
+        Swiftly::Smokestack.define do
 
-          if wp_config_file( project_name )
+          factory setting, &block
 
-            # load the wp-config file environment settings for wp-enabled environments
-            wp_local = File.read(
-              wp_config_file(
-                project_name
-              )
-            )[/\$local\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+        end
 
-            wp_staging = File.read(
-              wp_config_file(
-                project_name
-              )
-            )[/\$staging\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+        Swiftly::Resolver.load setting, args[0][:type], Swiftly::Smokestack.build( setting )
 
-            wp_production = File.read(
-              wp_config_file(
-                project_name
-              )
-            )[/\$production\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+      end
 
-            if wp_local.nil? || wp_staging.nil? || wp_production.nil?
+      def self.load file, project_name = nil
 
-              return {
-                local: {},
-                staging: {},
-                production: {}
-              }
+        case file
+        when :wp_config
 
-            end
+          wp_config_parse project_name
 
-            load_hash = {
-              local:       JSON.parse(wp_local).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-              staging:     JSON.parse(wp_staging).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo},
-              production:  JSON.parse(wp_production).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-            }
 
-          end
+          Resolver.get( :server )
 
         when :project
 
-          load_hash = YAML.load_file( project_file( project_name ) )
+          if !eval( IO.read( project_file( project_name ) ) ).nil?
+
+            load_hash = Resolver.get :server == {} ? false : Resolver.get( :package )
+
+          end
 
         when :swiftly
 
-          load_hash = YAML.load_file( swiftlyfile )
+          if !eval( IO.read( swiftlyfile ) ).nil?
+
+            load_hash = Resolver.get :server
+
+          end
 
         when :global
 
           load_hash = YAML.load_file( global_file )
 
+        when :all
+
+          eval( IO.read( swiftlyfile ) ) unless eval( IO.read( swiftlyfile ) ).nil?
+
+
+          wp_config_parse project_name
+
+
+          eval( IO.read( project_file( project_name ) ) ) unless eval( IO.read( project_file( project_name ) ) ).nil?
+
+
+
+          load_hash = Resolver.get :server
+
         end
 
+
          load_hash
 
       end
+
+      def self.wp_config_parse project_name
+
+        if wp_config_file( project_name )
+
+          # load the wp-config file environment settings for wp-enabled environments
+          wp_local = File.read(
+            wp_config_file(
+              project_name
+            )
+          )[/\$local\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          wp_staging = File.read(
+            wp_config_file(
+              project_name
+            )
+          )[/\$staging\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          wp_production = File.read(
+            wp_config_file(
+              project_name
+            )
+          )[/\$production\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          if wp_local.nil? || wp_staging.nil? || wp_production.nil?
+
+            return {
+              local: {},
+              staging: {},
+              production: {}
+            }
+
+          end
+
+          hash = {
+            local:       JSON.parse(wp_local).inject({}){|memo,(k,v)| memo[k] = v; memo},
+            staging:     JSON.parse(wp_staging).inject({}){|memo,(k,v)| memo[k] = v; memo},
+            production:  JSON.parse(wp_production).inject({}){|memo,(k,v)| memo[k] = v; memo}
+          }
+
+          hash.each do |k, v|
+
+            set :server, :type => k do
+
+              v.each do |setting, value|
+
+                if setting != 'wp_home'
+
+                  case setting
+                    when 'domain'
+                      domain value
+
+                    when 'repo'
+                      repo value
+
+                    when 'branch'
+                      branch value
+
+                    when 'ssh_path'
+                      ssh_path value
+
+                    when 'ssh_user'
+                      ssh_user value
+
+                    when 'db_name'
+                      db_name value
+
+                    when 'db_host'
+                      db_host value
+
+                    when 'db_user'
+                      db_user value
+
+                    when 'db_pass'
+                      db_pass value
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/swiftly/config_project_generator.rb

@@ -23,7 +23,7 @@ module Swiftly
         File.join(
           project_path,
           'config',
-          'config.yml'
+          'config.rb'
         )
       )
 

data/lib/swiftly/create.rb

@@ -59,7 +59,7 @@ module Swiftly
       global_settings  = Swiftly::Config.load :global
       project_settings = Swiftly::Config.load :swiftly
 
-      template = Swiftly::Packages.load({
+      template = Swiftly::Package.load({
         framework: :wordpress,
         type:      :template,
         name:      options[:template]
@@ -78,7 +78,6 @@ module Swiftly
       CreateWordpress.new([
         project_name,
         template,
-        project_settings,
         project_path
       ]).invoke_all
 

data/lib/swiftly/create_wordpress.rb

@@ -14,7 +14,7 @@ module Swiftly
 
     argument :project_name
     argument :template
-    argument :settings
+    # argument :settings
     argument :project_path
 
     desc "Handles the creation of a wordpress project."
@@ -121,7 +121,7 @@ module Swiftly
 
         inside File.join( "wp-content", "plugins" ) do
 
-          plugins = Swiftly::Packages.load_plugins :wordpress
+          plugins = Swiftly::Package.load_plugins :wordpress
 
           if plugins
 
@@ -153,17 +153,20 @@ module Swiftly
         gsub_file 'wp-config.php', /\/\/\s*Insert_Salts_Below/, Net::HTTP.get('api.wordpress.org', '/secret-key/1.1/salt')
         gsub_file 'wp-config.php', /(table_prefix\s*=\s*')(wp_')/, '\1' + @project_name[0,3] + "_'"
 
-        if !@settings[:local][:db_host].nil? &&
-           !@settings[:local][:db_user].nil? &&
-           !@settings[:local][:db_pass].nil?
+        settings = Swiftly::Config.load :swiftly
+
+        if !settings.nil? &&
+           !settings[:local][:db_host].nil? &&
+           !settings[:local][:db_user].nil? &&
+           !settings[:local][:db_pass].nil?
 
           gsub_file 'wp-config.php', /(\$local\s*?=[\s|\S]*?)({[\s|\S]*?})/  do |match|
 
             '$local = \'{
           "db_name": "' + @project_name + '_local_wp",
-          "db_host": "' + @settings[:local][:db_host] + '",
-          "db_user": "' + @settings[:local][:db_user] + '",
-          "db_pass": "' + @settings[:local][:db_pass] + '",
+          "db_host": "' + settings[:local][:db_host] + '",
+          "db_user": "' + settings[:local][:db_user] + '",
+          "db_pass": "' + settings[:local][:db_pass] + '",
           "domain":  "http://' + @project_name + '.dev",
           "wp_home": "http://' + @project_name + '.dev"
         }'

data/lib/swiftly/database.rb

@@ -170,7 +170,7 @@ module Swiftly
             -h'#{@settings[environment][:db_host]}' \
             -p'#{@settings[environment][:db_pass]}' \
             -Bse"CREATE DATABASE IF NOT EXISTS \
-            #{@settings[environment][:db_name]}"
+            #{@settings[environment][:db_name].gsub(/\-|\./, '_')}"
           EOF
 
           swiftly_shell cmd

data/lib/swiftly/definition_proxy.rb

@@ -0,0 +1,17 @@
+require "swiftly/smokestack"
+require "swiftly/factory"
+
+module Swiftly
+  class DefinitionProxy
+
+    def factory(factory_class, &block)
+
+      factory = Swiftly::Factory.new
+
+      factory.instance_eval(&block)
+
+      Smokestack.registry[Swiftly.const_get(factory_class.capitalize)] = factory
+
+    end
+  end
+end

data/lib/swiftly/destroy.rb

@@ -12,6 +12,7 @@ module Swiftly
     def destroy( project_name )
 
       settings     = Swiftly::Project.settings project_name
+
       directory    = File.join( settings[:project][:path], '' )
       zipfile_name = settings[:project][:path] + '.zip'
 

data/lib/swiftly/factory.rb

@@ -0,0 +1,20 @@
+require "swiftly/server"
+
+module Swiftly
+  class Factory < BasicObject
+
+    def initialize
+
+      @attributes = {}
+
+    end
+
+    attr_reader :attributes
+
+    def method_missing(name, *args, &block)
+
+      @attributes[name] = args[0]
+
+    end
+  end
+end

data/lib/swiftly/init.rb

@@ -16,7 +16,7 @@ module Swiftly
 
       say # spacer
 
-      say "\t\t#{APP_NAME} #{VERSION} Development Manager\n\n", :blue
+      say "\t\t#{APP_NAME} #{VERSION} Web Development Project Manager\n\n", :blue
 
       say_status "#{APP_NAME}:", "Thanks for trying out #{APP_NAME}. Lets get started!", :green
 

data/lib/swiftly/packages.rb

@@ -1,15 +1,21 @@
 require "swiftly/config"
 require "swiftly/app_module"
 require "yaml"
+require "swiftly/factory"
 
 module Swiftly
-  class Packages < Thor
+  class Package < Thor
 
     include Thor::Actions
     include Helpers
 
     no_commands do
 
+      attr_accessor :framework
+      attr_accessor :type
+      attr_accessor :name
+      attr_accessor :location
+
       def self.file
 
         @settings = Swiftly::Config.load :global
@@ -41,7 +47,21 @@ module Swiftly
 
       def self.available
 
-        YAML.load_file self.file
+        eval( IO.read( self.file ) )
+
+        load_hash = Resolver.get( :package ) == {} ? false : Resolver.get( :package )
+
+      end
+
+      def self.set setting, *args, &block
+
+        Swiftly::Smokestack.define do
+
+          factory setting, &block
+
+        end
+
+        Swiftly::Resolver.load setting, args[0][:type], Swiftly::Smokestack.build( setting )
 
       end
 

data/lib/swiftly/project.rb

@@ -10,69 +10,40 @@ module Swiftly
 
     no_commands do
 
-      def self.settings( project_name )
+      def self.set setting, *args, &block
 
-        project_name   = self.get_project project_name
-        global_config  = Swiftly::Config.load :global
-        swiftly_config = Swiftly::Config.load :swiftly
-        project_config = Swiftly::Config.load :project,   project_name
-        wp_config      = Swiftly::Config.load :wp_config, project_name
+        Swiftly::Smokestack.define do
 
-        global_config  = {
-          version:    VERSION,
-          sites_path: global_config[:sites_path],
-        }
+          factory setting, &block
 
-        switly_config  = {
-          staging: {
-            domain:  defined?(project_config[:staging][:domain])  ? project_config[:staging][:domain]  : global_config[:staging][:domain],
-            db_host: defined?(project_config[:staging][:db_host]) ? project_config[:staging][:db_host] : global_config[:staging][:db_host],
-            db_user: defined?(project_config[:staging][:db_user]) ? project_config[:staging][:db_user] : global_config[:staging][:db_user],
-            db_pass: defined?(project_config[:staging][:db_pass]) ? project_config[:staging][:db_pass] : global_config[:staging][:db_pass],
-          },
-          production: {
-            domain:  defined?(project_config[:production][:domain])  ? project_config[:production][:domain]  : global_config[:production][:domain],
-            db_host: defined?(project_config[:production][:db_host]) ? project_config[:production][:db_host] : global_config[:production][:db_host],
-            db_user: defined?(project_config[:production][:db_user]) ? project_config[:production][:db_user] : global_config[:production][:db_user],
-            db_pass: defined?(project_config[:production][:db_pass]) ? project_config[:production][:db_pass] : global_config[:production][:db_pass],
-          }
-        }.merge! local: global_config[:local]
-
-        settings = {
-          project: {
-            name: project_name,
-            path: File.join( global_config[:sites_path], project_name ),
-            dump: File.join( global_config[:sites_path], project_name, '_backups', 'dumps' )
-          },
-          local: {
-            domain:  defined?(wp_config[:local][:domain])  ? wp_config[:local][:domain]  : project_config[:local][:domain],
-            db_name: defined?(wp_config[:local][:db_name]) ? wp_config[:local][:db_name] : project_config[:local][:db_name],
-            db_host: defined?(wp_config[:local][:db_host]) ? wp_config[:local][:db_host] : switly_config[:local][:db_host],
-            db_user: defined?(wp_config[:local][:db_user]) ? wp_config[:local][:db_user] : switly_config[:local][:db_user],
-            db_pass: defined?(wp_config[:local][:db_pass]) ? wp_config[:local][:db_pass] : switly_config[:local][:db_pass],
-          },
-          staging: {
-            db_name:  defined?(wp_config[:staging][:db_name])    ? wp_config[:staging][:db_name] : project_config[:staging][:db_name],
-            db_host:  defined?(wp_config[:staging][:db_host])    ? wp_config[:staging][:db_host] : switly_config[:staging][:db_host],
-            db_user:  defined?(wp_config[:staging][:db_user])    ? wp_config[:staging][:db_user] : switly_config[:staging][:db_user],
-            db_pass:  defined?(wp_config[:staging][:db_pass])    ? wp_config[:staging][:db_pass] : switly_config[:staging][:db_pass],
-            domain:   defined?(switly_config[:staging][:domain]) ? switly_config[:staging][:domain]  : wp_config[:staging][:domain],
-            repo:     project_config[:staging][:repo],
-            branch:   project_config[:staging][:branch],
-            ssh_path: project_config[:staging][:ssh_path],
-            ssh_user: project_config[:staging][:ssh_user],
-          },
-          production: {
-            db_name:  defined?(wp_config[:production][:db_name])    ? wp_config[:production][:db_name] : project_config[:production][:db_name],
-            db_host:  defined?(wp_config[:production][:db_host])    ? wp_config[:production][:db_host] : switly_config[:production][:db_host],
-            db_user:  defined?(wp_config[:production][:db_user])    ? wp_config[:production][:db_user] : switly_config[:production][:db_user],
-            db_pass:  defined?(wp_config[:production][:db_pass])    ? wp_config[:production][:db_pass] : switly_config[:production][:db_pass],
-            domain:   defined?(switly_config[:production][:domain]) ? switly_config[:production][:domain]  : wp_config[:production][:domain],
-            repo:     project_config[:production][:repo],
-            branch:   project_config[:production][:branch],
-            ssh_path: project_config[:production][:ssh_path],
-            ssh_user: project_config[:production][:ssh_user],
-          }
+        end
+
+        Swiftly::Resolver.load setting, args[0][:type], Swiftly::Smokestack.build( setting )
+
+      end
+
+      def self.settings project_name = nil
+
+        project_name    = self.get_project project_name
+        global_config   = Swiftly::Config.load :global
+        swiftlyfile     = Swiftly::Config.swiftlyfile
+        project_file    = Swiftly::Config.project_file project_name
+        wp_config       = Swiftly::Config.wp_config_file project_name
+
+        eval( IO.read( swiftlyfile ) ) unless eval( IO.read( swiftlyfile ) ).nil?
+
+        wp_config_parse wp_config
+
+        eval( IO.read( project_file ) ) unless eval( IO.read( project_file ) ).nil?
+
+        settings = Resolver.get :server
+
+        settings[:global] = global_config
+
+        settings[:project] = {
+          name: project_name,
+          path: File.join( global_config[:sites_path], project_name ),
+          dump: File.join( global_config[:sites_path], project_name, '_backups', 'dumps' )
         }
 
         if defined?( settings[:staging][:ssh_user] ) &&
@@ -97,6 +68,76 @@ module Swiftly
 
       end
 
+      def self.wp_config_parse file
+
+        if file
+
+          # load the wp-config file environment settings for wp-enabled environments
+          wp_local = File.read( file )[/\$local\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          wp_staging = File.read( file )[/\$staging\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          wp_production = File.read( file )[/\$production\s*?=[\s|\S]*?({[\s|\S]*?})/, 1]
+
+          if wp_local.nil? || wp_staging.nil? || wp_production.nil?
+
+            return {
+              local: {},
+              staging: {},
+              production: {}
+            }
+
+          end
+
+          hash = {
+            local:       JSON.parse(wp_local).inject({}){|memo,(k,v)| memo[k] = v; memo},
+            staging:     JSON.parse(wp_staging).inject({}){|memo,(k,v)| memo[k] = v; memo},
+            production:  JSON.parse(wp_production).inject({}){|memo,(k,v)| memo[k] = v; memo}
+          }
+
+          hash.each do |k, v|
+
+            set :server, :type => k do
+
+              v.each do |setting, value|
+
+                if setting != 'wp_home'
+
+                  case setting
+                    when 'domain'
+                      domain value
+
+                    when 'repo'
+                      repo value
+
+                    when 'branch'
+                      branch value
+
+                    when 'ssh_path'
+                      ssh_path value
+
+                    when 'ssh_user'
+                      ssh_user value
+
+                    when 'db_name'
+                      db_name value
+
+                    when 'db_host'
+                      db_host value
+
+                    when 'db_user'
+                      db_user value
+
+                    when 'db_pass'
+                      db_pass value
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
       def self.get_project( project_name )
 
         pathname     = Pathname.new project_name
@@ -110,7 +151,7 @@ module Swiftly
         thor.say_status( "#{APP_NAME}:", "#{project_path} is not a project.\n", :yellow ) &&
         abort unless File.directory?( project_path )
 
-        pathname.expand_path.basename
+        pathname.expand_path.basename.to_s
 
       end
 

data/lib/swiftly/resolver.rb

@@ -0,0 +1,72 @@
+module Swiftly
+  class Resolver
+
+    @@settings = {
+      server: [],
+      package: []
+    }
+
+    def self.load setting, type, attributes
+
+      @@settings[setting] <<  { type => attributes }
+
+    end
+
+    def self.get setting
+
+      override  = {}
+      final     = {}
+
+      if !@@settings[setting].nil?
+
+        @@settings[setting].each do |s|
+
+          s.each do |k, v|
+
+            override[k] = []
+
+          end
+        end
+
+        @@settings[setting].each do |s|
+
+          s.each do |k, v|
+
+            override[k] << v
+
+          end
+        end
+
+        override.each do |k, v|
+
+          construct = {}
+          capture   = {}
+
+          override[k].each do |o|
+
+            final.merge!( {k => {} } )
+
+            available_methods = o.methods - Object.methods
+
+            available_methods.each_with_index do |n, e|
+
+              unless (n.to_s.end_with?("="))
+
+                construct[n] = o.send(n)  unless o.send(n).nil?
+
+              end
+
+            end
+
+            final[k] = capture.merge!( construct )
+
+          end
+        end
+      end
+
+      final
+
+    end
+
+  end
+end

data/lib/swiftly/server.rb

@@ -0,0 +1,17 @@
+require "swiftly/factory"
+
+module Swiftly
+  class Server
+
+    attr_accessor :domain
+    attr_accessor :repo
+    attr_accessor :branch
+    attr_accessor :ssh_path
+    attr_accessor :ssh_user
+    attr_accessor :db_name
+    attr_accessor :db_host
+    attr_accessor :db_user
+    attr_accessor :db_pass
+
+  end
+end

data/lib/swiftly/smokestack.rb

@@ -0,0 +1,37 @@
+require 'swiftly/definition_proxy'
+
+module Swiftly
+  module Smokestack
+
+    @registry = {}
+
+    def self.registry
+
+      @registry
+
+    end
+
+    def self.define(&block)
+
+      definition_proxy = Swiftly::DefinitionProxy.new
+      definition_proxy.instance_eval(&block)
+
+    end
+
+    def self.build(factory_class, overrides = {})
+
+      instance   = Swiftly.const_get(factory_class.capitalize).new
+      factory    = registry[Swiftly.const_get(factory_class.capitalize)]
+      attributes = factory.attributes.merge(overrides)
+
+      attributes.each do |attribute_name, value|
+
+        instance.send("#{attribute_name}=", value)
+
+      end
+
+      instance
+
+    end
+  end
+end

data/lib/swiftly/templates/config_project.erb

@@ -1,11 +1,17 @@
----
-:staging:
-  :repo:
-  :branch:
-  :ssh_path:
-  :ssh_user:
-:production:
-  :repo:
-  :branch:
-  :ssh_path:
-  :ssh_user:
+# set :server, :type => :staging do
+
+#   repo
+#   branch
+#   ssh_path
+#   ssh_user
+
+# end
+
+# set :server, :type => :production do
+
+#   repo
+#   branch
+#   ssh_path
+#   ssh_user
+
+# end

data/lib/swiftly/templates/swiftlyfile.erb

@@ -1,21 +1,23 @@
----
-:local:
-  :db_host: "<%= @db_host %>"
-  :db_user: "<%= @db_user %>"
-  :db_pass: "<%= @db_pass %>"
-:staging:
-  :domain:
-  :db_host:
-:production:
-  :domain:
-  :db_host:
-:packages:
-  :wordpress:
-    :template:
-    - :name: mask
-      :location: https://github.com/micalexander/mask/archive/master.zip
-      :status: :disabled
-    :plugins:
-    - :name: advanced-custom-fields-pro
-      :location: "/Users/username/plugins"
-      :status: :disabled
+set :server, :type => :local do
+
+  db_host '<%= @db_host %>'
+  db_user '<%= @db_user %>'
+  db_pass '<%= @db_pass %>'
+
+end
+
+# set :package, :type => :template do
+
+#   name     'mask'
+#   location 'https://github.com/micalexander/mask/archive/master.zip'
+#   status   :disabled
+
+# end
+
+# set :package, :type => :plugin do
+
+#   name     'advanced-custom-fields-pro'
+#   location '/Users/username/plugins'
+#   status   :disabled
+
+# end

data/lib/swiftly/version.rb

@@ -1,4 +1,4 @@
 module Swiftly
   APP_NAME = 'swiftly'
-  VERSION  = '4.0.1'
+  VERSION  = '5.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swiftly
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Mic Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -105,8 +105,8 @@ extra_rdoc_files: []
 files:
 - ".DS_Store"
 - ".gitignore"
-- Dropbox/Development/www/Swiftlyfile
 - Gemfile
+- README.md
 - bin/swiftly
 - lib/swiftly/Rakefile
 - lib/swiftly/app_module.rb
@@ -121,16 +121,19 @@ files:
 - lib/swiftly/create_project.rb
 - lib/swiftly/create_wordpress.rb
 - lib/swiftly/database.rb
+- lib/swiftly/definition_proxy.rb
 - lib/swiftly/destroy.rb
-- lib/swiftly/generate.rb
-- lib/swiftly/generate_post_type.rb
+- lib/swiftly/factory.rb
 - lib/swiftly/init.rb
 - lib/swiftly/packages.rb
 - lib/swiftly/project.rb
 - lib/swiftly/pull.rb
 - lib/swiftly/push.rb
+- lib/swiftly/resolver.rb
 - lib/swiftly/rollback.rb
+- lib/swiftly/server.rb
 - lib/swiftly/setup.rb
+- lib/swiftly/smokestack.rb
 - lib/swiftly/ssh.rb
 - lib/swiftly/templates/config_global.erb
 - lib/swiftly/templates/config_project.erb

data/Dropbox/Development/www/Swiftlyfile

@@ -1,8 +0,0 @@
-# :wordpress:
-#  :template:
-#    - :name:
-#      :remote: https://github.com/micalexander/mask/archive/master.zip
-#      :status: :disabled
-#  :plugins:
-#    - advanced-custom-fields-pro/acf.php
-#    - ambrosite-body-class-enhanced/ambrosite-body-class.php

data/lib/swiftly/generate.rb

@@ -1,23 +0,0 @@
-require 'swiftly/generate_post_type'
-require 'swiftly/app_module'
-
-module Swiftly
-  class Generate < Thor
-
-    include Helpers
-
-    desc "cpt [option] PROJECT_NAME", "Creates Custom Post Type file"
-
-    def cpt(post_type_name, post_type_filter, project_name)
-
-      settings = Swiftly::Project.settings( project_name )
-
-      GeneratePostType.new([
-        post_type_name,
-        post_type_filter,
-        settings[:project]
-      ]).invoke_all
-
-    end
-  end
-end

data/lib/swiftly/generate_post_type.rb

@@ -1,50 +0,0 @@
-require "thor/group"
-require 'rubygems'
-require 'active_support'
-require 'active_support/core_ext/string'
-
-module Swiftly
-  class GeneratePostType < Thor::Group
-
-    include Thor::Actions
-
-    argument     :post_type_name
-    argument     :post_type_filter
-    argument     :project
-
-    desc "Handles the creation of the post type file."
-
-    def self.source_root
-      File.dirname(__FILE__)
-    end
-
-    def create()
-
-      if @post_type_filter == 'published-date' or @post_type_filter == ''
-
-        @filter          = '&int-year=$matches[1]&int-month=$matches[2]'
-        @taxonomy_filter = '=$matches[1]&int-year=$matches[2]$&int-month=$matches[3]'
-        @filter_regexp   = '(\d{4})/(\d{2})/??'
-
-      elsif @post_type_filter == 'last-name'
-
-        @post_type_filter = '&letter=$matches[1]'
-        @filter_regexp    = '([A-Z])/??$'
-
-      elsif @post_type_filter == 'start-date'
-
-        @post_type_filter = '&month=$matches[1]'
-        @filter_regexp    = '(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)/?$'
-
-      else
-
-        say "\nswiftly: filter type \"#{@post_type_filter}\" unaccepted\n\n", :red
-        exit
-
-      end
-
-      template File.join( 'templates', 'post_type.erb' ), File.join( "#{@project[:path]}", 'wp-content', 'plugins', "#{@project[:name]}-specific-plugin", 'custom-post-types',"#{@post_type_name.pluralize}.php")
-
-    end
-  end
-end