bootic_cli 0.1.9 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 688263fa607dd97eb2335475ce3d9240906004ba
-  data.tar.gz: 7394dd12856ee4890df1de84d38e0afeab0069cb
+  metadata.gz: 912137c9b982caccf6e5c4fbe6a0cf7aff82cf5e
+  data.tar.gz: 0a33582b05a274372b79c60b65b32d37e34097dd
 SHA512:
-  metadata.gz: ba9be7df26eeba72b2838e53428c2bd639ac0ffae48f79b909d59bd31f42b73091f9cf99ffb505952ab55baca1c2e73bdfc0333b50af0c2fe864c5ee3b316cf9
-  data.tar.gz: 7b6214feac9fcde7b16fa2a74c04b20af28e877d09274aca885a05a50861e4a72cd1224b92aa8df9092781082804c0da18a5e619bb20be6b0bdafde8f77c6896
+  metadata.gz: eb4aafc997f9bda07cf351ca67fccdc89de4e241e80d079111e4585406be075ef1af4979d1d636b4f121389b1215416d91a511a55e56fadf1f2d0a595aaee91a
+  data.tar.gz: 9725a2def7ec18acad6e18abf2a35fffc9615acfca0ac72aa5042c5b959989beea68e471c320112755fca38d815231bfb818fd976f6ded4744e350490e4f2a5d

data/bootic_cli.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor'
   spec.add_dependency 'bootic_client', "~> 0.0.19"
+  spec.add_dependency 'diffy', "~> 3.2"
+  spec.add_dependency 'listen', "~> 3.1"
+  spec.add_dependency 'launchy'
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bootic_cli/cli.rb

@@ -137,7 +137,7 @@ module BooticCli
 
     require "bootic_cli/command"
 
-    Dir[File.join(File.dirname(__FILE__), 'cli', '*.rb')].each do |f|
+    Dir[File.join(File.dirname(__FILE__), 'commands', '*.rb')].each do |f|
       load_file f
     end
 

data/lib/bootic_cli/commands/themes.rb

@@ -0,0 +1,118 @@
+require 'launchy'
+require 'bootic_cli/themes/workflows'
+require 'bootic_cli/themes/theme_selector'
+
+module BooticCli
+  module Commands
+    class Themes < BooticCli::Command
+      desc 'pull [shop] [dir]', 'Pull latest theme changes in [shop] into directory [dir] (current by default)'
+      option :destroy, banner: '<true|false>', type: :boolean, default: true
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def pull(subdomain = nil, dir = '.')
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          workflows.pull(local_theme, remote_theme, destroy: options['destroy'])
+        end
+      end
+
+      desc 'push [shop] [dir]', 'Push all local theme files in [dir] to remote shop [shop]'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      option :destroy, banner: '<true|false>', type: :boolean, default: true
+      def push(subdomain = nil, dir = '.')
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          workflows.push(local_theme, remote_theme, destroy: options['destroy'])
+        end
+      end
+
+      desc 'sync [shop] [dir]', 'Sync local theme copy in [dir] with remote [shop]'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def sync(subdomain = nil, dir = '.')
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          workflows.sync(local_theme, remote_theme)
+        end
+      end
+
+      desc 'compare [shop] [dir]', 'Show differences between local and remote copies'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def compare(subdomain = nil, dir = '.')
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          workflows.compare(local_theme, remote_theme)
+        end
+      end
+
+      desc 'watch [shop] [dir]', 'Watch theme directory at [dir] and create/update/delete the one in [shop] when changed'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def watch(subdomain = nil, dir = '.')
+        logged_in_action do
+          _, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          workflows.watch(dir, remote_theme)
+        end
+      end
+
+      desc 'publish [shop] [dir]', 'Publish dev files to public theme'
+      def publish(subdomain = nil, dir = '.')
+        logged_in_action do
+          local_theme, remote_theme = theme_selector.select_theme_pair(subdomain, dir, false)
+          workflows.publish(local_theme, remote_theme)
+        end
+      end
+
+      desc 'open [shop] [dir]', 'Open theme in a browser'
+      option :public, banner: '<true|false>', type: :boolean, default: false, aliases: '-p'
+      def open(subdomain = nil, dir = '.')
+        logged_in_action do
+          _, remote_theme = theme_selector.select_theme_pair(subdomain, dir, options['public'])
+          Launchy.open remote_theme.href
+        end
+      end
+
+      private
+
+      def prompt
+        @prompt ||= Prompt.new
+      end
+
+      def workflows
+        BooticCli::Themes::Workflows.new(prompt: prompt)
+      end
+
+      def theme_selector
+        @theme_selector ||= BooticCli::Themes::ThemeSelector.new(root, prompt: prompt)
+      end
+
+      class Prompt
+        def initialize
+          @shell = Thor::Shell::Color.new
+        end
+
+        def yes_or_no?(question, default_answer)
+          default_char = default_answer ? 'y' : 'n'
+          input = shell.ask("\n#{question} [#{default_char}]").strip
+          return default_answer if input == '' || input.downcase == default_char
+          !default_answer
+        end
+
+        def notice(str)
+          parts = [" --->", str]
+          highlight parts.join(' ')
+        end
+
+        def highlight(str, color = :bold)
+          say str, color
+        end
+
+        def say(str, color = nil)
+          shell.say str, color
+        end
+
+        private
+        attr_reader :shell
+      end
+
+      declare self, 'manage shop themes'
+    end
+  end
+end

data/lib/bootic_cli/themes/api_theme.rb

@@ -0,0 +1,96 @@
+require 'time'
+require 'open-uri'
+
+module BooticCli
+  module Themes
+    class ItemWithTime < SimpleDelegator
+      def updated_on
+        Time.parse(super)
+      end
+    end
+
+    class APIAsset < ItemWithTime
+      def file
+        @file ||= open(rels[:file].href)
+      end
+    end
+
+    class APITheme
+      def initialize(theme)
+        @theme = theme
+      end
+
+      # this is unique to API themes
+      def publish(clone = false)
+        if theme.can?(:publish_theme)
+          @theme = theme.publish_theme
+          @theme.create_dev_theme if clone
+          reload!(false)
+        end
+      end
+
+      def href
+        theme.rels[:theme_preview].href
+      end
+
+      # Implement generic Theme interface
+      def reload!(refetch = true)
+        @templates = nil
+        @assets = nil
+        @theme = theme.self if refetch
+        self
+      end
+
+      def templates
+        @templates ||= theme.templates.map{|t| ItemWithTime.new(t) }
+      end
+
+      def assets
+        @assets ||= theme.assets.map{|t| APIAsset.new(t) }
+      end
+
+      def add_template(file_name, body)
+        check_errors! theme.create_template(
+          file_name: file_name,
+          body: body
+        )
+      end
+
+      def remove_template(file_name)
+        tpl = theme.templates.find { |t| t.file_name == file_name }
+        check_errors!(tpl.delete_template) if tpl && tpl.can?(:delete_template)
+      end
+
+      def add_asset(file_name, file)
+        check_errors! theme.create_theme_asset(
+          file_name: file_name,
+          data: file
+        )
+      end
+
+      def remove_asset(file_name)
+        asset = theme.assets.find{|t| t.file_name == file_name }
+        check_errors!(asset.delete_theme_asset) if asset
+      end
+
+      private
+      attr_reader :theme
+
+      class EntityErrors < StandardError
+        attr_reader :errors
+        def initialize(errors)
+          @errors = errors
+          super "Entity has errors: #{errors.map(&:field)}"
+        end
+      end
+
+      def check_errors!(entity)
+        if entity.has?(:errors)
+          raise EntityErrors.new(entity.errors)
+        end
+
+        entity
+      end
+    end
+  end
+end

data/lib/bootic_cli/themes/fs_theme.rb

@@ -0,0 +1,107 @@
+require 'fileutils'
+
+module BooticCli
+  module Themes
+    class FSTheme
+      Template = Struct.new(:file_name, :body, :updated_on)
+      ThemeAsset = Struct.new(:file_name, :file, :updated_on)
+
+      ASSETS_DIR = 'assets'.freeze
+      TEMPLATE_PATTERNS = ['*.liquid', '*.html', '*.css', '*.js', 'theme.yml'].freeze
+      ASSET_PATTERNS = [File.join(ASSETS_DIR, '*')].freeze
+
+      # helper to resolve the right type (Template or Asset) from a local path
+      # this is not part of the generic Theme interface
+      def self.resolve_type(path)
+        path =~ /assets\// ? :asset : :template
+      end
+
+      def self.resolve_file(path)
+        file = File.new(path)
+        file_name = File.basename(path)
+        type = resolve_type(path)
+
+        item = if path =~ /assets\//
+          ThemeAsset.new(file_name, file.read, file.mtime.utc)
+        else
+          Template.new(file_name, file.read, file.mtime.utc)
+        end
+
+        [item, type]
+      end
+
+      def initialize(dir)
+        FileUtils.mkdir_p dir
+        FileUtils.mkdir_p File.join(dir, ASSETS_DIR)
+        @dir = dir
+      end
+
+      # Implement generic Theme interface
+      def reload!
+        @templates = nil
+        @assets = nil
+      end
+
+      def templates
+        @templates ||= (
+          paths_for(TEMPLATE_PATTERNS).sort.map do |path|
+            name = File.basename(path)
+            file = File.new(path)
+            Template.new(name, file.read, file.mtime.utc)
+          end
+        )
+      end
+
+      def assets
+        @assets ||= (
+          paths_for(ASSET_PATTERNS).sort.map do |path|
+            fname = File.basename(path)
+            file = File.new(path)
+            ThemeAsset.new(fname, file, file.mtime.utc)
+          end
+        )
+      end
+
+      def add_template(file_name, body)
+        path = File.join(dir, file_name)
+
+        File.open(path, 'w') do |io|
+          io.write body
+        end
+        @templates = nil
+      end
+
+      def remove_template(file_name)
+        path = File.join(dir, file_name)
+        return false unless File.exists?(path)
+        File.unlink path
+        @templates = nil
+      end
+
+      def add_asset(file_name, file)
+        path = File.join(dir, ASSETS_DIR, file_name)
+        File.open(path, 'wb') do |io|
+          io.write file.read
+        end
+
+        @assets = nil
+      end
+
+      def remove_asset(file_name)
+        path = File.join(dir, ASSETS_DIR, file_name)
+        return false unless File.exists?(path)
+
+        File.unlink path
+        @assets = nil
+      end
+
+      private
+
+      attr_reader :dir
+
+      def paths_for(patterns)
+        patterns.reduce([]) {|m, pattern| m + Dir[File.join(dir, pattern)]}
+      end
+    end
+  end
+end

data/lib/bootic_cli/themes/mem_theme.rb

@@ -0,0 +1,50 @@
+module BooticCli
+  module Themes
+    class MemTheme
+      Template = Struct.new(:file_name, :body, :updated_on)
+      ThemeAsset = Struct.new(:file_name, :file, :updated_on)
+
+      def initialize
+        reload!
+      end
+
+      # Implement generic Theme interface
+      attr_reader :templates, :assets
+
+      def reload!
+        @templates = []
+        @assets = []
+      end
+
+      def add_template(file_name, body, mtime: Time.now)
+        tpl = Template.new(file_name, body, mtime)
+        if idx = templates.index{|t| t.file_name == file_name }
+          templates[idx] = tpl
+        else
+          templates << tpl
+        end
+      end
+
+      def remove_template(file_name)
+        if idx = templates.index{|t| t.file_name == file_name }
+          templates.delete_at idx
+        end
+      end
+
+      def add_asset(file_name, file, mtime: Time.now)
+        asset = ThemeAsset.new(file_name, file, mtime)
+        if idx = assets.index{|t| t.file_name == file_name }
+          assets[idx] = asset
+        else
+          assets << asset
+        end
+      end
+
+      def remove_asset(file_name)
+        if idx = assets.index{|t| t.file_name == file_name }
+          assets.delete_at idx
+        end
+      end
+    end
+  end
+end

data/lib/bootic_cli/themes/missing_items_theme.rb

@@ -0,0 +1,27 @@
+module BooticCli
+  module Themes
+    class MissingItemsTheme
+      def initialize(source:, target:)
+        @source, @target = source, target
+      end
+
+      def templates
+        @templates ||= find_missing_files(source.templates, target.templates)
+      end
+
+      def assets
+        @assets ||= find_missing_files(source.assets, target.assets)
+      end
+
+      private
+      attr_reader :source, :target
+
+      def find_missing_files(set1, set2)
+        file_names = set2.map(&:file_name)
+        set1.select do |f|
+          !file_names.include?(f.file_name)
+        end
+      end
+    end
+  end
+end

data/lib/bootic_cli/themes/theme_diff.rb

@@ -0,0 +1,31 @@
+require 'bootic_cli/themes/updated_theme'
+require 'bootic_cli/themes/missing_items_theme'
+
+module BooticCli
+  module Themes
+    class ThemeDiff
+      def initialize(source:, target:)
+        @source, @target = source, target
+      end
+
+      def updated_in_source
+        @updated_in_source ||= UpdatedTheme.new(source: source, target: target)
+      end
+
+      def updated_in_target
+        @updated_in_target ||= UpdatedTheme.new(source: target, target: source)
+      end
+
+      def missing_in_target
+        @missing_in_target ||= MissingItemsTheme.new(source: source, target: target)
+      end
+
+      def missing_in_source
+        @missing_in_source ||= MissingItemsTheme.new(source: target, target: source)
+      end
+
+      private
+      attr_reader :source, :target
+    end
+  end
+end

data/lib/bootic_cli/themes/theme_selector.rb

@@ -0,0 +1,84 @@
+require 'yaml/store'
+require 'bootic_cli/themes/api_theme'
+require 'bootic_cli/themes/fs_theme'
+
+module BooticCli
+  module Themes
+    class ThemeSelector
+      def initialize(root, prompt:)
+        @root = root
+        @prompt = prompt
+      end
+
+      def select_theme_pair(subdomain, dir, production = false)
+        local_theme = select_local_theme(dir)
+        st = YAML::Store.new(File.join(File.expand_path(dir), '.state'))
+        shop = resolve_and_store_shop(subdomain, dir)
+        remote_theme = resolve_remote_theme(shop, production)
+        prompt.say "Preview remote theme at #{remote_theme.rels[:theme_preview].href}", :yellow
+        [local_theme, APITheme.new(remote_theme)]
+      end
+
+      def select_local_theme(dir)
+        FSTheme.new(File.expand_path(dir))
+      end
+
+      def resolve_and_store_shop(subdomain, dir)
+        st = YAML::Store.new(File.join(File.expand_path(dir), '.state'))
+        st.transaction do
+          sub = st['subdomain']
+          if sub
+            shop = find_remote_shop(sub)
+            raise "No shop could be resolved with subdomain: #{subdomain} and dir: #{dir}" unless shop
+            shop
+          else # no subdomain stored yet. Resolve and store.
+            shop = resolve_shop_from_subdomain_or_dir(subdomain, dir)
+            st['subdomain'] = shop.subdomain
+            shop
+          end
+        end
+      end
+
+      private
+
+      def find_remote_shop(subdomain)
+        if root.has?(:all_shops)
+          root.all_shops(subdomains: subdomain).first
+        else
+          root.shops.find { |s| s.subdomain == subdomain }
+        end
+      end
+
+      def resolve_shop_from_subdomain_or_dir(subdomain, dir)
+        shop = if subdomain
+          find_remote_shop(subdomain)
+        elsif dir
+          subdomain = File.basename(dir)
+          find_remote_shop(subdomain)
+        end
+        shop || root.shops.first
+      end
+
+      def resolve_remote_theme(shop, production = false)
+        if production
+          prompt.say "Working on production theme", :red
+          return shop.theme
+        end
+
+        prompt.say "Working on development theme", :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
+        else
+          raise "No dev theme available"
+        end
+      end
+
+      private
+      attr_reader :root, :prompt
+    end
+  end
+end

data/lib/bootic_cli/themes/updated_theme.rb

@@ -0,0 +1,62 @@
+require 'diffy'
+
+module BooticCli
+  module Themes
+    # given :source and :target themes,
+    # UpdatedTheme computes assets and templates
+    # with more recent versions in :source
+    class UpdatedTheme
+      TemplateWithDiff = Struct.new('TemplateWithDiff', :file_name, :body, :updated_on, :diff)
+
+      def initialize(source:, target:)
+        @source, @target = source, target
+      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)
+          if more_recent?(a, b) && !diff.to_s.empty?
+            c = TemplateWithDiff.new(a.file_name, a.body, a.updated_on, diff)
+            [true, c]
+          else
+            [false, nil]
+          end
+        end
+      end
+
+      def assets
+        @assets ||= map_pair(source.assets, target.assets) do |a, b|
+          [more_recent?(a, b), a]
+        end
+      end
+
+      private
+      attr_reader :source, :target
+
+      def more_recent?(a, b)
+        a.updated_on > b.updated_on
+      end
+
+      def build_lookup(list)
+        list.each_with_object({}) do |item, lookup|
+          lookup[item.file_name] = item
+        end
+      end
+
+      def map_pair(list1, list2, &block)
+        lookup = build_lookup(list2)
+        list1.each_with_object([]) do |item, arr|
+          match = lookup[item.file_name]
+          if match
+            valid, item = yield(item, match)
+            arr << item if valid
+          end
+        end
+      end
+
+      def normalize_endings(str)
+        str.to_s.gsub(/\r\n?/, "\n")
+      end
+    end
+  end
+end

data/lib/bootic_cli/themes/workflows.rb

@@ -0,0 +1,294 @@
+require 'listen'
+require 'thread'
+require 'bootic_cli/themes/theme_diff'
+require 'bootic_cli/themes/fs_theme'
+
+module BooticCli
+  module Themes
+    class NullPrompt
+      def self.yes_or_no?(str, default)
+        true
+      end
+
+      def self.notice(str)
+
+      end
+
+      def self.highlight(str)
+
+      end
+
+      def self.say(*_)
+
+      end
+    end
+
+    class Workflows
+      def initialize(prompt: NullPrompt)
+        @prompt = prompt
+      end
+
+      def pull(local_theme, remote_theme, destroy: true)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        check_dupes!(local_theme.assets)
+
+        download_opts = {
+          overwrite: false,
+          interactive: true
+        }
+
+        notice 'Updating local templates...'
+        maybe_update(diff.updated_in_target.templates, 'remote', 'local') do |t|
+          local_theme.add_template t.file_name, t.body
+        end
+
+        if destroy
+          notice 'Removing local files that were removed on remote...'
+          remove_all(diff.missing_in_target, local_theme)
+        else
+          notice 'Not removing local files that were removed on remote.'
+        end
+
+        notice 'Pulling missing files from remote...'
+        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)
+      end
+
+      def push(local_theme, remote_theme, destroy: true)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        check_dupes!(local_theme.assets)
+
+        notice 'Pushing local changes to remote...'
+
+        # update existing templates
+        notice 'Updating remote templates...'
+        maybe_update(diff.updated_in_source.templates, 'local', 'remote') do |t|
+          remote_theme.add_template t.file_name, t.body
+        end
+
+        notice 'Pushing files that are missing in remote...'
+        copy_assets(diff.missing_in_target, remote_theme, overwrite: true)
+        copy_templates(diff.missing_in_target, remote_theme)
+
+        if destroy
+          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
+      end
+
+      def sync(local_theme, remote_theme)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        check_dupes!(local_theme.assets)
+        notice 'Syncing local copy with remote...'
+
+        download_opts = {
+          overwrite: false,
+          interactive: false
+        }
+
+        # first, update existing templates in each side
+        notice 'Updating local templates...'
+        maybe_update(diff.updated_in_target.templates, 'remote', 'local') do |t|
+          local_theme.add_template t.file_name, t.body
+        end
+
+        notice 'Updating remote templates...'
+        maybe_update(diff.updated_in_source.templates, 'local', 'remote') do |t|
+          remote_theme.add_template t.file_name, t.body
+        end
+
+        # now, download missing files on local end
+        notice 'Downloading missing local templates & assets...'
+        copy_templates(diff.missing_in_source, local_theme, download_opts)
+        copy_assets(diff.missing_in_source, local_theme, overwrite: true)
+
+        # now, upload missing files on remote
+        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)
+      end
+
+      def compare(local_theme, remote_theme)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        notice 'Comparing local and remote copies of theme...'
+
+        notice "Local <--- Remote"
+
+        diff.updated_in_target.templates.each do |t|
+          puts "Updated in remote: #{t.file_name}"
+        end
+
+        diff.missing_in_source.templates.each do |t|
+          puts "Remote template not in local dir: #{t.file_name}"
+        end
+
+        diff.missing_in_source.assets.each do |t|
+          puts "Remote asset not in local dir: #{t.file_name}"
+        end
+
+        notice "Local ---> Remote"
+
+        diff.updated_in_source.templates.each do |t|
+          puts "Updated locally: #{t.file_name}"
+        end
+
+        diff.missing_in_target.templates.each do |f|
+          puts "Local template not in remote: #{f.file_name}"
+        end
+
+        diff.missing_in_target.assets.each do |f|
+          puts "Local asset not in remote: #{f.file_name}"
+        end
+      end
+
+      def watch(dir, remote_theme, watcher: Listen)
+        listener = watcher.to(dir) do |modified, added, removed|
+          if modified.any?
+            modified.each do |path|
+              upsert_file remote_theme, path
+            end
+          end
+
+          if added.any?
+            added.each do |path|
+              upsert_file remote_theme, path
+            end
+          end
+
+          if removed.any?
+            removed.each do |path|
+              delete_file remote_theme, path
+            end
+          end
+
+          # update local cache
+          remote_theme.reload!
+        end
+
+        notice "Watching #{File.expand_path(dir)} for changes..."
+        listener.start
+
+        # ctrl-c
+        Signal.trap('INT') {
+          listener.stop
+          puts 'See you in another lifetime, brotha.'
+          exit
+        }
+
+        Kernel.sleep
+      end
+
+      def publish(local_theme, remote_theme)
+        keep_old_theme = !prompt.yes_or_no?("Do you want to keep the dev theme as the old public one?", false)
+        # first push local files to dev theme
+        prompt.say "pushing local changes to development theme"
+        push local_theme, remote_theme, destroy: 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.highlight "published to #{remote_theme.href}", :yellow
+      end
+
+      private
+      attr_reader :prompt
+
+      def check_dupes!(list)
+        names = list.map { |f| f.file_name.downcase }
+        dupes = names.group_by { |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+
+        dupes.each do |downcased|
+          arr = list.select { |f| f.file_name.downcase == downcased }
+          highlight(" --> Name clash between files: " + arr.map(&:file_name).join(', '), :red)
+        end
+
+        if dupes.any?
+          highlight("Please ensure there are no name clashes before continuing. Thanks!")
+          abort
+        end
+      end
+
+      def maybe_update(modified_templates, source_name, target_name, &block)
+        modified_templates.each do |t|
+          puts "---------"
+          puts "#{source_name} #{t.file_name} was modified at #{t.updated_on} (more recent than #{target_name}):"
+          puts "---------"
+          puts t.diff.to_s(:color)
+
+          yield(t) if prompt.yes_or_no?("Update #{target_name} #{t.file_name}?", true)
+        end
+      end
+
+      def notice(str)
+        prompt.notice str
+      end
+
+      def puts(str)
+        prompt.say str
+      end
+
+      def highlight(str)
+        prompt.highlight str
+      end
+
+      def remove_all(from, to)
+        from.templates.each { |f| to.remove_template(f.file_name) }
+        from.assets.each { |f| to.remove_asset(f.file_name) }
+      end
+
+      def copy_templates(from, to, opts = {})
+        from.templates.each do |t|
+          to.add_template t.file_name, t.body
+          puts "Copied #{t.file_name}"
+        end
+      end
+
+      def copy_assets(from, to, opts = {})
+        files = from.assets.find_all do |a|
+          if opts[:overwrite]
+            true
+          else
+            target_asset = to.assets.find{ |t| t.file_name == a.file_name }
+            if target_asset
+              opts[:interactive] && prompt.yes_or_no?("Asset exists: #{a.file_name}. Overwrite?", false)
+            else
+              true
+            end
+          end
+        end
+
+        files.each do |a|
+          to.add_asset a.file_name, a.file
+          puts "Copied asset #{a.file_name}"
+        end
+      end
+
+      def upsert_file(theme, path)
+        item, type = FSTheme.resolve_file(path)
+        case type
+        when :template
+          theme.add_template item.file_name, item.body
+        when :asset
+          theme.add_asset item.file_name, item.file
+        end
+        puts "Uploaded #{type}: #{item.file_name}"
+      end
+
+      def delete_file(theme, path)
+        type = FSTheme.resolve_type(path)
+        file_name = File.basename(path)
+        case type
+        when :template
+          theme.remove_template file_name
+        when :asset
+          theme.remove_asset file_name
+        end
+        puts "Deleted remote #{type}: #{file_name}"
+      end
+    end
+  end
+end
+

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.1.9"
+  VERSION = "0.2.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.19
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +157,23 @@ files:
 - exe/btc
 - lib/bootic_cli.rb
 - lib/bootic_cli/cli.rb
-- lib/bootic_cli/cli/orders.rb
 - lib/bootic_cli/command.rb
+- lib/bootic_cli/commands/orders.rb
+- lib/bootic_cli/commands/themes.rb
 - lib/bootic_cli/connectivity.rb
 - lib/bootic_cli/console.rb
 - lib/bootic_cli/file_runner.rb
 - lib/bootic_cli/formatters.rb
 - lib/bootic_cli/session.rb
 - lib/bootic_cli/store.rb
+- lib/bootic_cli/themes/api_theme.rb
+- lib/bootic_cli/themes/fs_theme.rb
+- lib/bootic_cli/themes/mem_theme.rb
+- lib/bootic_cli/themes/missing_items_theme.rb
+- lib/bootic_cli/themes/theme_diff.rb
+- lib/bootic_cli/themes/theme_selector.rb
+- lib/bootic_cli/themes/updated_theme.rb
+- lib/bootic_cli/themes/workflows.rb
 - lib/bootic_cli/version.rb
 homepage: http://www.bootic.net
 licenses:
@@ -142,12 +193,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Bootic command line.