theme-juice 0.27.2 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32fee2e62fadfd00f2871e61601722a792c50944
-  data.tar.gz: 824b5b9d58bb04fe429c652f86e61999a062d1bf
+  metadata.gz: 9a776df3c544a31881c70f1bdd63fdc32ff50423
+  data.tar.gz: c3b26a31fdfde2b1ce69a6ff44d4abb0f2fe5766
 SHA512:
-  metadata.gz: e7ea805859bc8db64710bcc205928af4e8c059099ec91e20ae52e51cc6d08f1ff887e3c112d6f7cb6198fbb4137f9cb6d10e1cc411c29094885d31ca8469348f
-  data.tar.gz: 7c39334015d4900513419b405a9e8cff43addf43918acec03fa47645e985e9488fc0419bd87101e18517b7ed657564835d7a39fedf5bfefa9adada120ba59aa6
+  metadata.gz: a2c2fcde5aec836834b7fbe77faf5bc71187d14b24891f93506c77a9b8aba46eee3e645b95dba08acfafe6f11dd569122b6e31c47ee2609000a559bab1423c57
+  data.tar.gz: bff98273a3d544cc258a500908857ba01d0cc54e112ccc1e1c41193dd9bf9633274912cf03b5e9625fe4ca0116a226948421ff72d9eaeb7485379dd390483fbf

data/lib/theme-juice.rb

@@ -53,9 +53,11 @@ require "theme-juice/tasks/vm_stage"
 require "theme-juice/tasks/settings"
 require "theme-juice/tasks/load"
 require "theme-juice/tasks/invoke"
+require "theme-juice/tasks/vm_update_box"
 require "theme-juice/command"
 require "theme-juice/commands/init"
 require "theme-juice/commands/create"
 require "theme-juice/commands/delete"
 require "theme-juice/commands/deploy"
+require "theme-juice/commands/update"
 require "theme-juice/cli"

data/lib/theme-juice/cli.rb

@@ -17,6 +17,7 @@ module ThemeJuice
       @create  = Commands::Create
       @delete  = Commands::Delete
       @deploy  = Commands::Deploy
+      @update  = Commands::Update
 
       init_env
     end
@@ -27,6 +28,7 @@ module ThemeJuice
         @env.vm_path         = options[:vm_path]
         @env.vm_ip           = options[:vm_ip]
         @env.vm_prefix       = options[:vm_prefix]
+        @env.vm_revision     = options[:vm_revision]
         @env.from_path       = options[:from_path]
         @env.from_srv        = options[:from_srv]
         @env.inside_vm       = options[:inside_vm]
@@ -62,6 +64,7 @@ module ThemeJuice
     class_option :vm_path,         :type => :string,                           :default => nil, :desc => ""
     class_option :vm_ip,           :type => :string,                           :default => nil, :desc => ""
     class_option :vm_prefix,       :type => :string,                           :default => nil, :desc => ""
+    class_option :vm_revision,     :type => :string,                           :default => nil, :desc => ""
     class_option :from_path,       :type => :string,  :aliases => "--in-path", :default => nil, :desc => ""
     class_option :from_srv,        :type => :string,  :aliases => "--in-srv",  :default => nil, :desc => ""
     class_option :inside_vm,       :type => :boolean, :aliases => "--in-vm",                    :desc => ""
@@ -131,23 +134,24 @@ 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_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 => ""
-    method_option :no_ssl,           :type => :boolean, :aliases => %w[--no-https],         :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 :template_revision, :type => :string,  :aliases => %w[--template-branch], :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 => ""
+    method_option :no_ssl,            :type => :boolean, :aliases => %w[--no-https],                          :desc => ""
     def create
       @io.hello
       @create.new(options).execute
@@ -197,7 +201,7 @@ module ThemeJuice
 
     desc "update", "Update tj and its dependencies"
     def update(*args)
-      @io.error "Not implemented"
+      @update.new(options).execute
     end
 
     desc "vm [ARGS]", "Manage development environment"

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

@@ -71,15 +71,16 @@ module ThemeJuice
           @io.notice "Project location is not empty. Assuming you meant to run a setup..."
         end
 
-        @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.url               = @opts.fetch("url")               { url }
+        @project.xip_url           = @opts.fetch("xip_url")           { xip_url }
+        @project.template          = @opts.fetch("template")          { template }
+        @project.template_revision = @opts.fetch("template_revision") { nil }
+        @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
         @project.vm_location
         @project.vm_srv

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

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+
+module ThemeJuice
+  module Commands
+    class Update < Command
+
+      def initialize(opts = {})
+        super
+
+        runner do |tasks|
+          tasks << Tasks::VMUpdateBox.new
+        end
+      end
+    end
+  end
+end

data/lib/theme-juice/env.rb

@@ -8,6 +8,7 @@ module ThemeJuice
     attr_accessor :vm_path
     attr_accessor :vm_ip
     attr_accessor :vm_prefix
+    attr_accessor :vm_revision
     attr_accessor :from_path
     attr_accessor :from_srv
     attr_accessor :inside_vm
@@ -45,6 +46,10 @@ module ThemeJuice
       @vm_prefix = val || ENV.fetch("TJ_VM_PREFIX") { "tj-" }
     end
 
+    def vm_revision=(val)
+      @vm_revision = val || ENV.fetch("TJ_VM_REVISION") { nil }
+    end
+
     def from_path=(val)
       @from_path = val || ENV.fetch("TJ_FROM_PATH") { nil }
     end

data/lib/theme-juice/man/tj

@@ -28,6 +28,10 @@ Force IP address of VM*
 Force directory prefix for project in VM*
 .
 .TP
+\fB\-\-vm\-revision\fR
+Revision hash or branch to checkout for VM (default is master)
+.
+.TP
 \fB\-\-from\-path\fR, \fB\-\-in\-path\fR=\fIpath\fR
 Run Juicefile(5) commands from the passed path instead of from the current directory\.
 .
@@ -120,6 +124,10 @@ Delete a project
 deploy(1), \fBserver\fR, \fBremote\fR
 Deploy and manage a project
 .
+.TP
+\fBupdate\fR
+Update virtual machine and dependencies
+.
 .SH "SECONDARY COMMANDS"
 .
 .TP

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" "July 2016" "" "Theme Juice Manual"
+.TH "TJ\-CREATE" "1" "August 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-create\fR \- Create a new project
@@ -59,6 +59,10 @@ Location of the local project
 Starter template to install
 .
 .TP
+\fB\-\-template\-revision\fR, \fB\-\-template\-branch\fR
+Revision hash or branch to checkout for starter template (default is master)
+.
+.TP
 \fB\-u\fR, \fB\-\-url\fR=\fIurl\fR
 Development URL for the project
 .

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

@@ -49,6 +49,10 @@ GLOBAL OPTIONS
        -t, --template=repository
 	      Starter template to install
 
+       --template-revision, --template-branch
+	      Revision	hash  or  branch  to  checkout	for  starter  template
+	      (default is master)
+
        -u, --url=url
 	      Development URL for the project
 
@@ -86,7 +90,7 @@ GLOBAL OPTIONS
 	      Project does not have a Juicefile(5) config
 
        --modify-wp-config, --wp-config-modify
-	      Modify  wp-config.php  file  contents with project configuration
+	      Modify wp-config.php file contents  with	project  configuration
 	      (this flag automatically disables the .env file when used)
 
        --no-ssl, --no-https
@@ -95,4 +99,4 @@ GLOBAL OPTIONS
 
 
 
-				   July 2016			  TJ-CREATE(1)
+				  August 2016			  TJ-CREATE(1)

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

@@ -21,6 +21,9 @@ GLOBAL OPTIONS
        --vm-prefix=string
 	      Force directory prefix for project in VM*
 
+       --vm-revision
+	      Revision hash or branch to checkout for VM (default is master)
+
        --from-path, --in-path=path
 	      Run  Juicefile(5)  commands from the passed path instead of from
 	      the current directory.
@@ -97,6 +100,8 @@ PRIMARY COMMANDS
        deploy(1), server, remote
 	      Deploy and manage a project
 
+       update Update virtual machine and dependencies
+
 SECONDARY COMMANDS
        version, --version, -v
 	      Print the current version

data/lib/theme-juice/project.rb

@@ -9,6 +9,7 @@ module ThemeJuice
     attr_accessor :url
     attr_accessor :xip_url
     attr_accessor :template
+    attr_accessor :template_revision
     attr_accessor :vm_root
     attr_accessor :vm_location
     attr_accessor :vm_srv

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

@@ -21,8 +21,13 @@ module ThemeJuice
       def clone_template
         @io.log "Cloning template"
         @util.inside @project.location do
-          @util.run "git clone --depth 1 #{@project.template} .", {
-            :verbose => @env.verbose, :capture => @env.quiet }
+          @util.run [], { :verbose => @env.verbose,
+            :capture => @env.quiet } do |cmds|
+            cmds << "git clone #{@project.template} ."
+            if @project.template_revision
+              cmds << "git checkout #{@project.template_revision}"
+            end
+          end
         end
       end
 

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

@@ -23,8 +23,13 @@ module ThemeJuice
 
         @io.log "Installing Vagrant box"
         @util.inside @env.vm_path do
-          @util.run "git clone #{@env.vm_box} . --depth 1", {
-            :verbose => @env.verbose, :capture => @env.quiet }
+          @util.run [], { :verbose => @env.verbose,
+            :capture => @env.quiet } do |cmds|
+            cmds << "git clone #{@env.vm_box} ."
+            if @env.vm_revision
+              cmds << "git checkout #{@env.vm_revision}"
+            end
+          end
         end
       end
     end

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

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+
+module ThemeJuice
+  module Tasks
+    class VMUpdateBox < Task
+
+      def initialize(opts = {})
+        super
+      end
+
+      def execute
+        update_box
+      end
+
+      private
+
+      def box_is_installed?
+        File.exist? "#{@env.vm_path}/Vagrantfile"
+      end
+
+      def update_box
+        return unless box_is_installed?
+
+        @io.log "Updating Vagrant box"
+        @util.inside @env.vm_path do
+          @util.run [], { :verbose => @env.verbose,
+            :capture => @env.quiet } do |cmds|
+            cmds << "git fetch"
+            if @env.vm_revision
+              cmds << "git checkout #{@env.vm_revision}"
+            else
+              cmds << "git checkout master"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.28.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -154,6 +154,7 @@ files:
 - lib/theme-juice/commands/delete.rb
 - lib/theme-juice/commands/deploy.rb
 - lib/theme-juice/commands/init.rb
+- lib/theme-juice/commands/update.rb
 - lib/theme-juice/config.rb
 - lib/theme-juice/env.rb
 - lib/theme-juice/helpers/hash_helper.rb
@@ -210,6 +211,7 @@ files:
 - lib/theme-juice/tasks/vm_provision.rb
 - lib/theme-juice/tasks/vm_restart.rb
 - lib/theme-juice/tasks/vm_stage.rb
+- lib/theme-juice/tasks/vm_update_box.rb
 - lib/theme-juice/tasks/wp_cli.rb
 - lib/theme-juice/tasks/wp_config.rb
 - lib/theme-juice/util.rb