theme-juice 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53e76ff764ee9274d0607d7fd2095100260df47
-  data.tar.gz: 4185a029dd165675c3bd7d36173b7760babe5de3
+  metadata.gz: 964a8ffb47c2eb9e67a2b0481a9c6bbb2376d43f
+  data.tar.gz: 4472173c815c9d389bcc190f1c2f5a8ee414e554
 SHA512:
-  metadata.gz: 0d96f30c99459f8e173e7422e336506f32b397dbf60a0f67d5fc21d8fa33e80a5a96c93ec79a2d9c36452880912cbfd9a40f27d6d2cb0025c405009921917526
-  data.tar.gz: b6fcb290f8770f46b55bc943402832ade82e9efcea9c9ca83278e62aeb11dc0006080f2161d8eb8e7a664f96366904c67fe7a1f6509dbd8cc68f89368659d886
+  metadata.gz: 27c921f287e5cc822f5e597ba619946d5999f73767a20228a5f5bc7d60095d21f98cec629b156b62f82d40f126d1e40a11a582d505dd18ebac936714e41a70ce
+  data.tar.gz: 9e8f085dfb997465220e4ec70c438fc4415a61162b0cbf0aaef60cb41f4bc3b3092219ea63d2efbf24c06a508ee3320f1181c8198c68dfe34a2fb6d5a948f71d

data/lib/theme-juice/cli.rb

@@ -13,18 +13,28 @@ module ThemeJuice
             ###
             def welcome
 
-              # Get WP logo ASCII art
-              logo = File.read(File.expand_path("../ascii/logo.txt", __FILE__))
-
-              # Output welcome message
-              say "\n"
-              say logo.gsub(/[m]/) { |char| set_color(char, :green) }.gsub(/[\+\/\-\'\:\.\~dyhos]/) { |char| set_color(char, :yellow) }
-              say "\n"
-              say "Welcome to Theme Juice!".center(60), :green
-              say "\n\n"
+                # Get WP logo ASCII art
+                logo = File.read(File.expand_path("../ascii/logo.txt", __FILE__))
+
+                # Output welcome message
+                say "\n"
+                say logo.gsub(/[m]/) { |char| set_color(char, :green) }.gsub(/[\+\/\-\'\:\.\~dyhos]/) { |char| set_color(char, :yellow) }
+                say "\n"
+                say "Welcome to Theme Juice!".center(60), :green
+                say "\n\n"
             end
         end
 
+        ###
+        # Print current version
+        #
+        # @return {String}
+        ###
+        desc "version", "Print current version"
+        def version
+            say "Current version: #{::ThemeJuice::VERSION}", :green
+        end
+
         ###
         # Install and setup VVV environment
         #

data/lib/theme-juice/scaffold.rb

@@ -63,7 +63,7 @@ module ThemeJuice
                     setup_synced_folder
                 end
 
-                if wpcli_exists? && !wpcli_is_setup?
+                unless wpcli_is_setup?
                     setup_wpcli
                 end
 
@@ -77,11 +77,11 @@ module ThemeJuice
                     if restart_vagrant
 
                         # Get smiley ASCII art
-                        success = File.read(File.expand_path("../ascii/smiley.txt", __FILE__))
+                        smiley = File.read(File.expand_path("../ascii/smiley.txt", __FILE__))
 
                         # Output welcome message
                         say "\n"
-                        say set_color(success, :yellow)
+                        say smiley, :yellow
                         say "\n"
                         say "Success!".center(48), :green
                         say "\n\n"
@@ -289,14 +289,7 @@ module ThemeJuice
             # @return {Bool}
             ###
             def wpcli_is_setup?
-                File.readlines(File.expand_path("#{@opts[:site_location]}/wp-cli.yml")).grep(/(url: #{@opts[:dev_url]})/m).any?
-            end
-
-            ###
-            # @return {Bool}
-            ###
-            def wpcli_exists?
-                File.exists? File.expand_path("#{@opts[:site_location]}/wp-cli.yml")
+                File.exists? File.expand_path("#{@opts[:site_location]}/wp-cli.local.yml")
             end
 
             ###
@@ -525,7 +518,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_wpcli
-                File.open "#{@opts[:site_location]}/wp-cli.yml", "a+" do |file|
+                File.open "#{@opts[:site_location]}/wp-cli.local.yml", "a+" do |file|
                     file.puts "require:"
                     file.puts "\t- vendor/autoload.php"
                     file.puts "ssh:"
@@ -535,7 +528,12 @@ module ThemeJuice
                     file.puts "\t\tcmd: cd ~/vagrant && vagrant ssh-config > /tmp/vagrant_ssh_config && ssh -q %pseudotty% -F /tmp/vagrant_ssh_config default %cmd%"
                     file.puts "\n"
                 end
-                say "Successfully added ssh settings to 'wp-cli.yml'.", :green
+
+                if wpcli_is_setup?
+                    say "Successfully added ssh settings to 'wp-cli.local.yml' file.", :green
+                else
+                    say "Could not create 'wp-cli.local.yml' file.", :red
+                end
             end
 
             ###
@@ -544,7 +542,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def remove_dev_site
-                if system "rm -rf #{@opts[:dev_location]}"
+                if run ["rm -rf #{@opts[:dev_location]}"]
                     say "VVV installation for '#{@opts[:site_name]}' successfully removed.", :yellow
                 else
                     say "Theme '#{@opts[:site_name]}' could not be removed. Make sure you have write capabilities.", :red

data/lib/theme-juice/version.rb

@@ -1,3 +1,3 @@
 module ThemeJuice
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ezekiel Gabrielse