theme-juice 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83b8bbe95fb64cf42a9a94d829fa61cdd53535c
-  data.tar.gz: 20a02695b68b423391286d183e845471549de900
+  metadata.gz: f8a40e35767cddfbeb2aab96fce9dd0cf3a509aa
+  data.tar.gz: 7dc5c7b4a1c816c61dc3312bd6d17bc52dcacfb8
 SHA512:
-  metadata.gz: c07184bc00044beb4610c10b463b16c4925eb82d45c2fcba3115caa3200c7b444ca38fb62acd9b252aad8c5547db0e542cc336a5a9113add09d1cf19d67044b7
-  data.tar.gz: d7b716f461b6ef926df7ee85632e77d9cd7b85f005a9604b1350b4d7d79a664f99a84cef14c6df8e5d760790cc662372b261aa01dbf82a79455a394c79f3c808
+  metadata.gz: 6051a33c1e1d44d2e2cf1023c85e1ecddd88e51c0ace13787a0f2d8ed5f1acef7cb06d20fb96a9875250f09cabec62014c934303172bd34ffd06aeedaee6f8ee
+  data.tar.gz: 9f9952d603b915ec5564b3fef51425dfe936d1420ec5fe14b46ebb1023cca8f9942bc0caec7916d9ac201e959c740d925bfee557411556e3a1e3b0c29aba708f

data/README.md

@@ -41,6 +41,7 @@ commands:
   wp:
     - wp ssh --host=vagrant %args%
   backup:
+    - mkdir -p backup
     - wp ssh --host=vagrant db export backup/$(date +'%Y-%m-%d-%H-%M-%S').sql
   dist:
     - tar -zcvf dist.tar.gz .
@@ -206,9 +207,11 @@ Uses `test` command within your config.
 tj test # Aliases: tests spec specs
 ```
 
-## Contributing
+## Can I add my starter theme, ________?
+Yes! Just update the `THEMES` constant inside [commands/create.rb](https://github.com/ezekg/theme-juice-cli/blob/master/lib/theme-juice/commands/create.rb#L7-L11) and make a pull request. I'll verify that it includes a `Juicefile`, and that everything looks solid. Until then (or if your theme is private), just run `tj new --theme https://your.repo/link/goes.here` to clone your theme.
 
-1. First, create an [issue](https://github.com/ezekg/theme-juice-cli/issues) for your proposed feature. If it's a bug fix, go right to step 2.
+## Contributing
+1. First, create a _well documented_ [issue](https://github.com/ezekg/theme-juice-cli/issues) for your proposed feature/bug fix.
 1. [Fork the repository](https://github.com/ezekg/theme-juice-cli/fork).
 1. Create a new feature branch. (`git checkout -b my-new-feature`)
 1. Commit your changes. (`git commit -am 'add some feature'`)

data/bin/tj

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-begin
-  require_relative "../lib/theme-juice"
-rescue LoadError => err
-  warn err
-  exit 1
-end
+require "theme-juice"
 
 Signal.trap "INT" do
   ThemeJuice::IO.goodbye

data/lib/theme-juice.rb

@@ -9,6 +9,7 @@ module ThemeJuice
 end
 
 require "theme-juice/version"
+require "theme-juice/helpers"
 require "theme-juice/env"
 require "theme-juice/project"
 require "theme-juice/util"

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

@@ -50,8 +50,9 @@ module ThemeJuice
           tasks << Tasks::DNS.new
           tasks << Tasks::WPCLI.new
           tasks << Tasks::Repo.new
-          tasks << Tasks::CreateSuccess.new
+          tasks << Tasks::VMProvision.new
           tasks << Tasks::ImportDatabase.new
+          tasks << Tasks::CreateSuccess.new
         end
       end
 
@@ -153,54 +154,25 @@ module ThemeJuice
         repo
       end
 
-      def db_host
-        return false if @project.no_db || @project.no_wp
-
-        if @project.skip_db || @project.use_defaults
-          db_host = "vvv"
-        else
-          db_host = @io.prompt "Database host", :default => "vvv"
-        end
-
-        db_host
-      end
-
-      def db_name
-        return false if @project.no_db || @project.no_wp
-
-        if @project.skip_db || @project.use_defaults
-          db_name = "#{clean_name}_db"
-        else
-          db_name = @io.prompt "Database name", :default => "#{clean_name}_db"
-        end
+      %w[host name user pass].each do |task|
+        define_method "db_#{task}" do
+          return false if @project.no_db || @project.no_wp
 
-        db_name
-      end
-
-      def db_user
-        return false if @project.no_db || @project.no_wp
-
-        if @project.skip_db || @project.use_defaults
-          db_user = "#{clean_name}_user"
-        else
-          db_user = @io.prompt "Database username", :default => "#{clean_name}_user"
-        end
-
-        db_user
-      end
-
-      def db_pass
-        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
 
-        pass = Faker::Internet.password 24
+          if @project.skip_db || @project.use_defaults
+            res = default
+          else
+            res = @io.prompt "Database #{task}", :default => default
+          end
 
-        if @project.skip_db || @project.use_defaults
-          db_pass = pass
-        else
-          db_pass = @io.prompt "Database password", :default => pass
+          res
         end
-
-        db_pass
       end
 
       def db_import

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

@@ -21,6 +21,7 @@ module ThemeJuice
           tasks << Tasks::VMLocation.new
           tasks << Tasks::SyncedFolder.new
           tasks << Tasks::DNS.new
+          tasks << Tasks::VMRestart.new
           tasks << Tasks::DeleteSuccess.new
         end
       end

data/lib/theme-juice/env.rb

@@ -2,6 +2,8 @@
 
 module ThemeJuice
   module Env
+    include Helpers
+
     attr_accessor :vm_path
     attr_accessor :vm_ip
     attr_accessor :vm_prefix
@@ -14,12 +16,6 @@ module ThemeJuice
     attr_accessor :verbose
     attr_accessor :dryrun
 
-    def inspect
-      res = []
-      self.instance_variables.each { |k, _| res << "#{k[1..-1]}: #{instance_variable_get(k)}" }
-      res.sort
-    end
-
     extend self
   end
 end

data/lib/theme-juice/helpers.rb

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

data/lib/theme-juice/project.rb

@@ -2,6 +2,8 @@
 
 module ThemeJuice
   module Project
+    include Helpers
+
     attr_accessor :name
     attr_accessor :location
     attr_accessor :url
@@ -24,12 +26,6 @@ module ThemeJuice
     attr_accessor :no_wp
     attr_accessor :no_db
 
-    def inspect
-      res = []
-      self.instance_variables.each { |k, _| res << "#{k[1..-1]}: #{instance_variable_get(k)}" }
-      res.sort
-    end
-
     extend self
   end
 end

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

@@ -6,25 +6,14 @@ module ThemeJuice
 
       def initialize(opts = {})
         super
-
-        @vm_provision = Tasks::VMProvision.new(opts)
       end
 
       def execute
-        provision_vm
         success
       end
 
       private
 
-      def provision_vm
-        if @io.agree? "In order to finish creating your project, you need to provision the VM. Do it now?"
-          @vm_provision.execute
-        else
-          @io.notice "Remember, the VM needs to be provisioned before you can use your new site"
-        end
-      end
-
       def success
         @io.success "Successfully created project '#{@project.name}'"
         @io.list "Your settings :", :yellow, settings

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

@@ -6,23 +6,14 @@ module ThemeJuice
 
       def initialize(opts = {})
         super
-
-        @vm_restart = Tasks::VMRestart.new(opts)
       end
 
       def unexecute
-        restart_vm
         success
       end
 
       private
 
-      def restart_vm
-        if @project.vm_restart
-          @vm_restart.execute
-        end
-      end
-
       def success
         @io.success "Successfully removed project '#{@project.name}'"
       end

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

@@ -9,6 +9,14 @@ module ThemeJuice
       end
 
       def execute
+        if @io.agree? "In order to finish creating your project, you need to provision the VM. Do it now?"
+          provision
+        else
+          @io.notice "Remember, the VM needs to be provisioned before you can use your new site"
+        end
+      end
+
+      def unexecute
         provision
       end
 

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

@@ -12,6 +12,12 @@ module ThemeJuice
         restart
       end
 
+      def unexecute
+        if @project.vm_restart
+          restart
+        end
+      end
+
       private
 
       def restart

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,6 +128,7 @@ 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/io.rb
 - lib/theme-juice/project.rb
 - lib/theme-juice/task.rb