shuttle-deploy 0.2.0.beta3 → 0.2.0.beta4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjk5YzAxY2JkMGFhMzcxMTI1OTFhYzJjYzllZDM3NWU2MzE3YzY2Zg==
+    NTdhYWM4MjI3ZmUyZjE5Mzc4YTJjNjFjYjA2ODViZWE3YWVlZTllZg==
   data.tar.gz: !binary |-
-    Mzk3MWU5Yjk4M2U1NjVmMDdiZGUzOTBhOWMwNTVkOTRiOTIxN2FjMw==
+    MzUxMzk0ZDlhMGYyYWNjYmI2YjdkMmM5NzNkN2I2MmM5YWRjOTI2MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDE0NDYzZTEwZmFjZDMyOTRmYzdhYWIyOTNhYjI0OWRjYzBlZmY1YWMzMTAw
-    YmFhYjJhZmI3MTQxZDYyZTI1MWJjNTliZmIzYjJkYmNjOWY5NThmN2UwNWE0
-    OTZhYTA0MzRhYmYyYjkxMjkxNjM4MGM2OWI4NTljNmIwOWNkN2Q=
+    NzVkZTFlNzgxMGI1ZjNmMDQ5ZmVjYjRiNzVmNGYwMWU2NDBmYmJkNzllZDA4
+    ZTBhYmUwMjQ3YjZlOGEzMGMxODVmMWY2MzAwMjQ3NWU3NzU5ZjJiNjZiZTJi
+    ZjllNTIxYzBkN2I0NDJiODM1NGEzODI3NDM2NmNhZTBiZGQ2MmY=
   data.tar.gz: !binary |-
-    MDU5YTYwNWU0N2QzNzc0NzFmNGYzMmZkYjJhOGFiZjc0Zjk3ODM3Y2VhYTFl
-    MThjZDFiNTgzOTdmNmVhODBiOTNhNGUwOWVlOWI1N2FjOGFiZTEwMWUzZmZh
-    MDIwNGQ0YWZmZDU1ZTQyNzkxOTU0ZTRlYjQ5YTQ5MGQ4MTE2ODQ=
+    YmY3NGUwNDUyM2NkYWQ1ZjkwMWQ4ZjIyOWFjMWFkMDFmYmQ4OTU0ZTZkMzAy
+    YzVmNTdmYTA4MDVkYmYzNzhkZDJmY2QxZWFmMjgwYjM1OTNhNGJkZmJkODcz
+    ZTIyM2Y2ZTAyODBhNWI0MDgyZmRlMTRmY2M0YTlmNWY4YTg2MDM=

data/examples/wordpress.yml

@@ -11,6 +11,8 @@ target:
   deploy_to: /home/deployer/www
 
 wordpress:
+  core: 3.5.1
+  cli: 0.9.1
   theme: theme_name
   site:
     title: "Site Title"
@@ -31,4 +33,4 @@ wordpress:
     - featured-page-widget
     - share-this
     - twitter-widget-pro
-    - types
+    - types

data/lib/shuttle/deployment/wordpress/cli.rb

@@ -3,25 +3,36 @@ module Shuttle
     CLI_GIT  = 'https://github.com/wp-cli/wp-cli.git'
     CLI_PATH = '/usr/local/share/wp-cli'
 
-    # Check if CLI is installed
-    # @return [Boolean]
     def cli_installed?
       ssh.run("which wp").success?
     end
 
-    # Install wordpress CLI
-    # @return [Boolean]
     def cli_install
-      log "Installing wordpress CLI"
+      log "Installing WordPress CLI"
 
       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
+      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 installed"
+        log "WordPress CLI (#{tag}) installed"
       else
-        error "Unable to install wordpress CLI"
+        error "Unable to install WordPress CLI"
       end
     end
+
+    def cli_uninstall
+      ssh.run("sudo rm $(which wp)")
+      ssh.run("sudo rm -rf #{CLI_PATH}")
+    end
   end
 end

data/lib/shuttle/deployment/wordpress/core.rb

@@ -21,18 +21,24 @@ module Shuttle
         core_remove
       end
 
-      log "Installing wordpress core"
+      log "Installing WordPress core"
 
       unless ssh.directory_exists?(core_path)
         ssh.run("mkdir -p #{core_path}")
       end
 
-      result = ssh.run("cd #{core_path} && wp core download")
+      cmd = "cd #{core_path} && wp core download"
+
+      if config.wordpress.core
+        cmd << " --version=#{config.wordpress.core}"
+      end
+
+      result = ssh.run(cmd)
 
       if result.success?
-        log "Wordpress core installed"
+        log "WordPress core installed"
       else
-        error "Unable to install wordpress core: #{result.output}"
+        error "Unable to install WordPress core: #{result.output}"
       end
     end
 
@@ -40,7 +46,7 @@ module Shuttle
     # @return [Boolean]
     def core_remove
       if ssh.directory_exists?(core_path)
-        log "Removing wordpress shared core"
+        log "Removing WordPress shared core"
         ssh.run("rm -rf #{core_path}")
       end
 

data/lib/shuttle/deployment/wordpress/vip.rb

@@ -30,7 +30,7 @@ module Shuttle
     end
 
     def vip_install
-      log "Installing wordpress VIP"
+      log "Installing WordPress VIP"
 
       vip = vip_get_config
 
@@ -47,9 +47,9 @@ module Shuttle
       res = ssh.run(cmd, &method(:stream_output))
 
       if res.success?
-        log "Wordpress VIP installed"
+        log "WordPress VIP installed"
       else
-        raise DeployError, "Unable to install wordpress VIP. Reason: #{res.output}"
+        raise DeployError, "Unable to install WordPress VIP. Reason: #{res.output}"
       end
     end
 
@@ -73,9 +73,9 @@ module Shuttle
     def vip_link
       ssh.run("mkdir -p #{release_path}/wp-content/themes/vip")
       result = ssh.run("cp -a #{vip_path} #{release_path('wp-content/themes/vip/plugins')}")
-      
+
       if result.success?
-        log "Wordpress VIP is linked"
+        log "WordPress VIP is linked"
       else
         error "Unable to link VIP: #{result.output}"
       end

data/lib/shuttle/deployment/wordpress.rb

@@ -19,8 +19,22 @@ module Shuttle
 
       setup_shared_dirs
       check_dependencies
-      cli_install if !cli_installed?
-      core_install if !core_installed?
+
+      if !cli_installed?
+        cli_install
+      else
+        version = ssh.capture("cd #{core_path} && wp --version")
+        version.gsub!('wp-cli', '').strip!
+        log "WordPress CLI version: #{version}"
+      end
+
+      if !core_installed?      
+        core_install
+      else
+        version = ssh.capture("cd #{core_path} && wp core version")
+        log "WordPress core version: #{version}"
+      end
+
       check_config
     end
 
@@ -87,13 +101,13 @@ module Shuttle
       if res.success?
         log "A new wordpress config has been generated"
       else
-        error "Unable to generate config"
+        error "Unable to generate config. Error: #{res.output}"
       end
     end
 
     def check_config
-      if !ssh.file_exists?(shared_path('wp-config.php'))
-        log "Creating wordpress config at 'shared/wp-config.php'"
+      if !ssh.file_exists?(shared_path('wordpress/core/wp-config.php'))
+        log "Creating wordpress config"
         generate_config
       end
     end

data/lib/shuttle/version.rb

@@ -1,3 +1,3 @@
 module Shuttle
-  VERSION = '0.2.0.beta3'
+  VERSION = '0.2.0.beta4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shuttle-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta3
+  version: 0.2.0.beta4
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake