infrataster 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45802587e55096a8eecbb01c976ee9f496a2dfc6
-  data.tar.gz: 8d752d4ff55cf971095bcd47caccf65422263690
+  metadata.gz: fb8def0e55eb1343153794f2f022fe53ff1dfb8e
+  data.tar.gz: cbc7037c6aa72c1d22c4bb93d88f1950a8cac967
 SHA512:
-  metadata.gz: d2e996d6feb987dc561d0d3ea019475d8dc8e206a197b53e00b2c2d8dd873229befa99c9b2bbf0730e3c9abe5794faab5f1b792a1be11cbbe218bcf77c6d71ac
-  data.tar.gz: 2382d3fc8e6fa2d1541522d361e2b8ec1a84f655c89570f3295997cec3d4821c516714351ba2179892dff6307d607d344696090c2f6a87d7d67ebb3b903ed769
+  metadata.gz: ada742cc200febf95205853d485e131d95db9153d359a73e96466cd172fcc7ff63b979303cb8290c7fa4a4f53bc09e9c9585f7052e4b3081807f857b3cb550fb
+  data.tar.gz: 7d29a0373733bca78c7747d3bb52975a853f3fa0918847182661827314d53076745afb5d2d8a8aa806c9f72e07d705506ed215a9153b1b461626ea7257877148

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.2.3
+
+* [http resource supports basic auth. (by @winebarrel)](https://github.com/ryotarai/infrataster/pull/54)
+
 ## v0.2.2
 
 * Server can be defined by block. (https://github.com/ryotarai/infrataster/pull/51 by @otahi)

data/lib/infrataster/contexts/http_context.rb

@@ -16,6 +16,7 @@ module Infrataster
             faraday.request  :url_encoded
             faraday.response :logger, Logger
             faraday.adapter  Faraday.default_adapter
+            faraday.basic_auth(*resource.basic_auth) if resource.basic_auth
           end
 
           conn.public_send(resource.method) do |req|

data/lib/infrataster/resources/http_resource.rb

@@ -44,6 +44,10 @@ module Infrataster
       def ssl_option
         @options[:ssl]
       end
+
+      def basic_auth
+        @options[:basic_auth]
+      end
     end
   end
 end

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/integration/http_spec.rb

@@ -22,6 +22,19 @@ describe server(:proxy) do
       expect(response.headers['content-encoding']).to eq('gzip')
     end
   end
+
+  describe http('http://static.example.com/auth') do
+    it "sends GET request without basic auth" do
+      expect(response.status).to eq 401
+    end
+  end
+
+  describe http('http://static.example.com/auth', basic_auth: ['dummy', 'dummy']) do
+    it "sends GET request with basic auth" do
+      expect(response.status).to eq 200
+      expect(response.body).to include('auth')
+    end
+  end
 end
 
 describe server(:app) do

data/spec/integration/vm/cookbooks/proxy/files/default/.htpasswd

@@ -0,0 +1 @@
+dummy:$apr1$xLfour3i$43BqMHRaaXxY8eRzmBtKr1

data/spec/integration/vm/cookbooks/proxy/files/default/auth

@@ -0,0 +1 @@
+auth

data/spec/integration/vm/cookbooks/proxy/recipes/default.rb

@@ -20,3 +20,10 @@ cookbook_file '/usr/share/nginx/www/index.html' do
   mode '0644'
 end
 
+cookbook_file '/usr/share/nginx/www/auth' do
+  mode '0644'
+end
+
+cookbook_file '/etc/nginx/.htpasswd' do
+  mode '0644'
+end

data/spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb

@@ -12,6 +12,11 @@ server {
 	location / {
 		try_files $uri $uri/ /index.html;
 	}
+
+	location = /auth {
+		auth_basic "Restricted";
+		auth_basic_user_file /etc/nginx/.htpasswd;
+	}
 }
 
 server {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -210,6 +210,8 @@ files:
 - spec/integration/vm/cookbooks/app/recipes/default.rb
 - spec/integration/vm/cookbooks/apt-mirror/metadata.rb
 - spec/integration/vm/cookbooks/apt-mirror/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/files/default/.htpasswd
+- spec/integration/vm/cookbooks/proxy/files/default/auth
 - spec/integration/vm/cookbooks/proxy/files/default/index.html
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb
 - spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb
@@ -257,6 +259,8 @@ test_files:
 - spec/integration/vm/cookbooks/app/recipes/default.rb
 - spec/integration/vm/cookbooks/apt-mirror/metadata.rb
 - spec/integration/vm/cookbooks/apt-mirror/recipes/default.rb
+- spec/integration/vm/cookbooks/proxy/files/default/.htpasswd
+- spec/integration/vm/cookbooks/proxy/files/default/auth
 - spec/integration/vm/cookbooks/proxy/files/default/index.html
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb
 - spec/integration/vm/cookbooks/proxy/templates/default/integration-test.erb