lib/shuttle/deployment/wordpress/cli.rb in shuttle-deploy-0.2.0.beta4 vs lib/shuttle/deployment/wordpress/cli.rb in shuttle-deploy-0.2.0.beta5

@@ -8,27 +8,55 @@
     end
 
     def cli_install
       log "Installing WordPress CLI"
 
+      rev, tag = cli_checkout_code
+
+      res = ssh.run("cd #{CLI_PATH} && sudo utils/dev-build")
+
+      if res.failure?
+        error "Unable to build cli: #{res.output}"
+      end
+      
+      if cli_installed?
+        log "WordPress CLI (#{tag}) installed"
+      else
+        error "Wordpress CLI installation failed"
+      end
+    end
+
+    # Checkout a proper wp-cli revision. By default it'll install
+    # latest available tag from git. That's considered a stable version.
+    # To install latest code, set `cli` option in config:
+    #
+    #   wordpress:
+    #     cli: master 
+    #
+    def cli_checkout_code
       ssh.run("sudo git clone --recursive --quiet #{CLI_GIT} #{CLI_PATH}")
 
       if config.wordpress.cli.nil?
         tags = ssh.capture("cd #{CLI_PATH} && git tag").split("\n").map(&:strip).reverse
         tag  = tags.first
         rev  = ssh.capture("cd #{CLI_PATH} && git rev-parse #{tag}").strip
       else
-        tag = rev = config.wordpress.cli
+        tag = config.wordpress.cli
+
+        if tag =~ /^[\d\.]+$/ # version def
+          tag = "v#{tag}" unless tag =~ /v[\d]+/
+        end
+        
+        rev = tag
       end
 
-      ssh.run("cd #{CLI_PATH} && sudo git checkout #{rev}")
-      ssh.run("cd #{CLI_PATH} && sudo utils/dev-build")
-      
-      if cli_installed?
-        log "WordPress CLI (#{tag}) installed"
-      else
-        error "Unable to install WordPress CLI"
+      res = ssh.run("cd #{CLI_PATH} && sudo git checkout #{rev}")
+
+      if res.failure?
+        error "Unable to checkout revision #{rev}: #{res.output}"
       end
+
+      #rev, tag
     end
 
     def cli_uninstall
       ssh.run("sudo rm $(which wp)")
       ssh.run("sudo rm -rf #{CLI_PATH}")
\ No newline at end of file