vagrantomatic 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83fc3dcd87b04014048017771a8aa048d24afbd0
-  data.tar.gz: 3308830d0c6486b688ea7715208fd56d931badf4
+  metadata.gz: e87545b4ceeb2375b37856c107092824afb24dca
+  data.tar.gz: 9b2b57f73f09c98bf7164e5c29a8577ca6725064
 SHA512:
-  metadata.gz: 209fca308c3c55f44081995f781101a37e6aa72efdfab9ce02c62753300e9d6877050b396fe10626594f2af1ea269703c6baa456bf9c35862e811d8e3b7d2d80
-  data.tar.gz: a30f119114ff811527fdc987eade59e681f845f8c9cdbc0e1420b783c33c2fe6ca8175f5d95da38fd2373d11b95537f8d6c619d9fd39d45ff196a09c128c449d
+  metadata.gz: 4be7d934d5e2dccd1072c6f9b5a3950b4758cb643b262448909fe8ec66ef6a576bab1210e9f1ad5e4950e95c2a9a43406e72d7612dcf2a6770fe82d9bab942e5
+  data.tar.gz: dc7fa3a0ce1fed4c334cfd29cdcef9ffc5f3eec9461c977e18b9f539bc89c900075289973d0338dc92db91058552728e3f5d48b4525c5e5694fa8ed5ad0186b2

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+/*.gem

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in vagrantomatic.gemspec
+gem 'derelict', :git => 'https://github.com/GeoffWilliams/derelict', :ref => 'preserve_real_status'
 gemspec

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/GeoffWilliams/vagrantomatic.svg?branch=master)](https://travis-ci.org/GeoffWilliams/vagrantomatic)
 # Vagrantomatic
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/vagrantomatic`. To experiment with that code, run `bin/console` for an interactive prompt.
@@ -33,4 +34,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/vagrantomatic.
-

data/lib/vagrantomatic/instance.rb

@@ -1,7 +1,3 @@
-# require "json"
-# require "vagrantomatic/vagrantfile"
-# require "vagrantomatic/logger"
-#
 require "derelict"
 require "fileutils"
 require "json"
@@ -15,11 +11,18 @@ module Vagrantomatic
 
     attr_accessor :config
 
-    def initialize(vagrant_vm_dir, name, logger: nil, config:{})
+    def initialize(vagrant_vm_dir, name, logger: nil, config:nil)
       @name           = name
       @vagrant_vm_dir = vagrant_vm_dir
       @logger         = ::Vagrantomatic::Logger.new(logger).logger
-      @config         = config
+
+      # use supplied config if present, otherwise load from file
+      if config
+        @config = config
+      else
+        @config = configfile_hash
+      end
+      @logger.debug "initialized vagrantomatic instance for #{name}"
     end
 
     def vm_instance_dir
@@ -34,15 +37,15 @@ module Vagrantomatic
       File.join(vm_instance_dir, VAGRANTFILE_JSON)
     end
 
-    # return a hash of the configfile or false if error encountered
+    # return a hash of the configfile or empty hash if error encountered
     def configfile_hash
 
-      config  = false
+      config  = {}
       begin
         json    = File.read(configfile)
         config  = JSON.parse(json)
       rescue Errno::ENOENT
-        @logger.error("#{configfile} does not exist")
+        @logger.debug("#{configfile} does not exist")
       rescue JSON::ParserError
         @logger.error("JSON parser error in #{configfile}")
       end
@@ -52,13 +55,13 @@ module Vagrantomatic
     def configured?
       configured = false
       if Dir.exists? (vm_instance_dir) and File.exists?(configfile) and File.exists?(vagrantfile)
-        json = File.read(configfile)
-        configured = !! configfile_hash
+        configured = configfile_hash.has_key?("box")
       end
       configured
     end
 
     def save
+      @logger.debug("saving vm settings...")
       FileUtils.mkdir_p(vm_instance_dir)
       ensure_config
       ensure_vagrantfile
@@ -85,11 +88,11 @@ module Vagrantomatic
 
     def get_vm
       # Create an instance (represents a Vagrant **installation**)
-      instance = Derelict.instance(Vagrantomatic::Vagrantomatic::VAGRANT_DIR)
+      instance = Derelict.instance(::Vagrantomatic::Vagrantomatic::DEFAULT_VAGRANT_DIR)
       result = instance.execute('--version') # Derelict::Executer object (vagrant --version)
       if result.success?
         # vagrant present and working, connect to our vm INSTANCE
-        vm = instance.connect(@vm_instance_dir)
+        vm = instance.connect(vm_instance_dir)
       else
         raise "Error connecting to vagrant! (vagrant --version failed)"
       end
@@ -97,6 +100,13 @@ module Vagrantomatic
       vm
     end
 
+    def execute_and_log(op)
+      get_vm.execute(op) { |stdout, stderr|
+        # only one of these will ever be set at a time, other one is nil
+        @logger.debug "#{stdout}#{stderr}"
+      }.success?
+    end
+
     def in_sync?
       configured  = false
       have_config = configfile_hash
@@ -109,20 +119,37 @@ module Vagrantomatic
     end
 
     def start
-      get_vm.execute(:up).success?
+      execute_and_log(:up)
     end
 
     def stop
-      get_vm.execute(:suspend).success?
+      execute_and_log(:suspend)
     end
 
     def purge
-      get_vm.execute(:destroy)
-      FileUtils::rm_rf(@vm_instance_dir)
+      execute_and_log(:destroy)
+      if Dir.exists? vm_instance_dir
+        FileUtils::rm_rf(vm_instance_dir)
+      end
     end
 
     def reload
-      set_vm.execute(:reload)
+      execute_and_log(:reload)
+    end
+
+    def run(command)
+      # arrayify
+      command = [command]
+
+      # throw the command over the wall to derelect whatever the state of instance
+      command.unshift("-c")
+      messages = []
+      vm = get_vm
+      executor = vm.execute(:ssh, command) { |stdout,stderr|
+        @logger.debug "#{stdout}#{stderr}"
+        messages << stdout << stderr
+      }
+      { :status => executor.status, :messages => messages}
     end
 
    end

data/lib/vagrantomatic/logger.rb

@@ -9,6 +9,9 @@ module Vagrantomatic
         @logger = logger
       else
         @logger = ::Logger.new(STDOUT)
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+          "#{severity}: #{msg}"
+        end
       end
     end
 

data/lib/vagrantomatic/vagrantomatic.rb

@@ -1,5 +1,4 @@
 require "vagrantomatic/version"
-require "vagrantomatic/vagrantfile"
 require "vagrantomatic/logger"
 require "vagrantomatic/instance"
 require "json"
@@ -34,7 +33,7 @@ module Vagrantomatic
 
     # Return a has of instances
     def instances_metadata()
-      instance_wildcard = File.join(@vagrant_vm_dir, "*", ::Vagrantomatic::Vagrantfile::VAGRANTFILE)
+      instance_wildcard = File.join(@vagrant_vm_dir, "*", ::Vagrantomatic::Instance::VAGRANTFILE)
       instances = {}
       Dir.glob(instance_wildcard).each { |f|
         elements = f.split(File::SEPARATOR)

data/lib/vagrantomatic/version.rb

@@ -1,3 +1,3 @@
 module Vagrantomatic
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/res/Vagrantfile

@@ -17,6 +17,7 @@ config_ip         = config["ip"]
 config_memory     = config["memory"]
 config_cpu        = config["cpu"]
 config_provision  = config["provision"]
+config_folders    = config["folders"] ? Array(config["folders"]) : false
 
 # Create boxes
 Vagrant.configure("2") do |config|
@@ -36,7 +37,12 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  # srv.vm.synced_folder "./", "/home/vagrant/#{servers['name']}"
+  if config_folders
+    config_folders.each do |folder|
+      folder_split = folder.split(':')
+      config.vm.synced_folder folder_split[0], folder_split[1]
+    end
+  end
   if config_provision
     config.vm.provision "shell", inline: config_provision
   end

data/vagrantomatic.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency "derelict", "0.6.2"
+  # https://github.com/bradfeehan/derelict/issues/16
+  # spec.add_dependency "derelict", "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrantomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: derelict
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.2
 description: 
 email:
 - geoff@geoffwilliams.me.uk