bootic_cli 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab56fed09f0be0994048a9cbda8ebccabdea4ed0
-  data.tar.gz: 127a9f3f5bbc73c2863b609b1c592cbe70a1f4ea
+  metadata.gz: e481971c908c55b0696187dacbcd90f2c0a98d0e
+  data.tar.gz: c815d530ed012021ba9c2eda228fcb96cd5d8b73
 SHA512:
-  metadata.gz: fd90883584f04cf470233ba2425d2545b80d96e805f43b229cdef0321d8f3e8263d32acd25b576eb4392a334d206d08a1511846b64479a5c22b0f783d1c0a01d
-  data.tar.gz: 46972dc89c124720c57ff4d571d738bc567e58b72d16199ee44ddd09fa0980ad235930a7641ee00f0e592fc952579d1827f40cc16fb72e049d4b436a44072bd3
+  metadata.gz: 3e8f04432406d094ecec4eb6457a53f576c9ed20736e929e3779c99711000b19ec623665fb3c64cab4b2fcdc5e53d98cdcef59605bc5cb24edf0028911b780f9
+  data.tar.gz: 3395443655a57ec2de06b2383c38b5057a334fb607ef7e59853bb1a90b1570ecfb71ae83c4a1ce35debae1c0368cf20299154ade38fff908279a58b0797922f1

data/lib/bootic_cli/commands/themes.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'launchy'
 require 'bootic_cli/themes/workflows'
 require 'bootic_cli/themes/theme_selector'
@@ -79,11 +80,25 @@ module BooticCli
         end
       end
 
-      desc 'publish', 'Publish local files to remote public theme'
+      desc 'publish', 'Moves your development theme into your public website'
       def publish
         within_theme do
-          local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, false)
-          workflows.publish(local_theme, remote_theme)
+          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)
+
+              backup_path = File.join(local_theme.path, "public-theme-backup-#{Time.now.to_i}")
+              backup_theme, public_theme = theme_selector.select_theme_pair(default_subdomain, backup_path, true)
+
+              say("Gotcha. Backing up your public theme into #{backup_theme.path}")
+              workflows.pull(backup_theme, public_theme)
+            end
+
+            workflows.publish(local_theme, remote_theme)
+          end
         end
       end
 

data/lib/bootic_cli/themes/missing_items_theme.rb

@@ -5,6 +5,10 @@ module BooticCli
         @source, @target = source, target
       end
 
+      def any?
+        templates.any? || assets.any?
+      end
+
       def templates
         @templates ||= find_missing_files(source.templates, target.templates)
       end

data/lib/bootic_cli/themes/theme_diff.rb

@@ -9,6 +9,10 @@ module BooticCli
         @force_update = force_update
       end
 
+      def any?
+        updated_in_source.any? || updated_in_target.any? || missing_in_target.any? || missing_in_source.any?
+      end
+
       def updated_in_source
         @updated_in_source ||= UpdatedTheme.new(source: source, target: target, force_update: force_update)
       end

data/lib/bootic_cli/themes/theme_selector.rb

@@ -26,7 +26,7 @@ module BooticCli
 
           if wants_dev or prompt.yes_or_no?("Would you like to create (and work on) a development version of your theme? (recommended)", true)
             prompt.say "Good thinking. Creating a development theme out of your current public one...", :green
-            remote_theme = shop.themes.create_dev_theme
+            remote_theme = APITheme.new(shop.themes.create_dev_theme)
           end
         end
 

data/lib/bootic_cli/themes/updated_theme.rb

@@ -15,6 +15,10 @@ module BooticCli
         @force_update = force_update
       end
 
+      def any?
+        templates.any? || assets.any?
+      end
+
       def templates
         @templates ||= map_pair(source.templates, target.templates) do |a, b|
           diff = Diffy::Diff.new(normalize_endings(b.body), normalize_endings(a.body), context: 1)

data/lib/bootic_cli/themes/workflows.rb

@@ -127,7 +127,8 @@ module BooticCli
         notice "Local <--- Remote"
 
         diff.updated_in_target.templates.each do |t|
-          puts "Updated in remote: #{t.file_name}"
+          puts "Updated in remote: #{t.file_name} (updated at #{t.updated_on})"
+          puts t.diff.to_s(:color)
         end
 
         diff.missing_in_source.templates.each do |t|
@@ -141,7 +142,8 @@ module BooticCli
         notice "Local ---> Remote"
 
         diff.updated_in_source.templates.each do |t|
-          puts "Updated locally: #{t.file_name}"
+          puts "Updated locally: #{t.file_name} (updated at #{t.updated_on})"
+          puts t.diff.to_s(:color)
         end
 
         diff.missing_in_target.templates.each do |f|
@@ -183,24 +185,31 @@ module BooticCli
         # ctrl-c
         Signal.trap('INT') {
           listener.stop
-          puts 'See you in another lifetime, brotha.'
+          puts 'See you in another lifetime, brother.'
           exit
         }
 
-        prompt.say "Preview changes at #{remote_theme.path}", :cyan
+        prompt.say "Preview changes at #{remote_theme.path}. Hit Ctrl-C to stop watching for changes.", :cyan
         Kernel.sleep
       end
 
       def publish(local_theme, remote_theme)
-        keep_old_theme = prompt.yes_or_no?("Do you want to keep your old public theme as your dev theme?", false)
-        # first push local files to dev theme
-        prompt.say "Pushing local changes to development theme"
-        push(local_theme, remote_theme, delete: true)
-        # now publish remote dev theme
-        # let it fail if remote_theme doesn't respond to #publish
-        prompt.notice "Publishing development theme"
-        remote_theme.publish(!keep_old_theme) # swap remote themes
-        prompt.notice "Published to #{remote_theme.href}", :yellow
+        raise "This command is meant for dev themes only" unless remote_theme.dev?
+
+        changes = ThemeDiff.new(source: local_theme, target: remote_theme)
+        if changes.any?
+          prompt.say "There are some differences between your local and the remote version of your development theme."
+          if prompt.yes_or_no? "Do you want to push your local changes now?", false
+            push(local_theme, remote_theme, delete: true)
+          else
+            prompt.say "Oh well. Please make sure both versions are synced before publishing.", :magenta
+            exit(1)
+          end
+        end
+
+        prompt.notice "Alrighty! Publishing your development theme..."
+        remote_theme.publish(true) # syncs dev to public, without flipping them
+        prompt.notice "Yay! Your development theme has been made public. Take a look at #{remote_theme.path}", :cyan
       end
 
       private

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor