vagrant_filoo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b0385a665c31b877a060d18231e12bc264b1a9
-  data.tar.gz: 5d9de96e77ef02d20f5736c816099d10ee669bd0
+  metadata.gz: 01d209f3223347ab6a53ec2e8a780933b5de19cf
+  data.tar.gz: 8d5ef55d30fec3f352fa31131c773c42ddcf28a6
 SHA512:
-  metadata.gz: 61964f5d18997c8ecd44ea7d4c7e53c325e8cdec0506dcdeeef55d028d5a6d7fd7c4d87771a8a71806dde8ac8356cc49c2f7fefb5f91f45f7967d6c71dbb35bd
-  data.tar.gz: f5e5a0125cddf965b1ba302e1fed58cc74027a009ca09c1000cdf2ef56634d6e0d494ceaa4a9ddc34be21d3221416e2ef3f2058af5f787fafccccc21d452ac0c
+  metadata.gz: c12e7747b81417ef62cc76a348763a806a43b76a73c18a24603df6c06f9779ca82d8d43b11aa233bafa9ec781faaa51e699bf7dfc70a15f19cb8463415046b85
+  data.tar.gz: fd549e5372956e5b3654015e8c8ea167aa32bd4214aea47968c9c9f66262f2ce9c56dde4c46c64bf1358cd4c2addee09569c1b23c67d7f46def9f163fd320863

data/README.md

@@ -1,4 +1,4 @@
-# vagrant_filoo 0.0.2
+# vagrant_filoo 0.0.3
 Vagrant filoo provisioner
 
 This is a Vagrant 1.7x plugin that adds an  provider for filoo hosting to Vagrant, allowing Vagrant to control and provision machines within the filoo public and private cloud.
@@ -32,7 +32,7 @@ Of course prior to doing this, you'll need to obtain an Filoo-compatible box fil
 After installing the plugin (instructions above), the quickest way to get started is to actually use a dummy Filoo box and specify all the details manually within a `config.vm.provider` block. So first, add the dummy box using any name you want:
 
 ```
-$ vagrant box add filoo <url to filoo box>
+$ vagrant box add filoo https://github.com/hufsm/vagrant-filoo/raw/master/filoo.box
 ...
 ```
 

data/lib/vagrant_filoo/action/create_server.rb

@@ -1,6 +1,7 @@
 require_relative "../cloud_compute"
 require_relative '../errors'
 require 'vagrant_filoo/util/timer'
+require('JSON')
 
 module VagrantPlugins
   module Filoo
@@ -30,7 +31,8 @@ module VagrantPlugins
             :cpu => config.cpu,
             :ram => config.ram,
             :hdd => config.hdd,
-            :cd_imageid => imageId
+            :cd_imageid => imageId,
+            :additional_nic => config.additional_nic
           }
 
           env[:ui].info("vagrant_filoo creating_instance")
@@ -41,8 +43,19 @@ module VagrantPlugins
           env[:ui].info(" -- Image Name: #{config.cd_image_name}")
           env[:result] = VagrantPlugins::Filoo::CloudCompute::createServer(params, @baseUrl, @apiKey)
           env[:machine].id = env[:result]["vmid"]
+          env[:ui].info(" -- Server created with config")
           #env[:machine].name  = env[:result]["custom_vmname"]
-          env[:ui].info(" -- Server created, server state #{env[:result]}")      
+          #env[:result].each do |key, |
+          #  if value.kind_of?(String)
+          #    env[:ui].info("      #{key}: #{value}")
+          #  elsif value.kind_of?(Array)
+          #  elsif value.kind_of?(Hash)
+          #  end
+          #end
+          #env[:ui].info(" -- Server created, server state #{env[:result]}")
+          env[:ui].info(" -- Server created with config")
+          env[:ui].info(
+            "#{JSON.pretty_generate(env[:result]).gsub!('{','').gsub!('}','').gsub!('"','').gsub!(',','').gsub!('[','').gsub!(']','')}")
           @app.call(env)
         end
       end

data/lib/vagrant_filoo/action/start_instance.rb

@@ -20,7 +20,11 @@ module VagrantPlugins
           env[:metrics] ||= {}
           vmid = env[:machine].id
           env[:result] = VagrantPlugins::Filoo::CloudCompute::startInstance(vmid, @baseUrl, @apiKey, @filooConfig) 
-          env[:ui].info("Machine #{vmid} successfully started, state #{env[:result].to_json}")
+          env[:ui].info("Machine #{vmid} successfully started with config")
+            
+          env[:ui].info(
+            "#{JSON.pretty_generate(env[:result]).gsub!('{','').gsub!('}','').gsub!('"','').gsub!(',','').gsub!('[','').gsub!(']','')}")
+            
           @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
 
           if !env[:interrupted]

data/lib/vagrant_filoo/action/stop_instance.rb

@@ -20,7 +20,9 @@ module VagrantPlugins
             vmid = env[:machine].id
             env[:ui].info("Halt machine #{vmid}")
             env[:result] = VagrantPlugins::Filoo::CloudCompute::stopInstance vmid, @baseUrl, @apiKey
-            env[:ui].info("Machine #{vmid} successfully halted, state #{env[:result].to_json}")
+            env[:ui].info("Machine #{vmid} successfully halted, new state:")
+            env[:ui].info(
+             "#{JSON.pretty_generate(env[:result]).gsub!('{','').gsub!('}','').gsub!('"','').gsub!(',','').gsub!('[','').gsub!(']','')}")
           end      
           @app.call(env)
         end

data/lib/vagrant_filoo/action/terminate_instance.rb

@@ -15,6 +15,7 @@ module VagrantPlugins
         def call(env)
           vmid = env[:machine].id
           env[:result] = VagrantPlugins::Filoo::CloudCompute::deleteServer(vmid, @baseUrl, @apiKey)
+          env[:ui].info("Machine #{env[:machine].id} successfully terminated")
           env[:machine].id = nil
           @app.call(env)
         end

data/lib/vagrant_filoo/action.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
   module Filoo
     module Action
       
-      # This action is called to read the SSH info of the machine. The
+      # This action is called to read the SSH info of the machine.
       # resulting state is expected to be put into the `:machine_ssh_info`
       # key.
       def self.action_read_ssh_info

data/lib/vagrant_filoo/cloud_compute.rb

@@ -90,7 +90,10 @@ module VagrantPlugins
 
              raise e
          end
- 
+         
+         if params[:additional_nic]
+            self.addNic(vmid, baseUrl, apiKey)
+         end 
          serverStatus
       end
       
@@ -184,7 +187,7 @@ module VagrantPlugins
         
         if filooConfig.additional_nic && nicList.count < 1
           self.addNic(vmid, baseUrl, apiKey)
-        elsif !filooConfig.additional_nic && nicList.count > 0 
+        elsif !filooConfig.additional_nic && nicList.count > 0
           self.deleteNic(vmid, baseUrl, apiKey)
         end
         

data/lib/vagrant_filoo/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module Filoo
-        VERSION = '0.0.2'
+        VERSION = '0.0.3'
     end
 end

data/vagrant_filoo.gemspec

@@ -5,10 +5,11 @@ Gem::Specification.new do |s|
   s.name          = "vagrant_filoo"
   s.version       = VagrantPlugins::Filoo::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.authors       = "Stefan heuer"
+  s.authors       = "Huf Secure Mobile GmbH"
   s.email         = "stefan.heuer@huf-group.com"
   s.summary       = "Enables Vagrant to manage machines in Filoo infrastructure."
-  s.description   = "Enables Vagrant to manage machines in Filoo infrastructure."
+  s.description   = "Enables Vagrant to manage machines in Filoo infrastructure." +
+  				    "\n hosted on Github: https://github.com/hufsm/vagrant-filoo"
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant_filoo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_filoo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
-- Stefan heuer
+- Huf Secure Mobile GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -108,7 +108,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.5
-description: Enables Vagrant to manage machines in Filoo infrastructure.
+description: |-
+  Enables Vagrant to manage machines in Filoo infrastructure.
+   hosted on Github: https://github.com/hufsm/vagrant-filoo
 email: stefan.heuer@huf-group.com
 executables: []
 extensions: []