bootic_cli 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f49bbc8333263cc87d2e254d0e2d3dca1d801ac685c343a64512b22ccddd91
-  data.tar.gz: 31d0c8fa3d9c3b7d070c172441b4df0187728606153d15235ba65cb5fc513c7a
+  metadata.gz: 5b387d8fd3e457f8d96ee99d8ef47cc9202ab52f2a161815a79138e0047b4613
+  data.tar.gz: e933918d22e7ce87854b905816cb1a20190f393f0c390209ba479e351599d8e9
 SHA512:
-  metadata.gz: 8ecbeaf2859c4fb9ba81611ccf810d4c10e1a9e61888c7d206c1ef7facc2bd7a1e78589cbd9512903a0799faf0cad3b2aeb6a0fbd4c16c40f22399f286d94891
-  data.tar.gz: d13807aacb8f8428d7306eab4f30c5b4862a3a4ef7c067e0591c1ab04043904940bcf0d4098be445932c2730f5a02e6d0bef655a405af4af543acbec892989f6
+  metadata.gz: 5d87ca108ef8c9db618dd49e64731b7d910332b76900b7c3ca0db5fdc50a0781fb9078af96751dd3eedeba14ce680f96296e49554e2ce039f49989c70f88437e
+  data.tar.gz: ec3e339333a702508a32bce522a66a4580915e4140ef05faf6e5c9b459439cf7f56f0d9f0f671eae2885f5f4ee2b7f317bcb65a8585ccb188a15a2ed8d208d56

data/bootic_cli.gemspec

@@ -25,6 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'listen', "~> 3.1"
   spec.add_dependency 'launchy', "~> 2.4"
 
+  if Gem.win_platform?
+    spec.add_dependency 'diff-lcs'
+    spec.add_dependency 'wdm', '>= 0.1.0'
+  end
+
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"

data/lib/bootic_cli/commands/themes.rb

@@ -89,7 +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
+            prompt.pause "Comparing againt public theme now. Press any key to continue.", :cyan
             local_theme, public_theme = theme_selector.select_theme_pair(default_subdomain, current_dir, true)
             workflows.compare(local_theme, public_theme)
           end
@@ -262,6 +262,15 @@ module BooticCli
           !default_answer
         end
 
+        def pause(string, color = nil)
+          begin
+            input = shell.ask(string, color)
+          rescue Interrupt
+            say "\nCtrl-C received. Bailing out!", :magenta
+            abort
+          end
+        end
+
         def notice(str)
           parts = [" --->", str]
           puts highlight parts.join(' ')

data/lib/bootic_cli/themes/updated_theme.rb

@@ -1,5 +1,14 @@
 require 'diffy'
 
+module Diffy
+  class Diff
+    # monkey patch diffy to fix buggy bug: https://github.com/samg/diffy/pull/103
+    def diff_options
+      Array(options[:context] ? "-U#{options[:context]}" : options[:diff])
+    end
+  end
+end
+
 module BooticCli
   module Themes
     # given :source and :target themes,
@@ -21,9 +30,7 @@ module BooticCli
 
       def templates
         @templates ||= map_pair(source.templates, target.templates) do |a, b|
-          # don't use context until diffy bug is fixed: https://github.com/samg/diffy/pull/103
-          # diff = Diffy::Diff.new(normalize_endings(b.body), normalize_endings(a.body), context: 1)
-          diff = Diffy::Diff.new(normalize_endings(b.body), normalize_endings(a.body))
+          diff = Diffy::Diff.new(normalize_endings(b.body), normalize_endings(a.body), context: 1)
 
           if !diff.to_s.empty? && should_update?(a, b)
             c = TemplateWithDiff.new(a.file_name, a.body, a.updated_on, diff)

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ismael Celis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor