itamae 1.9.6 → 1.9.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22cb29d51218a3ccdd9cdbe7639e845304de437f
-  data.tar.gz: c0df1a26bed2e1525edeb1f525296adcae879916
+  metadata.gz: 063ccd6fdae32d852d450265017ede39586ea176
+  data.tar.gz: e4456e84fc2421e01c86247f926aa6625f6921c5
 SHA512:
-  metadata.gz: 1ea7c9dda884abe52f924b092efb824471f0aebf75d926a1cf609f3dd2cefd3bc82a9d2cd265196974886b3f1bbe8dea87fc580789b3786e89a132e4962abbd3
-  data.tar.gz: dae45b57a02792e4657a75716fd473f23cc3b2bb6f869284c3785d01b063692a3f2b2307d748d9cdd31be32b67afbb9894c6ba714f731e1b29adb686afd00e47
+  metadata.gz: b88477096228dfad7451b746f41ccf727ee5ddf0b0da023d019e348467cd591e4f014cb4cd1417317599dbeb6e288e67657c775490db98b9064865e109d30191
+  data.tar.gz: e73bfa3cf90a183b5e6ef4931679d56bf88d420d0c946c591fda609a167c3fb4d8cb9298565b5d0cd142f09badc8226e3d697d73c8c68bb4a64c01fd955d3206

data/CHANGELOG.md

@@ -1,13 +1,20 @@
+## v1.9.7 (pre)
+
+Bugfixes
+
+- [Mark a file as updated in dry-run mode (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/208)
+- [Do not surround LF with the ANSI escape sequence (by @daic-h)](https://github.com/itamae-kitchen/itamae/pull/209)
+
 ## v1.9.6
 
 Features
 
-- [Introduce `--detailed-exitcode` option.](https://github.com/itamae-kitchen/itamae/pull/206)
+- [Introduce `--detailed-exitcode` option. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/206)
 
 Bugfixes
 
-- [If `git rev-list` fails, do `git fetch origin`](https://github.com/itamae-kitchen/itamae/pull/205)
-- [If gid passed to user resource is a String, treat it as group name.](https://github.com/itamae-kitchen/itamae/pull/207)
+- [If `git rev-list` fails, do `git fetch origin` (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/205)
+- [If gid passed to user resource is a String, treat it as group name. (by @ryotarai)](https://github.com/itamae-kitchen/itamae/pull/207)
 
 ## v1.9.5
 
@@ -48,7 +55,7 @@ Improvements
 
 Features
 
-- [Add `get`, `post`, `put`, `delete` and `options` actions to `http_request` resource](https://github.com/itamae-kitchen/itamae/pull/184)
+- [Add `get`, `post`, `put`, `delete` and `options` actions to `http_request` resource (by @hico-horiuchi)](https://github.com/itamae-kitchen/itamae/pull/184)
 
 ## v1.9.0
 

data/lib/itamae/logger.rb

@@ -73,12 +73,9 @@ module Itamae
       attr_accessor :colored
 
       def call(severity, datetime, progname, msg)
-        log = "%s : %s\n" % ["%5s" % severity, msg2str(msg)]
-        if colored
-          colorize(log, severity)
-        else
-          log
-        end
+        log = "%s : %s" % ["%5s" % severity, msg2str(msg)]
+
+        (colored ? colorize(log, severity) : log) + "\n"
       end
 
       def color(code)

data/lib/itamae/resource/file.rb

@@ -30,9 +30,11 @@ module Itamae
         end
 
         send_tempfile
+        compare_file
       end
 
       def set_current_attributes
+        current.modified = false
         if current.exist
           current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
           current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
@@ -51,7 +53,7 @@ module Itamae
         super
 
         if @temppath && @current_action != :delete
-          compare_file
+          show_content_diff
         end
       end
 
@@ -60,19 +62,7 @@ module Itamae
           run_command(["touch", attributes.path])
         end
 
-        if @temppath
-          if run_specinfra(:check_file_is_file, attributes.path)
-            unless check_command(["diff", "-q", @temppath, attributes.path])
-              # the file is modified
-              updated!
-            end
-          else
-            # new file
-            updated!
-          end
-        end
-
-        change_target = @temppath && updated?  ? @temppath : attributes.path
+        change_target = attributes.modified ? @temppath : attributes.path
 
         if attributes.mode
           run_specinfra(:change_file_mode, change_target, attributes.mode)
@@ -82,7 +72,7 @@ module Itamae
           run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
         end
 
-        if @temppath && updated?
+        if attributes.modified
           run_specinfra(:move_file, @temppath, attributes.path)
         end
       end
@@ -110,29 +100,39 @@ module Itamae
           run_specinfra(:change_file_group, @temppath, group)
         end
 
-        unless check_command(["diff", "-q", @temppath, attributes.path])
-          # the file is modified
-          updated!
-        end
-
         run_specinfra(:move_file, @temppath, attributes.path)
       end
 
       private
 
-      def compare_file
-        compare_to = if current.exist
-                       attributes.path
-                     else
-                       '/dev/null'
-                     end
-
-        diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
-        if diff.exit_status == 0
-          # no change
-          Itamae.logger.debug "file content will not change"
+      def compare_to
+        if current.exist
+          attributes.path
         else
+          '/dev/null'
+        end
+      end
+
+      def compare_file
+        attributes.modified = false
+        unless @temppath
+          return
+        end
+
+        case run_command(["diff", "-q", compare_to, @temppath], error: false).exit_status
+        when 1
+          # diff found
+          attributes.modified = true
+        when 2
+          # error
+          raise Itamae::Backend::CommandExecutionError, "diff command exited with 2"
+        end
+      end
+
+      def show_content_diff
+        if attributes.modified
           Itamae.logger.info "diff:"
+          diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
           diff.stdout.each_line do |line|
             color = if line.start_with?('+')
                       :green
@@ -146,6 +146,9 @@ module Itamae
             end
           end
           runner.handler.event(:file_content_changed, diff: diff.stdout)
+        else
+          # no change
+          Itamae.logger.debug "file content will not change"
         end
       end
 

data/lib/itamae/resource/http_request.rb

@@ -7,6 +7,9 @@ module Itamae
     class HttpRequest < File
       RedirectLimitExceeded = Class.new(StandardError)
 
+      alias_method :_action_create, :action_create
+      undef_method :action_create, :action_delete, :action_edit
+
       define_attribute :action, default: :get
       define_attribute :headers, type: Hash, default: {}
       define_attribute :message, type: String, default: ""
@@ -14,6 +17,23 @@ module Itamae
       define_attribute :url, type: String, required: true
 
       def pre_action
+        attributes.exist = true
+        attributes.content = fetch_content
+
+        send_tempfile
+        compare_file
+      end
+
+      def show_differences
+        current.mode    = current.mode.rjust(4, '0') if current.mode
+        attributes.mode = attributes.mode.rjust(4, '0') if attributes.mode
+
+        super
+
+        show_content_diff
+      end
+
+      def fetch_content
         uri = URI.parse(attributes.url)
         response = nil
         redirects_followed = 0
@@ -42,29 +62,27 @@ module Itamae
           end
         end
 
-        attributes.content = response.body
-
-        super
+        response.body
       end
 
       def action_delete(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_get(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_options(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_post(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_put(options)
-        action_create(options)
+        _action_create(options)
       end
     end
   end

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.6"
+  VERSION = "1.9.7.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7.pre
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -308,9 +308,9 @@ 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