theme-juice 0.19.5 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbfecab588b74f964cb79a3de2742a200f314e78
-  data.tar.gz: 9af699e7120a66a5325348750f05b530a2215616
+  metadata.gz: 7c9fca52d72a4f48aee8afea4a1bf79e910ab5b4
+  data.tar.gz: 556f6c6891375960ddb923ea494ef8b614ba8a87
 SHA512:
-  metadata.gz: 58a08bbd9b4f2f299d00ab62a5a895f9732df9ed0f439322c322756a73dc5ae150d5c10b5e460491f6d568134d143f80560408323d8e1f005986f15e0ebdd43b
-  data.tar.gz: c0282daee601b2e43dbee735079658143f7e105f5bc9069a7de7d96c6c25793d4f7f6d81fa1c501e29a6f539b9dbf041a0f7decda1dea25f2c431ad5d5b5aeef
+  metadata.gz: 3a9a77b68588a07545cc0c80d3bc6bedbd2fccf0326fa78212ecf73b24a9916bf21c074e250febc19b22b7950e4bb816a9a0620aa6c923689bb102645c542d31
+  data.tar.gz: 3766089d433880aaa037038019a367a0ac5719714ee3e11e500d6141d3f0354ff30dcf19943f6609788ab287adf240907d04251354367af86a80ad687f5a2781

data/lib/theme-juice.rb

@@ -27,6 +27,7 @@ require "theme-juice/tasks/location"
 require "theme-juice/tasks/template"
 require "theme-juice/tasks/repo"
 require "theme-juice/tasks/dot_env"
+require "theme-juice/tasks/wp_config"
 require "theme-juice/tasks/forward_ports"
 require "theme-juice/tasks/nginx"
 require "theme-juice/tasks/apache"

data/lib/theme-juice/cli.rb

@@ -122,18 +122,22 @@ module ThemeJuice
     end
 
     desc "create", "Create new project"
-    method_option :name,         :type => :string,  :aliases => "-n", :default => nil, :desc => ""
-    method_option :location,     :type => :string,  :aliases => "-l", :default => nil, :desc => ""
-    method_option :template,     :type => :string,  :aliases => "-t", :default => nil, :desc => ""
-    method_option :url,          :type => :string,  :aliases => "-u", :default => nil, :desc => ""
-    method_option :repository,   :type => :string,  :aliases => "-r",                  :desc => ""
-    method_option :db_import,    :type => :string,  :aliases => %w[-i --import-db],    :desc => ""
-    method_option :bare,         :type => :boolean, :aliases => %w[--no-template],     :desc => ""
-    method_option :skip_repo,    :type => :boolean,                                    :desc => ""
-    method_option :skip_db,      :type => :boolean,                                    :desc => ""
-    method_option :use_defaults, :type => :boolean,                                    :desc => ""
-    method_option :no_wp,        :type => :boolean,                                    :desc => ""
-    method_option :no_db,        :type => :boolean,                                    :desc => ""
+    method_option :name,             :type => :string,  :aliases => "-n", :default => nil,  :desc => ""
+    method_option :location,         :type => :string,  :aliases => "-l", :default => nil,  :desc => ""
+    method_option :template,         :type => :string,  :aliases => "-t", :default => nil,  :desc => ""
+    method_option :url,              :type => :string,  :aliases => "-u", :default => nil,  :desc => ""
+    method_option :repository,       :type => :string,  :aliases => "-r",                   :desc => ""
+    method_option :db_import,        :type => :string,  :aliases => %w[-i --import-db],     :desc => ""
+    method_option :bare,             :type => :boolean, :aliases => %w[--no-template],      :desc => ""
+    method_option :skip_repo,        :type => :boolean,                                     :desc => ""
+    method_option :skip_db,          :type => :boolean,                                     :desc => ""
+    method_option :use_defaults,     :type => :boolean,                                     :desc => ""
+    method_option :no_wp,            :type => :boolean,                                     :desc => ""
+    method_option :no_wp_cli,        :type => :boolean, :aliases => %w[--no-wp-cli-config], :desc => ""
+    method_option :no_db,            :type => :boolean,                                     :desc => ""
+    method_option :no_env,           :type => :boolean,                                     :desc => ""
+    method_option :no_config,        :type => :boolean, :aliases => %w[--no-juicefile],     :desc => ""
+    method_option :wp_config_modify, :type => :boolean, :aliases => %w[--modify-wp-config], :desc => ""
     def create
       @io.hello
       @create.new(options).execute

data/lib/theme-juice/commands/create.rb

@@ -30,7 +30,11 @@ module ThemeJuice
           else
             tasks << Tasks::Apache.new
           end
-          tasks << Tasks::DotEnv.new
+          if @project.no_env
+            tasks << Tasks::WPConfig.new
+          else
+            tasks << Tasks::DotEnv.new
+          end
           tasks << Tasks::Landrush.new
           tasks << Tasks::ForwardPorts.new
           tasks << Tasks::SyncedFolder.new
@@ -46,23 +50,27 @@ module ThemeJuice
       private
 
       def init_project
-        @project.use_defaults = @opts.fetch("use_defaults") { false }
-        @project.bare         = @opts.fetch("bare")         { false }
-        @project.skip_repo    = @opts.fetch("skip_repo")    { false }
-        @project.skip_db      = @opts.fetch("skip_db")      { false }
-        @project.no_wp        = @opts.fetch("no_wp")        { false }
-        @project.no_db        = @opts.fetch("no_db")        { false }
-        @project.name         = @opts.fetch("name")         { name }
-        @project.location     = @opts.fetch("location")     { location }
-        @project.url          = @opts.fetch("url")          { url }
-        @project.xip_url      = @opts.fetch("xip_url")      { xip_url }
-        @project.template     = @opts.fetch("template")     { template }
-        @project.repository   = @opts.fetch("repository")   { repository }
-        @project.db_host      = @opts.fetch("db_host")      { db_host }
-        @project.db_name      = @opts.fetch("db_name")      { db_name }
-        @project.db_user      = @opts.fetch("db_user")      { db_user }
-        @project.db_pass      = @opts.fetch("db_pass")      { db_pass }
-        @project.db_import    = @opts.fetch("db_import")    { db_import }
+        @project.use_defaults     = @opts.fetch("use_defaults")     { false }
+        @project.bare             = @opts.fetch("bare")             { false }
+        @project.skip_repo        = @opts.fetch("skip_repo")        { false }
+        @project.skip_db          = @opts.fetch("skip_db")          { false }
+        @project.no_wp            = @opts.fetch("no_wp")            { false }
+        @project.no_wp_cli        = @opts.fetch("no_wp_cli")        { false }
+        @project.no_db            = @opts.fetch("no_db")            { false }
+        @project.wp_config_modify = @opts.fetch("wp_config_modify") { false }
+        @project.no_config        = @opts.fetch("no_config")        { false }
+        @project.no_env           = @opts.fetch("no_env")           { @project.wp_config_modify }
+        @project.name             = @opts.fetch("name")             { name }
+        @project.location         = @opts.fetch("location")         { location }
+        @project.url              = @opts.fetch("url")              { url }
+        @project.xip_url          = @opts.fetch("xip_url")          { xip_url }
+        @project.template         = @opts.fetch("template")         { template }
+        @project.repository       = @opts.fetch("repository")       { repository }
+        @project.db_host          = @opts.fetch("db_host")          { db_host }
+        @project.db_name          = @opts.fetch("db_name")          { db_name }
+        @project.db_user          = @opts.fetch("db_user")          { db_user }
+        @project.db_pass          = @opts.fetch("db_pass")          { db_pass }
+        @project.db_import        = @opts.fetch("db_import")        { db_import }
       end
 
       def name
@@ -144,7 +152,11 @@ module ThemeJuice
           when /(theme-juice)/
             @io.say "Awesome choice!", :color => :green, :icon => :success
           when /(wordpress)/
-            @io.say "This is a stock WordPress install, so things such as the '.env' file will not be set up. You'll need to input your database information manually after the setup.", {
+            @project.wp_config_modify = true
+            @project.no_config        = true
+            @project.no_wp_cli        = true
+            @project.no_env           = true
+            @io.say "This is a stock WordPress install, so I'll go ahead and modify the 'wp-config' file for you.", {
               :color => :yellow, :icon => :notice }
           when /(other)/
             TEMPLATES[choice] = @io.ask "What is the repository URL of the starter template that you would like to clone?"

data/lib/theme-juice/config.rb

@@ -9,6 +9,8 @@ module ThemeJuice
     @config  = nil
 
     def command(cmd, *args)
+      return if @project.no_config
+
       commands.fetch("#{cmd}") {
         @io.error "Command '#{cmd}' not found in config", NotImplementedError }
         .each { |c| run format_command(c, *args) }

data/lib/theme-juice/man/tj-create

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-CREATE" "1" "December 2015" "" "Theme Juice Manual"
+.TH "TJ\-CREATE" "1" "January 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-create\fR \- Create a new project
@@ -91,6 +91,22 @@ Skip all prompts and use default settings
 Project is not a wordpress(7) install
 .
 .TP
+\fB\-\-no\-wp\-cli\fR, \fB\-\-no\-wp\-cli\-config\fR
+Skip creating the local wp\-cli(1) config file
+.
+.TP
 \fB\-\-no\-db\fR
 Project does not need a database
+.
+.TP
+\fB\-\-no\-env\fR
+Project does not need a \fB\.env\fR file
+.
+.TP
+\fB\-\-no\-config\fR, \fB\-\-no\-juicefile\fR
+Project does not have a Juicefile(1) config
+.
+.TP
+\fB\-\-modify\-wp\-config\fR, \fB\-\-wp\-config\-modify\fR
+Modify \fBwp\-config\.php\fR file contents with project configuration (this flag automatically disables the \fB\.env\fR file when used)
 

data/lib/theme-juice/man/tj-create.txt

@@ -73,10 +73,23 @@ GLOBAL OPTIONS
        --no-wp
 	      Project is not a wordpress(7) install
 
+       --no-wp-cli, --no-wp-cli-config
+	      Skip creating the local wp-cli(1) config file
+
        --no-db
 	      Project does not need a database
 
+       --no-env
+	      Project does not need a .env file
+
+       --no-config, --no-juicefile
+	      Project does not have a Juicefile(1) config
+
+       --modify-wp-config, --wp-config-modify
+	      Modify  wp-config.php  file  contents with project configuration
+	      (this flag automatically disables the .env file when used)
+
 
 
 
-				 December 2015			  TJ-CREATE(1)
+				 January 2016			  TJ-CREATE(1)

data/lib/theme-juice/project.rb

@@ -25,7 +25,11 @@ module ThemeJuice
     attr_accessor :skip_db
     attr_accessor :use_defaults
     attr_accessor :no_wp
+    attr_accessor :no_wp_cli
     attr_accessor :no_db
+    attr_accessor :no_env
+    attr_accessor :no_config
+    attr_accessor :wp_config_modify
 
     def vm_root
       @vm_root ||= File.expand_path("#{Env.vm_path}/www")

data/lib/theme-juice/tasks/dot_env.rb

@@ -9,7 +9,7 @@ module ThemeJuice
       end
 
       def execute
-        return if @project.no_wp
+        return if @project.no_env || @project.no_wp
 
         create_dot_env_file
       end

data/lib/theme-juice/tasks/wp_cli.rb

@@ -27,7 +27,7 @@ module ThemeJuice
       end
 
       def create_wp_cli_file
-        return if wp_cli_is_setup? || @project.no_wp
+        return if wp_cli_is_setup? || @project.no_wp_cli || @project.no_wp
 
         @io.log "Creating WP-CLI file"
         @util.create_file wp_cli_file, { :verbose => @env.verbose,

data/lib/theme-juice/tasks/wp_config.rb

@@ -0,0 +1,79 @@
+# encoding: UTF-8
+
+module ThemeJuice
+  module Tasks
+    class WPConfig < Task
+
+      def initialize(opts = {})
+        super
+
+        @using_wp_config_sample = false
+      end
+
+      def execute
+        return if !@project.wp_config_modify || @project.no_wp || @project.no_db
+
+        unless wp_config_is_setup?
+          @io.say "Could not find wp-config file to modify", {
+            :color => :yellow, :icon => :notice }
+
+          unless wp_config_sample_is_setup?
+            @io.error "Could not find a wp-config-sample file either. Are you sure one exists in the project directory?"
+          end
+
+          @util.create_file(wp_config_file, { :verbose => @env.verbose,
+            :capture => @env.quiet }) { File.read(wp_config_sample_file) }
+
+          @using_wp_config_sample = true
+        end
+
+        modify_wp_config_settings({
+          :db_name     => "#{@project.db_name}",
+          :db_user     => "#{@project.db_user}",
+          :db_password => "#{@project.db_pass}",
+          :db_host     => "#{@project.db_host}",
+          :wp_debug    => true
+        })
+      end
+
+      private
+
+      def wp_config_file
+        "#{@project.location}/wp-config.php"
+      end
+
+      def wp_config_is_setup?
+        File.exist? wp_config_file
+      end
+
+      def wp_config_sample_file
+        "#{@project.location}/wp-config-sample.php"
+      end
+
+      def wp_config_sample_is_setup?
+        File.exist? wp_config_sample_file
+      end
+
+      def modify_wp_config_settings(settings)
+        if @using_wp_config_sample
+          @io.log "Creating wp-config file from sample"
+        else
+          return unless @io.agree? "Do you want to modify your current wp-config settings?"
+          @io.log "Modifying wp-config file"
+        end
+
+        settings.each do |setting, value|
+          replacement = case value
+                        when TrueClass, FalseClass
+                          "define('#{setting.upcase}', #{value.to_s});"
+                        else
+                          "define('#{setting.upcase}', '#{value.to_s}');"
+                        end
+
+          @util.gsub_file wp_config_file, /define\(\W*#{setting}\W*,\s*['"]{0,1}(.*?)['"]{0,1}\)\;/mi,
+            "#{replacement}", { :verbose => @env.verbose, :capture => @env.quiet }
+        end
+      end
+    end
+  end
+end

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-  VERSION = "0.19.5"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.20.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,6 +209,7 @@ files:
 - lib/theme-juice/tasks/vm_restart.rb
 - lib/theme-juice/tasks/vm_stage.rb
 - lib/theme-juice/tasks/wp_cli.rb
+- lib/theme-juice/tasks/wp_config.rb
 - lib/theme-juice/util.rb
 - lib/theme-juice/version.rb
 homepage: http://themejuice.it