vagrant-zentoo 0.1.3 → 0.2.0

data/.gitignore

@@ -1,15 +1,3 @@
 *.gem
-
-### Eclipse project management files
-.loadpath
-.buildpath
-.project
-.settings/*
-
-### Mac OS temporary files
-.DS_Store
-._*
-
-### Windows temporary files
-Thumbs.db
-
+.vagrant*
+Gemfile.lock

data/Gemfile

@@ -1,3 +1,10 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec
+
+group :development do
+  # We depend on Vagrant for development, but we don't add it as a
+  # gem dependency because we expect to be installed within the
+  # Vagrant environment itself using `vagrant plugin`.
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+end

data/Rakefile

@@ -1,10 +1,3 @@
 # encoding: utf-8
 
-require 'rubygems'
-
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue LoadError
-  $stderr.puts "Bundler not installed. You should install it with: gem install bundler"
-end
+require 'bundler/gem_tasks'

data/lib/vagrant-zentoo.rb

@@ -1,30 +1,20 @@
-require 'vagrant'
-require 'vagrant/guest/zentoo'
+require "vagrant"
 
-Vagrant.guests.register(:zentoo)  { Vagrant::Guest::Zentoo }
-
-module Vagrant
-  module Guest
-    class Linux
-      def distro_dispatch_with_zentoo
-        result = nil
-
-        if @vm.channel.test("cat /etc/os-release")
-          @vm.channel.execute("cat /etc/os-release | grep ^ID") do |type, data|
-            next if data.chomp.empty?
-            result = data.chomp.gsub(/^ID="?([^"]*)"?/, '\1').to_sym if type == :stdout
-          end
-        end
+module VagrantPlugins
+  module GuestZentoo
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("cat /etc/os-release")
+      end
+    end
 
-        unless result
-          result = distro_dispatch_without_zentoo
-        end
+    class Plugin < Vagrant.plugin("2")
+      name "Zentoo Linux based guest"
+      description "Zentoo Linux based guest support."
 
-        result
+      guest("zentoo", "systemd") do
+        Guest
       end
-
-      alias_method :distro_dispatch_without_zentoo, :distro_dispatch
-      alias_method :distro_dispatch, :distro_dispatch_with_zentoo
     end
   end
 end

data/vagrant-zentoo.gemspec

@@ -2,17 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "vagrant-zentoo"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
   s.authors = ["Benedikt Böhm"]
   s.email = ["bb@xnull.de"]
   s.homepage = "http://github.com/zentoo/vagrant-zentoo"
-  s.summary = %q{Vagrant plugin to detect and support Zentoo Linux}
-  s.description = %q{Vagrant plugin to detect and support Zentoo Linux}
+  s.summary = %q{Vagrant plugin to detect and support Zentoo Linux based systems}
+  s.description = %q{Vagrant plugin to detect and support Zentoo Linux based systems}
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths    = ["lib"]
-
-  s.add_dependency "vagrant", ">= 1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zentoo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,20 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: &19240700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *19240700
-description: Vagrant plugin to detect and support Zentoo Linux
+date: 2013-06-22 00:00:00.000000000 Z
+dependencies: []
+description: Vagrant plugin to detect and support Zentoo Linux based systems
 email:
 - bb@xnull.de
 executables: []
@@ -30,15 +19,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.rst
 - Rakefile
 - lib/vagrant-zentoo.rb
-- lib/vagrant/guest/zentoo.rb
-- lib/vagrant_init.rb
 - vagrant-zentoo.gemspec
 homepage: http://github.com/zentoo/vagrant-zentoo
 licenses: []
@@ -60,8 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Vagrant plugin to detect and support Zentoo Linux
+summary: Vagrant plugin to detect and support Zentoo Linux based systems
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create ruby-1.9.3-p125@vagrant-zentoo

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    vagrant-zentoo (0.1.0)
-      vagrant (~> 1.0.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    archive-tar-minitar (0.5.2)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    i18n (0.6.0)
-    json (1.5.4)
-    log4r (1.1.10)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    vagrant (1.0.3)
-      archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (~> 1.5.1)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  vagrant-zentoo!

data/README.rst

@@ -1,4 +0,0 @@
-Vagrant for Zentoo
-==================
-
-This Vagrant plugin adds support for Zentoo Linux.

data/lib/vagrant/guest/zentoo.rb

@@ -1,38 +0,0 @@
-require 'yaml'
-require 'vagrant/guest/gentoo'
-
-module Vagrant
-  module Guest
-    class Zentoo < Gentoo
-      TEMPLATES = YAML::load <<EOF
----
-:network_dhcp: |
-  # The contents below are automatically generated by Vagrant. Do not modify.
-  dhcpcd eth<%= options[:interface] %>
-  exit 0
-:network_static: |
-  # The contents below are automatically generated by Vagrant. Donot modify.
-  ip link set eth<%= options[:interface] %> up
-  ip addr add <%= options[:ip] %>/<%= options[:netmask] %> dev eth<%= options[:interface] %>
-  exit 0
-EOF
-
-      def configure_networks(networks)
-        # Configure each network interface
-        networks.each do |network|
-          entry = TemplateRenderer.render_string(TEMPLATES["network_#{network[:type]}".to_sym], :options => network)
-
-          # Upload the entry to a temporary location
-          temp = Tempfile.new("vagrant")
-          temp.binmode
-          temp.write(entry)
-          temp.close
-
-          vm.channel.upload(temp.path, "/tmp/vagrant-network-entry")
-          vm.channel.sudo("cat /tmp/vagrant-network-entry > /etc/ifup.eth#{network[:interface]}")
-          vm.channel.sudo("/bin/bash /etc/ifup.eth#{network[:interface]}")
-        end
-      end
-    end
-  end
-end

data/lib/vagrant_init.rb

@@ -1,2 +0,0 @@
-# This file is automatically loaded by Vagrant to load any plugins.
-require 'vagrant-zentoo'