bootic_cli 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d23940a740e8d8427e4eccf0f5bb872a19d9470
-  data.tar.gz: fb069df631666e1f2771f5d3fc4455a4c8b1dc0a
+  metadata.gz: a5127d49dc387636714e2b3a9cbc724d3c240fc8
+  data.tar.gz: 7bd10ce8519aa573ecd6aa0af7dffc900e3b7970
 SHA512:
-  metadata.gz: 5a65fbc81c21cefc4fdbbcd74002970541db887fccdcded111f0fa607246ea1e8293b4758c821c674b2e9db2b919cba85cf68d856eebf3bd2d5cf5a726df8846
-  data.tar.gz: fa6bed44f947a7197a490f8407682cf7f47a1a3a0dc695aa17c5cee69549a786479c5b49773c575ebb912cdc933c32eac3541006e40fd59623a6b7d768fc4484
+  metadata.gz: 3faff67e89ed9592bf5b7255addbe884154cb21eb4cd9856ef461cd9c9b966b5bc9b5ab15635006f3a0346ab04041aef008d514996452e0f9c42178012840c7a
+  data.tar.gz: 1b205ad3dd475ff19d16e1d65b36b89d86bdc5493ede8efc5e9a56abca64fb9416750e6de9cd89e797659ecaf6d3fab4d0e80b8a8fa2d9bd50b73ecd569f622d

data/lib/bootic_cli/commands/themes.rb

@@ -48,7 +48,7 @@ module BooticCli
       def push
         within_theme do
           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?
+          warn_about_public 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
@@ -59,7 +59,7 @@ module BooticCli
       def sync
         within_theme do
           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?
+          warn_about_public 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
@@ -78,8 +78,17 @@ module BooticCli
       option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Pushes any changes to public theme, even if dev theme exists'
       def watch
         within_theme do
-          _, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
-          warn_user if remote_theme.public? and options['public'].nil?
+          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
+          warn_about_public if remote_theme.public? and options['public'].nil?
+
+          diff = BooticCli::Themes::ThemeDiff.new(source: local_theme, target: remote_theme)
+          if diff.any?
+            unless prompt.yes_or_no?("There are differences between the remote theme and your local copy. Continue anyway?", true)
+              prompt.say "No problem. Bye."
+              exit 1
+            end
+          end
+
           workflows.watch(current_dir, remote_theme)
         end
       end
@@ -90,7 +99,7 @@ module BooticCli
           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
+            prompt.say "You don't seem to have a development theme set up, so there's nothing to publish!", :red
           else
 
             # check if there are any differences between the dev and public themes
@@ -104,13 +113,13 @@ module BooticCli
               end
             end
 
-            # say("Publishing means all your public theme's templates and assets will be replaced and lost.")
+            # prompt.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 = theme_selector.select_local_theme(backup_path, local_theme.subdomain)
 
-              say("Gotcha. Backing up your public theme into #{prompt.highlight(backup_theme.path)}")
+              prompt.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
@@ -140,7 +149,7 @@ module BooticCli
 
       private
 
-      def warn_user
+      def warn_about_public
         unless prompt.yes_or_no?("You're pushing changes directly to your public theme. Are you sure?", true)
           prompt.say("Ok, sure. You can skip the above warning prompt by passing a `--public` flag.")
           abort

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor