bootic_cli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1635165613bb3c1108f62bcf3fb9a455b66a22cc
-  data.tar.gz: b9eda84070803bdf7892769033bc5ceb4dd38b05
+  metadata.gz: c74b9f852a960a50c152cef0dc870ecf9e39eb46
+  data.tar.gz: 8badbddd5640c48465531fc40ab690fe83ebdfb3
 SHA512:
-  metadata.gz: 2921db246029beec8a51e242a5635524a7106fc8f2d2cd93cd52b660597b4bee084ed04ef09109ee2502fce068be135a276f08d002fdbde761653d1d78fb5124
-  data.tar.gz: 07db650fb21e51a90e1042c940ada82a8af43abdb85f6a34a183caa391153bca54c6b045f4c248abfc4e8910171b9683fecfc55965dc6ad52f60cad3d732121b
+  metadata.gz: 4f3a737ceaadbe4a4533fedcfaa90c98ef627aa01d5e4807a271538588608731f5bfeb354df730f242633c50d0bacc00ada01520a6a41f9b0ff274a66d942dd1
+  data.tar.gz: 1b5f6e3e05545c14365eaaa5c759ea209758bbec3c90e8d880bb97c94ad07eb74c6f29fb3398c362c4ee9fe42e1cfa40e8a4f4f3437356771fda28716310eea1

data/bin/bootic

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require "bootic_cli"
+require 'bootic_cli'
 BooticCli::CLI.start

data/lib/bootic_cli/cli.rb

@@ -123,7 +123,7 @@ module BooticCli
       end
     end
 
-    desc "erase", "clear all credentials from this computer"
+    desc 'erase', 'Clear all credentials from this computer'
     def erase
       if session.setup?
         session.erase!
@@ -208,7 +208,7 @@ module BooticCli
       end
     end
 
-    require "bootic_cli/command"
+    require 'bootic_cli/command'
 
     Dir[File.join(File.dirname(__FILE__), 'commands', '*.rb')].each do |f|
       load_file f

data/lib/bootic_cli/commands/themes.rb

@@ -13,46 +13,55 @@ module BooticCli
 
       desc 'clone [dir]', 'Clone remote theme into directory [dir]'
       option :shop, banner: '<shop_subdomain>', type: :string
-      option :destroy, banner: '<true|false>', type: :boolean, default: true
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Clones public theme, even if dev theme exists'
+      option :dev, banner: '<true|false>', type: :boolean, aliases: '-d', desc: 'Clones development theme, or creates one if missing'
       def clone(dir = nil)
         logged_in_action do
-          local_theme, remote_theme = theme_selector.setup_theme_pair(options['shop'], dir, options['public'])
-          workflows.pull(local_theme, remote_theme, destroy: options['destroy'])
+          local_theme, remote_theme = theme_selector.setup_theme_pair(options['shop'], dir, options['public'], options['dev'])
+
+          if File.exist?(local_theme.path)
+            prompt.say "Directory already exists! (#{local_theme.path})", :red
+          else
+            prompt.say "Cloning theme files into #{local_theme.path}"
+            workflows.pull(local_theme, remote_theme)
+            local_theme.write_subdomain
+          end
         end
       end
 
       desc 'pull', 'Pull remote changes into current theme directory'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
-      option :destroy, banner: '<true|false>', type: :boolean, default: true
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Pull from public theme, even if dev theme exists'
+      option :delete, banner: '<true|false>', type: :boolean, desc: 'Remove local files that were removed in remote theme (default: true)'
       def pull
         within_theme do
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
-          workflows.pull(local_theme, remote_theme, destroy: options['destroy'])
+          workflows.pull(local_theme, remote_theme, delete: options['delete'] || true)
         end
       end
 
       desc 'push', 'Push all local theme files in current dir to remote shop'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
-      option :destroy, banner: '<true|false>', type: :boolean, default: true
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Push to public theme, even if dev theme exists'
+      option :delete, banner: '<true|false>', type: :boolean, desc: 'Remove files in remote theme that were removed locally (default: true)'
       def push
         within_theme do
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
-          workflows.push(local_theme, remote_theme, destroy: options['destroy'])
+          warn_user if remote_theme.public? and options['public'].nil?
+          workflows.push(local_theme, remote_theme, delete: options['delete'] || true)
         end
       end
 
-      desc 'sync', 'Sync local theme copy in local dir with remote shop'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      desc 'sync', 'Sync changes from local theme copy with remote'
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Sync to public theme, even if dev theme exists'
       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?
           workflows.sync(local_theme, remote_theme)
         end
       end
 
       desc 'compare', 'Show differences between local and remote copies'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Compare against public theme, even if dev theme exists'
       def compare
         within_theme do
           local_theme, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
@@ -60,11 +69,12 @@ module BooticCli
         end
       end
 
-      desc 'watch', 'Watch local theme directory and create/update/delete remote one when any file changes'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      desc 'watch', 'Watch local theme dir and update remote when any file changes'
+      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?
           workflows.watch(current_dir, remote_theme)
         end
       end
@@ -78,7 +88,7 @@ module BooticCli
       end
 
       desc 'open', 'Open theme preview URL in a browser'
-      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      option :public, banner: '<true|false>', type: :boolean, aliases: '-p', desc: 'Opens public theme URL'
       def open
         within_theme do
           _, remote_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, options['public'])
@@ -97,9 +107,15 @@ module BooticCli
 
       private
 
+      def warn_user
+        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
+        end
+      end
+
       def within_theme(&block)
-        dir = File.expand_path(current_dir)
-        unless File.exist?(File.join(dir, 'layout.html'))
+        unless is_within_theme?
           prompt.say "This directory doesn't look like a Bootic theme! (#{dir})", :magenta
           abort
         end
@@ -109,6 +125,11 @@ module BooticCli
         end
       end
 
+      def is_within_theme?
+        dir = File.expand_path(current_dir)
+        File.exist?(File.join(dir, 'layout.html'))
+      end
+
       def current_dir
         '.'
       end
@@ -136,7 +157,14 @@ module BooticCli
 
         def yes_or_no?(question, default_answer)
           default_char = default_answer ? 'y' : 'n'
-          input = shell.ask("#{question} [#{default_char}]").strip
+
+          begin
+            input = shell.ask("#{question} [#{default_char}]").strip
+          rescue Interrupt
+            say "\nCtrl-C received. Bailing out!", :red
+            abort
+          end
+
           return default_answer if input == '' || input.downcase == default_char
           !default_answer
         end

data/lib/bootic_cli/themes/api_theme.rb

@@ -24,6 +24,14 @@ module BooticCli
       end
 
       # this is unique to API themes
+      def public?
+        !dev?
+      end
+
+      def dev?
+        theme.can?(:publish_theme)
+      end
+
       def publish(clone = false)
         if theme.can?(:publish_theme)
           @theme = theme.publish_theme

data/lib/bootic_cli/themes/fs_theme.rb

@@ -31,12 +31,20 @@ module BooticCli
         [item, type]
       end
 
-      attr_reader :subdomain
-
       def initialize(dir, subdomain: nil)
         @dir = dir
         @setup = false
-        @subdomain = subdomain ? write_subdomain(subdomain) : read_subdomain
+        @subdomain = subdomain
+      end
+
+      def subdomain
+        @subdomain || read_subdomain
+      end
+
+      def write_subdomain
+        store.transaction do
+          store['subdomain'] = @subdomain
+        end
       end
 
       def reset!
@@ -132,15 +140,8 @@ module BooticCli
         )
       end
 
-      def write_subdomain(sub)
-        store.transaction do
-          store['subdomain'] = sub
-        end
-        sub
-      end
-
       def read_subdomain
-        store.transaction{ store['subdomain'] }
+        store.transaction { store['subdomain'] }
       end
     end
   end

data/lib/bootic_cli/themes/mem_theme.rb

@@ -11,6 +11,14 @@ module BooticCli
       # Implement generic Theme interface
       attr_reader :templates, :assets
 
+      def public?
+        false # just for tests
+      end
+
+      def path
+        nil
+      end
+
       def reload!
         @templates = []
         @assets = []

data/lib/bootic_cli/themes/theme_selector.rb

@@ -9,16 +9,27 @@ module BooticCli
         @prompt = prompt
       end
 
-      def setup_theme_pair(subdomain, dir = nil, production = false)
+      def setup_theme_pair(subdomain, dir = nil, wants_public = false, wants_dev = false)
+        raise "Cannot pass both public and dev flags at the same time!" if wants_public && wants_dev
+
         shop = find_remote_shop(subdomain)
         raise "No shop with subdomain #{subdomain}" unless shop
 
         path = dir || shop.subdomain
-        local_theme = select_local_theme(path, shop.subdomain)
-        remote_theme = select_remote_theme(shop, production)
+        local_theme  = select_local_theme(path, shop.subdomain)
+        remote_theme = select_remote_theme(shop, wants_public)
+
+        # if no `wants_public` flag was passed and no dev theme is present
+        # ask the user whether he/she wants to create one now.
+        if !wants_public and remote_theme.public?
+          raise 'Dev theme not available!' unless shop.themes.can?(:create_dev_theme)
+
+          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
+          end
+        end
 
-        prompt.say "Cloning theme files into #{local_theme.path}"
-        prompt.say "Preview this theme at #{remote_theme.path}", :magenta
         [local_theme, remote_theme]
       end
 
@@ -27,15 +38,15 @@ module BooticCli
         shop = find_remote_shop(local_theme.subdomain)
         raise "No shop with subdomain #{local_theme.subdomain}" unless shop
         remote_theme = select_remote_theme(shop, production)
-
-        prompt.say "Preview this theme at #{remote_theme.path}", :magenta
         [local_theme, remote_theme]
       end
 
       def pair(subdomain, dir)
         shop = find_remote_shop(subdomain)
         raise "No shop with subdomain #{subdomain}" unless shop
-        select_local_theme(dir, subdomain)
+        theme = select_local_theme(dir, subdomain)
+        theme.write_subdomain
+        theme
       end
 
       def select_local_theme(dir, subdomain = nil)
@@ -62,24 +73,15 @@ module BooticCli
       private
 
       def resolve_remote_theme(shop, production = false)
-        if production
-          prompt.say "Working on public theme of shop #{shop.subdomain}", :red
-          return shop.theme
-        end
-
-        prompt.say "Working on development theme of shop #{shop.subdomain}", :green
-        themes = shop.themes
-        if themes.has?(:dev_theme)
-          themes.dev_theme
-        elsif themes.can?(:create_dev_theme)
-          prompt.say "Creating development theme...", :green
-          themes.create_dev_theme
+        if production or !shop.themes.has?(:dev_theme)
+          prompt.say "Working on public theme of shop #{shop.subdomain}", :yellow
+          shop.theme
         else
-          raise "No dev theme available"
+          prompt.say "Working on development theme of shop #{shop.subdomain}", :green
+          shop.themes.dev_theme
         end
       end
 
-      private
       attr_reader :root, :prompt
     end
   end

data/lib/bootic_cli/themes/workflows.rb

@@ -31,7 +31,7 @@ module BooticCli
         @prompt = prompt
       end
 
-      def pull(local_theme, remote_theme, destroy: true)
+      def pull(local_theme, remote_theme, delete: true)
         diff = ThemeDiff.new(source: local_theme, target: remote_theme)
         check_dupes!(local_theme.assets)
 
@@ -45,7 +45,7 @@ module BooticCli
           local_theme.add_template t.file_name, t.body
         end
 
-        if destroy
+        if delete
           notice 'Removing local files that were removed on remote...'
           remove_all(diff.missing_in_target, local_theme)
         else
@@ -56,9 +56,11 @@ 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, destroy: true)
+      def push(local_theme, remote_theme, delete: true)
         diff = ThemeDiff.new(source: local_theme, target: remote_theme)
         check_dupes!(local_theme.assets)
 
@@ -74,12 +76,14 @@ module BooticCli
         copy_assets(diff.missing_in_target, remote_theme, overwrite: true)
         copy_templates(diff.missing_in_target, remote_theme)
 
-        if destroy
+        if delete
           notice 'Removing remote files that were removed locally...'
           remove_all(diff.missing_in_source, remote_theme)
         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)
@@ -112,6 +116,8 @@ 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, overwrite: true)
+
+        prompt.say "Synced! Preview this theme at #{remote_theme.path}", :cyan
       end
 
       def compare(local_theme, remote_theme)
@@ -181,6 +187,7 @@ module BooticCli
           exit
         }
 
+        prompt.say "Preview changes at #{remote_theme.path}", :cyan
         Kernel.sleep
       end
 
@@ -188,7 +195,7 @@ module BooticCli
         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, destroy: true
+        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"

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

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