itamae 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be707f952f0626bb44b015cee0d20e52458d732e
-  data.tar.gz: 1c12830f1a14ce7dacc5c10bf90f33e1cae17398
+  metadata.gz: 1922ba87b574d058801766b1b549a9a26e9b9b20
+  data.tar.gz: ddf59e714b58036d98cc1e11510adb54e41fb6eb
 SHA512:
-  metadata.gz: 052278ea06cccc8065d3452fec345eead2ff9ca5dd0a77bc447d9bb699f5c4de8efb20ca5648a36ef73a70e96eec3788895d1ef12053f920e92b046819905bef
-  data.tar.gz: d52c51210ae9ae7b6a99ee1c14be97a2f0fea28ceb596fc8bb66eee2b7668d21bcdb183100a597ba39852bb75fd283aa17ecd59c77e39c9bed28cd3e0c1124a3
+  metadata.gz: 7d44161aadb0e9a388e14668fbedb08ef4bf3e585f95347e529751a2b6a98f6949c1f41c2d940c485b8db95df0bcb50504d8b7f43c3ba1b00c8ee6e2141761dd
+  data.tar.gz: bde120804a97c6109a37ceece9667d17214c1f1cb155b69938ded9c43b5be181e5932c0e548bc9c7429d98b008d70cd52ff756a571e49a8360a2d7e9425658e6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.9.1
+
+Features
+
+- [Add `get`, `post`, `put`, `delete` and `options` actions to `http_request` resource](https://github.com/itamae-kitchen/itamae/pull/184)
+
 ## v1.9.0
 
 Features

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in itamae.gemspec
 gemspec
 
-gem 'vagrant', github: 'mitchellh/vagrant'
+gem 'vagrant', github: 'ryotarai/vagrant', branch: 'latest-bundler'
 gem 'vagrant-digitalocean'
 
 path = Pathname.new("Gemfile.local")

data/README.md

@@ -1,4 +1,6 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://itamae-slackin.herokuapp.com/)
+# [![](https://raw.githubusercontent.com/itamae-kitchen/itamae-logos/master/small/FA-Itamae-horizontal-01-180x72.png)](https://github.com/itamae-kitchen/itamae)
+
+[![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://itamae-slackin.herokuapp.com/)
 
 Simple and lightweight configuration management tool inspired by Chef.
 

data/lib/itamae/resource/http_request.rb

@@ -1,19 +1,53 @@
 require 'itamae'
-require 'open-uri'
+require 'uri'
+require 'net/http'
 
 module Itamae
   module Resource
     class HttpRequest < File
       UrlNotFoundError = Class.new(StandardError)
 
+      define_attribute :action, default: :get
       define_attribute :headers, type: Hash, default: {}
+      define_attribute :message, type: String, default: ""
       define_attribute :url, type: String, required: true
 
       def pre_action
-        attributes.content = open(attributes.url, attributes.headers).read
+        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)
+        end
+
+        attributes.content = response.body
 
         super
       end
+
+      def action_delete(options)
+        action_create(options)
+      end
+
+      def action_get(options)
+        action_create(options)
+      end
+
+      def action_options(options)
+        action_create(options)
+      end
+
+      def action_post(options)
+        action_create(options)
+      end
+
+      def action_put(options)
+        action_create(options)
+      end
     end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.9.0
+1.9.1

data/spec/integration/default_spec.rb

@@ -75,6 +75,27 @@ describe file('/tmp/http_request.html') do
   its(:content) { should match(/"from": "itamae"/) }
 end
 
+describe file('/tmp/http_request_delete.html') do
+  it { should be_file }
+  its(:content) { should match(/"from": "itamae"/) }
+end
+
+describe file('/tmp/http_request_post.html') do
+  it { should be_file }
+  its(:content) do
+    should match(/"from": "itamae"/)
+    should match(/"love": "sushi"/)
+  end
+end
+
+describe file('/tmp/http_request_put.html') do
+  it { should be_file }
+  its(:content) do
+    should match(/"from": "itamae"/)
+    should match(/"love": "sushi"/)
+  end
+end
+
 describe file('/tmp/http_request_headers.html') do
   it { should be_file }
   its(:content) { should match(/"User-Agent": "Itamae"/) }

data/spec/integration/recipes/default.rb

@@ -160,6 +160,23 @@ http_request "/tmp/http_request.html" do
   url "https://httpbin.org/get?from=itamae"
 end
 
+http_request "/tmp/http_request_delete.html" do
+  action :delete
+  url "https://httpbin.org/delete?from=itamae"
+end
+
+http_request "/tmp/http_request_post.html" do
+  action :post
+  message "love=sushi"
+  url "https://httpbin.org/post?from=itamae"
+end
+
+http_request "/tmp/http_request_put.html" do
+  action :put
+  message "love=sushi"
+  url "https://httpbin.org/put?from=itamae"
+end
+
 http_request "/tmp/http_request_headers.html" do
   headers "User-Agent" => "Itamae"
   url "https://httpbin.org/get"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool