bootic_cli 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c610888d557df1cea6a07b3e8e11104476c1a7d
-  data.tar.gz: e1d8c6f28dd1edef01bbbc8e1fb258f33532ccd0
+  metadata.gz: 2678e5ad8fef33d47eda0b55c2b014d3da644e42
+  data.tar.gz: 3eb8e3690d8d379911dd4528927c8e61c5b27515
 SHA512:
-  metadata.gz: 7f492d23d1c5ae13cdd0a78d33578d2b1e61530d35a20cb796c4d6003dcead8bebf2318db4e8b8acad422c6b774cd7890e68eddc0d6217f75923a6eae2e5a986
-  data.tar.gz: cc766798c0ed812aee7aa24e9464c83809cf7836c1974e1fed6dcc473615afa6374522168dc79ec4d7b0646b643e246520d6c7c43c42899684effbbb52d6eda6
+  metadata.gz: 173b6a35f6a715b6e75b2a5c7a4379a198b8d7b045257b8afa66143bf4fa5e87e31f53721fb9fc0e51b7f37263ae429cd92a4f9511ed0b05353286734790e9d4
+  data.tar.gz: ac13c53e4b8a6ede30ea4d21bca91defac55146c8245579c36f7eb11fd6ec355c1aa99c13ad76145006469b6b430f3ab92f4fded5cf07238a948ad1600f23ffb

data/lib/bootic_cli/commands/themes.rb

@@ -164,7 +164,7 @@ module BooticCli
           begin
             input = shell.ask("#{question} [#{default_char}]").strip
           rescue Interrupt
-            say "\nCtrl-C received. Bailing out!", :red
+            say "\nCtrl-C received. Bailing out!", :magenta
             abort
           end
 

data/lib/bootic_cli/themes/fs_theme.rb

@@ -86,9 +86,16 @@ module BooticCli
         setup
         path = File.join(dir, file_name)
 
+        # remove DOS line endings for new templates
+        # or for existing ones that don't have any.
+        if !File.exist?(path) or !has_dos_line_endings?(path)
+          body = body.gsub(/\r\n?/, "\n")
+        end
+
         File.open(path, 'w') do |io|
-          io.write body
+          io.write(body)
         end
+
         @templates = nil
       end
 
@@ -121,6 +128,10 @@ module BooticCli
 
       attr_reader :dir
 
+      def has_dos_line_endings?(path)
+        !!IO.read(path)["\r\n"]
+      end
+
       def paths_for(patterns)
         patterns.reduce([]) {|m, pattern| m + Dir[File.join(dir, pattern)]}
       end

data/lib/bootic_cli/themes/theme_diff.rb

@@ -4,16 +4,17 @@ require 'bootic_cli/themes/missing_items_theme'
 module BooticCli
   module Themes
     class ThemeDiff
-      def initialize(source:, target:)
+      def initialize(source:, target:, force_update:)
         @source, @target = source, target
+        @force_update = force_update
       end
 
       def updated_in_source
-        @updated_in_source ||= UpdatedTheme.new(source: source, target: target)
+        @updated_in_source ||= UpdatedTheme.new(source: source, target: target, force_update: force_update)
       end
 
       def updated_in_target
-        @updated_in_target ||= UpdatedTheme.new(source: target, target: source)
+        @updated_in_target ||= UpdatedTheme.new(source: target, target: source, force_update: force_update)
       end
 
       def missing_in_target
@@ -25,7 +26,7 @@ module BooticCli
       end
 
       private
-      attr_reader :source, :target
+      attr_reader :source, :target, :force_update
     end
   end
 end

data/lib/bootic_cli/themes/updated_theme.rb

@@ -8,14 +8,17 @@ module BooticCli
     class UpdatedTheme
       TemplateWithDiff = Struct.new('TemplateWithDiff', :file_name, :body, :updated_on, :diff)
 
-      def initialize(source:, target:)
+      def initialize(source:, target:, force_update: false)
         @source, @target = source, target
+        # when doing a pull or push, we don't care if the other end has a more recent version
+        # we only do that when syncing changes, in which case force_update should be false
+        @force_update = force_update
       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?
+          if !diff.to_s.empty? && should_update?(a, b)
             c = TemplateWithDiff.new(a.file_name, a.body, a.updated_on, diff)
             [true, c]
           else
@@ -26,12 +29,16 @@ module BooticCli
 
       def assets
         @assets ||= map_pair(source.assets, target.assets) do |a, b|
-          [more_recent?(a, b), a]
+          [should_update?(a, b), a]
         end
       end
 
       private
-      attr_reader :source, :target
+      attr_reader :source, :target, :force_update
+
+      def should_update?(a, b)
+        force_update || more_recent?(a, b)
+      end
 
       def more_recent?(a, b)
         a.updated_on > b.updated_on

data/lib/bootic_cli/themes/workflows.rb

@@ -32,7 +32,7 @@ module BooticCli
       end
 
       def pull(local_theme, remote_theme, delete: true)
-        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme, force_update: true)
         check_dupes!(local_theme.assets)
 
         download_opts = {
@@ -61,7 +61,7 @@ module BooticCli
       end
 
       def push(local_theme, remote_theme, delete: true)
-        diff = ThemeDiff.new(source: local_theme, target: remote_theme)
+        diff = ThemeDiff.new(source: local_theme, target: remote_theme, force_update: true)
         check_dupes!(local_theme.assets)
 
         notice 'Pushing local changes to remote...'

data/lib/bootic_cli/version.rb

@@ -1,3 +1,3 @@
 module BooticCli
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootic_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ismael Celis