vagrant-smartos-zones 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a13e6ad538b1e3c6c75a7a12d0d7c18d12c43e7
-  data.tar.gz: 7070cd9f5472d61db25ae4124a3b095e80971994
+  metadata.gz: 017d81d8ef59ed8fe4f8ffdbe557a987ed8b4ada
+  data.tar.gz: ad0ce0a88a2debd443641eb771916ad74ac4936e
 SHA512:
-  metadata.gz: ce4d10009bbc7a2be3fb38ab0c304aecb969b2924420bd1205b149870aadb4b8e7fa22d37a9a79a46a0c2c98af0d4af5234337bb1727ba04e718b4533d876ff9
-  data.tar.gz: ce02542db87e470874c2ca803144abae4060a71e7b46f2f94cfdd516d19add28b957c1b1dbbb25873cb8e8cfc8369c8e9a566ee87ef5d3a1c5d2c3ba4f26dd00
+  metadata.gz: 5de14a90d5cf2d8a26badff84b4682b0b875be92c61405c0777012d699b73cdf0e85b6416ae2c8183cf09a8d92424b6f44d02deb6f2a1d7a3a864db05a168f50
+  data.tar.gz: bd39add13ae466896d6061a670f41eb8e76a8c905b9b2f5a63171c61f6189b54e21a4da6d09ce30ea8ecf17c1a62c0f9a34cb2ba424043e89f63ab05f1fe88a9

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
 group :development do
+  gem 'pry-nav'
+  gem 'rake'
+  gem 'rspec'
   gem 'rubocop'
   gem 'vagrant'
-  gem 'rake'
-  gem 'pry-nav'
 end
 
 group :plugins do
@@ -12,6 +13,6 @@ group :plugins do
 end
 
 group :integration do
-  gem 'test-kitchen'
   gem 'kitchen-vagrant'
+  gem 'test-kitchen'
 end

data/lib/vagrant/smartos/zones/models/config.rb

@@ -10,7 +10,7 @@ module Vagrant
           end
 
           def self.config(env)
-            @config ||= new(env).load
+            new(env).load
           end
 
           attr_reader :env, :hash

data/lib/vagrant/smartos/zones/models/network.rb

@@ -17,25 +17,25 @@ module Vagrant
           end
 
           def zone_network
-            [cidr.network, cidr.bits].join('/')
+            [cidr.network, cidr.netmask].join
           end
 
           def gz_addr
-            [gz_stub_ip, cidr.bits].join('/')
+            [gz_stub_ip, cidr.netmask].join
           end
 
           def gz_stub_ip
-            cidr[1].ip
+            cidr.nth(1).to_s
           end
 
           def zone_ip
-            cidr[2].ip
+            cidr.nth(2).to_s
           end
 
           private
 
           def cidr
-            @cidr ||= NetAddr::CIDR.create(network)
+            @cidr ||= NetAddr::IPv4Net.parse(network)
           end
 
           def plugin_config

data/lib/vagrant/smartos/zones/version.rb

@@ -1,7 +1,7 @@
 module Vagrant
   module Smartos
     module Zones
-      VERSION = '0.2.4'
+      VERSION = '0.2.5'
     end
   end
 end

data/spec/fixtures/config/network/smartos/config.yml

@@ -0,0 +1,2 @@
+---
+network: "10.16.0.0/16"

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.disable_monkey_patching!
+  config.order = :random
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  Kernel.srand config.seed
+end

data/spec/vagrant/smartos/zones/models/network_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'pathname'
+require 'vagrant/smartos/zones/models/network'
+
+RSpec.describe Vagrant::Smartos::Zones::Models::Network do
+  subject(:network) { described_class.new(env) }
+
+  let(:env) { default_env }
+  let(:default_env) { { home_path: pwd.join(home_path) } }
+  let(:pwd) { Pathname.new(ENV['PWD']) }
+  let(:home_path) { 'spec/fixtures/config/default' }
+
+  describe 'network' do
+    it 'defaults to 172.16.0.0/24' do
+      expect(network.network).to eq('172.16.0.0/24')
+    end
+
+    describe 'with a network specified in the plugin configuration' do
+      let(:home_path) { 'spec/fixtures/config/network' }
+
+      it 'uses the value' do
+        expect(network.network).to eq('10.16.0.0/16')
+      end
+    end
+  end
+
+  describe 'zone_network' do
+    it 'is a CIDR of the network' do
+      expect(network.zone_network).to eq('172.16.0.0/24')
+    end
+  end
+
+  describe 'gz_addr' do
+    it 'is a CIDR of the first IP on the network' do
+      expect(network.gz_addr).to eq('172.16.0.1/24')
+    end
+  end
+
+  describe 'gz_stub_ip' do
+    it 'is the first IP on the network' do
+      expect(network.gz_stub_ip).to eq('172.16.0.1')
+    end
+  end
+
+  describe 'zone_ip' do
+    it 'is the second IP on the network' do
+      expect(network.zone_ip).to eq('172.16.0.2')
+    end
+  end
+end

data/vagrant-smartos-zones.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'netaddr', '~> 1.5.1'
+  spec.add_dependency 'netaddr', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'pry-nav'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-zones
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Eric Saxby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".kitchen.yml"
+- ".rspec"
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
@@ -156,6 +157,10 @@ files:
 - lib/vagrant/smartos/zones/util/zone_user.rb
 - lib/vagrant/smartos/zones/util/zones.rb
 - lib/vagrant/smartos/zones/version.rb
+- spec/fixtures/config/default/smartos/config.yml
+- spec/fixtures/config/network/smartos/config.yml
+- spec/spec_helper.rb
+- spec/vagrant/smartos/zones/models/network_spec.rb
 - test/integration/default/serverspec/group_spec.rb
 - test/integration/default/serverspec/spec_helper.rb
 - test/integration/default/serverspec/user_spec.rb
@@ -187,6 +192,10 @@ signing_key:
 specification_version: 4
 summary: Manage SmartOS zones in Vagrant
 test_files:
+- spec/fixtures/config/default/smartos/config.yml
+- spec/fixtures/config/network/smartos/config.yml
+- spec/spec_helper.rb
+- spec/vagrant/smartos/zones/models/network_spec.rb
 - test/integration/default/serverspec/group_spec.rb
 - test/integration/default/serverspec/spec_helper.rb
 - test/integration/default/serverspec/user_spec.rb