theme-juice 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a40e35767cddfbeb2aab96fce9dd0cf3a509aa
-  data.tar.gz: 7dc5c7b4a1c816c61dc3312bd6d17bc52dcacfb8
+  metadata.gz: 47453dc6785ca46556845b56bd1a46f4cbd87fd2
+  data.tar.gz: b5b347209b63b93778a684add12a618a0f7e0a12
 SHA512:
-  metadata.gz: 6051a33c1e1d44d2e2cf1023c85e1ecddd88e51c0ace13787a0f2d8ed5f1acef7cb06d20fb96a9875250f09cabec62014c934303172bd34ffd06aeedaee6f8ee
-  data.tar.gz: 9f9952d603b915ec5564b3fef51425dfe936d1420ec5fe14b46ebb1023cca8f9942bc0caec7916d9ac201e959c740d925bfee557411556e3a1e3b0c29aba708f
+  metadata.gz: f7af5978b857e8c59705bbacf31bd2d8d14f47660527d41af344fa86c6d624c2a0284ac0027cca9ca6d6ab96bcce08020b8412181cf6613209338e9f34b24f92
+  data.tar.gz: 9dcbf6263ec2fc2fc1a622d4417e35e154e5e5836c6e9bf85603ec8f36f800af77ef499dd4147b6440018f9ec5b93c2f4fde4699b8ae50d5384dd19922c167cd

data/bin/tj

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+lib = File.expand_path "../lib/", __FILE__
+$:.unshift lib unless $:.include? lib
+
 require "theme-juice"
 
 Signal.trap "INT" do

data/lib/theme-juice.rb

@@ -9,7 +9,8 @@ module ThemeJuice
 end
 
 require "theme-juice/version"
-require "theme-juice/helpers"
+require "theme-juice/patches/option"
+require "theme-juice/helpers/singleton_helper"
 require "theme-juice/env"
 require "theme-juice/project"
 require "theme-juice/util"

data/lib/theme-juice/cli.rb

@@ -1,42 +1,5 @@
 # encoding: UTF-8
 
-#
-# Monkey patch to not print out reverse bool options on --help
-#
-# @see https://github.com/erikhuda/thor/issues/417
-#
-class Thor
-  class Option < Argument
-    def usage(padding = 0)
-      sample = if banner && !banner.to_s.empty?
-        "#{switch_name}=#{banner}"
-      else
-        switch_name
-      end
-
-      sample = "[#{sample}]" unless required?
-
-      # if boolean?
-      #   sample << ", [#{dasherize("no-" + human_name)}]" unless name == "force" or name.start_with?("no-")
-      # end
-
-      if aliases.empty?
-        (" " * padding) << sample
-      else
-        "#{aliases.join(', ')}, #{sample}"
-      end
-    end
-
-    VALID_TYPES.each do |type|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{type}?
-          self.type == #{type.inspect}
-        end
-      RUBY
-    end
-  end
-end
-
 module ThemeJuice
   class CLI < Thor
 
@@ -53,17 +16,24 @@ module ThemeJuice
       @create            = Commands::Create
       @delete            = Commands::Delete
       @deploy            = Commands::Deploy
-      @env.vm_path       = options.fetch "vm_path",       ENV.fetch("TJ_VM_PATH", File.expand_path("~/vagrant"))
-      @env.vm_ip         = options.fetch "vm_ip",         ENV.fetch("TJ_VM_IP", "192.168.50.4")
-      @env.vm_prefix     = options.fetch "vm_prefix",     ENV.fetch("TJ_VM_PREFIX", "tj-")
-      @env.yolo          = options.fetch "yolo",          ENV.fetch("TJ_YOLO", false)
-      @env.boring        = options.fetch "boring",        ENV.fetch("TJ_BORING", false)
-      @env.no_unicode    = options.fetch "no_unicode",    ENV.fetch("TJ_NO_UNICODE", @env.boring)
-      @env.no_colors     = options.fetch "no_colors",     ENV.fetch("TJ_NO_COLORS", @env.boring)
-      @env.no_animations = options.fetch "no_animations", ENV.fetch("TJ_NO_ANIMATIONS", @env.boring)
-      @env.no_landrush   = options.fetch "no_landrush",   ENV.fetch("TJ_NO_LANDRUSH", false)
-      @env.verbose       = options.fetch "verbose",       ENV.fetch("TJ_VERBOSE", false)
-      @env.dryrun        = options.fetch "dryrun",        ENV.fetch("TJ_DRYRUN", false)
+
+      init_env
+    end
+
+    no_commands do
+      def init_env
+        @env.vm_path       = options.fetch "vm_path",       ENV.fetch("TJ_VM_PATH", File.expand_path("~/vagrant"))
+        @env.vm_ip         = options.fetch "vm_ip",         ENV.fetch("TJ_VM_IP", "192.168.50.4")
+        @env.vm_prefix     = options.fetch "vm_prefix",     ENV.fetch("TJ_VM_PREFIX", "tj-")
+        @env.yolo          = options.fetch "yolo",          ENV.fetch("TJ_YOLO", false)
+        @env.boring        = options.fetch "boring",        ENV.fetch("TJ_BORING", false)
+        @env.no_unicode    = options.fetch "no_unicode",    ENV.fetch("TJ_NO_UNICODE", @env.boring)
+        @env.no_colors     = options.fetch "no_colors",     ENV.fetch("TJ_NO_COLORS", @env.boring)
+        @env.no_animations = options.fetch "no_animations", ENV.fetch("TJ_NO_ANIMATIONS", @env.boring)
+        @env.no_landrush   = options.fetch "no_landrush",   ENV.fetch("TJ_NO_LANDRUSH", false)
+        @env.verbose       = options.fetch "verbose",       ENV.fetch("TJ_VERBOSE", false)
+        @env.dryrun        = options.fetch "dryrun",        ENV.fetch("TJ_DRYRUN", false)
+      end
     end
 
     map %w[--version -v]             => :version
@@ -71,7 +41,8 @@ module ThemeJuice
     map %w[up prep init]             => :setup
     map %w[rm remove trash teardown] => :delete
     map %w[ls projects apps sites]   => :list
-    map %w[assets dev build]         => :watch
+    map %w[build]                    => :install
+    map %w[assets dev]               => :watch
     map %w[dependencies deps]        => :vendor
     map %w[distrubute pack package]  => :dist
     map %w[wordpress]                => :wp
@@ -126,7 +97,7 @@ module ThemeJuice
     method_option :location,     :type => :string,  :aliases => "-l", :default => nil, :desc => "Location of the local project"
     method_option :url,          :type => :string,  :aliases => "-u", :default => nil, :desc => "Development URL for the project"
     method_option :repository,   :type => :string,  :aliases => "-r",                  :desc => "Initialize a new Git remote repository"
-    method_option :import_db,    :type => :string,  :aliases => "-i",                  :desc => "Import an existing database"
+    method_option :db_import,    :type => :string,  :aliases => %w[-i --import-db],    :desc => "Import an existing database"
     method_option :skip_repo,    :type => :boolean,                                    :desc => "Skip repository prompts and use default settings"
     method_option :skip_db,      :type => :boolean,                                    :desc => "Skip database prompts and use default settings"
     method_option :use_defaults, :type => :boolean,                                    :desc => "Skip all prompts and use default settings"

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

@@ -5,33 +5,15 @@ module ThemeJuice
     class Create < Command
 
       THEMES = {
-        "theme-juice/theme-juice-starter" => "https://github.com/ezekg/theme-juice-starter.git",
-        "other"                           => nil,
-        "none"                            => false
+        "theme-juice/trellis" => "https://github.com/ezekg/theme-juice-starter.git",
+        "other"               => nil,
+        "none"                => false
       }
 
       def initialize(opts = {})
         super
 
-        @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.theme        = @opts.fetch("theme") { theme }
-        @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.vm_root      = vm_root
-        @project.vm_location  = vm_location
-        @project.vm_srv       = vm_srv
+        init_project
 
         runner do |tasks|
           tasks << Tasks::CreateConfirm.new
@@ -58,6 +40,28 @@ 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.theme        = @opts.fetch("theme") { theme }
+        @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.vm_root      = vm_root
+        @project.vm_location  = vm_location
+        @project.vm_srv       = vm_srv
+      end
+
       def name
         if @env.yolo
           name = Faker::Internet.domain_word
@@ -158,12 +162,12 @@ module ThemeJuice
         define_method "db_#{task}" do
           return false if @project.no_db || @project.no_wp
 
-          case task
-          when "host" then default = "vvv"
-          when "name" then default = "#{clean_name}_db"
-          when "user" then default = "#{clean_name}_user"
-          when "pass" then default = Faker::Internet.password(24)
-          end
+          default = case task
+                    when "host" then "vvv"
+                    when "name" then "#{clean_name}_db"
+                    when "user" then "#{clean_name}_user"
+                    when "pass" then Faker::Internet.password(24)
+                    end
 
           if @project.skip_db || @project.use_defaults
             res = default

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

@@ -7,13 +7,7 @@ module ThemeJuice
       def initialize(opts = {})
         super
 
-        @project.name        = @opts.fetch("name") { name }
-        @project.url         = @opts.fetch("url") { url }
-        @project.db_drop     = @opts.fetch("db_drop", false)
-        @project.vm_restart  = @opts.fetch("vm_restart", false)
-        @project.vm_root     = vm_root
-        @project.vm_location = vm_location
-        @project.vm_srv      = vm_srv
+        init_project
 
         runner do |tasks|
           tasks << Tasks::DeleteConfirm.new
@@ -28,6 +22,16 @@ module ThemeJuice
 
       private
 
+      def init_project
+        @project.name        = @opts.fetch("name") { name }
+        @project.url         = @opts.fetch("url") { url }
+        @project.db_drop     = @opts.fetch("db_drop", false)
+        @project.vm_restart  = @opts.fetch("vm_restart", false)
+        @project.vm_root     = vm_root
+        @project.vm_location = vm_location
+        @project.vm_srv      = vm_srv
+      end
+
       def name
         name = @io.prompt "What's the project name?"
 

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

@@ -7,14 +7,20 @@ module ThemeJuice
       def initialize(opts = {})
         super
 
-        @project.vm_root     = vm_root
-        @project.vm_location = vm_location
-        @project.vm_srv      = vm_srv
+        init_project
 
         runner do |tasks|
           @io.error "Not implemented"
         end
       end
+
+      private
+
+      def init_project
+        @project.vm_root     = vm_root
+        @project.vm_location = vm_location
+        @project.vm_srv      = vm_srv
+      end
     end
   end
 end

data/lib/theme-juice/env.rb

@@ -2,7 +2,7 @@
 
 module ThemeJuice
   module Env
-    include Helpers
+    include SingletonHelper
 
     attr_accessor :vm_path
     attr_accessor :vm_ip

data/lib/theme-juice/{helpers.rb → helpers/singleton_helper.rb}

@@ -1,5 +1,5 @@
 module ThemeJuice
-  module Helpers
+  module SingletonHelper
     def inspect
       res = []
       self.instance_variables.each { |k, _| res << "#{k[1..-1]}: #{instance_variable_get(k)}" }

data/lib/theme-juice/patches/option.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+
+#
+# Monkey patch to not print out reverse bool options on --help
+#
+# @see https://github.com/erikhuda/thor/issues/417
+#
+class Thor
+  class Option < Argument
+    def usage(padding = 0)
+      sample = if banner && !banner.to_s.empty?
+        "#{switch_name}=#{banner}"
+      else
+        switch_name
+      end
+
+      sample = "[#{sample}]" unless required?
+
+      if aliases.empty?
+        (" " * padding) << sample
+      else
+        "#{aliases.join(', ')}, #{sample}"
+      end
+    end
+
+    VALID_TYPES.each do |type|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{type}?
+          self.type == #{type.inspect}
+        end
+      RUBY
+    end
+  end
+end

data/lib/theme-juice/project.rb

@@ -2,7 +2,7 @@
 
 module ThemeJuice
   module Project
-    include Helpers
+    include SingletonHelper
 
     attr_accessor :name
     attr_accessor :location

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

@@ -36,6 +36,8 @@ module ThemeJuice
 DB_USER=#{@project.db_user}
 DB_PASSWORD=#{@project.db_pass}
 DB_HOST=#{@project.db_host}
+WP_ENV=development
+WP_DEBUG=true
 WP_HOME=http://#{@project.url}
 WP_SITEURL=http://#{@project.url}/wp
 

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,8 +128,9 @@ files:
 - lib/theme-juice/commands/deploy.rb
 - lib/theme-juice/config.rb
 - lib/theme-juice/env.rb
-- lib/theme-juice/helpers.rb
+- lib/theme-juice/helpers/singleton_helper.rb
 - lib/theme-juice/io.rb
+- lib/theme-juice/patches/option.rb
 - lib/theme-juice/project.rb
 - lib/theme-juice/task.rb
 - lib/theme-juice/tasks/create_confirm.rb
@@ -183,4 +184,3 @@ signing_key:
 specification_version: 4
 summary: Theme Juice - WordPress development made easy
 test_files: []
-has_rdoc: