bootic_cli 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def2df2eed49539b45547161ee455656398f20b8796eb80b299976f303deb96b
-  data.tar.gz: 65c4fe5a6d0a41d0327dc461bddfc0e5c5335681152243481d800dd88fd0b07b
+  metadata.gz: 5c70dee5796feb738f8649d42d711deab4d584174a3e711b72b1cbbf1b7fbf1d
+  data.tar.gz: 591b4080c30abc76ead069bd437fd3046c752ff83d3934bc3fd3cee61dd094b4
 SHA512:
-  metadata.gz: e02f380074ef425d08187cd0daa9fe12f5e6ef435e8cfa5fc4385ba07b9278e288b9de4ce9e79c8c53fd61a80deca6078ea58e8a131a792dd1f160becaea7e2a
-  data.tar.gz: 1bf4e225d6c5339bf31fa570f44542ca67ca933f07edbcdca15f13cfaa1d4d2f9faf74439a61da36bc552c6ef34c2034a627a19647f926dae938eff5a949a4b1
+  metadata.gz: 3edf369d283f4d79909a8e77b3b7d1911e38c4e1c4f326c2fea089eb5f26f5dc307560844d9fbf6cf7fd82b9aa55c69e87e4fa5bc951b79c875bd33b108fe779
+  data.tar.gz: 5da2f658f1dd9611ad61043a3a33aca12e0cec0c3c51f355d5818ddfb54ea16f89e4d6fd81e89f32537489199e327c024db888df192c758de7921c03e1d90386

data/lib/bootic_cli/commands/themes.rb

@@ -89,6 +89,7 @@ module BooticCli
 
           # if we just compared against the dev theme, redo the mumbo-jumbo but with the public one
           unless remote_theme.public?
+            prompt.say "Comparing againt public theme now.", :cyan
             local_theme, public_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, true)
             workflows.compare(local_theme, public_theme)
           end
@@ -150,21 +151,43 @@ module BooticCli
         end
       end
 
-      desc 'open', 'Open theme preview URL in a browser'
-      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'])
-          Launchy.open remote_theme.path
-        end
-      end
+      # desc 'open', 'Open theme preview URL in a browser'
+      # 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'])
+      #     Launchy.open remote_theme.path
+      #   end
+      # end
 
       desc 'pair', 'Pair this directory to remote [shop]'
       option :shop, banner: '<shop_subdomain>', type: :string, required: true
       def pair
         within_theme do
           local_theme = theme_selector.pair(options['shop'], current_dir)
-          prompt.say "Directory #{local_theme.path} paired with shop #{options['shop']}", :green
+          prompt.say "Directory #{File.dirname(local_theme.path)} paired with shop #{options['shop']}", :green
+        end
+      end
+
+      desc 'local_pull [from_path]', 'Pull changes from a local (parent) theme into current one'
+      # option :path, banner: '<path>', type: :string, required: true
+      option :delete, banner: '<true|false>', type: :boolean, desc: 'Remove local files that were removed in parent theme (default: false)'
+      def local_pull(dir)
+        within_theme do
+          unless File.directory?(dir) and contains_theme?(dir)
+            prompt.say("Path doesn't exist or doesn't contain theme: #{dir}")
+            abort
+          end
+
+          dirname = File.dirname(dir)
+          local_theme = theme_selector.select_local_theme(current_dir)
+          parent_theme = theme_selector.select_local_theme(dir)
+
+          prompt.say "Pulling changes from parent theme at #{dirname}", :green
+          delete_removed = options['delete'].nil? ? false : options['delete']
+          workflows.pull(local_theme, parent_theme, delete: delete_removed)
+
+          prompt.say "Synced changes from parent theme at #{dirname} with local one.", :cyan
         end
       end
 
@@ -188,8 +211,12 @@ module BooticCli
         end
       end
 
+      def contains_theme?(path)
+        File.exist?(File.join(path, 'layout.html'))
+      end
+
       def is_within_theme?
-        File.exist?(File.join(current_expanded_dir, 'layout.html'))
+        contains_theme?(current_expanded_dir)
       end
 
       def current_dir

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor