bootic_cli 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd67c5e244fa152afde49d0ded817c9733d6ce640aee72c14854f635566e0a43
-  data.tar.gz: 51b29bf4e75a6f597887198fbdfa66df41301370f2a3169de0f4bcba363b755b
+  metadata.gz: 55a78add4d79c5db970e4ad5df3b038fd6db6702c674cb60092c9d9f93bcf533
+  data.tar.gz: 120a782606574c1dd7d94b25112e033cb348fd6fb2889201bbfe1bf28cf55fde
 SHA512:
-  metadata.gz: 4e6094bca75a4a68b4a94a80180e543fdae6286612a8697fb66662821e896b3b4008ed2abb0a62c4ea89c64f0346b3efe8a57ac583467151d359531b708ffff5
-  data.tar.gz: 1e32cc79ee74403371a7b5daeecc6355a32db967559701f7d262b5509baea3d74c4a5a0224c1dec395063a00e97850aeebbf85023d9266e4ceaa0aae47144988
+  metadata.gz: 2a5a02b98f284912ce408de4cdcd141907e56f5b3e0b1741fbd60a42f3e32a0118e7635a82e9de57955f92ef1880ca7149d31c2c8d9b8b95c7f921382cedf5c1
+  data.tar.gz: 94ff56bc77d419c27886aef885ebcbaa93eed49d63b7eca8aa8a325c834ac6c3f05c99ab9811c481ed2e5b55e06dfea3c6072d76436027d3cce4745a8e9c6c5f

data/lib/bootic_cli/commands/themes.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'launchy'
+require 'bootic_cli/themes/theme_diff'
 require 'bootic_cli/themes/workflows'
 require 'bootic_cli/themes/theme_selector'
 
@@ -37,6 +38,7 @@ module BooticCli
         within_theme do
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
           workflows.pull(local_theme, remote_theme, delete: options['delete'] || true)
+          prompt.say "Done! Preview this theme at #{remote_theme.path}", :cyan
         end
       end
 
@@ -48,6 +50,7 @@ module BooticCli
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
           warn_user if remote_theme.public? and options['public'].nil?
           workflows.push(local_theme, remote_theme, delete: options['delete'] || true)
+          prompt.say "Done! View updated version at #{remote_theme.path}", :cyan
         end
       end
 
@@ -58,6 +61,7 @@ module BooticCli
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
           warn_user if remote_theme.public? and options['public'].nil?
           workflows.sync(local_theme, remote_theme)
+          prompt.say "Synced! Preview this theme at #{remote_theme.path}", :cyan
         end
       end
 
@@ -84,17 +88,31 @@ module BooticCli
       def publish
         within_theme do
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir)
+
           if remote_theme.public?
             say "You don't seem to have a development theme set up, so there's nothing to publish!", :red
           else
-            say("Publishing means all your public theme's templates and assets will be lost.")
-            if prompt.yes_or_no?("Would you like to make a local copy of your current public theme before publishing?", false)
+
+            # check if there are any differences between the dev and public themes
+            local_theme, public_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, true)
+            diff = BooticCli::Themes::ThemeDiff.new(source: remote_theme, target: public_theme)
+
+            unless diff.any?
+              unless prompt.yes_or_no?("Your public and development themes seem to be in sync (no differences). Publish anyway?", false)
+                prompt.say "Okeysay. Bye."
+                exit 1
+              end
+            end
+
+            # say("Publishing means all your public theme's templates and assets will be replaced and lost.")
+            if prompt.yes_or_no?("Would you like to make a local copy of your current public theme before publishing?", diff.any?) # default to true if changes exist
 
               backup_path = File.join(local_theme.path, "public-theme-backup-#{Time.now.to_i}")
-              backup_theme, public_theme = theme_selector.select_theme_pair(local_theme.subdomain, backup_path, true)
+              backup_theme = theme_selector.select_local_theme(backup_path, local_theme.subdomain)
 
-              say("Gotcha. Backing up your public theme into #{backup_theme.path}")
+              say("Gotcha. Backing up your public theme into #{prompt.highlight(backup_theme.path)}")
               workflows.pull(backup_theme, public_theme)
+              prompt.say "Done! Existing public theme was saved to #{prompt.highlight(File.basename(backup_theme.path))}", :cyan
             end
 
             workflows.publish(local_theme, remote_theme)

data/lib/bootic_cli/themes/theme_selector.rb

@@ -34,7 +34,7 @@ module BooticCli
       end
 
       def select_theme_pair(subdomain, dir, production = false)
-        local_theme = select_local_theme(dir)
+        local_theme = select_local_theme(dir, subdomain)
         shop = find_remote_shop(local_theme.subdomain)
         raise "No shop with subdomain #{local_theme.subdomain}" unless shop
         remote_theme = select_remote_theme(shop, production)

data/lib/bootic_cli/themes/workflows.rb

@@ -56,8 +56,6 @@ module BooticCli
         copy_templates(diff.missing_in_source, local_theme, download_opts)
         # lets copy all of them and let user decide to overwrite existing
         copy_assets(remote_theme, local_theme, download_opts)
-
-        prompt.say "Done! Preview this theme at #{remote_theme.path}", :cyan
       end
 
       def push(local_theme, remote_theme, delete: true)
@@ -82,8 +80,6 @@ module BooticCli
         else
           notice 'Not removing remote files that were removed locally.'
         end
-
-        prompt.say "Done! View updated version at #{remote_theme.path}", :cyan
       end
 
       def sync(local_theme, remote_theme)
@@ -116,8 +112,6 @@ module BooticCli
         notice 'Uploading missing remote templates & assets...'
         copy_templates(diff.missing_in_target, remote_theme, download_opts)
         copy_assets(diff.missing_in_target, remote_theme, download_opts)
-
-        prompt.say "Synced! Preview this theme at #{remote_theme.path}", :cyan
       end
 
       def compare(local_theme, remote_theme)
@@ -221,8 +215,8 @@ module BooticCli
         end
 
         prompt.notice "Alrighty! Publishing your development theme..."
-        remote_theme.publish # syncs dev to public, without flipping them
-        prompt.notice "Yay! Your development theme has been made public. Take a look at #{remote_theme.path}"
+        updated_theme = remote_theme.publish # syncs dev to public, without flipping them
+        prompt.notice "Yay! Your development theme has been made public. Take a look at #{remote_theme.path.sub('/preview/dev', '')}"
       end
 
       private

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.4.8"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Ismael Celis