infrataster 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd8224440be0202f0981f08c84d41d96452ced1
-  data.tar.gz: 22738c41f609c5a5975251c41aaf4405fb2a451b
+  metadata.gz: 6deb149a0997920f69ccdb20adbdabcbb923ebb4
+  data.tar.gz: 4e9c444f8d6beee298c37286998eb6e7a6517642
 SHA512:
-  metadata.gz: 0afc168b4efdf3c99d69f8780061c0d4276873c03801ef49394d56922a73e23a15da02a1376c6ff136c90cb5eca7b71e029d9351200b20713b3c4f4b08ebb11e
-  data.tar.gz: f737fd8a7ea09bdda40fffb1fc0e9165a3fe8369d7779a055b6c4b3b56be6ffd1568214e7996784cdbfd89db110138458bdb9e4e7e367492488bc0232eef52c5
+  metadata.gz: e69c2d0111708ed18d616419f10515bb06283841d561d97e9935064a2e0dce16d42e9c3c02aab7adf3ceec80769cf392e2cd3b66e8765bfdbb9fca7f939cf3f4
+  data.tar.gz: 6337545b1a1fb3d1d81517ff972d214e1c91c9b3ec3499169010eb156499e1b674e31cf36909b3b558e22be45a625e0768aa8254c01d9fa35a006bd8adde7912

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.1.9
+
+* Add "fuzzy IP address" feature which determine IP address by CIDR or netmask.
+
 ## v0.1.8
 
 * Use Poltergeist's header manipulation instead of BrowserMob Proxy. Remove BrowserMob Proxy dependency.

data/README.md

@@ -63,15 +63,15 @@ $ rspec --init
 require 'infrataster/rspec'
 
 Infrataster::Server.define(
-  :proxy,          # name
-  '192.168.33.10', # ip address
-  vagrant: true    # for vagrant VM
+  :proxy,           # name
+  '192.168.0.0/16', # ip address
+  vagrant: true     # for vagrant VM
 )
 Infrataster::Server.define(
-  :app,            # name
-  '172.16.33.11',  # ip address
-  vagrant: true,   # for vagrant VM
-  from: :proxy     # access to this machine via SSH port forwarding from proxy
+  :app,             # name
+  '172.16.0.0/16',  # ip address
+  vagrant: true,    # for vagrant VM
+  from: :proxy      # access to this machine via SSH port forwarding from proxy
 )
 
 # Code generated by `rspec --init` is following...
@@ -117,7 +117,7 @@ Infrataster::Server.define(
   # Name of the server, this will be used in the spec files.
   :proxy,
   # IP address of the server
-  '192.168.44.10',
+  '192.168.0.0/16',
   # If the server is provided by vagrant and this option is true,
   # SSH configuration to connect to this server is got from `vagrant ssh-config` command automatically.
   vagrant: true,
@@ -127,7 +127,7 @@ Infrataster::Server.define(
   # Name of the server, this will be used in the spec files.
   :app,
   # IP address of the server
-  '172.16.44.11',
+  '172.16.0.0/16',
   # If the server is provided by vagrant and this option is true,
   # SSH configuration to connect to this server is got from `vagrant ssh-config` command automatically.
   vagrant: true,
@@ -147,6 +147,27 @@ Infrataster::Server.define(
 )
 ```
 
+### fuzzy IP address
+
+Infrataster has "fuzzy IP address" feature. You can pass IP address which has netmask (= CIDR) to `Infrataster::Server#define`. This needs `vagrant` option or `ssh` option which has `host_name` because this fetches all IP address via SSH and find the matching one.
+
+```ruby
+Infrataster::Server.define(
+  :app,
+  # find IP address matching 172.16.0.0 ~ 172.16.255.255
+  '172.16.0.0/16',
+```
+
+Of course, you can set fully-specified IP address too.
+
+```ruby
+Infrataster::Server.define(
+  :app,
+  '172.16.11.22',
+  # or
+  '172.16.11.22/32',
+```
+
 ### #ssh_exec
 
 You can execute a command on the server like the following:

data/lib/infrataster/helpers/resource_helper.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'infrataster/resources'
 
 module Infrataster

data/lib/infrataster/server.rb

@@ -36,7 +36,8 @@ module Infrataster
     attr_reader :name, :address, :options
 
     def initialize(name, address, options = {})
-      @name, @address, @options = name, address, options
+      @name, @options = name, options
+      @address = determine_address(address)
     end
 
     def from
@@ -134,6 +135,44 @@ module Infrataster
 
       config
     end
+
+    def fetch_all_addresses
+      result = []
+      ssh_exec('ip addr').each_line do |line|
+        #inet 10.0.2.15/24 brd 10.0.2.255 scope global eth0
+        if %r{inet ([^/]+)} =~ line
+          result << $1
+        end
+      end
+
+      result
+    end
+
+    def determine_address(address)
+      Logger.debug("Determining ip address...")
+
+      ipaddr = IPAddr.new(address)
+      if ipaddr.to_range.begin == ipaddr.to_range.end
+        # subnet mask is 255.255.255.255
+        return ipaddr.to_s
+      end
+
+      all_addresses = fetch_all_addresses
+      Logger.debug(all_addresses)
+
+      matched = all_addresses.select do |a|
+        ipaddr.include?(a)
+      end
+      Logger.debug(matched)
+
+      if matched.empty?
+        raise Error, "No IP address matching #{ipaddr} is not found."
+      elsif matched.size > 1
+        raise Error, "Multiple IP addresses matching #{ipaddr} are found."
+      end
+
+      matched.first
+    end
   end
 end
 

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/integration/spec_helper.rb

@@ -2,12 +2,12 @@ require 'infrataster/rspec'
 
 Infrataster::Server.define(
   :proxy,
-  '192.168.44.10',
+  '192.168.0.0/16',
   vagrant: true,
 )
 Infrataster::Server.define(
   :app,
-  '172.16.44.11',
+  '172.16.0.0/16',
   vagrant: true,
   from: :proxy,
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec