vagrant-atomic 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae89fcd9e176e407d8a9904de9aeccc22688e12
-  data.tar.gz: 75d69780dc27429a6011fffd193d07babbace82e
+  metadata.gz: ac48d4e6491035b1eaec1862db7610a1e1b93b49
+  data.tar.gz: cf51c03ef50adfd210b464178c872c33d586704a
 SHA512:
-  metadata.gz: a30c23f402f5cdd2bdf46b35a70fdacd72053a282799a80b4e8b8aba8592039d5aa6f84d89170060c59b1e5bca1ddb4b5f6c9ef3b795d4644a3c7bbd2eb6125c
-  data.tar.gz: f782d0fbf06939c5675c6fec5838499da64733f49bdace3939208d006593484b2eda27d8bd66765728fe03ef36a3fbc8d0188964d6222f5fda64b6d201c2886b
+  metadata.gz: a036bed19d81badb438ca45a869715ea3b6bc4c6f5503acc93501aa02988fd487b95532ad63cb90d6ba6285ec7694d36c236d5554761b5de1c811753f80019d1
+  data.tar.gz: 32f8035c3ed97d63d8c9f1100a28440a8510af21ce2eb74bb9700ad8726a3c1d37aa4cc15914d267a2ba22fd2fa1e8c0a64a78b622a5e842924a4df6645e2f7c

data/lib/vagrant-atomic/cap/docker.rb

@@ -3,7 +3,6 @@ module VagrantPlugins
     module Cap
       module Docker
         def self.docker_daemon_running(machine)
-          #not sure this is the best test, seems to always pass
           machine.communicate.test("test -S /run/docker.sock")
         end
       end

data/lib/vagrant-atomic/guest.rb

@@ -4,13 +4,7 @@ module VagrantPlugins
   module GuestAtomic
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-	# For now we use this non 100% bullet proof solution.
-	# Bugs issued to include word atomic in upstream releases
-	# Centos: http://bugs.centos.org/view.php?id=8288
-	# Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1200122
-	#
-	# machine.communicate.test("cat /etc/os-release | grep Atomic")
-        machine.communicate.test("which rpm-ostree")
+        machine.communicate.test("grep 'ostree=' /proc/cmdline")
       end
     end
   end

data/lib/vagrant-atomic/plugin.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
       name "Atomic Host guest"
       description "Atomic Host guest support."
 
-      guest("atomic", "redhat") do
+      guest("atomic", "fedora") do
         require File.expand_path("../guest", __FILE__)
         Guest
       end

data/lib/vagrant-atomic/plugin.rb~

@@ -0,0 +1,74 @@
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The vagrant-atomic plugin must be run within Vagrant.'
+end
+
+module VagrantPlugins
+  module GuestAtomic
+    class Plugin < Vagrant.plugin("2")
+      name "Atomic Host guest"
+      description "Atomic Host guest support."
+
+      guest("atomic", "redhat") do
+        require File.expand_path("../", __FILE__)
+        Guest
+      end
+
+      guest_capability("atomic", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("atomic", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+
+      guest_capability("atomic", "docker_daemon_running") do
+        require_relative "cap/docker"
+        Cap::Docker
+      end
+
+      # This sets up our log level to be whatever VAGRANT_LOG is
+      # for loggers prepended with 'vagrant_libvirt'
+      def self.setup_logging
+        require 'log4r'
+        level = nil
+        begin
+          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
+        rescue NameError
+          # This means that the logging constant wasn't found,
+          # which is fine. We just keep `level` as `nil`. But
+          # we tell the user.
+          level = nil
+        end
+        # Some constants, such as "true" resolve to booleans, so the
+        # above error checking doesn't catch it. This will check to make
+        # sure that the log level is an integer, as Log4r requires.
+        level = nil if !level.is_a?(Integer)
+        # Set the logging level on all "vagrant" namespaced
+        # logs as long as we have a valid level.
+        if level
+          logger = Log4r::Logger.new('vagrant_registration')
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+
+#shouldn't need these as I inherit
+      # guest_capability("atomic", "register") do
+      #   require_relative "cap/register"
+      #   Cap::Register
+      # end
+  
+      # guest_capability("atomic", "unregister") do
+      #   require_relative "cap/unregister"
+      #   Cap::Unregister
+      # end
+
+
+    end
+  end
+end

data/lib/vagrant-atomic/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GuestAtomic
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/vagrant-atomic.gemspec

@@ -6,15 +6,13 @@ Gem::Specification.new do |s|
   s.version       = VagrantPlugins::GuestAtomic::VERSION
   s.platform      = Gem::Platform::RUBY
   s.license       = "GPL-2.0"
-  s.authors       = ["Langdon White", "et al"]
+  s.authors       = ["Langdon White", "Josef Strzibny", "et al"]
   s.email         = "langdon@fedoraproject.org"
-  s.summary       = "Enables the Project Atomic OS (http://projectatomic.io) as a guest for vagrant"
-  s.description   = "Enables the Project Atomic OS (http://projectatomic.io) as a guest for vagrant. Tested with Fedora Atomic and RHEL Atomic"
-
+  s.summary       = "Project Atomic guest for Vagrant"
+  s.description   = "Adds the Project Atomic OS (http://projectatomic.io) as a guest for Vagrant. Tested with Fedora Atomic and RHEL Atomic."
+  s.homepage      = "https://github.com/projectatomic/vagrant-atomic"
   s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "vagrant-atomic"
 
-  # this gemspec is, and parsing out the ignored files from the gitignore.
   # Note that the entire gitignore(5) syntax is not supported, specifically
   # the "!" syntax, but it should mostly work correctly.
   root_path      = File.dirname(__FILE__)

metadata

@@ -1,40 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-atomic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Langdon White
+- Josef Strzibny
 - et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies: []
-description: Enables the Project Atomic OS (http://projectatomic.io) as a guest for
-  vagrant. Tested with Fedora Atomic and RHEL Atomic
+description: Adds the Project Atomic OS (http://projectatomic.io) as a guest for Vagrant.
+  Tested with Fedora Atomic and RHEL Atomic.
 email: langdon@fedoraproject.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- vagrant-atomic.gemspec
+- ".gitignore"
+- CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - Vagrantfile
 - lib/vagrant-atomic.rb
-- lib/vagrant-atomic/plugin.rb
-- lib/vagrant-atomic/guest.rb
-- lib/vagrant-atomic/cap/unregister.rb
-- lib/vagrant-atomic/cap/register.rb
 - lib/vagrant-atomic/cap/change_host_name.rb
 - lib/vagrant-atomic/cap/docker.rb
+- lib/vagrant-atomic/guest.rb
+- lib/vagrant-atomic/plugin.rb
+- lib/vagrant-atomic/plugin.rb~
 - lib/vagrant-atomic/version.rb
-- CHANGELOG.md
-- Rakefile
-- Gemfile
-- .gitignore
-homepage: 
+- vagrant-atomic.gemspec
+homepage: https://github.com/projectatomic/vagrant-atomic
 licenses:
 - GPL-2.0
 metadata: {}
@@ -44,18 +44,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: vagrant-atomic
-rubygems_version: 2.0.14
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Enables the Project Atomic OS (http://projectatomic.io) as a guest for vagrant
+summary: Project Atomic guest for Vagrant
 test_files: []
+has_rdoc: 

data/lib/vagrant-atomic/cap/register.rb

@@ -1,14 +0,0 @@
-module VagrantPlugins
-  module GuestAtomic
-    module Cap
-      class Register
-        def self.register(machine)
-          username = machine.config.registration.subscriber_username
-          password = machine.config.registration.subscriber_password	       
-          command = "subscription-manager register --username=#{username} --password=#{password} --auto-attach"
-          machine.communicate.execute("cmd=$(#{command}); if [ \"$?\" != \"0\" ]; then echo $cmd | grep 'This system is already registered' || (echo $cmd 1>&2 && exit 1) ; fi", sudo: true)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-atomic/cap/unregister.rb

@@ -1,24 +0,0 @@
-module VagrantPlugins
-  module GuestAtomic
-    module Cap
-      class Unregister
-        def self.unregister(machine)
-          begin
-            if machine.communicate.ready?
-              machine.communicate.execute("subscription-manager unregister || :", sudo: true)             
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-
-            # if !machine.communicate.ready?
-            #   raise Vagrant::Errors::VMNotCreatedError
-            # end
-            
-#          rescue IOError
-          # Ignore, this probably means connection closed because it
-          # shut down.