infrataster 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a8caff494d20499e9c34ed7cd0f87bc3d19890
-  data.tar.gz: fea6e96fc2ca5ba70317c400b0e1b22a6b91d2c8
+  metadata.gz: 45802587e55096a8eecbb01c976ee9f496a2dfc6
+  data.tar.gz: 8d752d4ff55cf971095bcd47caccf65422263690
 SHA512:
-  metadata.gz: ba347d3caf3b0401e8442b9965aaa7588dd22cbab24e05dc5ee95967980ceeb11f062ba3cb679664788dbf598620d6efc53ccd2d821d23b62655ce98033f455b
-  data.tar.gz: 1f0fc80ef9998d0ea255e0bb7771bc193e58c04ea030669caa945825f02e5b6740eb7ed5fb941cd8a02bf2accd2c3e15b478970a1ae67e09c893f3aab554605a
+  metadata.gz: d2e996d6feb987dc561d0d3ea019475d8dc8e206a197b53e00b2c2d8dd873229befa99c9b2bbf0730e3c9abe5794faab5f1b792a1be11cbbe218bcf77c6d71ac
+  data.tar.gz: 2382d3fc8e6fa2d1541522d361e2b8ec1a84f655c89570f3295997cec3d4821c516714351ba2179892dff6307d607d344696090c2f6a87d7d67ebb3b903ed769

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.2.2
+
+* Server can be defined by block. (https://github.com/ryotarai/infrataster/pull/51 by @otahi)
+
 ## v0.2.1
 
 * `http` resource support `ssl` option which is passed to Faraday.new (by @SnehaM)

data/README.md

@@ -75,6 +75,24 @@ Infrataster::Server.define(
   from: :proxy      # access to this machine via SSH port forwarding from proxy
 )
 
+# Code generated by `rspec --init` is following...
+```
+Or
+
+```ruby
+# spec/spec_helper.rb
+require 'infrataster/rspec'
+
+Infrataster::Server.define(:proxy) do |server|
+    server.address = '192.168.0.0/16'
+    server.vagrant = true
+end
+Infrataster::Server.define(:app) do |server|
+    server.address = '172.16.0.0/16'
+    server.vagrant = true
+    server.from = :proxy
+end
+
 # Code generated by `rspec --init` is following...
 ```
 
@@ -251,6 +269,12 @@ end
 
 `pgsql_query` is provided by [infrataster-plugin-pgsql](https://github.com/SnehaM/infrataster-plugin-pgsql) by [@SnehaM](https://github.com/SnehaM).
 
+### `dns` resource
+
+`dns` resource send query to DNS server.
+
+`dns` is provided by [infrataster-plugin-dns](https://github.com/otahi/infrataster-plugin-dns) by [@otahi](https://github.com/otahi).
+
 ## Example
 
 * [example](example)

data/lib/infrataster/server.rb

@@ -3,6 +3,7 @@ require 'net/ssh'
 require 'net/ssh/gateway'
 require 'ipaddr'
 require 'shellwords'
+require 'ostruct'
 
 module Infrataster
   class Server
@@ -10,8 +11,16 @@ module Infrataster
 
     class << self
 
-      def define(*args)
-        @@servers << Server.new(*args)
+      def define(name, *args, &block)
+        address = args.shift
+        options = args.any? ? args.shift : {}
+        if block
+          st = OpenStruct.new
+          block.call(st)
+          address = st.address if st.address
+          st.each_pair { |k, v| options[k] = v unless k == :address }
+        end
+        @@servers << Server.new(name, address, options)
       end
 
       def defined_servers

data/lib/infrataster/version.rb

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

data/spec/integration/vm/cookbooks/app/files/default/rackup.conf

@@ -1,3 +1,3 @@
 [program:rackup]
 directory=/vagrant/app
-command=rackup -p 80 config.ru
+command=rackup -o 0.0.0.0 -p 80 config.ru

data/spec/integration/vm/cookbooks/apt-mirror/metadata.rb

@@ -0,0 +1,2 @@
+name 'apt-mirror'
+depends 'apt'

data/spec/unit/lib/infrataster/server_spec.rb

@@ -11,6 +11,23 @@ module Infrataster
         expect(servers[0].address).to eq('127.0.0.1')
         expect(servers[0].options).to eq({})
       end
+      it "adds a Server instance to defined_servers with block" do
+        described_class.define(:app) do |server|
+          server.address = '127.0.0.1'
+          server.vagrant = true
+          server.from = :proxy
+        end
+        described_class.define(:proxy) do |server|
+          server.address = '127.0.0.1'
+          server.vagrant = true
+        end
+        servers = described_class.defined_servers
+        expect(servers.size).to eq(2)
+        expect(servers[0].name).to eq(:app)
+        expect(servers[0].address).to eq('127.0.0.1')
+        expect(servers[0].options[:vagrant]).to eq(true)
+        expect(servers[0].from).to eq(servers[1])
+      end
     end
 
     describe "self.find_by_name" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -208,6 +208,7 @@ files:
 - spec/integration/vm/app/config.ru
 - spec/integration/vm/cookbooks/app/files/default/rackup.conf
 - 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/index.html
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb
@@ -254,6 +255,7 @@ test_files:
 - spec/integration/vm/app/config.ru
 - spec/integration/vm/cookbooks/app/files/default/rackup.conf
 - 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/index.html
 - spec/integration/vm/cookbooks/proxy/recipes/default.rb