itamae 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7c43e3ad6a6bfafe1bc42c97b72e9869218f10
-  data.tar.gz: 6d4c623011615e7bf8220876642479cbddc94fc6
+  metadata.gz: 154b1597ae0505eec08966ce87e4481cebc99291
+  data.tar.gz: eaed49c1a0352814e22227999385e0668dc99320
 SHA512:
-  metadata.gz: ba8d6b72cd15260fc2e0b4b53d8a9774e9a7baa1352cc5ef3aafdfc3be0224848873cafd846c0e44d2650e6aeb6b6a5ae0906f4eb5b92c6251d89669f11137d8
-  data.tar.gz: f5925dbc882fb1e6b1f654a51ddf7cc77059725bb678404ad11cb522fffcba317d1c09092007102c8f8787d5437749cc019b4eaa725f7ea1f6ffc953c8a21004
+  metadata.gz: 749602fb374334e832b70aeadbae91dade0aaa0426747dc11394771c1cb4d4f00d78af4f290907659c15307e773c977e0fd7b4d6eaa72536248a9eca757b005d
+  data.tar.gz: 97c15caa14ea44d38898a2ec44c629a25a499855b5d16553e04fa431cc72dff470b7f8844e0b0fc31aff9d9abae51a8509a3263ec8c243b36b86c95baded7bc6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.9.3
+
+Improvements
+
+- [Support redirect on http_request resource (by @hico-horiuchi)](https://github.com/itamae-kitchen/itamae/pull/190)
+- [Use /bin/bash as default shell if shell is not set (by @hico-horiuchi)](https://github.com/itamae-kitchen/itamae/pull/192)
+- [Stop replacing files which are not updated (by @KitaitiMakoto)](https://github.com/itamae-kitchen/itamae/pull/194)
+
 ## v1.9.2
 
 Features

data/lib/itamae/backend.rb

@@ -36,7 +36,7 @@ module Itamae
 
     class Base
       attr_reader :executed_commands
-      
+
       def initialize(options)
         @options = options
         @backend = create_specinfra_backend
@@ -189,7 +189,7 @@ module Itamae
       end
 
       def shell
-        @options[:shell]
+        @options[:shell] || '/bin/sh'
       end
 
       def run_command_with_profiling(command)

data/lib/itamae/resource/file.rb

@@ -80,7 +80,9 @@ module Itamae
             updated!
           end
 
-          run_specinfra(:move_file, @temppath, attributes.path)
+          if updated?
+            run_specinfra(:move_file, @temppath, attributes.path)
+          end
         end
       end
 

data/lib/itamae/resource/http_request.rb

@@ -1,27 +1,45 @@
 require 'itamae'
 require 'uri'
-require 'net/http'
+require 'net/https'
 
 module Itamae
   module Resource
     class HttpRequest < File
-      UrlNotFoundError = Class.new(StandardError)
+      RedirectLimitExceeded = Class.new(StandardError)
 
       define_attribute :action, default: :get
       define_attribute :headers, type: Hash, default: {}
       define_attribute :message, type: String, default: ""
+      define_attribute :redirect_limit, type: Integer, default: 10
       define_attribute :url, type: String, required: true
 
       def pre_action
         uri = URI.parse(attributes.url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true if uri.scheme == "https"
-
-        case attributes.action
-        when :delete, :get, :options
-          response = http.method(attributes.action).call(uri.request_uri, attributes.headers)
-        when :post, :put
-          response = http.method(attributes.action).call(uri.request_uri, attributes.message, attributes.headers)
+        response = nil
+        redirects_followed = 0
+
+        loop do
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true if uri.scheme == "https"
+
+          case attributes.action
+          when :delete, :get, :options
+            response = http.method(attributes.action).call(uri.request_uri, attributes.headers)
+          when :post, :put
+            response = http.method(attributes.action).call(uri.request_uri, attributes.message, attributes.headers)
+          end
+
+          if response.kind_of?(Net::HTTPRedirection)
+            if redirects_followed < attributes.redirect_limit
+              uri = URI.parse(response["location"])
+              redirects_followed += 1
+              Itamae.logger.debug "Following redirect #{redirects_followed}/#{attributes.redirect_limit}"
+            else
+              raise RedirectLimitExceeded
+            end
+          else
+            break
+          end
         end
 
         attributes.content = response.body

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.9.2
+1.9.3

data/spec/integration/default_spec.rb

@@ -101,6 +101,11 @@ describe file('/tmp/http_request_headers.html') do
   its(:content) { should match(/"User-Agent": "Itamae"/) }
 end
 
+describe file('/tmp/http_request_redirect.html') do
+  it { should be_file }
+  its(:content) { should match(/"from": "itamae"/) }
+end
+
 describe file('/tmp/notifies') do
   it { should be_file }
   its(:content) { should eq("2431") }

data/spec/integration/recipes/default.rb

@@ -186,6 +186,11 @@ http_request "/tmp/http_request_headers.html" do
   url "https://httpbin.org/get"
 end
 
+http_request "/tmp/http_request_redirect.html" do
+  redirect_limit 1
+  url "https://httpbin.org/redirect-to?url=https%3A%2F%2Fhttpbin.org%2Fget%3Ffrom%3Ditamae"
+end
+
 ######
 
 service "cron" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor